Changeset 37185

Timestamp:

04/12/2016 10:33:18 PM (9 years ago)

Author:

iseulde

Message:

Build/Test Tools: Better git/svn detection

Prevent tasks from running twice in parallel
if both .svn and .git directories are present.

Add --ignore-externals to svn status
and replace git diff --name-only with git status --short.

Merge some duplicate code.

Fixes #36394.
See #35557.
See [36906].

Location:

trunk

Files:

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

trunk/Gruntfile.js

@@ -2 +2 @@
 module.exports = function(grunt) {
     var path = require('path'),
-        gitorsvn = require('git-or-svn'),
+        fs = require( 'fs' ),
         SOURCE_DIR = 'src/',
         BUILD_DIR = 'build/',
@@ -690 +690 @@
     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:base'];
-            if ( /.*\.js/.test( filesModified ) ) {
-                grunt.log.write( 'JavaScript source files modified. JavaScript tests will be run.\n');
-                taskList = taskList.concat( ['precommit:js'] );
-            }
-            if ( /src.*\.css/.test( filesModified ) ) {
-                grunt.log.write( 'CSS source files modified. CSS tests will be run.\n');
-                taskList = taskList.concat( ['postcss:core'] );
-            }
-            if ( /.*\.php/.test( filesModified ) ) {
-                grunt.log.write( 'PHP source files modified. PHP tests will be run.\n');
-                taskList = taskList.concat( ['precommit:php'] );
-            }
-            grunt.task.run( taskList );
-            done();
+        var map = {
+            svn: 'svn status --ignore-externals',
+            git: 'git status --short'
+        };
+
+        find( [
+            __dirname + '/.svn',
+            __dirname + '/.git',
+            path.dirname( __dirname ) + '/.svn'
+        ] );
+
+        function find( set ) {
+            var dir;
+
+            if ( set.length ) {
+                fs.stat( dir = set.shift(), function( error ) {
+                    error ? find( set ) : run( path.basename( dir ).substr( 1 ) );
+                } );
+            } else {
+                grunt.fatal( 'This WordPress install is not under version control.' );
+            }
         }
-        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.' );
-            }
-        });
-    });
+
+        function run( type ) {
+            var command = map[ type ].split( ' ' );
+            var taskList = [ 'precommit:base' ];
+
+            grunt.util.spawn( {
+                cmd: command.shift(),
+                args: command
+            }, function( error, result, code ) {
+                if ( code !== 0 ) {
+                    grunt.fatal( 'The `' +  map[ type ] + '` command returned a non-zero exit code.', code );
+                }
+
+                [ 'js', 'css', 'php' ].forEach( function( extension ) {
+                    if ( ( result.stdout + '\n' ).indexOf( '.' + extension + '\n' ) !== -1 ) {
+                        grunt.log.writeln( extension.toUpperCase() + ' files modified. ' + extension.toUpperCase() + ' tests will be run.');
+                        taskList.push( 'precommit:' + extension );
+                    }
+                } );
+
+                grunt.task.run( taskList );
+
+                done();
+            } );
+        }
+    } );
 
     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": "~5.0.0",