<!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>[41708] trunk/Gruntfile.js: Tools: enable Grunt precommit task to run without requiring SVN or GIT.</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/41708">41708</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/41708","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>azaozz</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-10-03 15:19:23 +0000 (Tue, 03 Oct 2017)</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'>Tools: enable Grunt precommit task to run without requiring SVN or GIT.
Fixes <a href="https://core.trac.wordpress.org/ticket/41957">#41957</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkGruntfilejs">trunk/Gruntfile.js</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 2017-10-03 15:17:09 UTC (rev 41707)
+++ trunk/Gruntfile.js 2017-10-03 15:19:23 UTC (rev 41708)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -839,10 +839,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> error ? find( set ) : run( path.basename( dir ).substr( 1 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- grunt.fatal( 'This WordPress install is not under version control.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ runAllTasks();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function runAllTasks() {
+ grunt.log.writeln( 'Cannot determine which files are modified as SVN and GIT are not available.' );
+ grunt.log.writeln( 'Running all tasks and all tests.' );
+ grunt.task.run([
+ 'precommit:js',
+ 'precommit:css',
+ 'precommit:image',
+ 'precommit:emoji',
+ 'precommit:php'
+ ]);
+
+ done();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function run( type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var command = map[ type ].split( ' ' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -852,10 +866,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }, function( error, result, code ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var taskList = [];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( code !== 0 ) {
- grunt.fatal( 'The `' + map[ type ] + '` command returned a non-zero exit code.', code );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Callback for finding modified paths.
</span><span class="cx" style="display: block; padding: 0 10px"> function testPath( path ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var regex = new RegExp( ' ' + path + '$', 'm' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -868,31 +878,34 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return regex.test( result.stdout );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 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( testExtension ) ) {
- grunt.log.writeln( 'Image files modified. Minifying.' );
- taskList.push( 'precommit:image' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( code === 0 ) {
+ 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( testExtension ) ) {
+ grunt.log.writeln( 'Image files modified. Minifying.' );
+ taskList.push( 'precommit:image' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- [ 'js', 'css', 'php' ].forEach( function( extension ) {
- if ( testExtension( extension ) ) {
- grunt.log.writeln( extension.toUpperCase() + ' files modified. ' + extension.toUpperCase() + ' tests will be run.' );
- taskList.push( 'precommit:' + extension );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ [ 'js', 'css', 'php' ].forEach( function( extension ) {
+ if ( testExtension( extension ) ) {
+ grunt.log.writeln( extension.toUpperCase() + ' files modified. ' + extension.toUpperCase() + ' tests will be run.' );
+ taskList.push( 'precommit:' + extension );
+ }
+ } );
+
+ if ( [ 'twemoji.js' ].some( testPath ) ) {
+ grunt.log.writeln( 'twemoji.js has updated. Running `precommit:emoji.' );
+ taskList.push( 'precommit:emoji' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } );
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( [ 'twemoji.js' ].some( testPath ) ) {
- grunt.log.writeln( 'twemoji.js has updated. Running `precommit:emoji.' );
- taskList.push( 'precommit:emoji' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ grunt.task.run( taskList );
+ done();
+ } else {
+ runAllTasks();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- grunt.task.run( taskList );
-
- done();
</del><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span></span></pre>
</div>
</div>
</body>
</html>