punt 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0d53d651e4708507fc26cb28fb7254d7878c90f
-  data.tar.gz: 9c72338d9a5424e6c3eecd52069bf60e2dcac111
+  metadata.gz: 6c44be7df1cf91c7b83ed7583f1e052620655145
+  data.tar.gz: 4fe8396030c059c359824d1f240373774e366e9a
 SHA512:
-  metadata.gz: 616c7f75dff897ac978bd5c07cbaa383e8e305cbfc407f7d2866f06573a93218e8244b6810508c88ccef52d425a7700ef588bcc8d27cd4f142d4bad1136ec03a
-  data.tar.gz: 239305264e44ad2fb1032e187324adf6d8d41da09ab80c2c7ef09438d560e0d6116596563973829a81f91e4a5584a57fb42c9b515dc8fdba6b59910f8cc155f5
+  metadata.gz: 0cb4f36fe49c046e51af865c808d0d195053115a639916fd31852b51a55a4fa3c2af20d6b08acbb7dcd80aef4f10df43d7a3f1dc5b3836f2c6f825a9b557053e
+  data.tar.gz: 373aa2997001a4660635cde238c57a62aa76795eca5deedde37a2e4755db1ccd74da6a6ec9e5949d15f1f5d579977d4611ac456a765bfc7cf00891cc84ded1b4

data/lib/punt/cmd/cmd_deploy.rb

@@ -11,7 +11,7 @@ class CmdDeploy < Cmd
         env = argv.shift
         repo_ref = argv.shift
 
-        Deploy.new.deploy(env: env, repo_ref: repo_ref, dry_run: opts[:dry_run], force_local: opts[:force_local])
+        Deploy.new.deploy(env: env, repo_ref: repo_ref, dry_run: opts[:dry_run], verbose: opts[:verbose], force_local: opts[:force_local])
     end
 
     private
@@ -26,6 +26,10 @@ class CmdDeploy < Cmd
                 options[:dry_run] = d
             end
 
+            opts.on("-v", "--verbose", "Run in verbose mode") do |v|
+                options[:verbose] = v
+            end
+
             opts.on("-l", "--force-local", "Try and push commits even if there are local changes") do |f|
                 options[:force_local] = f
             end

data/lib/punt/deploy.rb

@@ -3,7 +3,7 @@ class Deploy
     include ModeHelper
     include RepoHelper
 
-    def deploy(env: nil, repo_ref: nil, dry_run: false, force_local: false)
+    def deploy(env: nil, repo_ref: nil, dry_run: false, verbose: false, force_local: false)
 
         dry_run_banner if dry_run
 
@@ -37,18 +37,23 @@ class Deploy
             repo.checkout_revision(desired_revision, dry_run: dry_run)
         end
 
+        # Mode Logistics
+        mode.mode_start(mode_opts: mode_opts, dry_run: dry_run, verbose: verbose)
+
         # Upload Starting File
-        mode.upload_versionfile(desired_revision_long, "start", mode_opts: mode_opts ) unless dry_run
+        mode.upload_versionfile(desired_revision_long, "start", mode_opts: mode_opts, verbose: verbose ) unless dry_run
 
         # Upload Files
+        mode.transfer_start(mode_opts: mode_opts, dry_run: dry_run, verbose: verbose)
         if environment["files"]
             environment["files"].each do |key, value|
-                mode.transfer(key, value, mode_opts: mode_opts, dry_run: dry_run, verbose: true)
+                mode.transfer(key, value, mode_opts: mode_opts, dry_run: dry_run, verbose: verbose)
             end
         end
+        mode.transfer_complete(mode_opts: mode_opts, dry_run: dry_run, verbose: verbose)
 
         # Upload Success File
-        mode.upload_versionfile(desired_revision_long, "success", mode_opts: mode_opts ) unless dry_run
+        mode.upload_versionfile(desired_revision_long, "success", mode_opts: mode_opts, verbose: verbose ) unless dry_run
 
         # Revert to our previous checkout
         if desired_revision != starting_revision

data/lib/punt/mode/mode_scp.rb

