From b0710cad1e0f54f7542310039f89b13c8b71e46c Mon Sep 17 00:00:00 2001
From: Ibby Hadeed <ibby93@gmail.com>
Date: Tue, 28 Mar 2017 19:31:39 -0400
Subject: [PATCH 01/19] test cci2

---
 circle.yml | 61 +++++++++++++++++++++++++++++++-----------------------
 1 file changed, 35 insertions(+), 26 deletions(-)

diff --git a/circle.yml b/circle.yml
index 0a8ac6b2f..41db9af16 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,26 +1,35 @@
-machine:
-  node:
-    version: 5.5.0
-  ruby:
-    version: 2.1.2
-
-general:
-  branches:
-    only:
-      - master # ignore PRs and branches
-
-dependencies:
- pre:
-   - ./scripts/docs/prepare.sh
- cache_directories:
-   - "~/ionic-site" # cache ionic-site
-
-test:
-  override:
-    - echo "No tests to run"
-
-deployment:
- staging:
-   branch: master
-   commands:
-     - ./scripts/docs/update_docs.sh
+version: 2
+jobs:
+  build:
+    working_directory: ~/ionic-native/
+    docker:
+      - image: node:7
+    branches:
+      - only:
+        - cci2
+    steps:
+      - checkout
+      - run:
+         name: Install node modules
+         run: npm i
+  deployDocs:
+    working_directory: ~/ionic-native/
+    docker:
+      - image: node:7
+    branches:
+      - only:
+        - cci2 # set this to master
+    steps:
+      - run:
+          name: Prepare ionic-site repo
+          command: ./scripts/docs/prepare.sh
+      - save_cache:
+         paths:
+           - ~/ionic-site/
+      - checkout
+      - run:
+          name: Install node modules
+          command: npm i
+      - run:
+          name: Update docs
+          command: ./scripts/docs/update_docs.sh

From 15237ea98331516e8b60dac2830edd2140036b6a Mon Sep 17 00:00:00 2001
From: Ibby Hadeed <ibby93@gmail.com>
Date: Tue, 28 Mar 2017 19:32:07 -0400
Subject: [PATCH 02/19] fix syntax

---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 41db9af16..e1078ed7f 100644
--- a/circle.yml
+++ b/circle.yml
@@ -11,7 +11,7 @@ jobs:
       - checkout
       - run:
          name: Install node modules
-         run: npm i
+         command: npm i
   deployDocs:
     working_directory: ~/ionic-native/
     docker:

From a1ff059e90acd878dd9bdb28d51040451cf27054 Mon Sep 17 00:00:00 2001
From: Ibby Hadeed <ibby93@gmail.com>
Date: Tue, 28 Mar 2017 19:37:05 -0400
Subject: [PATCH 03/19] try building

---
 circle.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index e1078ed7f..7b1f2db11 100644
--- a/circle.yml
+++ b/circle.yml
@@ -12,7 +12,9 @@ jobs:
       - run:
          name: Install node modules
          command: npm i
-  deployDocs:
+      - run: npm run build
+  update_docs:
+    machine: true
     working_directory: ~/ionic-native/
     docker:
       - image: node:7

From 4778637bd5ef0045822ff0a7337187a6a695cf87 Mon Sep 17 00:00:00 2001
From: Ibby Hadeed <ibby93@gmail.com>
Date: Tue, 28 Mar 2017 19:37:52 -0400
Subject: [PATCH 04/19] Remove machine option

---
 circle.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 7b1f2db11..d70ac2687 100644
--- a/circle.yml
+++ b/circle.yml
@@ -14,7 +14,6 @@ jobs:
          command: npm i
       - run: npm run build
   update_docs:
-    machine: true
     working_directory: ~/ionic-native/
     docker:
       - image: node:7

From cadafaa3b600eb7bf762e1e0bf176b36440b4360 Mon Sep 17 00:00:00 2001
From: Ibby Hadeed <ibby93@gmail.com>
Date: Tue, 28 Mar 2017 19:41:50 -0400
Subject: [PATCH 05/19] build timeouts

---
 circle.yml | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/circle.yml b/circle.yml
index d70ac2687..db177646b 100644
--- a/circle.yml
+++ b/circle.yml
@@ -8,29 +8,17 @@ jobs:
       - only:
         - cci2
     steps:
+      - run:
+            name: Prepare ionic-site repo
+            command: ./scripts/docs/prepare.sh
+      - save_cache:
+               paths:
+                 - ~/ionic-site/
       - checkout
       - run:
          name: Install node modules
          command: npm i
