cca cleanup

Author: Nick Balestra

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

@@ -0,0 +1,21 @@
+'use strict'
+
+const chalk = require('chalk')
+const console = require('console')
+const fs = require('fs')
+
+const isSafeToCreateApp = require('./isSafeToCreateApp')
+
+module.exports = function createProjectIn (appPath) {
+  if (!fs.existsSync(appPath)) {
+    fs.mkdirSync(appPath)
+    return
+  }
+
+  if (isSafeToCreateApp(appPath)) {
+    return
+  } else {
+    console.log(chalk.red(`The directory \`${appPath}\` contains file(s) that could conflict. Aborting.`))
+    process.exit(1)
+  }
+}

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

@@ -0,0 +1,24 @@
+'use strict'
+
+const chalk = require('chalk')
+const console = require('console')
+const fs = require('fs')
+const path = require('path')
+
+module.exports = function createPackageJson (appPath, appName) {
+  // Prepare package.json
+  const content = {
+    name: appName,
+    version: '0.1.0',
+    private: true
+  }
+  const packageJsonContent = JSON.stringify(content, null, 2)
+
+  // Write package.json in the app folder
+  console.log(chalk.green(`Creating a new Cycle.js app in ${appPath}.`))
+  console.log()
+  fs.writeFileSync(
+    path.join(appPath, 'package.json'),
+    packageJsonContent
+  )
+}

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

@@ -41,11 +41,6 @@ const initQuestions = [
   }
 ]
 
-module.exports = (flavor, cb) => {
-  if (flavor) {
-    return cb(false)
-  }
-  inquirer.prompt(initQuestions).then(answers => {
-    return cb(answers)
-  })
+module.exports = cb => {
+  inquirer.prompt(initQuestions).then(cb)
 }

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

@@ -4,49 +4,58 @@ const chalk = require('chalk')
 const spawn = require('cross-spawn')
 const console = require('console')
 const path = require('path')
-const process = require('process')
 
 const getPackageName = require('./getPackageName')
 
-module.exports = function installScripts (appFolder, appName, flavor, verbose, options) {
-  const originalDirectory = process.cwd()
-  process.chdir(appFolder)
+module.exports = function installScripts (appFolder, appName, options) {
+  const verbose = options.verbose
+  const flavor = options.flavor
+  const cli = options.cli
 
-  // Find the right version
+  // Check if the the the flavor to be used is local
   const local = /^\.\/|^\//.test(flavor)
+  // Get the right name of the flavor package
   const packageName = getPackageName(flavor)
-
   // Install dependencies
+  const args = {
+    npm: [
+      'install',
+      verbose && '--verbose',
+      '--save-dev',
+      '--save-exact',
+      flavor
+    ].filter(a => a),
+    yarn: [
+      'add',
+      '--exact',
+      verbose && '--verbose',
+      local ? 'file:' + flavor : flavor
+    ].filter(a => a)
+  }
+
+  // Trigger npm installation
   console.log(chalk.green('Installing packages. This might take a couple minutes.'))
   console.log(chalk.green(`Installing ${packageName} from ${(local ? 'local' : 'npm')} ...`))
   console.log()
 
-  const args = [
-    'install',
-    verbose && '--verbose',
-    '--save-dev',
-    '--save-exact',
-    local ? path.resolve(originalDirectory, flavor) : flavor
-  ].filter(function (a) { return a })
-
-  // Trigger npm installation
-  const proc = spawn('npm', args, {stdio: 'inherit'})
+  const proc = spawn(cli, args[cli], {stdio: 'inherit', cwd: appFolder})
+  proc.on('error', (e) => console.log(e))
   proc.on('close', function (code) {
     if (code !== 0) {
-      console.error(chalk.red(`npm \`${args.join(' ')}\` failed`))
+      console.error(chalk.red(`${cli} \`${args[cli].join(' ')}\` failed`))
       return
     }
 
     const initScriptPath = path.resolve(
-      process.cwd(),
+      appFolder,
       'node_modules',
       packageName,
       'scripts',
       'init.js'
     )
     const init = require(initScriptPath)
 
-    // Execute the cycle-scripts's specific initialization
-    init(appFolder, appName, verbose, originalDirectory, options)
+    // Execute the flavor's specific initialization
+    init(appFolder, appName, options)
   })
 }

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

@@ -2,7 +2,7 @@
 
 const fs = require('fs')
 
-module.exports = function isSafeToCreateProjectIn (appFolder) {
+module.exports = function isSafeToCreateApp (appFolder) {
   const whitelist = [
     '.DS_Store',
     'Thumbs.db',

…cycle-app/src/isSafeToCreateProjectIn.js …reate-cycle-app/src/isSafeToCreateApp.jspackages/create-cycle-app/src/isSafeToCreateProjectIn.js renamed to packages/create-cycle-app/src/isSafeToCreateApp.js packages/create-cycle-app/src/isSafeToCreateProjectIn.js renamed to packages/create-cycle-app/src/isSafeToCreateApp.js

@@ -1,10 +1,10 @@
-const execSync = require('child_process').execSync;
+const execSync = require('child_process').execSync
 
-module.exports = function shouldUseYarn() {
+module.exports = function shouldUseYarn () {
   try {
-    execSync('yarnpkg --version', { stdio: 'ignore' });
-    return true;
+    execSync('yarnpkg --version', { stdio: 'ignore' })
+    return true
   } catch (e) {
-    return false;
+    return false
   }
 }