@@ -4,26 +4,48 @@ class ModeScp
         return environment["scp"]
     end
 
-    def transfer(local_path, remote_path, mode_opts: nil, dry_run: false, verbose: true)
+    def mode_start(mode_opts: nil, dry_run: false, verbose: true)
+        @has_sshpass = feature_detect_sshpass
+
+        if @has_sshpass && !mode_opts['ssh_key']
+            print "(using sshpass) enter the ssh password: "
+            @ssh_password = gets.chomp
+        elsif !mode_opts['ssh_key']
+            puts "sshpass is not installed. You will need to enter your password for every scp action that is generated. To avoid entering your password for every scp action, you can switch to key-based authentication by setting ssh_key. If key based authentication is not possible, try installing sshpass (https://gist.github.com/arunoda/7790979)"
+            puts ""
+        end
+    end
+
+    def transfer_start(mode_opts: nil, dry_run: false, verbose: true)
+    end
+
+    def transfer_complete(mode_opts: nil, dry_run: false, verbose: true)
+    end
+
+    def transfer(local_path, remote_path, mode_opts: nil, dry_run: false, verbose: false)
         scp_args = ["scp"]
-        scp_common_options(mode_opts, scp_args)
+        scp_common_options(mode_opts, verbose, scp_args)
 
         if (File.directory?(local_path))
             scp_args << "-r"
         end
 
+        if (@has_sshpass && @ssh_password)
+            scp_args.unshift(@ssh_password).unshift("-p").unshift("sshpass")
+        end
+
         scp_args << local_path
         scp_args << scp_remote_file(remote_path, mode_opts)
 
         scp_command = scp_args.join(" ")
 
-        puts scp_command if verbose
+        puts scp_command
         `#{scp_command}` unless dry_run
     end
 
-    def download(local_path, remote_path, mode_opts: nil, dry_run: false, verbose: true)
+    def download(local_path, remote_path, mode_opts: nil, dry_run: false, verbose: false)
         scp_args = ["scp"]
-        scp_common_options(mode_opts, scp_args)
+        scp_common_options(mode_opts, verbose, scp_args)
 
         if (File.directory?(local_path))
             scp_args << "-r"
@@ -38,7 +60,8 @@ class ModeScp
         `#{scp_command}` unless dry_run
     end
 
-    def upload_versionfile(version, deploystage, mode_opts: nil)
+    def upload_versionfile(version, deploystage, mode_opts: nil, verbose: false)
+
         filename = ".punt_#{deploystage}"
 
         versionfile = Tempfile.new(filename)
@@ -50,15 +73,12 @@ class ModeScp
         versionfile.unlink
     end
 
-    def download_versionfile(deploystage, mode_opts: nil)
+    def download_versionfile(deploystage, mode_opts: nil, verbose: false)
         filename = ".punt_#{deploystage}"
 
         versionfile = Tempfile.new(filename)
-
-        download(versionfile.path, filename, mode_opts: mode_opts, verbose: false)
-
+        download(versionfile.path, filename, mode_opts: mode_opts, verbose: verbose)
         version = versionfile.read
-
         versionfile.unlink
 
         return version
@@ -66,11 +86,26 @@ class ModeScp
 
     private
 
-    def scp_common_options(scp_opts, scp_args)
+    def feature_detect_sshpass
+        feature_check = `command -v sshpass >/dev/null 2>&1 || { echo "NOSCP"; }`.chomp
+
+        return feature_check != "NOSCP";
+    end
+
+    def scp_common_options(scp_opts, verbose, scp_args)
         if (scp_opts["ssh_key"])
             scp_args << "-i"
             scp_args << scp_opts["ssh_key"]
         end
+
+        if (verbose)
+            scp_args << "-v"
+        end
+
+        if (scp_opts["port"])
+            scp_args << "-P"
+            scp_args << scp_opts["port"]
+        end
     end
 
     def scp_remote_file(remote_path, scp_opts)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: punt
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Noah Callaway
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies: []
 description: Minimal deployment tool that can copy files to specific hosts over SCP
   and/or SFTP