<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[37185] trunk: Build/Test Tools: Better git/svn detection</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/37185">37185</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/37185","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iseulde</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-04-12 22:33:18 +0000 (Tue, 12 Apr 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="https://core.trac.wordpress.org/ticket/36394">#36394</a>.
See <a href="https://core.trac.wordpress.org/ticket/35557">#35557</a>.
See <a href="https://core.trac.wordpress.org/changeset/36906">[36906]</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkGruntfilejs">trunk/Gruntfile.js</a></li>
<li><a href="#trunkpackagejson">trunk/package.json</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkGruntfilejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/Gruntfile.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/Gruntfile.js 2016-04-12 20:36:31 UTC (rev 37184)
+++ trunk/Gruntfile.js 2016-04-12 22:33:18 UTC (rev 37185)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* jshint node:true */
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = function(grunt) {
</span><span class="cx" style="display: block; padding: 0 10px"> var path = require('path'),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- gitorsvn = require('git-or-svn'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fs = require( 'fs' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> SOURCE_DIR = 'src/',
</span><span class="cx" style="display: block; padding: 0 10px"> BUILD_DIR = 'build/',
</span><span class="cx" style="display: block; padding: 0 10px"> autoprefixer = require('autoprefixer'),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -689,58 +689,55 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.registerTask( 'precommit', 'Runs test and build tasks in preparation for a commit', function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var done = this.async();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var map = {
+ svn: 'svn status --ignore-externals',
+ git: 'git status --short'
+ };
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // 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'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 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();
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 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 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ 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 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- );
- } 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.' );
- }
- });
- });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ grunt.task.run( taskList );
+
+ done();
+ } );
+ }
+ } );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> grunt.registerTask( 'copy:all', [
</span><span class="cx" style="display: block; padding: 0 10px"> 'copy:files',
</span><span class="cx" style="display: block; padding: 0 10px"> 'copy:wp-admin-css-compat-rtl',
</span></span></pre></div>
<a id="trunkpackagejson"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/package.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/package.json 2016-04-12 20:36:31 UTC (rev 37184)
+++ trunk/package.json 2016-04-12 22:33:18 UTC (rev 37185)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "license": "GPL-2.0+",
</span><span class="cx" style="display: block; padding: 0 10px"> "devDependencies": {
</span><span class="cx" style="display: block; padding: 0 10px"> "autoprefixer": "~6.3.3",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "git-or-svn": "~0.1.0",
</del><span class="cx" style="display: block; padding: 0 10px"> "grunt": "~0.4.5",
</span><span class="cx" style="display: block; padding: 0 10px"> "grunt-browserify": "~5.0.0",
</span><span class="cx" style="display: block; padding: 0 10px"> "grunt-contrib-clean": "~1.0.0",
</span></span></pre>
</div>
</div>
</body>
</html>