[TASK] check is specified folder exist in current dir

t3kit · Jun 1, 2017 · 669e5a6 · 669e5a6
1 parent c5e1d35
commit 669e5a6
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/index.js b/index.js
@@ -14,7 +14,6 @@ const parse = require('./lib/parse')
 // const dep = require('./lib/dep')
 const argv = require('minimist')(process.argv.slice(2))
 const cmd = require('./lib/cmd')
-// const subtheme = require('./lib/subtheme')
 const text = require('./lib/text')
 
 var cache = {}
@@ -32,7 +31,8 @@ function generateSubtheme () {
   .then(check.folder)
 
   .then(prompt.siteName)
-  .then(() => prompt.isOk(cache, text.subtheme.isAutoDirName(cache), prompt.dirName))
+  .then(check.isFolderExist)
+  .then(() => cache.isFolderExist ? prompt.dirName(cache) : prompt.isOk(cache, text.subtheme.isAutoDirName(cache), prompt.dirName))
   .then(cmd.mkdir)
   .then(() => git.clone(cache, variables.subtheme.repo))
 

diff --git a/lib/check/index.js b/lib/check/index.js
@@ -1,6 +1,6 @@
 'use strict'
 
-// var fs = require('fs')
+var fs = require('fs')
 const shell = require('shelljs')
 const chalk = require('chalk')
 const variables = require('../variables')
@@ -33,3 +33,14 @@ check.folder = function folder (cache) {
     return cache
   }
 }
+
+check.isFolderExist = function isFolderExist (cache) {
+  let isFolderExist = {}
+  if (fs.existsSync(variables.subtheme.dirName(cache))) {
+    isFolderExist.isFolderExist = true
+  } else {
+    isFolderExist.isFolderExist = false
+  }
+  helpers.addTo(cache, isFolderExist)
+  return cache
+}
diff --git a/lib/prompt/index.js b/lib/prompt/index.js
@@ -76,6 +76,9 @@ prompt.siteName = function siteName (cache) {
     function recursivePrompt () {
       inquirer.prompt(siteName)
       .then(function (answers) {
+        if (fs.existsSync(variables.subtheme.dirName(answers))) {
+          console.log(` ${chalk.yellow(text.subtheme.warning.nameAlreadyExists(answers))}`)
+        }
         if (answers.isOk === false) {
           recursivePrompt()
         } else if (answers.isOk === true) {

diff --git a/lib/text/index.js b/lib/text/index.js
@@ -48,7 +48,10 @@ text.subtheme = {
     capitalLetter: `Do not use a capital first letter`,
     oneWord: `Should be one word or use camelCase`,
     camelCase: `Use camelCase`,
-    dirName: `Folder exists. Please choose another folder name.`
+    dirName: `Folder exists. Please choose another folder name`
+  },
+  warning: {
+    nameAlreadyExists: (cache) => `Warning: Folder subtheme_t3kit_${cache.siteName} already exist in current directory.`
   }
 }