Fixed issue #29

Added espree to parse the given paramater as a js function, this prevents invalid names

bin/choo-generate.js

@@ -4,19 +4,31 @@ const yaml = require('yamljs')
 const fs = require('fs')
 const help = require('./help')
 const _ = require('lodash')
+const { parse } = require('espree')
+const chalk = require('chalk')
 const args = process.argv.slice(2)
 const resolvePath = require('path').resolve
 const requestedGeneratorName = args[0]
 const fileName = _.kebabCase(args[1])
 const name = _.camelCase(args[1])
 const { findConfig, findRootPath, generate, message } = require('../lib/utils')
-const config = yaml.parse(fs.readFileSync(findConfig(), 'utf8'))
-const chalk = require('chalk')
+let config
 
-// message(config);
+try {
+  config = yaml.parse(fs.readFileSync(findConfig(), 'utf8'))
+} catch (e) {
+  message(chalk.red(' choo.yaml not found'))
+  process.exit(1)
+}
 const availableGenerators = Object.keys(config.generators)
 
 function createFromTemplate (options) {
+  try {
+    parse(`function ${options.name} () {}`)
+  } catch (e) {
+    message(chalk.red(options.name, 'is an invalid name'))
+    process.exit(1)
+  }
   generate(options.templatePath, options.target, {
     name: options.name,
     fileName: options.fileName

lib/genus.js

@@ -9,6 +9,7 @@ const fs = require('fs')
 const yaml = require('yamljs')
 const rimraf = require('rimraf')
 const mkdirp = require('mkdirp')
+const { parse } = require('espree')
 
 const choochoo = fs.readFileSync(path.resolve(__dirname, '../choo!')).toString()
 function formatState (state) {
@@ -27,6 +28,12 @@ function formatState (state) {
 }
 
 module.exports = (props) => {
+  try {
+    parse(`function ${props.projectName} () {}`)
+  } catch (e) {
+    message(chalk.red(props.projectName, 'is an invalid name'))
+    process.exit(1)
+  }
   const destinationPath = newProjectPath(props.projectName)
   const templateRepo = (!props.templateRepo) ? 'trainyard/template-basic' : props.templateRepo
   const generatorRootPath = path.join(destinationPath(), '.generators', '.downloaded', templateRepo.split('/').pop())
@@ -115,11 +122,11 @@ function generateApp (source, destinationPath, props, required) {
   })
 
   message(`
-  
+
 ${chalk.yellow('HOORAY!')}  Your application scaffold is complete!
 ${choochoo}
 Running ${chalk.yellow.bold('npm install')} for you...
-    
+
     `)
   xfs.commit(npmInstall)
 }

lib/utils.js

@@ -23,6 +23,7 @@ const findRootPath = once(() => {
     }
   }
 })
+
 const destinationPath = (dir) => resolvePath(findRootPath(), dir || '')
 const npmInstall = process.env.NODE_ENV === 'test' ? () => { } : () => process.nextTick(() => {
   exec('npm', ['install', '-s'], { cwd: destinationPath() })

package.json

@@ -12,6 +12,7 @@
     "chalkline": "0.0.5",
     "cli-spinners": "^0.3.0",
     "cross-spawn": "^5.0.1",
+    "espree": "^3.3.2",
     "inquirer": "^1.1.2",
     "left-pad": "^1.1.1",
     "lodash": "^4.14.1",

tests/generators/app.js

@@ -3,8 +3,10 @@ const test = require('tape')
 const testUtils = require('../../lib/test-utils')
 const clinton = require('clinton')
 const exec = require('../../lib/exec')
+const spawn = require('cross-spawn')
 
 test('App Generator', t => {
+  t.plan(15)
   exec('choo-new.js', ['temp'], {
     cwd: testUtils.cwd
   }, () => {
@@ -43,10 +45,17 @@ test('App Generator', t => {
           t.notOk(check, check.message)
         }
       })
-      t.end()
+      const execShouldFail = spawn('choo-new', [500], {
+        env: process.env,
+        stdio: 'inherit'
+      })
+
+      execShouldFail.on('exit', (code) => {
+        t.assert(code === 1, 'choo-new should fail when given invalid syntax')
+      })
     }).catch(errors => {
       t.notOk(errors)
-      t.end()
     })
   })
 })
+

tests/generators/element.js

@@ -2,8 +2,10 @@
 const test = require('tape')
 const testUtils = require('../../lib/test-utils')
 const exec = require('../../lib/exec')
+const spawn = require('cross-spawn')
 
 test('Element Generator', t => {
+  t.plan(2)
   exec('choo-generate.js', ['element', 'testElement'], {
     cwd: testUtils.tempDir
   }, () => {
@@ -12,6 +14,13 @@ test('Element Generator', t => {
     ]).forEach(file => {
       t.assert(file.exists, `${file.name} must be generated.`)
     })
-    t.end()
+  })
+  const execShouldFail = spawn('choo-generate.js', ['element', 500], {
+    env: process.env,
+    stdio: 'inherit'
+  })
+
+  execShouldFail.on('exit', (code) => {
+    t.assert(code === 1, 'choo-new should fail when given invalid syntax')
   })
 })

tests/generators/model.js

@@ -2,8 +2,10 @@
 const test = require('tape')
 const testUtils = require('../../lib/test-utils')
 const exec = require('../../lib/exec')
+const spawn = require('cross-spawn')
 
 test('Model Generator', t => {
+  t.plan(2)
   exec('choo-generate.js', ['model', 'testModel'], {
     cwd: testUtils.tempDir
   }, () => {
@@ -12,6 +14,13 @@ test('Model Generator', t => {
     ]).forEach(file => {
       t.assert(file.exists, `${file.name} must be generated.`)
     })
-    t.end()
+  })
+  const execShouldFail = spawn('choo-generate.js', ['element', 500], {
+    env: process.env,
+    stdio: 'inherit'
+  })
+
+  execShouldFail.on('exit', (code) => {
+    t.assert(code === 1, 'choo-new should fail when given invalid syntax')
   })
 })

tests/generators/page.js

@@ -2,8 +2,10 @@
 const test = require('tape')
 const testUtils = require('../../lib/test-utils')
 const exec = require('../../lib/exec')
+const spawn = require('cross-spawn')
 
 test('Page Generator', t => {
+  t.plan(2)
   exec('choo-generate.js', ['page', 'testPage'], {
     cwd: testUtils.tempDir
   }, () => {
@@ -12,6 +14,13 @@ test('Page Generator', t => {
     ]).forEach(file => {
       t.assert(file.exists, `${file.name} must be generated.`)
     })
-    t.end()
+  })
+  const execShouldFail = spawn('choo-generate.js', ['element', 500], {
+    env: process.env,
+    stdio: 'inherit'
+  })
+
+  execShouldFail.on('exit', (code) => {
+    t.assert(code === 1, 'choo-new should fail when given invalid syntax')
   })
 })