updating to nest angular-cli

Author: JohannesHoppe

README.md

@@ -10,12 +10,13 @@
 Angular CLI addon. Publish to any gh-pages branch on GitHub (or any other branch on any other remote).  
 Made for Travis-CI. Brought to you by the [angular2buch.de](https://angular2buch.de/) team! 
 
-## WHY?
+## About
 
-This is __NOT__ [IgorMinar/angular-cli-github-pages](https://github.com/IgorMinar/angular-cli-github-pages). That addon is limited to the `gh-pages` branch of the same repository.
+This is similar to the normal `github-pages:deploy` command.
+But by design, the command 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/).__ No git credentials must be set up in before. Specific environment variables of Travis-CI are evaluated, too.
+__This addon works great on [Travis-CI](https://travis-ci.org/).__ No git credentials must be set up in before. Specific environment variables of Travis-CI are evaluated, too. You will like it!
 
 ## Installation & Setup
 
@@ -33,13 +34,11 @@ npm install --save-dev angular-cli-ghpages
 
 ## Usage
 
-Run `ng build` to fill the `dist` folder.
-Then execute `ng ghpages` in order to deploy it.
+Execute `ng ghpages` in order to deploy the project with a `production` build.
 
 Usage:
 
 ```sh
-ng build
 ng ghpages [OPTIONS]
 ```
 
@@ -49,14 +48,14 @@ ng ghpages [OPTIONS]
  * optional
  * default: url of the origin remote of the current dir (assumes a git repository)
 
-By default, [tschaub/gh-pages](https://github.com/tschaub/gh-pages) assumes that the current working directory is a git repository, and that you want to push changes to the `origin` remote. If instead your script is not in a git repository, or if you want to push to another repository, you can provide the repository URL in the `repo` option.
+By default, __gh-pages__ assumes that the current working directory is a git repository, and that you want to push changes to the `origin` remote. If instead your script is not in a git repository, or if you want to push to another repository, you can provide the repository URL in the `repo` option.
 
 #### <a id="message">--message</a>
  * optional
  * default: `Auto-generated commit`
 
 The commit message, __must be wrapped in quotes__.  
-Hardcoded additional text is always added, if the environment variable `process.env.TRAVIS` exists (for Travis CI). 
+Some handy additional text is always added, if the environment variable `process.env.TRAVIS` exists (for Travis CI).
 
 Example:
 ```sh
@@ -84,15 +83,31 @@ 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. By default the silent mode is enabled to avoid sensitive data exposure.
+> This option should be used if the repository URL or other information passed to git commands is sensitive and should not be logged (== you have a public build server). By default the silent mode is enabled to avoid sensitive data exposure.
 
 
 #### <a id="dir">--dir</a>
  * optional
  * default: `dist`
 
 Directory for all sources, relative to the project-root.  
-Monst probably no change is required here.
+Most probably no change is required here, usefull together with --skip-build.
+This option can be used to deploy completely different folders, which are note related at all to angular.
+
+
+#### <a id="environment">--environment</a>
+ * optional
+ * default: `production`
+
+The Angular environment to create a build for.
+
+
+#### <a id="skip-build">--skip-build</a>
+ * optional
+ * default: `false` (boolean)
+
+Skip building the project before deploying, usefull together with --dir.
+
 
 
 

deploy.js

@@ -1,11 +1,14 @@
 'use strict';
 
+var Command = require('ember-cli/lib/models/command');
+var Promise = require('ember-cli/lib/ext/promise');
+var BuildTask = require('ember-cli/lib/tasks/build');
+
 var path = require('path');
 var fs = require('fs');
 var ghpages = require('gh-pages');
-var RSVP = require('rsvp');
 
-module.exports = {
+module.exports =  Command.extend({
   name: 'ghpages',
   aliases: ['gh-pages'],
   description: 'Publish to any gh-pages branch on GitHub (or any other branch on any other remote). Build the project before publishing!',
@@ -45,14 +48,24 @@ module.exports = {
     name:         'dir',
     type:         String,
     default:      'dist',
-    description:  'Directory for all sources, relative to the project-root. Monst probably no change is required here.'
+    description:  'Directory for all sources, relative to the project-root. Most probably no change is required here.'
+  }, {
+      name: 'environment',
+      type: String,
+      default: 'production',
+      description: 'The Angular environment to create a build for'
+  }, {
+      name: 'skip-build',
+      type: Boolean,
+      default: false,
+      description: 'Skip building the project before deploying, usefull together with --dir'
   }],
   run: function(options, rawArgs) {
 
     var ui = this.ui;
     var root = this.project.root;
     var dir = path.join(root, options.dir);
-
+    
     options = options || {};
     if (options['name'] && options['email']) {
       options.user = {
@@ -72,21 +85,35 @@ module.exports = {
     // for your convenience - here you can hack credentials into the repository URL
     if (process.env.GH_TOKEN && options.repo) {
       options.repo = options.repo.replace('GH_TOKEN', process.env.GH_TOKEN); 
-    }    
-    
+    }       
+
     // 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);
+    var access = publish = Promise.denodeify(fs.access);
+    var publish = Promise.denodeify(ghpages.publish);
 
+    function build() {
+      if (options.skipBuild) return Promise.resolve();
+      
+      var buildTask = new BuildTask({
+        ui: this.ui,
+        analytics: this.analytics,
+        project: this.project
+      });
+      
+      return buildTask.run(buildOptions);
+    }    
 
-    return access(dir, fs.F_OK)
-       .catch(function(error) {
-          ui.writeError('Dist folder does not exist. Can \'t publish anything. Run `ng build` first!\n');
-          return RSVP.reject(error) ;
-        })
+    return build()
+      .then(function() {
+        return access(dir, fs.F_OK)
+      })        
+      .catch(function(error) {
+        ui.writeError('Dist folder does not exist. Check the dir --dir parameter or build the project first!\n');
+        return Promise.reject(error) ;
+      })
       .then(function() {
         return publish(dir, options)
       })
@@ -95,7 +122,7 @@ module.exports = {
       })
       .catch(function(error) {
          ui.writeError('An error occurred!\n');
-         return RSVP.reject(error) ;
+         return Promise.reject(error) ;
       });
   }
-};
+});

package.json

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