Inserting log in create project

Author: andrelmlins

src/generators/ControllerGenerator.ts

@@ -20,7 +20,7 @@ const createController = (name: string) => {
       const contentFile = fs.readFileSync(source).toString();
       fs.writeFileSync(target, replaceMask(contentFile, { name }));
 
-      Log.Instance.successHeap(`The controller ${name} created.`);
+      Log.Instance.successHeap(`The ${name} controller was created.`);
       Log.Instance.info(`Path: ${target}\n\n`);
     } catch (err) {
       Log.Instance.exception(err);

src/generators/ModelGenerator.ts

@@ -19,7 +19,7 @@ const createModel = (name: string) => {
       const contentFile = fs.readFileSync(source).toString();
       fs.writeFileSync(target, replaceMask(contentFile, { name }));
 
-      Log.Instance.successHeap(`The model ${name} created.`);
+      Log.Instance.successHeap(`The ${name} model was created.`);
       Log.Instance.info(`Path: ${target}\n\n`);
     } catch (err) {
       Log.Instance.exception(err);

src/generators/ProjectGenerator.ts

@@ -6,40 +6,45 @@ import copyFolder from '../utils/copyFolder';
 import createPackageJson from '../stages/CreatePackageJson';
 import installDependencies from '../stages/InstallDependencies';
 import initializeGit from '../stages/InitializeGit';
-
-let projectName;
+import Log from '../Log';
+
+const createProject = (name: string) => {
+  if (name) {
+    Log.Instance.infoHeap(`Creating the project`);
+
+    const source = path.join(__dirname, '/../../templates/project');
+    const target = path.join(process.cwd(), name);
+
+    try {
+      Log.Instance.infoHeap(`Copying files`);
+      fs.mkdirSync(name);
+
+      copyFolder(source, target);
+      fs.renameSync(
+        path.join(target, 'gitignore'),
+        path.join(target, '.gitignore')
+      );
+
+      createPackageJson(target, name);
+      installDependencies(target);
+      initializeGit(name);
+
+      Log.Instance.successHeap(`The ${name} project was created.`);
+      Log.Instance.info(`Path: ${target}\n\n`);
+    } catch (err) {
+      Log.Instance.exception(err);
+    }
+  } else {
+    Log.Instance.errorHeap(`Specify the name project.`);
+    Log.Instance.info(
+      `For example: recife-cli project my-project-name\nRun --help for more information`
+    );
+  }
+};
 
 commander
   .name(`recife-cli project`)
   .arguments('<project-name>')
-  .action(name => (projectName = name))
+  .action(name => createProject(name))
   .allowUnknownOption(false)
   .parse(process.argv);
-
-if (projectName) {
-  const source = path.join(__dirname, '/../../templates/project');
-  const target = path.join(process.cwd(), projectName);
-
-  try {
-    fs.mkdirSync(projectName);
-
-    copyFolder(source, target);
-    fs.renameSync(
-      path.join(target, 'gitignore'),
-      path.join(target, '.gitignore')
-    );
-
-    createPackageJson(target, projectName);
-    installDependencies(target);
-    initializeGit(projectName);
-
-    console.info(`\x1b[36mCreating the project ${projectName}.`, '\x1b[0m');
-    console.info(`Path: ${target}`, '\x1b[0m\n');
-  } catch (err) {
-    console.log(`\x1b[31m${err}\x1b[0m`);
-  }
-} else {
-  console.error('\x1b[31mSpecify the name project.', '\x1b[0m');
-  console.log(`  For example: recife-cli project my-project-name`);
-  console.log(`  Run --help for more information\n`);
-}

src/generators/ScalarGenerator.ts

@@ -25,7 +25,7 @@ const createScalar = (name: string) => {
         })
       );
 
-      Log.Instance.successHeap(`The scalar ${name} created.`);
+      Log.Instance.successHeap(`The ${name} scalar was created.`);
       Log.Instance.info(`Path: ${target}\n\n`);
     } catch (err) {
       Log.Instance.exception(err);

src/generators/ValidatorGenerator.ts

@@ -19,7 +19,7 @@ const createValidator = (name: string) => {
       const contentFile = fs.readFileSync(source).toString();
       fs.writeFileSync(target, replaceMask(contentFile, { name }));
 
-      Log.Instance.successHeap(`The validator ${name} created.`);
+      Log.Instance.successHeap(`The ${name} validator was created.`);
       Log.Instance.info(`Path: ${target}\n\n`);
     } catch (err) {
       Log.Instance.exception(err);

src/stages/CreatePackageJson.ts

@@ -1,7 +1,10 @@
 import fs from 'fs';
 import path from 'path';
+import Log from '../Log';
 
 const createPackageJson = (target: string, name: string) => {
+  Log.Instance.infoHeap(`Creating file package.json`);
+
   const basePackageJson = {
     name: name,
     version: '0.0.1',

src/stages/InitializeGit.ts

@@ -1,16 +1,19 @@
 import { spawnSync } from 'child_process';
+import Log from '../Log';
 
 const initializeGit = (projectName: string) => {
+  Log.Instance.infoHeap(`Starting the git`);
+
   const originalDirectory = process.cwd();
 
   try {
     process.chdir(projectName);
 
-    spawnSync('git', ['init'], { stdio: 'inherit' });
-    spawnSync('git', ['add', '*'], { stdio: 'inherit' });
-    spawnSync('git', ['commit', '-m', 'First Commit'], { stdio: 'inherit' });
+    spawnSync('git', ['init'], { stdio: 'ignore' });
+    spawnSync('git', ['add', '*'], { stdio: 'ignore' });
+    spawnSync('git', ['commit', '-m', 'First Commit'], { stdio: 'ignore' });
   } catch (err) {
-    console.log(`\x1b[31m${err}\x1b[0m`);
+    Log.Instance.exception(err);
   }
 
   process.chdir(originalDirectory);

src/stages/InstallDependencies.ts

@@ -1,4 +1,5 @@
 import { spawnSync } from 'child_process';
+import Log from '../Log';
 
 const yarnInstalled = () => {
   try {
@@ -10,15 +11,17 @@ const yarnInstalled = () => {
 };
 
 const installDependencies = (target: string) => {
+  Log.Instance.infoHeap(`Installing dependencies`);
+
   const originalDirectory = process.cwd();
 
   try {
     process.chdir(target);
 
     if (yarnInstalled()) {
-      spawnSync('yarnpkg', ['install'], { stdio: 'inherit' });
+      spawnSync('yarnpkg', ['install'], { stdio: 'ignore' });
     } else {
-      spawnSync('npm', ['install'], { stdio: 'inherit' });
+      spawnSync('npm', ['install'], { stdio: 'ignore' });
     }
   } catch (err) {
     console.log(`\x1b[31m${err}\x1b[0m`);