-      - run: npm run build
-  update_docs:
-    working_directory: ~/ionic-native/
-    docker:
-      - image: node:7
-    branches:
-      - only:
-        - cci2 # set this to master
-    steps:
-      - run:
-          name: Prepare ionic-site repo
-          command: ./scripts/docs/prepare.sh
-      - save_cache:
-         paths:
-           - ~/ionic-site/
-      - checkout
-      - run:
-          name: Install node modules
-          command: npm i
+      - run: npm run lint
       - run:
           name: Update docs
           command: ./scripts/docs/update_docs.sh

From 117b0578b073254820582be16520075139fc9e39 Mon Sep 17 00:00:00 2001
From: Ibby Hadeed <ibby93@gmail.com>
Date: Tue, 28 Mar 2017 19:45:44 -0400
Subject: [PATCH 06/19] fixes

---
 circle.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/circle.yml b/circle.yml
index db177646b..6070064bb 100644
--- a/circle.yml
+++ b/circle.yml
@@ -8,10 +8,13 @@ jobs:
       - only:
         - cci2
     steps:
+      - restore_cache:
+         key: ionic-site
       - run:
             name: Prepare ionic-site repo
             command: ./scripts/docs/prepare.sh
       - save_cache:
+               key: ionic-site
                paths:
                  - ~/ionic-site/
       - checkout

From 7953ca0e72fd14d5b3f6433a8e025f3d12ba1530 Mon Sep 17 00:00:00 2001
From: Ibby Hadeed <ibby93@gmail.com>
Date: Tue, 28 Mar 2017 19:46:17 -0400
Subject: [PATCH 07/19] fixes

---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 6070064bb..96fee4272 100644
--- a/circle.yml
+++ b/circle.yml
@@ -8,6 +8,7 @@ jobs:
       - only:
         - cci2
     steps:
+      - checkout
       - restore_cache:
          key: ionic-site
       - run:
@@ -17,7 +18,6 @@ jobs:
                key: ionic-site
                paths:
                  - ~/ionic-site/
-      - checkout
       - run:
          name: Install node modules
          command: npm i

From 3f2a983c6e5439322afe0338821a9dfcaefb4350 Mon Sep 17 00:00:00 2001
From: Ibby Hadeed <ibby93@gmail.com>
Date: Tue, 28 Mar 2017 19:59:33 -0400
Subject: [PATCH 08/19] more caching

---
 circle.yml | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/circle.yml b/circle.yml
index 96fee4272..0aee714bc 100644
--- a/circle.yml
+++ b/circle.yml
@@ -12,16 +12,24 @@ jobs:
       - restore_cache:
          key: ionic-site
       - run:
-            name: Prepare ionic-site repo
-            command: ./scripts/docs/prepare.sh
+         name: Prepare ionic-site repo
+         command: ./scripts/docs/prepare.sh
       - save_cache:
-               key: ionic-site
-               paths:
-                 - ~/ionic-site/
+         key: ionic-site
+         paths:
+         - ~/ionic-site/
+      - restore_cache:
+         key: node_modules
       - run:
          name: Install node modules
          command: npm i
-      - run: npm run lint
+      - save_cache:
+         key: node-modules-{{ checksum "package.json" }} # used cached node_modules if package.json didn't change
+         paths:
+         - ~/node_modules/
+      - run:
+          name: Run tslint
+          command: npm run lint
       - run:
           name: Update docs
           command: ./scripts/docs/update_docs.sh

From 3d82d0d5929bf3ec1b5adf48b6889584267db800 Mon Sep 17 00:00:00 2001
From: Ibby Hadeed <ibby93@gmail.com>
Date: Tue, 28 Mar 2017 20:01:17 -0400
Subject: [PATCH 09/19] fix restore cache key

---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 0aee714bc..014b966fc 100644
--- a/circle.yml
+++ b/circle.yml
@@ -19,7 +19,7 @@ jobs:
          paths:
          - ~/ionic-site/
       - restore_cache:
-         key: node_modules
+         key: node-modules-{{ checksum "package.json" }}
       - run:
          name: Install node modules
          command: npm i

From 7c8c71bdc8e89dc43793f65cc5a0593687d4d7c6 Mon Sep 17 00:00:00 2001
From: Ibby Hadeed <ibby93@gmail.com>
Date: Tue, 28 Mar 2017 20:02:33 -0400
Subject: [PATCH 10/19] fix node_modules path

