Merge pull request #1411 from driftyco/generators

fix(generators): allow configurable directory to be passed in

Author: danbucholtz

lib/ionic/generate.js

@@ -60,13 +60,45 @@ function run(ionic, argv) {
       includeSass: includeSass
     };
 
+    var componentsDir = path.join(process.cwd(), 'src', 'components');
+    var directivesDir = path.join(process.cwd(), 'src', 'components');
+    var pagesDir = path.join(process.cwd(), 'src', 'pages');
+    var pipesDir = path.join(process.cwd(), 'src', 'pipes');
+    var providersDir = path.join(process.cwd(), 'src', 'providers');
+    var templateDir = path.join(process.cwd(), 'node_modules', 'ionic-angular', 'templates');
+
+    if (argv.componentsDir && argv.componentsDir.length > 0) {
+      componentsDir = path.resolve(argv.componentsDir);
+    }
+
+    if (argv.directivesDir && argv.directivesDir.length > 0) {
+      directivesDir = path.resolve(argv.directivesDir);
+    }
+
+    if (argv.pagesDir && argv.pagesDir.length > 0) {
+      pagesDir = path.resolve(argv.pagesDir);
+    }
+
+    if (argv.pipesDir && argv.pipesDir.length > 0) {
+      pipesDir = path.resolve(argv.pipesDir);
+    }
+
+    if (argv.providersDir && argv.providersDir.length > 0) {
+      providersDir = path.resolve(argv.providersDir);
+    }
+
+    if (argv.templateDir && argv.templateDir.length > 0) {
+      templateDir = path.resolve(argv.templateDir);
+    }
+
+
     var projectStructureOptions = {
-      absoluteComponentDirPath: process.cwd() + '/src/components',
-      absoluteDirectiveDirPath: process.cwd() + '/src/components',
-      absolutePagesDirPath: process.cwd() + '/src/pages',
-      absolutePipeDirPath: process.cwd() + '/src/pipes',
-      absoluteProviderDirPath: process.cwd() + '/src/providers',
-      absolutePathTemplateBaseDir: process.cwd() + '/node_modules/ionic-angular/templates'
+      absoluteComponentDirPath: componentsDir,
+      absoluteDirectiveDirPath: directivesDir,
+      absolutePagesDirPath: pagesDir,
+      absolutePipeDirPath: pipesDir,
+      absoluteProviderDirPath: providersDir,
+      absolutePathTemplateBaseDir: templateDir
     };
 
     return appGenerator.generate(generatorOptions, projectStructureOptions).catch(function(err) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.1.0-beta.2",
+  "version": "2.1.0-beta.3",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",