update deploy prompts

ajam · Nov 30, 2015 · 0d25e1f · 0d25e1f
1 parent 6cfcc06
commit 0d25e1f
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 16 deletions.
diff --git a/bin/deploy-prompts.js b/bin/deploy-prompts.js
@@ -38,9 +38,9 @@ function getLocalDeployDirChoices(){
 
   // Add repo-name
   var dirs_with_basename = dirs.map(function(dir){
-    return [LOCAL_FOLDER, dir].join('>>'); // Use this as the file delimiter to avoid os-mismatch between client and server
+    return ['.', dir].join('/'); // Kestrel server will run with `/` file paths for Linux
   })
-  return [LOCAL_FOLDER].concat(dirs_with_basename);
+  return ['./'].concat(dirs_with_basename);
 }
 
 function getConfigRemotePath(){
@@ -54,7 +54,7 @@ function getConfigRemotePath(){
 var default_deploy = {
   bucket_environment: 'staging',
   trigger_type: 'sync',
-  local_path: LOCAL_FOLDER,
+  local_path: './',
   remote_path: getConfigRemotePath() + '/' + LOCAL_FOLDER,
   when: 'now'
 };
@@ -72,14 +72,27 @@ var questions = [
     type: 'list',
     name: 'trigger_type',
     message: 'Deploy method?',
-    choices: ['sync', 'hard'],
+    choices: function(){
+      var choices = ['sync']
+      if (!config.server.hard_deploy.enabled) {
+        choices.push('hard')
+      }
+      return choices
+    },
     default: default_deploy.trigger_type
   },{
     type: 'list',
     name: 'local_path',
     message: 'Deploy from directory:',
     choices: getLocalDeployDirChoices(),
-    default: default_deploy.local_path
+    default: './',
+    filter: function(input){
+      if (input == './') {
+        return LOCAL_FOLDER
+      } else {
+        return input.replace('.', LOCAL_FOLDER)
+      }
+    }
   },{
     type: 'input',
     name: 'remote_path',

diff --git a/bin/index.js b/bin/index.js
@@ -157,14 +157,9 @@ function checkDeployInfo(dplySettings){
   }
 
   // Make sure your sub-directory exists
-  var full_local_path = path.join(LOCAL_FOLDER, local_path);
-  if ( !io.existsSync(full_local_path) ) {
-  	throw chalk.red.bold('Error: Local directory `') + chalk.yellow.bold(local_path) + chalk.red('` does not exist.');
-  }
-
-  // Make sure you specified a bucket environment
-  if (bucket_environment != 'prod' && bucket_environment != 'staging') {
-  	throw chalk.red.bold('Error: Bucket environment must be either `prod` or `staging`.');
+  // var full_local_path = path.join(LOCAL_FOLDER, local_path);
+  if ( !io.existsSync(local_path.replace(LOCAL_FOLDER, '.')) ) {
+    throw chalk.red.bold('Error:') + ' Local directory `' + chalk.bold(local_path) + '` does not exist.';
   }
 
   // Make sure your date is a proper date, unless it's `now`
@@ -246,12 +241,12 @@ function promptFor(target, dplySettings){
         console.log(chalk.red('\n\nCancelled.'));
       } else {
         if (target == 'deploy') {
-          deploy(answers);
+          commands.deploy(answers);
           writeDeploySettings(answers);
         } else if (target == 'archive'){
-          archive(answers);
+          commands.archive(answers);
         } else if (target == 'unschedule'){
-          unschedule(answers);
+          commands.unschedule(answers);
         }
       }
     })