---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 014b966fc..48ecb3a21 100644
--- a/circle.yml
+++ b/circle.yml
@@ -26,7 +26,7 @@ jobs:
       - save_cache:
          key: node-modules-{{ checksum "package.json" }} # used cached node_modules if package.json didn't change
          paths:
-         - ~/node_modules/
+         - ~/ionic-native/node_modules/
       - run:
           name: Run tslint
           command: npm run lint

From 75ee0418bfe9c08d4ba9941ae9d38b2dd17e51c6 Mon Sep 17 00:00:00 2001
From: Ibby Hadeed <ibby93@gmail.com>
Date: Tue, 28 Mar 2017 20:04:03 -0400
Subject: [PATCH 11/19] replace cache pattern since we messed it up

---
 circle.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/circle.yml b/circle.yml
index 48ecb3a21..1cbdd094f 100644
--- a/circle.yml
+++ b/circle.yml
@@ -19,12 +19,12 @@ jobs:
          paths:
          - ~/ionic-site/
       - restore_cache:
-         key: node-modules-{{ checksum "package.json" }}
+         key: {{ checksum "package.json" }}-node-modules
       - run:
          name: Install node modules
          command: npm i
       - save_cache:
-         key: node-modules-{{ checksum "package.json" }} # used cached node_modules if package.json didn't change
+         key: {{ checksum "package.json" }}-node-modules # used cached node_modules if package.json didn't change
          paths:
          - ~/ionic-native/node_modules/
       - run:

From e474b2987fee11e8b6018c37b5d9b09a89b2e326 Mon Sep 17 00:00:00 2001
From: Ibby Hadeed <ibby93@gmail.com>
Date: Tue, 28 Mar 2017 20:06:28 -0400
Subject: [PATCH 12/19] replace cache pattern since we messed it up

---
 circle.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/circle.yml b/circle.yml
index 1cbdd094f..75d6abfcd 100644
--- a/circle.yml
+++ b/circle.yml
@@ -19,12 +19,12 @@ jobs:
          paths:
          - ~/ionic-site/
       - restore_cache:
-         key: {{ checksum "package.json" }}-node-modules
+         key: node_modules_{{ checksum "package.json" }}
       - run:
          name: Install node modules
          command: npm i
       - save_cache:
-         key: {{ checksum "package.json" }}-node-modules # used cached node_modules if package.json didn't change
+         key: node_modules_{{ checksum "package.json" }} # used cached node_modules if package.json didn't change
          paths:
          - ~/ionic-native/node_modules/
       - run:

From 3e124f1807cb6f32a9c443d344309a4f0a947d54 Mon Sep 17 00:00:00 2001
From: Ibby Hadeed <ibby93@gmail.com>
Date: Tue, 28 Mar 2017 20:13:44 -0400
Subject: [PATCH 13/19] update docs only master

---
 circle.yml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/circle.yml b/circle.yml
index 75d6abfcd..e568b213e 100644
--- a/circle.yml
+++ b/circle.yml
@@ -24,12 +24,18 @@ jobs:
          name: Install node modules
          command: npm i
       - save_cache:
-         key: node_modules_{{ checksum "package.json" }} # used cached node_modules if package.json didn't change
+         key: node_modules_{{ checksum "package.json" }}
          paths:
          - ~/ionic-native/node_modules/
       - run:
           name: Run tslint
           command: npm run lint
-      - run:
+      - deploy:
           name: Update docs
-          command: ./scripts/docs/update_docs.sh
+          command: |
+            if [ "${CIRCLE_BRANCH}" == "cci2" ]; then
+              # update docs since we're on master
+              ./scripts/docs/update_docs.sh
+            else
+              echo "We are on ${CIRCLE_BRANCH} branch, not going to update docs"
+            fi

From d6711080e39ba599266f6b4a9c8f40396d8feef2 Mon Sep 17 00:00:00 2001
From: Ibby Hadeed <ibby93@gmail.com>
Date: Tue, 28 Mar 2017 20:22:34 -0400
Subject: [PATCH 14/19] update docs on master only

---
 circle.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/circle.yml b/circle.yml
index e568b213e..bcd762651 100644
--- a/circle.yml
+++ b/circle.yml
@@ -33,9 +33,8 @@ jobs:
       - deploy:
           name: Update docs
           command: |
-            if [ "${CIRCLE_BRANCH}" == "cci2" ]; then
-              # update docs since we're on master
+            if [ "${CIRCLE_BRANCH}" == "master" ]; then
               ./scripts/docs/update_docs.sh
             else
