Changeset 37749

Timestamp:

06/19/2016 12:31:15 PM (7 years ago)

Author:

azaozz

Message:

Grunt: when running precommit use regex to check which files have been modified.

Fixes #36528.

File:

• trunk/Gruntfile.js (modified) (2 diffs)

trunk/Gruntfile.js

@@ -726 +726 @@
                 }
 
-                if ( [ 'package.json', 'Gruntfile.js' ].some( function( path ) {
-                    return ( result.stdout + '\n' ).indexOf( ' ' + path + '\n' ) !== -1;
-                } ) ) {
+                // Callback for finding modified paths.
+                function testPath( path ) {
+                    var regex = new RegExp( ' ' + path + '$', 'm' );
+                    return regex.test( result.stdout );
+                }
+
+                // Callback for finding modified files by extension.
+                function testExtension( extension ) {
+                    var regex = new RegExp( '\.' + extension + '$', 'm' );
+                    return regex.test( result.stdout );
+                }
+
+                if ( [ 'package.json', 'Gruntfile.js' ].some( testPath ) ) {
                     grunt.log.writeln( 'Configuration files modified. Running `prerelease`.' );
                     taskList.push( 'prerelease' );
                 } else {
-                    if ( [ 'png', 'jpg', 'gif', 'jpeg' ].some( function( extension ) {
-                        return ( result.stdout + '\n' ).indexOf( '.' + extension + '\n' ) !== -1;
-                    } ) ) {
+                    if ( [ 'png', 'jpg', 'gif', 'jpeg' ].some( testExtension ) ) {
                         grunt.log.writeln( 'Image files modified. Minifying.' );
                         taskList.push( 'precommit:image' );
@@ -740 +748 @@
 
                     [ 'js', 'css', 'php' ].forEach( function( extension ) {
-                        if ( ( result.stdout + '\n' ).indexOf( '.' + extension + '\n' ) !== -1 ) {
+                        if ( testExtension( extension ) ) {
                             grunt.log.writeln( extension.toUpperCase() + ' files modified. ' + extension.toUpperCase() + ' tests will be run.' );
                             taskList.push( 'precommit:' + extension );