Merge pull request #2 from ivankristianto/develop

Develop

Author: ivankristianto

.DS_Store

@@ -42,3 +42,6 @@ jspm_packages
 
 # Lib
 lib
+
+# Others
+.DS_Store

.gitignore

@@ -1,6 +1,11 @@
 create-wp-site Changelogs
 ==============
 
+## v0.1.5
+
+* Allow to run with directly passed the directory name as first param. sample: `create-wp-site mylocaldocker`
+* Compatibility with yarn create. Sample: `yarn create wp-site mylocaldocker`
+
 ## v0.1.x
 
 * Release minimal version

CHANGELOGS.md

@@ -44,7 +44,12 @@ $ create-wp-site
   
     Examples:
   
-      $ create-wp-site create
+      $ create-wp-site <directory-name>
+```
+
+### Using Yarn  
+```
+$ yarn create wp-site <directory-name>
 ```
 
 For more help on specific command, supply `-h` or `--help`.

README.md

@@ -1,6 +1,6 @@
 {
   "name": "create-wp-site",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Create local WordPress development with 10up/wp-local-docker",
   "bin": {
 	"create-wp-site": "bin/create-wp-site"
@@ -21,7 +21,11 @@
 	"docker",
 	"cli"
   ],
-  "author": "Ivan Kristianto <[email protected]>",
+  "author": {
+	"name": "Ivan Kristianto",
+	"email": "[email protected]",
+	"url": "https://www.ivankristianto.com"
+  },
   "license": "MIT",
   "dependencies": {
 	"archiver": "^1.3.0",

package.json

@@ -2,6 +2,7 @@
  * External dependencies
  */
 import cli from 'commander';
+import create from './commands/create';
 
 /**
  * Internal dependencies
@@ -16,7 +17,7 @@ function main() {
 			.on( '--help', function() {
 				console.log( '  Examples:' );
 				console.log( '' );
-				console.log( '    $ create-wp-site create' );
+				console.log( '    $ create-wp-site <foldername>' );
 				console.log( '' );
 			} );
 
@@ -56,8 +57,8 @@ function runCommand() {
 	const passedCmd = process.argv.slice( 2 );
 
 	// No command specified or invalid command.
-	if ( ! passedCmd.length && ! commands[ passedCmd[ 0 ] ] ) {
-		cli.help();
+	if ( ! passedCmd.length || ! ( passedCmd in commands ) ) {
+		create( { directory: passedCmd[ 0 ] } );
 	}
 
 	cli.parse( process.argv );

src/cli.js

@@ -13,21 +13,28 @@ const ghURL = 'https://github.com/10up/wp-local-docker.git';
 
 export default ( args, config ) => {
 	const params = getParams( args, config );
-	const promptOpt = prompts.getCreatePrompts();
-	prompts.ask( promptOpt ).then( handlePrompt, e => {
+	const promptOpt = prompts.getCreatePrompts( params );
+	const createPromptHandler = ( args, config ) =>
+    function( data ) {
+	return handlePrompt( data, args, config );
+};
+	prompts.ask( promptOpt ).then( createPromptHandler( args, config ), e => {
 		log.error( e.toString() );
 	} );
 };
 
 function getParams( args, config ) {
-	const dir = args.dir || '';
+	const directory = args.directory || '';
 	return {
-		dir,
+		directory,
 	};
 }
 
-function handlePrompt( data ) {
+function handlePrompt( data, args, config ) {
 	try {
+		const params = getParams( args, config );
+		data = Object.assign( data, params );
+
 		log.info( 'Checking if directory exist' );
 		is_directory_exist( data.directory );
 
@@ -55,12 +62,12 @@ function handlePrompt( data ) {
 	return data;
 }
 
-function is_directory_exist( dir ) {
-	if ( ! dir ) {
+function is_directory_exist( directory ) {
+	if ( ! directory ) {
 		throw new Error( 'We need directory name.' );
 	}
 
-	if ( ! fs.emptyDirSync( dir ) ) {
+	if ( ! fs.emptyDirSync( directory ) ) {
 		throw new Error( 'Directory exist, exit now.' );
 	}
 
@@ -134,8 +141,10 @@ function installWp( data ) {
 	log.info( wp.install( data ) );
 }
 
-function successInfo( data ){
-	log.success( 'Congratulations! Your local WordPress site now has been created.' );
+function successInfo( data ) {
+	log.success(
+    'Congratulations! Your local WordPress site now has been created.'
+  );
 	log.success( 'Url: http://' + data.domain );
 	log.success( 'Username: admin' );
 	log.success( 'Password: password' );

src/commands/create.js

@@ -1,28 +1,40 @@
 import inquirer from 'inquirer';
 
-function getCreatePrompts() {
+function getCreatePrompts( params ) {
 	const prompts = [
 		{
 			type: 'input',
 			name: 'directory',
 			message: 'Name of new site directory:',
-			validate: function (text) {
-				if (text.length == 0) {
+			validate: function( text ) {
+				if ( text.length == 0 ) {
 					return 'You must specify the directory name';
 				}
 				return true;
-			}
+			},
+			'default': function() {
+				if ( '' === params.directory ) {
+					return 'wplocaldocker';
+				}
+				return params.directory + '.dev';
+			},
+			when: function( answers ) {
+				return '' === params.directory;
+			},
 		},
 		{
 			type: 'input',
 			name: 'domain',
 			message: 'Domain to use:',
-			default: function (answers) {
-				return answers.directory+'.dev';
+			'default': function( answers ) {
+				if ( '' === params.directory ) {
+					return answers.directory + '.dev';
+				}
+				return params.directory + '.dev';
 			},
-			filter: function (val) {
+			filter: function( val ) {
 				return val.toLowerCase();
-			}
+			},
 		},
     /*
 		//TODO: Work in Progress