Remove support for a custom PHP tools path.

Trying to maintain support for a custom tools path was becoming a little messy.

Searching GitHub didn't reveal any projects using the option, aside from a few
that had the default value copied from old documentation.

Author: bradyvercher

docs/addtextdomain.md

@@ -15,7 +15,6 @@ In your project's Gruntfile, add a section named `addtextdomain` to the data obj
 grunt.initConfig({
     addtextdomain: {
         options: {
-            i18nToolsPath: '', // Path to the i18n tools directory.
             textdomain: '',    // Project text domain.
             updateDomains: []  // List of text domains to replace.
         },
@@ -29,11 +28,6 @@ grunt.initConfig({
 
 ## Options
 
-### options.i18nToolsPath
-Type: `String`
-
-Path to a local copy of the WordPress i18n tools. May be relative to the project or an absolute path. Defaults to a bundled version of the i18n tools.
-
 ### options.textdomain
 Type: `String`  
 Default value: `''`  

tasks/add-textdomain.js

@@ -12,7 +12,6 @@ module.exports = function( grunt ) {
 
 	var async = require( 'async' ),
 		path = require( 'path' ),
-		localConfig = require( './lib/util' ).init( grunt ).getLocalConfig(),
 		wp = require( './lib/wordpress' ).init( grunt );
 
 	/**
@@ -22,12 +21,10 @@ module.exports = function( grunt ) {
 	 */
 	grunt.registerMultiTask( 'addtextdomain', 'Add the text domain to gettext functions.', function() {
 		var done = this.async(),
-			defaultI18nToolsPath = path.resolve( __dirname, '../vendor/wp-i18n-tools/' ),
 			files = [],
 			cmdArgs, o;
 
 		o = this.options({
-			i18nToolsPath: defaultI18nToolsPath,
 			textdomain: '',
 			updateDomains: []
 		});
@@ -38,39 +35,23 @@ module.exports = function( grunt ) {
 			o.textdomain = wp.getHeader( 'Text Domain' ) || wp.slugify();
 		}
 
-		o.i18nToolsPath = localConfig.i18nToolsPath || o.i18nToolsPath;
-
-		// Make sure the add-textdomain.php script exists.
-		o.addTextdomainScript = path.join( o.i18nToolsPath, 'add-textdomain.php' );
-		if ( ! grunt.file.exists( o.addTextdomainScript ) ) {
-			grunt.fatal( 'add-textdomain.php could not be found in ' + o.i18nToolsPath );
-		}
-
 		if ( true === o.updateDomains ) {
 			o.updateDomains = ['all'];
 		}
 
 		// Build the list of CLI args.
 		cmdArgs = [
-			o.addTextdomainScript,
+			path.resolve( __dirname, '../vendor/wp-i18n-tools/grunt-add-textdomain.php' ),
 			'-i',
 			o.textdomain,
-			''
+			'',
+			o.updateDomains.join( ',' )
 		];
 
 		if ( grunt.option( 'dry-run' ) ) {
 			cmdArgs[1] = '';
 		}
 
-		// Only add custom CLI args if using the bundled tools.
-		if ( defaultI18nToolsPath === o.i18nToolsPath ) {
-			// Use the custom CLI script that extends add-textdomain.php.
-			o.addTextdomainScript = path.join( o.i18nToolsPath, 'grunt-add-textdomain.php' );
-
-			cmdArgs[0] = o.addTextdomainScript;
-			cmdArgs.push( o.updateDomains.join( ',' ) );
-		}
-
 		this.files.forEach(function( f ) {
 			var filtered = f.src.filter(function( filepath ) {
 				// Warn on and remove invalid source files (if nonull was set).

tasks/lib/util.js

@@ -60,24 +60,6 @@ exports.init = function( grunt ) {
 		return originalHash === compareHash;
 	};
 
-	/**
-	 * Load local config options from config.json in the project root.
-	 *
-	 * The config.json may contain sensitive data and should not be included in
-	 * version control.
-	 *
-	 * @return {Object}
-	 */
-	exports.getLocalConfig = function() {
-		var localConfig = {};
-
-		if ( grunt.file.exists( 'config.json' ) ) {
-			localConfig = grunt.file.readJSON( 'config.json' );
-		}
-
-		return localConfig;
-	};
-
 	/**
 	 * Merge custom POT headers.
 	 *

tasks/makepot.js

@@ -15,7 +15,6 @@ module.exports = function( grunt ) {
 		path = require( 'path' ),
 		pkg = require( '../package.json' ),
 		util = require( './lib/util' ).init( grunt ),
-		localConfig = util.getLocalConfig(),
 		wp = require( './lib/wordpress' ).init( grunt),
 		msgMerge = require( './lib/msgmerge' ).init( grunt ),
 		async = require( 'async' );
@@ -33,7 +32,6 @@ module.exports = function( grunt ) {
 	 */
 	grunt.registerMultiTask( 'makepot', 'Generate a POT file for translating strings.', function() {
 		var done = this.async(),
-			defaultI18nToolsPath = path.resolve( __dirname, '../vendor/wp-i18n-tools/' ),
 			gruntBase = process.cwd(),
 			cmdArgs, o, originalPot;
 
@@ -42,7 +40,6 @@ module.exports = function( grunt ) {
 			domainPath: '',
 			exclude: [],
 			include: [],
-			i18nToolsPath: defaultI18nToolsPath,
 			mainFile: '',
 			potComments: '',
 			potFilename: '',
@@ -74,15 +71,8 @@ module.exports = function( grunt ) {
 		}
 
 		o.domainPath = _.ltrim( o.domainPath, [ '/', '\\' ] );
-		o.i18nToolsPath = localConfig.i18nToolsPath || o.i18nToolsPath;
 		o.potFile = path.join( o.cwd, o.domainPath, o.potFilename );
 
-		// Make sure the makepot.php script exists.
-		o.makepotScript = path.join( o.i18nToolsPath, 'makepot.php' );
-		if ( ! grunt.file.exists( o.makepotScript ) ) {
-			grunt.fatal( 'makepot.php could not be found in ' + o.i18nToolsPath );
-		}
-
 		// Create the domain path directory if it doesn't exist.
 		grunt.file.mkdir( path.resolve( o.cwd, o.domainPath ) );
 
@@ -94,23 +84,15 @@ module.exports = function( grunt ) {
 
 		// Build the list of CLI args.
 		cmdArgs = [
-			o.makepotScript,
+			path.resolve( __dirname, '../vendor/wp-i18n-tools/grunt-makepot.php' ),
 			o.type,
 			o.cwd,
-			o.potFile
+			o.potFile,
+			o.mainFile.split( '.' ).shift(),
+			o.exclude.join( ',' ),
+			o.include.join( ',' )
 		];
 
-		if ( defaultI18nToolsPath === o.i18nToolsPath ) {
-			// Use the custom CLI script that extends makepot.php.
-			o.makepotScript = path.join( o.i18nToolsPath, 'grunt-makepot.php' );
-
-			// Only add custom CLI args if using the bundled tools.
-			cmdArgs[0] = o.makepotScript;
-			cmdArgs.push( o.mainFile.split( '.' ).shift() );
-			cmdArgs.push( o.exclude.join( ',' ) );
-			cmdArgs.push( o.include.join( ',' ) );
-		}
-
 		// Parse the existing POT file to compare for changes.
 		if ( ! o.updateTimestamp && grunt.file.exists( o.potFile ) ) {
 			originalPot = gettext.po.parse( grunt.file.read( o.potFile ) );