ghpages.clean is now always called - more or less, the addon should be shippable now

Author: JohannesHoppe

README.md

@@ -1,13 +1,15 @@
 # angular-cli-ghpages
 
 Angular CLI addon. Publish to any gh-pages branch on GitHub (or any other branch on any other remote).  
-This is __NOT__ [IgorMinar/angular-cli-github-pages](https://github.com/IgorMinar/angular-cli-github-pages).
+This is __NOT__ [IgorMinar/angular-cli-github-pages](https://github.com/IgorMinar/angular-cli-github-pages). Brought to you by the [angular2buch.de](https://angular2buch.de/) team! 
 
 ## WHY?
 
-[IgorMinar/angular-cli-github-pages](https://github.com/IgorMinar/angular-cli-github-pages) is fixed to the `gh-pages` branch of the same repository. In my oponion it is also trying to do too much.
-In contrast to this, the [Angular2Buch/angular-cli-ghpages](https://github.com/Angular2Buch/angular-cli-ghpages) addon is much more simple. It pushes to any branch on any repository, by utilizing [tschaub/gh-pages](https://github.com/tschaub/gh-pages). Nothing more.
-This addon works great on Travis-CI.
+[IgorMinar/angular-cli-github-pages](https://github.com/IgorMinar/angular-cli-github-pages) is limited to the `gh-pages` branch of the same repository.
+
+In contrast to this, the [Angular2Buch/angular-cli-ghpages](https://github.com/Angular2Buch/angular-cli-ghpages) addon is able to push to any branch on any repository. It's build on top of [tschaub/gh-pages](https://github.com/tschaub/gh-pages).
+
+__This addon works great on [Travis-CI](https://travis-ci.org/).__
 
 ## Installation & Setup
 
@@ -35,14 +37,6 @@ ng build
 ng ghpages [OPTIONS]
 ```
 
-The following command runs on our Travis-CI:
-
-```sh
-ng build --environment=production
-ng ghpages --repo=https://TheBuildbot:[email protected]/Angular2Buch/book-monkey2-public.git --name="The Buildbot" [email protected]
-```
-
-
 ## Options
 
 #### <a id="repo">--repo</a>
@@ -84,9 +78,20 @@ If you are running the command in a repository without a `user.name` or `user.em
 
 Suppress logging. With silent `true` log messages are suppressed and error messages are sanitized.
 
-> This option should be used if the repository URL or other information passed to git commands is sensitive and should not be logged.
+> This option should be used if the repository URL or other information passed to git commands is sensitive and should not be logged. By default the silent mode is enabled to avoid sensitive data exposure.
+
+
+## Extra
+
+For your convenience, the addon will recognize the [environment variable](https://docs.travis-ci.com/user/environment-variables/#Defining-Variables-in-Repository-Settings) `REPO_USER_AND_PASS` and will replace this pattern in the `--repo` string. Please __do NOT disable the silent mode__ if you have credentials in the repository URL!
 
+In example, the following command runs [on our Travis-CI](https://travis-ci.org/Angular2Buch/book-monkey2):
 
+```sh
+ng build --environment=production
+ng ghpages --repo=https://[email protected]/Angular2Buch/book-monkey2-public.git --name="The Buildbot" [email protected]
+```
+> REPO_USER_AND_PASS stores credentials in the format `username:password`. Special charcaters must be [percent-encoded](https://en.wikipedia.org/wiki/Percent-encoding).
 
 ## License
 Code released under the [MIT license](https://opensource.org/licenses/MIT).

deploy.js

@@ -63,6 +63,15 @@ module.exports = {
         'Triggered by commit: https://github.com/' + process.env.TRAVIS_REPO_SLUG + '/commit/' + process.env.TRAVIS_COMMIT + '\n' +
         'Travis build: https://travis-ci.org/'     + process.env.TRAVIS_REPO_SLUG + '/builds/' + process.env.TRAVIS_BUILD_ID;
     }
+    
+    // for your convenience - here you can hack credentials into the repository URL
+    if (process.env.REPO_USER_AND_PASS && options.repo) {
+      options.repo = options.repo.replace('REPO_USER_AND_PASS', process.env.REPO_USER_AND_PASS); 
+    }    
+    
+    // always clean the cache directory.
+    // avoids "Error: Remote url mismatch."
+    ghpages.clean();
 
     var access = publish = RSVP.denodeify(fs.access);
     var publish = RSVP.denodeify(ghpages.publish);

package.json

@@ -33,7 +33,7 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "gh-pages": "^0.3.1",
+    "gh-pages": "^0.11.0",
     "rsvp": "^3.0.14"
   },
   "keywords": ["ember-addon", "angular2", "angular-cli", "git", "gh-pages", "ghpages"]