wp-lemon-create 1.3.4 → 1.4.0

package/lib/index.js

@@ -6,6 +6,7 @@ var shell = require('shelljs');
 const commandName = 'wp-lemon-create';
 const { engines, version } = require('../package.json');
 const prompt = require('prompt-sync')();
+const rootPath = path.basename(path.resolve());
 
 program
     .name(commandName)
@@ -19,7 +20,9 @@ program
     )
     .version(version)
     .action((name, options, command) => {
+        var project_name = rootPath;
         var project_repository = '';
+        var project_url = '';
         var username = '';
         var email = '';
         var password = '';
@@ -33,6 +36,7 @@ program
         var skipGit = false;
         var branch = false;
 
+
         console.log(`Starting $${commandName} @${version}`);
 
         if (!shell.which('git')) {
@@ -80,14 +84,16 @@ program
         }
 
         shell.echo('\n');
-        const projectname = prompt('What is the project name (only lowercase and -, no spaces. Do not add tld (.local/.test):');
-        child_theme_folder = projectname;
+        project_name = prompt(`What is the project name (only lowercase and -, no spaces. Do not add tld (.local/.test), defaults to ${project_name}:`, project_name);
         const tld = prompt('What is the project tld? (defaults to .local):', '.local');
 
-        const projecttype = prompt('Project type? new or existing (defaults to new):', 'new');
+        child_theme_folder = project_name; // update child theme folder name
+        project_url = project_name + tld; // set project url
+
+        const project_type = prompt('Project type? new or existing (defaults to new):', 'new');
         shell.echo('\n');
 
-        if (projecttype == 'new') {
+        if (project_type == 'new') {
             shell.echo('Please create a new Git repository and fill in the link in ssh format.');
             project_repository = prompt('Git repository link or enter "none" to skip GIT setup:', 'none');
             username = prompt('WordPress username:');
@@ -100,7 +106,7 @@ program
             if (project_repository == 'none') {
                 skipGit = true;
             }
-        } else if (projecttype == 'existing') {
+        } else if (project_type == 'existing') {
             project_repository = prompt('Existing repository link in ssh format:');
             branch = prompt('Branch to checkout (defaults to master):', 'master');
         } else {
@@ -112,9 +118,9 @@ program
         DBpassword = prompt('Database password. Defaults to root:', 'root');
 
         shell.echo('\n');
-        shell.echo(`🎉 Setting up ${projecttype} wp-lemon project with url ${projectname + tld}\n`);
+        shell.echo(`🎉 Setting up ${project_type} wp - lemon project with url ${project_url} \n`);
 
-        if (projecttype == 'new') {
+        if (project_type == 'new') {
             shell.echo('Downloading Bedrock. This may take a minute or so.\n');
 
             /**
@@ -174,7 +180,7 @@ program
              */
             if (!skipGit) {
                 shell.exec('git init', { silent: true });
-                shell.exec(`git remote add origin ${project_repository}`);
+                shell.exec(`git remote add origin ${project_repository} `);
                 shell.echo(`✔️  Setting up empty local git repository and adding ${project_repository} as remote.\n`);
             }
 
@@ -192,7 +198,7 @@ program
             shell.echo('Downloading child theme.\n');
             shell.cd('web/app/themes/');
 
-            shell.exec(`composer create-project --repository https://packagist.studiolemon.nl/satispress/ satispress/wp-lemon-child ${child_theme_folder} --no-dev`, { silent: true });
+            shell.exec(`composer create - project--repository https://packagist.studiolemon.nl/satispress/ satispress/wp-lemon-child ${child_theme_folder} --no-dev`, { silent: true });
 
             shell.cd(child_theme_folder);
             shell.rm('-rf', '.github');
@@ -224,9 +230,9 @@ program
          * Create child theme config file
          */
         shell.cp('resources/assets/config.json.example', 'resources/assets/config.json');
-        shell.sed('-i', 'http://wplemon.local', `http://${projectname + tld}`, 'resources/assets/config.json');
+        shell.sed('-i', 'http://wplemon.local', `http://${project_url}`, 'resources/assets/config.json');
         shell.sed('-i', 'wp-lemon-child', child_theme_folder, 'resources/assets/config.json');
-        shell.sed('-i', 'wp-lemon child', projectname, 'style.css');
+        shell.sed('-i', 'wp-lemon child', project_name, 'style.css');
         shell.echo('✔️  Configuring child theme succesful.\n');
 
         /**
@@ -263,12 +269,12 @@ program
          */
         shell.echo('Creating .env file\n');
         shell.exec(`wp dotenv init --template=.env.example --with-salts`, { silent: true });
-        shell.exec(`wp dotenv set DB_NAME ${projectname}`, { silent: true });
+        shell.exec(`wp dotenv set DB_NAME ${project_name}`, { silent: true });
         shell.exec(`wp dotenv set DB_USER ${DBuser}`, { silent: true });
         shell.exec(`wp dotenv set DB_PASSWORD ${DBpassword}`, { silent: true });
-        shell.exec(`wp dotenv set WP_HOME http://${projectname + tld}`, { silent: true });
+        shell.exec(`wp dotenv set WP_HOME http://${project_url}`, { silent: true });
         shell.exec(`wp dotenv salts generate`, { silent: true });
-        shell.echo('✔️  Generating .env succesful.\n');
+        shell.echo('✔️  Generating .env successful.\n');
 
         if (is_wsl) {
             shell.echo('Uncommenting #DB_host and changing to 127.0.0.1 for allowing connection in WSL\n');
@@ -276,7 +282,7 @@ program
             shell.sed('-i', 'localhost', '127.0.0.1', '.env');
         }
 
-        if (projecttype == 'new') {
+        if (project_type == 'new') {
             shell.echo('Installing WordPress.\n');
 
             if (shell.exec(`wp db create`, { silent: true }).code !== 0) {
@@ -287,7 +293,7 @@ program
 
             if (
                 shell.exec(
-                    `wp core install --skip-email --url="http://${projectname + tld}" --title="${projectname}" --admin_user="${username}" --admin_password="${password}" --admin_email="${email}"`,
+                    `wp core install --skip-email --url="http://${project_url}" --title="${project_name}" --admin_user="${username}" --admin_password="${password}" --admin_email="${email}"`,
                     { silent: true },
                 ).code !== 0
             ) {
@@ -339,6 +345,6 @@ program
 
         shell.echo(`\n`);
         shell.echo(`🎉  All done! Happy developing!`);
-        shell.echo(`🌐  You can now navigate to http://${projectname + tld}`);
+        shell.echo(`🌐  You can now navigate to http://${project_url}`);
     })
     .parse(process.argv);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "wp-lemon-create",
-    "version": "1.3.4",
+    "version": "1.4.0",
     "description": "Bootstrap your wp-lemon project",
     "main": "index.js",
     "author": "Erik van der bas",