removed karama reporter flag for all but test task, fixed annoying --subdir functionality on init task

Author: benholloway

tasks/build.js

@@ -4,10 +4,9 @@ var gulp        = require('gulp'),
     wordwrap    = require('wordwrap'),
     runSequence = require('run-sequence');
 
-var yargs            = require('../lib/util/yargs'),
-    jshintReporter   = require('../lib/util/jshint-reporter'),
-    karma            = require('../lib/test/karma'),
-    hr               = require('../lib/util/hr');
+var yargs          = require('../lib/util/yargs'),
+    jshintReporter = require('../lib/util/jshint-reporter'),
+    hr             = require('../lib/util/hr');
 
 yargs.getInstance('build')
   .usage(wordwrap(2, 80)('The "build" task performs a single build of the javascript and SASS composition root(s).'))
@@ -25,11 +24,9 @@ yargs.getInstance('build')
     default : false
   })
   .options(jshintReporter.yargsOption.key, jshintReporter.yargsOption.value)
-  .options(karma.yargsOption.key, karma.yargsOption.value)
   .strict()
   .check(yargs.subCommandCheck)
   .check(jshintReporter.yargsCheck)
-  .check(karma.yargsCheck)
   .wrap(80);
 
 gulp.task('build', function (done) {

tasks/init.js

@@ -23,7 +23,6 @@ var cliArgs;
 var config = defaults.getInstance('init')
   .file(platform.userHomeDirectory(), '.angularity')
   .defaults({
-    subdir     : true,
     name       : 'my-project',
     version    : '0.0.0',
     description: '',
@@ -124,19 +123,20 @@ yargs.getInstance('init')
     'The following steps are taken. Some steps are gated by respective a flag. Default options may be globally ' +
     'defined or reset using the --defaults option.',
     '',
-    '* project directory    exists, else create    --subdir',
-    '* /' + padded(20)(streams.APP            ) + 'exists, else create',
-    '* /' + padded(20)(streams.APP + '/*.html') + 'exists, else create',
-    '* /' + padded(20)(streams.APP + '/*.scss') + 'exists, else create',
-    '* angularity.json      exists, else create',
-    '* package.json         exists, else create    --npm',
-    '* bower.json           exists, else create    --bower',
-    '* karma.conf.js        exists, else create    --karma',
-    '* .jshintrc            exists, else create    --jshint',
-    '* .gitignore           exists, else create    --gitignore',
-    '* run IDE task                                --ide',
+    '* project directory exists, else create',
+    '* /app              exists, else create',
+    '* /app/*.html       exists, else create',
+    '* /app/*.scss       exists, else create',
+    '* angularity.json   exists, else create',
+    '* package.json      exists, else create    --npm',
+    '* bower.json        exists, else create    --bower',
+    '* karma.conf.js     exists, else create    --karma',
+    '* .jshintrc         exists, else create    --jshint',
+    '* .gitignore        exists, else create    --gitignore',
+    '* run IDE task                             --ide',
     '',
-    'By default, a subdirectory is created for the project',
+    'If a package.json is present initialisation will occur in the current directory. Otherwise a sub-directory is' +
+    'created per the project name',
     '',
     'Where run on an exising project existing files will not be altered, delete existing files in order to change ' +
     'properties.',
@@ -161,12 +161,6 @@ yargs.getInstance('init')
     alias   : 'z',
     string  : true
   })
-  .options('subdir', {
-    describe: 'Create a sub-directory per name',
-    alias   : 's',
-    boolean : true,
-    default : config.get('subdir')
-  })
   .options('name', {
     describe: 'The project name',
     alias   : 'n',
@@ -255,7 +249,7 @@ gulp.task('init', function (done) {
         return (IDE_LIST.indexOf(ide) >= 0);
       });
     var taskList = [
-        cliArgs.subdir && 'init:subdir',
+        'init:subdir',
         'init:composition',
         'init:angularity',
         cliArgs.npm && 'init:npm',
@@ -272,8 +266,11 @@ gulp.task('init', function (done) {
 });
 
 gulp.task('init:subdir', function () {
-  mkdirIfNotExisting(cliArgs.name);
-  process.chdir(path.resolve(cliArgs.name));  // !! changing cwd !!
+  var hasPackageJson = fs.existsSync(path.resolve('package.json'));
+  if (!hasPackageJson) {
+    mkdirIfNotExisting(cliArgs.name);
+    process.chdir(path.resolve(cliArgs.name));  // !! changing cwd !!
+  }
 });
 
 gulp.task('init:composition', function () {

tasks/javascript.js

@@ -7,12 +7,10 @@ var gulp            = require('gulp'),
     gulpFilter      = require('gulp-filter'),
     jshint          = require('gulp-jshint'),
     rimraf          = require('gulp-rimraf'),
-    gutil           = require('gulp-util'),
     runSequence     = require('run-sequence'),
     combined        = require('combined-stream'),
     to5ify          = require('6to5ify'),
     stringify       = require('stringify'),
-    through         = require('through2'),
     wordwrap        = require('wordwrap'),
     ngAnnotate      = require('browserify-ngannotate');
 
@@ -33,20 +31,18 @@ yargs.getInstance('javascript')
   .options('help', {
     describe: 'This help message',
     alias: ['h', '?'],
-    boolean: true,
+    boolean: true
   })
   .options('unminified', {
     describe: 'Inhibit minification of javascript',
     alias: ['u'],
     boolean: true,
-    default: false,
+    default: false
   })
   .options(jshintReporter.yargsOption.key, jshintReporter.yargsOption.value)
-  .options(karma.yargsOption.key, karma.yargsOption.value)
   .strict()
   .check(yargs.subCommandCheck)
   .check(jshintReporter.yargsCheck)
-  .check(karma.yargsCheck)
   .wrap(80);
 
 //TODO @bguiz jsHintReporter module should only need to be imported by this module
@@ -117,16 +113,10 @@ gulp.task('javascript:lint', function () {
 
 // karma unit tests in local library only
 gulp.task('javascript:unit', function () {
-  var reporters = cliArgs.karmareporter;
-  if (reporters.constructor === Array) {
-  }
-  else if (typeof reporters === 'string' &&
-    reporters !== karma.yargsOption.value.default) {
-    reporters = [reporters];
-  }
-  else {
-    reporters = [];
-  }
+  var reporters = [].concat(cliArgs.karmareporter)
+    .filter(function isString(value) {
+      return (typeof value === 'string');
+    });
   return combined.create()
     .append(
       streams

tasks/release.js

@@ -17,7 +17,6 @@ var injectAdjacent   = require('../lib/inject/adjacent-files'),
     yargs            = require('../lib/util/yargs'),
     hr               = require('../lib/util/hr'),
     jshintReporter   = require('../lib/util/jshint-reporter'),
-    karma            = require('../lib/test/karma'),
     streams          = require('../lib/config/streams');
 
 yargs.getInstance('release')
@@ -37,11 +36,9 @@ yargs.getInstance('release')
     default : false
   })
   .options(jshintReporter.yargsOption.key, jshintReporter.yargsOption.value)
-  .options(karma.yargsOption.key, karma.yargsOption.value)
   .strict()
   .check(yargs.subCommandCheck)
   .check(jshintReporter.yargsCheck)
-  .check(karma.yargsCheck)
   .wrap(80);
 
 gulp.task('release', ['build'], function (done) {

tasks/server.js

@@ -5,12 +5,11 @@ var gulp        = require('gulp'),
     wordwrap    = require('wordwrap'),
     browserSync = require('browser-sync');
 
-var defaults         = require('../lib/config/defaults'),
-    yargs            = require('../lib/util/yargs'),
-    hr               = require('../lib/util/hr'),
-    jshintReporter   = require('../lib/util/jshint-reporter'),
-    karma            = require('../lib/test/karma'),
-    streams          = require('../lib/config/streams');
+var defaults       = require('../lib/config/defaults'),
+    yargs          = require('../lib/util/yargs'),
+    hr             = require('../lib/util/hr'),
+    jshintReporter = require('../lib/util/jshint-reporter'),
+    streams        = require('../lib/config/streams');
 
 var cliArgs;
 
@@ -57,12 +56,10 @@ yargs.getInstance('server')
     default : config.get('port')
   })
   .options(jshintReporter.yargsOption.key, jshintReporter.yargsOption.value)
-  .options(karma.yargsOption.key, karma.yargsOption.value)
   .strict()
   .check(yargs.subCommandCheck)
   .check(check)
   .check(jshintReporter.yargsCheck)
-  .check(karma.yargsCheck)
   .wrap(80);
 
 gulp.task('server', ['build'], function () {

tasks/watch.js

@@ -5,12 +5,11 @@ var gulp          = require('gulp'),
     wordwrap      = require('wordwrap'),
     watchSequence = require('gulp-watch-sequence');
 
-var defaults         = require('../lib/config/defaults'),
-    yargs            = require('../lib/util/yargs'),
-    hr               = require('../lib/util/hr'),
-    jshintReporter   = require('../lib/util/jshint-reporter'),
-    karma            = require('../lib/test/karma'),
-    streams          = require('../lib/config/streams');
+var defaults       = require('../lib/config/defaults'),
+    yargs          = require('../lib/util/yargs'),
+    hr             = require('../lib/util/hr'),
+    jshintReporter = require('../lib/util/jshint-reporter'),
+    streams        = require('../lib/config/streams');
 
 var config = defaults.getInstance()
   .file('angularity.json')
@@ -56,12 +55,10 @@ yargs.getInstance('watch')
     default : config.get('port')
   })
   .options(jshintReporter.yargsOption.key, jshintReporter.yargsOption.value)
-  .options(karma.yargsOption.key, karma.yargsOption.value)
   .strict()
   .check(yargs.subCommandCheck)
   .check(check)
   .check(jshintReporter.yargsCheck)
-  .check(karma.yargsCheck)
   .wrap(80);
 
 gulp.task('watch', ['server'], function () {