Merge pull request #79 from cyclejs-community/validate-cli-params

fixes #78

Author: nickbalestra

packages/create-cycle-app/index.js

@@ -7,6 +7,11 @@ const argv = require('minimist')(process.argv.slice(2))
 const createApp = require('./src/createApp')
 const VERSION = require(path.resolve(__dirname, 'package.json')).version
 
+const validCommands = {
+  'verbose': true,
+  'flavor': true
+}
+
 // Command line prelude (version and usage)
 const commands = argv._
 if (commands.length === 0) {
@@ -17,6 +22,21 @@ if (commands.length === 0) {
   console.error(chalk.red('Usage: create-cycle-app <project-directory> [--flavor] [--verbose]'))
   process.exit(1)
 }
-// Parse the command line options and run the setup
-createApp(commands[0], argv.verbose, argv.flavor)
 
+Object.keys(argv)
+  .filter(cmd => cmd !== '_')
+  .every(cmd => {
+    if (!validCommands[cmd]) {
+      console.error(chalk.red(`Invalid command: ${cmd}`))
+      process.exit(1)
+      return false
+    }
+    return true
+  })
+
+const flavor = argv.flavor || false
+const verbose = argv.verbose || false
+const name = commands[0]
+
+// Parse the command line options and run the setup
+createApp(name, verbose, flavor)

packages/create-cycle-app/src/createApp.js

@@ -7,7 +7,6 @@ const installScripts = require('./installScripts')
 module.exports = function createApp (name, verbose, flavor) {
   const appFolder = path.resolve(name)
   const appName = path.basename(appFolder)
-  flavor = flavor || 'cycle-scripts'
 
   createProjectIn(appFolder)
   preparePackageJson(appFolder, appName, () => {

packages/create-cycle-app/test/integration/__snapshots__/createCycleApp.spec.js.snap

@@ -1,4 +1,4 @@
-exports[`create-cycle-app when invoked with the a directory it generate a correct package.json file 1`] = `
+exports[`create-cycle-app when invoked with the the correct arguments it generate a correct package.json file 1`] = `
 "{
   \"name\": \"MYCYCLEAPP\",
   \"version\": \"0.1.0\",

packages/create-cycle-app/test/integration/createCycleApp.spec.js

@@ -4,7 +4,30 @@ const appName = path.resolve(__dirname, 'MYCYCLEAPP')
 const spawn = require('cross-spawn')
 
 describe('create-cycle-app', () => {
-  describe('when invoked with the a directory', () => {
+  describe('when invoked with the wrong arguments', () => {
+    test('should throw an error', () => {
+      expect(
+        spawn.sync('node', [
+          path.resolve(__dirname, '../../index.js'),
+          appName,
+          '--flavour',
+          'cycle-scripts@1.0.3'
+        ])
+      ).toThrowError()
+    })
+
+    test('should throw an error', () => {
+      expect(
+        spawn.sync('node', [
+          path.resolve(__dirname, '../../index.js'),
+          appName,
+          '--verbos'
+        ])
+      ).toThrowError()
+    })
+  })
+
+  describe('when invoked with the the correct arguments', () => {
     let dir
 
     beforeEach((done) => {