Added watch for tests and renamed "clear" to "force" for composer:install

Author: rregeer

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "rregeer/gulp-php-dev-toolbox",
   "description": "Php development toolbox using the gulp taskrunner",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "keywords": [
     "Testing", "PHP", "phpunit", "Unittest", "Codestyle", "CI",
     "Code complexity", "phpcs", "phpcbf", "phplint", "Gulp", "phpmd",

tasks/composer.js

@@ -5,32 +5,28 @@ var del = require('del');
 var gutil = require('gulp-util');
 
 var knownOptions = {
-  boolean: ['clean']
+  boolean: ['force']
 };
 
 var commandLineOptions = minimist(process.argv.slice(2), knownOptions);
 
 gulp.task('composer:install', 'Install all the required dependencies.', function () {
-  if (commandLineOptions.clean) {
-    del(['vendor/']);
-    gutil.log(gutil.colors.blue('Clean install triggerd, the composer vendor directory will be removed.'));
+  if (commandLineOptions.force) {
+    del(['vendor/', 'composer.lock']);
+    gutil.log(gutil.colors.blue('Forced install triggerd, removing the vendor diretory and composer lock file.'));
   }
 
   return composer();
 },{
   options: {
-    'clean': 'Clears the vendor folder before install the packages. For example gulp composer:install --clear'
+    'force': 'Clears the vendor folder and composer lockfile before install the packages. For example gulp composer:install --force'
   }
 });
 
 gulp.task('composer:update-lockfile', 'Only update the composer lock file.', function () {
   return composer('update', {lock: true});
 });
 
-gulp.task('clear:vendor', 'Clear the composer vendor folder.', function() {
-  return del(['vendor/']);
-});
-
 gulp.task('composer', ['composer:install']);
 
 gulp.task('default', ['composer:install']);

tasks/tests.js

@@ -5,11 +5,12 @@ var del = require('del');
 var gulpif = require('gulp-if');
 var fileExists = require('file-exists');
 var gutil = require('gulp-util');
+var shell = require('gulp-shell');
+var _ = require('lodash');
 
 var knownOptions = {
-  string: ['testsuite', 'test'],
-  boolean: ['coverage'],
-  alias: ['s', 'c', 't']
+  string: ['testsuite', 'test', 'source'],
+  boolean: ['coverage']
 };
 
 var commandLineOptions = minimist(process.argv.slice(2), knownOptions);
@@ -18,40 +19,39 @@ gulp.task('tests', 'Run the selected unit tests with phpunit. Requires a phpunit
   var options;
   var projectRoot = gulp.task.configuration.projectRoot;
 
-  options = {};
+  options = {
+    notify: false
+  };
 
   gutil.log(gutil.colors.blue('Running task \'tests\' in directoy: ' + projectRoot));
 
-  if (commandLineOptions.testsuite || commandLineOptions.s) {
-    options.testSuite = commandLineOptions.testsuite || commandLineOptions.s;
+  if (commandLineOptions.testsuite) {
+    options.testSuite = commandLineOptions.testsuite;
+    gutil.log(gutil.colors.blue('Run tests in test suite ' + commandLineOptions.testsuite));
   }
 
-  if(commandLineOptions.coverage || commandLineOptions.c) {
+  if(commandLineOptions.coverage) {
     options.coverageHtml = 'coverage/';
   }
 
-  if(commandLineOptions.test || commandLineOptions.t) {
-    options.filter = commandLineOptions.test || commandLineOptions.t;
+  if(commandLineOptions.test) {
+    options.testClass = commandLineOptions.test;
+    gutil.log(gutil.colors.blue('Run test file ' + commandLineOptions.test));
   }
 
   if(!fileExists(projectRoot + '/phpunit.xml.dist')) {
     gutil.log(gutil.colors.red('Mandatory file \'phpunit.xml.dist\' does not exists.'));
     return;
   }
 
-  return gulp.src('', {read: false})
-    .pipe(shell(['cd ' +
-      ['vendor/bin/phpmd ' + source + ' text codesize,unusedcode,naming,design,cleancode,controversial']
-    ]));
-
-  return gulp.src(projectRoot + '/phpunit.xml.dist', {cwd: projectRoot})
+  return gulp.src(projectRoot + '/phpunit.xml.dist')
     .pipe(gulpif(options.coverageHtml, gulp.dest('coverage/')))
     .pipe(phpunit(projectRoot + '/vendor/bin/phpunit', options));
 },{
   options: {
-    'test | t': 'Run a single test. Example gulp tests --test [testname]',
-    'testsuite | s': 'The test suite to run. Example gulp tests --testsuite [suiteName]',
-    'coverage | c ': 'Run the tests with coverage enabled. Coverage will be stored in a HTML report in coverage/coverage-html. Example gulp tests --coverage'
+    'test': 'Run a single test. Example gulp tests --test [testname]',
+    'testsuite': 'The test suite to run. Example gulp tests --testsuite [suiteName]',
+    'coverage': 'Run the tests with coverage enabled. Coverage will be stored in a HTML report in coverage/coverage-html. Example gulp tests --coverage'
   }
 });
 
@@ -61,4 +61,31 @@ gulp.task('clear:coverage', 'Clear the coverage reports files.', function() {
   return del([projectRoot +'/coverage/**'], {force: true});
 });
 
+gulp.task('watch:tests', 'Watch for file changes and execute the tests task. Default the tests directory will be watched.', function() {
+  var projectRoot = gulp.task.configuration.projectRoot;
+  var source = projectRoot + '/tests/';
+
+  if (!(commandLineOptions.test || commandLineOptions.testsuite)) {
+    gutil.log(gutil.colors.red('No arguments supplied. Supply --test or --testsuite.'));
+    return;
+  }
+
+  if (commandLineOptions.source) {
+    source = commandLineOptions.source;
+  }
+  else if(_.has(gulp.task.configuration, "tasks.watch:tests.source")) {
+    source = gulp.task.configuration.tasks['watch:tests'].source;
+    gutil.log(gutil.colors.blue("Read source from the configuration file: " + source));
+  }
+
+  gutil.log(gutil.colors.blue('Watch directory ' + source +' for changes and run the tests on'));
+  gulp.watch(source, ['tests']);
+},{
+    options: {
+      'test': 'The test to run when a file is changed. Example gulp watch:tests --test [path/test.php]',
+      'testsuite': 'The test suite to run when a file is changed. Example gulp watch:tests --testsuite [suiteName]',
+      'source': 'The directory to watch for file changes. Default the tests directory will be watched. Example gulp watch:tests --source=UnitTests/**/*.php'
+    }
+  });
+
 gulp.task('default', ['tests']);