=BG= server task uses port number from cli options

generate task created, used name from cli options

Author: Brendan Graetz

bin/cli-args.js

@@ -1,11 +1,18 @@
+'use strict';
+
 var yargs = require('yargs');
+var config = require('../lib/config/config');
+
 var args = yargs
   .describe('p', 'Define a port number when serving files')
   .alias('p', 'port')
-  .default('p', 10101)
-  .describe('v', 'Version number')
+  .default('p', config.getServerHttpPort())
+  .describe('v', 'Display version number')
   .alias('v', 'version')
   .boolean('v')
-  .usage()
-  .wrap(80);
-module.exports = yargs;
+  .describe('n', 'Name of the project to create or work on')
+  .alias('n', 'name')
+  .string('n')
+  .usage('Angularity is an opinionated build tool for AngularJs projects.')
+  .wrap(config.getConsoleWidth());
+module.exports = args;

bin/cli.js

@@ -14,7 +14,6 @@ var path       = require('path'),
     prettyTime = require('pretty-hrtime');
 
 var mainMenu = require('../lib/cli/mainMenu');
-
 require('../index');
 
 var generator = require('../lib/generator/generator');
@@ -36,19 +35,16 @@ gulp.on('task_stop', function (e) {
 // gulp tasks can access argv using this same method
 var argv = require('./cli-args').argv;
 
-var subCmd = (argv._.length > 0) ? argv._[0] : undefined;
+var taskName = (!!argv._) ? argv._[0] : undefined;
 
-if (argv.v) {
+if (argv.version) {argv._
   var packagePath = path.join(__dirname, '..', 'package.json');
   var version     = require(packagePath).version;
   console.log('angularity:', version);
 }
-else if (!subCmd) {
+else if (!taskName) {
   mainMenu.prompt();
 }
-else if (subCmd === 'generate') {
-  generator.util.generateProject(argv._[1]);
-}
 else {
-  gulp.start(gulp.hasTask(subCmd) ? subCmd : 'default');
+  gulp.start(gulp.hasTask(taskName) ? taskName : 'default');
 }

tasks/generate.js

@@ -0,0 +1,9 @@
+'use strict';
+
+var gulp = require('gulp');
+var argv = require('../bin/cli-args').argv;
+var generator = require('../lib/generator/generator');
+
+gulp.task('generate', [], function() {
+  generator.util.generateProject(argv.name);
+});

tasks/server.js

@@ -8,7 +8,9 @@ var config  = require('../lib/config/config'),
     hr      = require('../lib/util/hr'),
     streams = require('../lib/config/streams');
 
-var HTTP_PORT     = config.getServerHttpPort();
+var argv = require('../bin/cli-args').argv;
+
+var HTTP_PORT     = argv.port;
 var CONSOLE_WIDTH = config.getConsoleWidth();
 
 gulp.task('server', ['build'], function () {
@@ -29,4 +31,4 @@ gulp.task('reload', function () {
   console.log(hr('-', CONSOLE_WIDTH, 'reload'));
   gutil.log('serving on port:', HTTP_PORT);
   browserSync.reload();
-});
+});

tasks/watch.js

@@ -11,7 +11,6 @@ var config  = require('../lib/config/config'),
 var CONSOLE_WIDTH = config.getConsoleWidth();
 
 gulp.task('watch', ['server'], function () {
-
   // enqueue actions to avoid multiple trigger
   var queue = watchSequence(500, function () {
     console.log(hr('\u2591', CONSOLE_WIDTH));
@@ -42,4 +41,4 @@ gulp.task('watch', ['server'], function () {
     name      : 'TEST',
     emitOnGlob: false
   }, queue.getHandler('test'));
-});
+});