create-directus-docker 1.4.4 → 1.5.1

package/package.json

@@ -1,13 +1,16 @@
 {
   "name": "create-directus-docker",
   "description": "An installer for Dockerized Directus + MySQL + Adminer + GraphiQL with a helper Node app",
-  "version": "1.4.4",
+  "version": "1.5.1",
   "type": "module",
   "author": {
     "name": "Dave Kobrenski",
     "email": "dave@rlmg.com"
   },
-  "bin": "src/cli.js",
+  "bin": {
+    "create-directus-docker": "src/cli.js",
+    "cdd": "src/cli.js"
+  },
   "keywords": [
     "directus",
     "docker",
@@ -32,10 +35,11 @@
   ],
   "dependencies": {
     "chalk": "^5.2.0",
-    "create-create-app": "7.1.0",
     "execa": "^6.1.0",
+    "fs-extra": "^11.1.0",
     "log-update": "^5.0.1",
-    "upath": "^2.0.1"
+    "upath": "^2.0.1",
+    "yargs": "^17.6.2"
   },
   "license": "MIT",
   "devDependencies": {

package/src/cli.js

@@ -3,40 +3,26 @@
 import upath from 'upath';
 import chalk from 'chalk';
 import path from 'path';
-import {fileURLToPath} from 'url';
-import { create } from 'create-create-app';
-// import { spawn } from 'node:child_process';
-// import logUpdate from 'log-update';
-// import {execa} from 'execa';
+import { fileURLToPath } from 'url';
+import logUpdate from 'log-update';
+import fs from 'fs-extra';
+import yargs from 'yargs';
+import { hideBin } from 'yargs/helpers';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
+const templateDir = upath.resolve(__dirname, '../templates/default');
 
-create('create-directus-docker', {
-  templateRoot: upath.resolve(__dirname, '../templates'),
-  promptForDescription: false,
-  promptForAuthor: false,
-  promptForEmail: false,
-  promptForLicense: false,
-
-  // after: ({packageDir}) => {
-    // const cd = spawn('cd', [packageDir]);
-    // cd.on('close', code => {
-    //   const install = spawn('npm', ['install']);
-
-    //   install.stdout.on('data', (data) => {
-    //     logUpdate(`${data}`);
-    //   });
-
-    //   install.on('close', (code) => {
-    //     logUpdate.done();
-    //     execa('npm', ['start']).stdout.pipe(process.stdout);
-    //   });
-    // });
-  // },
-
-  caveat: ({ packageDir }) => {
-    return `
+const rootPath = path.resolve();
+
+const argv = yargs(hideBin(process.argv)).argv;
+const args = argv._;
+
+//check enough args
+if (args.length > 0) {
+  const packageDir = args[0];
+
+  const successMsg = `
 ${chalk.bold.yellowBright("Directus with MySQL, Adminer, and GraphiQL:")}
 
 To configure and run your Directus services, first ${chalk.bold("make sure you have Docker installed and running")}, then run:
@@ -49,6 +35,28 @@ For more information, see:
 https://github.com/davekobrenski/create-directus-docker
 
 Enjoy!
-`
+`;
+  console.log("");
+  logUpdate(`Creating directory: ${packageDir}...`);
+  const dirFullPath = path.join(rootPath, packageDir);
+
+  //make the dir for the project
+  if (fs.existsSync(dirFullPath) === false) {
+    fs.mkdir(path.join(rootPath, packageDir)).then(() => {
+      //success
+      logUpdate(chalk.greenBright(`Directory '${packageDir}' created successfully.`));
+      logUpdate.done();
+
+      try {
+        fs.copySync(templateDir, dirFullPath);
+        logUpdate(successMsg);
+      } catch (err) {
+        console.error(err);
+      } 
+    }).catch(err => console.error(err));
+  } else {
+    console.error(chalk.redBright(`Error: Specified directory '${packageDir}' already exists.`));
   }
-});
+} else {
+  console.error(chalk.redBright(`Error: please specify a project directory.`));
+}

package/templates/default/lib/launch-services.js

@@ -124,30 +124,27 @@ export default function launchServices() {
                         jq.run(q, data.toString(), { input: 'string' })
                             .then((data) => {
                                 const json = JSON.parse(data);
-                                console.log(data);
+                                //console.log(data);
 
                                 if(json.State == 'running') {
-                                    logUpdate(`${chalk.yellowBright("Directus appears to be running, but took a while to respond.")}`);
-                                    console.log(`Just run ${chalk.greenBright("npm run launch")} to verify, and you should be good to go.`);
-
-                                    logUpdate.done();
+                                    logUpdate(`${chalk.yellowBright("Directus appears to be running, but took a while to respond.")}. \nJust run ${chalk.greenBright("npm run launch")} to verify, and you should be good to go.`);
                                 } else {
-                                    logUpdate(`${chalk.redBright("Directus taking too long to respond. You may need to manually start it.")}`);
-                                    logUpdate.done();
-                                    console.log(`Just run ${chalk.greenBright("npm run launch")} and you should be good to go.`);
+                                    logUpdate(`${chalk.redBright("Directus taking too long to respond. You may need to manually start it.")}. \nJust run ${chalk.greenBright("npm run launch")} and you should be good to go.`);
                                 }
                             });
                     });
 
                     check.on('close', (code) => {
                         if (code !== 0) {
-                            console.log(`${chalk.redBright("Directus taking too long to respond. You may need to manually start it.")}`);
-                            console.log(`Just run ${chalk.greenBright("npm run launch")} and you should be good to go.`);
-                            console.log(`You can also check if it is running with ${chalk.greenBright("docker-compose ps")}`);
+                            var line1 = `${chalk.redBright("Directus taking too long to respond. You may need to manually start it.")}`;
+                            var line2 = `Just run ${chalk.greenBright("npm run launch")} and you should be good to go.`;
+                            var line3 = `You can also check if it is running with ${chalk.greenBright("docker-compose ps")}`;
+                            logUpdate(`${line1} \n${line2} \n${line3}`);
                         } else {
-                            console.log(`${chalk.yellowBright("Directus appears to be running, but took a while to respond.")}`);
-                            console.log(`Just run ${chalk.greenBright("npm run launch")} to verify, and you should be good to go.`);
-                            console.log(`You can also check if it is running with ${chalk.greenBright("docker-compose ps")}`);
+                            var line1 = `${chalk.yellowBright("Directus appears to be running, but took a while to respond.")}`;
+                            var line2 = `Just run ${chalk.greenBright("npm run launch")} to verify, and you should be good to go.`;
+                            var line3 = `You can also check if it is running with ${chalk.greenBright("docker-compose ps")}`;
+                            logUpdate(`${line1} \n${line2} \n${line3}`);
                         }
                     });
                 });

package/templates/default/package.json

@@ -1,6 +1,6 @@
 {
   "name": "directus-mysql-docker",
-  "version": "1.1.2",
+  "version": "1.2.1",
   "description": "A helper app to configure Directus on Docker with MySQL, Adminer, and GraphQL",
   "main": "./lib/index.js",
   "type": "module",