Merge pull request pocketarc#40 from sergeyvolkov/master

pocketarc · pocketarc · commit af7ee87edf11 · 2014-12-17T19:42:26.000Z
Added the password prompt in the terminal
diff --git a/deploy.ini b/deploy.ini
@@ -4,11 +4,12 @@
 
 skip = false
 user = example
+; remove this options and enter a password in the terminal
 pass = password
 host = example.com
 port = 21
 path = /path/to/installation
 passive = true
 
 ; If that seemed too long for you, you can specify servers like this:
-[ftp://example:password@example.com:21/path/to/installation]
+[ftp://example:password@example.com:21/path/to/installation]
diff --git a/git-deploy b/git-deploy
@@ -617,7 +617,6 @@ class Config {
                     'host' => '',
                     'user' => '',
                     'branch' => null,
-                    'pass' => '',
                     'port' => 21,
                     'path' => '/',
                     'passive' => true,
@@ -626,6 +625,10 @@ class Config {
                     'upload_untracked' => array()
                         ), $options);
 
+                if (!isset($options['pass'])) {
+                    $options['pass'] = self::promptPassword();
+                }
+
                 if ($options['skip']) {
                     continue;
                 } else {
@@ -639,6 +642,24 @@ class Config {
         return $return;
     }
 
+    public static function promptPassword() {
+        $prompt = 'Enter ftp password: ';
+
+        $command = "/usr/bin/env bash -c 'echo OK'";
+        if (rtrim(shell_exec($command)) !== 'OK') {
+            trigger_error("Can't invoke bash");
+            return;
+        }
+
+        $command = "/usr/bin/env bash -c 'read -s -p \""
+                . addslashes($prompt)
+                . "\" mypassword && echo \$mypassword'";
+        $password = rtrim(shell_exec($command));
+        echo "\n";
+
+        return $password;
+    }
+
 }
 
 #### PHP SEC LIB 0.3.5
@@ -32098,4 +32119,4 @@ class Net_SSH2 {
     }
 }
 
-main();
+main();
