Changeset 36906

Timestamp:

03/09/2016 08:54:10 PM (9 years ago)

Author:

jorbin

Message:

Improve grunt precommit task

Instead of running all tasks, all the time, let's run tasks based on the files changed. PHPUNIT is now a precommit task for all php file changes.

This adds a new dependency. Please run npm install.

Fixes #35557
Props ericlewis, netweb, jorbin

Location:

trunk

Files:

• Gruntfile.js (modified) (3 diffs)
• package.json (modified) (1 diff)

trunk/Gruntfile.js

@@ -2 +2 @@
 module.exports = function(grunt) {
     var path = require('path'),
+        gitorsvn = require('git-or-svn'),
         SOURCE_DIR = 'src/',
         BUILD_DIR = 'build/',
@@ -659 +660 @@
     } );
 
-    grunt.registerTask( 'precommit', 'Runs front-end dev/test tasks in preparation for a commit.', [
-        'postcss:core',
-        'imagemin:core',
+    grunt.registerTask( 'precommit:core', [
+        'imagemin:core'
+    ] );
+
+    grunt.registerTask( 'precommit:js', [
         'browserify',
         'jshint:corejs',
@@ -667 +670 @@
         'qunit:compiled'
     ] );
+
+    grunt.registerTask( 'precommit:css', [
+        'postcss:core'
+    ] );
+
+    grunt.registerTask( 'precommit:php', [
+        'phpunit'
+    ] );
+
+    grunt.registerTask( 'precommit', 'Runs test and build tasks in preparation for a commit', function() {
+        var done = this.async();
+
+        // Figure out what tasks to run based on what files have been modified.
+        function enqueueTestingTasksForModifiedFiles( filesModified ) {
+            var taskList = ['precommit:core'];
+            if ( /.*\.js/.test( filesModified ) ) {
+                grunt.log.write( 'JavaScript source files modified, will run JavaScript tests.\n');
+                taskList = taskList.concat( ['precommit:js'] );
+            }
+            if ( /src.*\.css/.test( filesModified ) ) {
+                grunt.log.write( 'CSS source files modified, will run CSS tests.\n');
+                taskList = taskList.concat( ['postcss:core'] );
+            }
+            if ( /.*\.php/.test( filesModified ) ) {
+                grunt.log.write( 'PHP source files modified, will run PHP tests.\n');
+                taskList = taskList.concat( ['precommit:php'] );
+            }
+            grunt.task.run( taskList );
+            done();
+        }
+        gitorsvn( __dirname, function(gitorsvn) {
+            if ( gitorsvn === 'svn' ) {
+                grunt.util.spawn(
+                    {
+                        cmd: 'svn',
+                        args: ['status']
+                    },
+                    function(error, result, code) {
+                        if ( code !== 0 ) {
+                            grunt.fail.warn( 'The `svn status` command returned a non-zero exit code.', code );
+                        }
+                        enqueueTestingTasksForModifiedFiles( result.stdout );
+                    }
+                );
+            } else if ( gitorsvn === 'git' ) {
+                grunt.util.spawn(
+                    {
+                        cmd: 'git',
+                        args: ['diff', '--name-only']
+                    },
+                    function(error, result, code) {
+                        if ( code !== 0 ) {
+                            grunt.fail.warn( 'The `git diff --name-only` command returned a non-zero exit code.', code );
+                        }
+                        enqueueTestingTasksForModifiedFiles( result.stdout );
+                    }
+                );
+            } else {
+                grunt.log.write( 'This WordPress install is not under version control, no tests will be run.' );
+            }
+        });
+    });
 
     grunt.registerTask( 'copy:all', [

trunk/package.json

@@ -11 +11 @@
   "devDependencies": {
     "autoprefixer": "~6.3.3",
+    "git-or-svn": "~0.1.0",
     "grunt": "~0.4.5",
     "grunt-browserify": "~4.0.1",