Build: fix scripts for new shelljs

- Also refactored a few things to help testing mid-release

Author: timmywil

lib/bootstrap.js

@@ -63,6 +63,9 @@ Release.define( {
 		} else {
 			console.log( "This is a real release. GitHub and npm will be updated." );
 		}
+
+		Release.dir = { base: process.cwd() + "/__release" };
+		Release.dir.repo = Release.dir.base + "/repo";
 	},
 
 	_parseRemote: function() {
@@ -87,10 +90,6 @@ Release.define( {
 	},
 
 	_createReleaseDirectory: function() {
-		console.log( "Determining directories..." );
-		Release.dir = { base: process.cwd() + "/__release" };
-		Release.dir.repo = Release.dir.base + "/repo";
-
 		if ( fs.existsSync( Release.dir.base ) ) {
 			console.log( "The directory '" + Release.dir.base + "' already exists." );
 			console.log( "Aborting." );

lib/npm.js

@@ -22,7 +22,7 @@ module.exports = function( Release ) {
 			if ( result.code !== 0 ) {
 
 				// The npm package may not exist yet
-				if ( result.output.split( "\n" ).some(
+				if ( result.stdout.split( /\r?\n/ ).some(
 					function( line ) {
 						return ( /ERR! 404/ ).test( line );
 					} )
@@ -33,7 +33,7 @@ module.exports = function( Release ) {
 				Release.abort( "Error getting npm owners." );
 			}
 
-			return result.output.trim().split( "\n" ).map( function( owner ) {
+			return result.stdout.trim().split( /\r?\n/ ).map( function( owner ) {
 				return owner.split( " " )[ 0 ];
 			} );
 		},

lib/repo.js

@@ -7,8 +7,9 @@ module.exports = function( Release ) {
 
 Release.define( {
 	_jsonFiles: [ "package.json", "package-lock.json", "bower.json" ],
+
 	_cloneRepo: function() {
-		var projectRelease, releaseDependencies;
+		var releaseDependencies, projectRelease;
 
 		Release.chdir( Release.dir.base );
 		console.log( "Cloning " + chalk.cyan( Release.remote ) + "..." );
@@ -25,16 +26,18 @@ Release.define( {
 		console.log();
 
 		projectRelease = require( Release.dir.repo + "/build/release" );
-
 		if ( projectRelease.dependencies ) {
 			console.log( "Installing release dependencies..." );
 			releaseDependencies = projectRelease.dependencies.join( " " );
 			Release.exec( "npm install --no-save " + releaseDependencies,
 				"Error installing release dependencies." );
 			console.log();
 		}
+	},
 
+	_loadReleaseScript: function() {
 		console.log( "Loading project-specific release script..." );
+		var projectRelease = require( Release.dir.repo + "/build/release" );
 		projectRelease( Release );
 		console.log();
 	},
@@ -62,18 +65,18 @@ Release.define( {
 
 	_checkAuthorsTxt: function() {
 		console.log( "Checking AUTHORS.txt..." );
+		Release.chdir( Release.dir.repo );
 		var result, lastActualAuthor,
 			lastListedAuthor = fs.readFileSync( "AUTHORS.txt", "utf8" )
 				.trim()
 				.split( /\r?\n/ )
 				.pop();
 
-		Release.chdir( Release.dir.repo );
 		result = Release.exec( {
-			command: "grunt authors",
+			command: "npx grunt authors",
 			silent: true
 		}, "Error getting list of authors." );
-		lastActualAuthor = result.split( /\r?\n/ ).splice( -4, 1 )[ 0 ];
+		lastActualAuthor = result.split( /\r?\n/ ).splice( -3, 1 )[ 0 ];
 
 		if ( lastListedAuthor !== lastActualAuthor ) {
 			console.log( "Last listed author is " + chalk.red( lastListedAuthor ) + "." );

lib/util.js

@@ -26,7 +26,7 @@ Release.define( {
 			Release.abort( errorMessage );
 		}
 
-		return result.output;
+		return result.stdout.trim();
 	},
 
 	chdir: function( directory ) {

release.js

@@ -34,10 +34,10 @@ commonTasks = [
 	Release._parseArguments,
 	Release.confirm,
 
-	Release._createReleaseDirectory,
-
 	Release._section( "setting up repo" ),
+	Release._createReleaseDirectory,
 	Release._cloneRepo,
+	Release._loadReleaseScript,
 	Release._checkRepoState,
 	Release._checkNpmCredentials,