Merge pull request #2 from arboshiki/master

Update gulp module-generator

gulp/generators/module-generator/generator.js

@@ -1,13 +1,14 @@
+/* eslint-disable no-console */
 /**
  * Created by george on 4/18/17.
  */
 
 var gulp = require('gulp');
 var replace = require('gulp-replace');
 var rename = require('gulp-rename');
+var colors = require('colors');
 var fs = require('fs');
 
-
 function processArguments(args) {
   //Creating empty hash map
   var argsMap = {};
@@ -48,6 +49,7 @@ function processArguments(args) {
 function validateArgs(argsMap) {
   //Defining path value
   var path = argsMap["--path"];
+  var errorSuffix = "The path is relative to src/app folder";
 
   //Checking if there is '--path' argument in hashmap
   if (argsMap.hasOwnProperty("--path") != false) {
@@ -62,42 +64,47 @@ function validateArgs(argsMap) {
         return true;
       }
     }
-    //If no value is defined for path
+    //If no value is defined for --path
     else {
-      console.log("NO PATH VALUE DEFINED");
+      console.log(("--path argument requires full path (including module name). " + errorSuffix).red);
       return false;
     }
   }
-  //If no path argument is defined
+  //If no --path argument is defined
   else {
-    console.log("NO PATH ARGUMENT DEFINED");
+    console.log(("Please specify --path argument with full path (including module name). " + errorSuffix).red);
     return false;
   }
 }
 
 function generateModule(params) {
-  var streams = {
+  var fileSuffix = {
     'module.txt': ".module.js",
     'controller.txt': ".controller.js",
     'html.txt': ".html",
     'less.txt': ".less"
   };
 
-  for (var s in streams) {
+  for (var s in fileSuffix) {
 
     //Creating stream
-    var stream = gulp.src('gulp/generators/module-generator/template/'+s);
+    var stream = gulp.src('gulp/generators/module-generator/template/' + s);
 
     //Replacing all matching strings with custom strings
     for (var i in params) {
       stream.pipe(replace("{{" + i + "}}", params[i]));
     }
 
+    var filePath = 'src/app/' + params.ModulePath + '/' + params.FolderName + fileSuffix[s];
+    if (fs.existsSync(filePath)) {
+      console.log(("[Skipping] ".yellow + filePath).yellow);
+      continue;
+    }
     //Saving
-    stream.pipe(rename(params.ModulePath.split("/").pop() + streams[s]))
+    stream.pipe(rename(params.FolderName + fileSuffix[s]))
       .pipe(gulp.dest('src/app/' + params.ModulePath + '/'));
 
-    console.log("src/app/"+params['ModulePath']+"/"+params['FolderName']+streams[s]+" Generated");
+    console.log("[Creating] ".green + filePath);
   }
 }
 
@@ -129,4 +136,4 @@ String.prototype.ucFirst = function () {
 };
 String.prototype.lcFirst = function () {
   return this.valueOf()[0].toLowerCase() + this.valueOf().substring(1);
-};
+};

gulp/generators/module-generator/template/controller.txt

@@ -7,20 +7,20 @@
 
   /** @ngInject */
   function {{ControllerName}}Fn(){
-      // var vm = this;
+    // var vm = this;
 
-      // Data
+    // Data
 
 
-      // Methods
+    // Methods
 
 
-      init();
+    init();
 
-      ///////////
+    ///////////
 
-      function init(){
+    function init(){
 
-      }
+    }
   }
 })();

gulp/generators/module-generator/template/html.txt

@@ -1,3 +1,3 @@
 <div id="{{ModuleName}}">
-  {{ModuleContent}}
+    {{ModuleContent}}
 </div>

gulp/generators/module-generator/template/less.txt

@@ -1,3 +1,3 @@
 #{{ModuleName}}{
 
-}
+}

gulp/generators/module-generator/template/module.txt

@@ -25,7 +25,6 @@
       text: '{{ModuleDisplayName}}',
       state: 'app.{{ModuleName}}',
       weight: 1
-      // icon: 'fa fa-table'
     });
   }
 })();

package.json

@@ -9,6 +9,7 @@
     "browser-sync": "~2.9.11",
     "browser-sync-spa": "~1.0.3",
     "chalk": "~1.1.1",
+    "colors": "^1.1.2",
     "del": "~2.0.2",
     "eslint-plugin-angular": "~0.12.0",
     "estraverse": "~4.1.0",