-              echo "We are on ${CIRCLE_BRANCH} branch, not going to update docs"
+              echo "We are on ${CIRCLE_BRANCH} branch, not going to update docs."
             fi

From b872bd01ceeb02ff949ebffdabfbecd8ba8b31d9 Mon Sep 17 00:00:00 2001
From: Ibby Hadeed <ibby93@gmail.com>
Date: Tue, 28 Mar 2017 20:26:43 -0400
Subject: [PATCH 15/19] docs(): update docs

---
 src/@ionic-native/plugins/status-bar/index.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/@ionic-native/plugins/status-bar/index.ts b/src/@ionic-native/plugins/status-bar/index.ts
index b67a99e7e..aacfd1957 100644
--- a/src/@ionic-native/plugins/status-bar/index.ts
+++ b/src/@ionic-native/plugins/status-bar/index.ts
@@ -19,10 +19,11 @@ declare var window;
  *
  * ...
  *
+ * // let status bar overlay webview
+ * this.statusBar.overlaysWebView(true);
  *
- * this.statusBar.overlaysWebView(true); // let status bar overlay webview
- *
- * this.statusBar.backgroundColorByHexString('#ffffff'); // set status bar to white
+ * // set status bar to white
+ * this.statusBar.backgroundColorByHexString('#ffffff');
  * ```
  *
  */

From 029a196f38e7c6888b8e70ac8d98e8f61db3727c Mon Sep 17 00:00:00 2001
From: Ibby Hadeed <ibby93@gmail.com>
Date: Tue, 28 Mar 2017 20:27:35 -0400
Subject: [PATCH 16/19] test doc update

---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index bcd762651..7fda826e5 100644
--- a/circle.yml
+++ b/circle.yml
@@ -33,7 +33,7 @@ jobs:
       - deploy:
           name: Update docs
           command: |
-            if [ "${CIRCLE_BRANCH}" == "master" ]; then
+            if [ "${CIRCLE_BRANCH}" == "cci2" ]; then
               ./scripts/docs/update_docs.sh
             else
               echo "We are on ${CIRCLE_BRANCH} branch, not going to update docs."

From ebd272e30ae7bcf0ea378566958477c8c4713b40 Mon Sep 17 00:00:00 2001
From: Ibby Hadeed <ibby93@gmail.com>
Date: Tue, 28 Mar 2017 20:28:27 -0400
Subject: [PATCH 17/19] revert last test commit

---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 7fda826e5..bcd762651 100644
--- a/circle.yml
+++ b/circle.yml
@@ -33,7 +33,7 @@ jobs:
       - deploy:
           name: Update docs
           command: |
-            if [ "${CIRCLE_BRANCH}" == "cci2" ]; then
+            if [ "${CIRCLE_BRANCH}" == "master" ]; then
               ./scripts/docs/update_docs.sh
             else
               echo "We are on ${CIRCLE_BRANCH} branch, not going to update docs."

From 723ac779df3d89def1d31d778c0278940d9ff784 Mon Sep 17 00:00:00 2001
From: Ibby Hadeed <ibby93@gmail.com>
Date: Tue, 28 Mar 2017 20:30:41 -0400
Subject: [PATCH 18/19] test doc update

---
 circle.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index bcd762651..c510c1c7e 100644
--- a/circle.yml
+++ b/circle.yml
@@ -30,10 +30,11 @@ jobs:
       - run:
           name: Run tslint
           command: npm run lint
+      - add_ssh_keys
       - deploy:
           name: Update docs
           command: |
-            if [ "${CIRCLE_BRANCH}" == "master" ]; then
+            if [ "${CIRCLE_BRANCH}" == "cci2" ]; then
               ./scripts/docs/update_docs.sh
             else
               echo "We are on ${CIRCLE_BRANCH} branch, not going to update docs."

From 31d0f71cc94587dc813703c8812e6ca17bb60e0a Mon Sep 17 00:00:00 2001
From: Ibby Hadeed <ibby93@gmail.com>
Date: Tue, 28 Mar 2017 20:32:14 -0400
Subject: [PATCH 19/19] works 100%

---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index c510c1c7e..2b60be25e 100644
--- a/circle.yml
+++ b/circle.yml
@@ -34,7 +34,7 @@ jobs:
       - deploy:
           name: Update docs
           command: |
-            if [ "${CIRCLE_BRANCH}" == "cci2" ]; then
+            if [ "${CIRCLE_BRANCH}" == "master" ]; then
               ./scripts/docs/update_docs.sh
             else
               echo "We are on ${CIRCLE_BRANCH} branch, not going to update docs."