punt 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85662d179b096c017a378b0b34fea547c5da584f
-  data.tar.gz: 06f3732c176a5c0f7e681c7c00f5598388ec3d80
+  metadata.gz: a0d53d651e4708507fc26cb28fb7254d7878c90f
+  data.tar.gz: 9c72338d9a5424e6c3eecd52069bf60e2dcac111
 SHA512:
-  metadata.gz: 6805ab861ee0fb061e4df7f7f23124b3b3720740066e2c6c31f50a72556b2a0476c54f8789c3fdb521c087d2aed339d7e8963834049d9644070f19f338aeec15
-  data.tar.gz: dead02ac41701114854d8ebec2091a19a09e8ea0ef538e1f5842862009495652ff2c677b88ae082d26d0e062cb747789b0867b1e64529566254fb6bd6d7ef168
+  metadata.gz: 616c7f75dff897ac978bd5c07cbaa383e8e305cbfc407f7d2866f06573a93218e8244b6810508c88ccef52d425a7700ef588bcc8d27cd4f142d4bad1136ec03a
+  data.tar.gz: 239305264e44ad2fb1032e187324adf6d8d41da09ab80c2c7ef09438d560e0d6116596563973829a81f91e4a5584a57fb42c9b515dc8fdba6b59910f8cc155f5

data/assets/init/puntfile.yml

@@ -1,10 +1,11 @@
 staging:
-    mode: scp
     repo: git
-    ssh_key:
-    host:
-    username: ubuntu
-    remote_base: ~/
+    mode: scp
+    scp:
+        ssh_key:
+        user:
+        host:
+        remote_base: ~/
     files:
-        LICENSE: LICENSE
-        example-dir: example-dir
+        example-file: example-file
+        example-directory: example-directory

data/lib/punt.rb

@@ -9,6 +9,7 @@ require 'punt/helper/mode_helper'
 require 'punt/helper/repo_helper'
 
 require 'punt/deploy'
+require 'punt/remote'
 
 require 'punt/cmd/cmd'
 require 'punt/cmd/cmd_init'

data/lib/punt/cmd/cmd_remote.rb

@@ -8,97 +8,7 @@ class CmdRemote < Cmd
 
     def run(argv)
         env = argv.shift
-        env = puntfile.first.first unless env
 
-        environment = puntfile[env] if env
-
-        if (!environment)
-            raise "No environment #{env} was found in the puntfile"
-        end
-
-        mode = environment["mode"]
-
-        if mode != "scp"
-            raise "No mode available for the given mode '#{mode}'"
-        end
-
-        puts "Fetching Version for #{env}"
-        puts ""
-
-        # Upload Version File
-        start_version = scp_fetch_versionfile("start", environment)
-        success_version = scp_fetch_versionfile("success", environment)
-
-        if (success_version == start_version)
-            puts "Currently deployed version: #{success_version}"
-        else
-            puts "An aborted deployement was detected!"
-            puts "\tLast Success: #{success_version}"
-            puts "\tLast Attempt: #{start_version}"
-        end
-    end
-
-    private
-
-    def scp_fetch_versionfile(version_name, environment)
-        versionfile = Tempfile.new('foo')
-
-        scp_download(versionfile.path, ".punt_#{version_name}", environment)
-
-        version = versionfile.read
-
-        versionfile.unlink
-
-        return version.strip
-    end
-
-    def scp_versionfile(ref, version_name, environment, dry_run: false)
-
-        if (!dry_run)
-            versionfile = Tempfile.new('foo')
-            versionfile.write("#{ref}")
-
-            scp_upload(versionfile.path, ".punt_#{version_name}", environment, dry_run: dry_run)
-
-            versionfile.unlink
-        end
-    end
-
-    def scp_download(local_file, remote, environment, dry_run: false)
-        scp_args = ["scp"]
-        scp = scp_opts(environment, scp_args)
-
-        if (File.directory?(local_file))
-            scp << "-r"
-        end
-
-        scp << scp_remote_file(remote, environment)
-        scp << local_file
-
-        scp_command = scp.join(" ")
-
-        `#{scp_command}` unless dry_run
-    end
-
-    def scp_opts(environment, scp_args)
-        if (environment["ssh_key"])
-            scp_args << "-i"
-            scp_args << environment["ssh_key"]
-        end
-    end
-
-    def scp_remote_file(remote, environment)
-        if !remote.start_with?("/") && !remote.start_with?("~")
-            remote = File.join(environment["remote_base"], remote)
-        end
-
-        return "#{scp_host(environment)}#{remote}"
-    end
-
-    def scp_host(environment)
-        arg = "#{environment["host"]}:"
-        arg = "#{environment["username"]}@#{arg}" if environment["username"]
-
-        return arg
+        Remote.new.remote(env: env)
     end
 end

data/lib/punt/deploy.rb

@@ -10,10 +10,10 @@ class Deploy
         environment = punt_environment(env: env)
 
         mode = get_mode(environment)
+        mode_opts = mode.mode_opts(environment)
         repo = get_repo(environment)
 
         repo_state = repo.save_state()
-        mode_opts = mode.mode_opts(environment)
 
         starting_revision = repo.current_revision_name(short: true)
 
@@ -43,7 +43,7 @@ class Deploy
         # Upload Files
         if environment["files"]
             environment["files"].each do |key, value|
-                mode.upload(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: true)
             end
         end
 

data/lib/punt/helper/asset_helper.rb

@@ -12,6 +12,6 @@ module AssetHelper
     end
 
     def asset_path(*path)
-        return File.join(File.dirname(__FILE__), "..", "..", "assets", path)
+        return File.join(File.dirname(__FILE__), "..", "..", "..", "assets", path)
     end
 end

data/lib/punt/mode/mode_scp.rb

@@ -4,7 +4,7 @@ class ModeScp
         return environment["scp"]
     end
 
-    def upload(local_path, remote_path, mode_opts: nil, dry_run: false, verbose: true)
+    def transfer(local_path, remote_path, mode_opts: nil, dry_run: false, verbose: true)
         scp_args = ["scp"]
         scp_common_options(mode_opts, scp_args)
 
@@ -21,6 +21,23 @@ class ModeScp
         `#{scp_command}` unless dry_run
     end
 
+    def download(local_path, remote_path, mode_opts: nil, dry_run: false, verbose: true)
+        scp_args = ["scp"]
+        scp_common_options(mode_opts, scp_args)
+
+        if (File.directory?(local_path))
+            scp_args << "-r"
+        end
+
+        scp_args << scp_remote_file(remote_path, mode_opts)
+        scp_args << local_path
+
+        scp_command = scp_args.join(" ")
+
+        puts scp_command if verbose
+        `#{scp_command}` unless dry_run
+    end
+
     def upload_versionfile(version, deploystage, mode_opts: nil)
         filename = ".punt_#{deploystage}"
 
@@ -28,11 +45,25 @@ class ModeScp
         versionfile.write("#{version}")
         versionfile.close()
 
-        upload(versionfile.path, filename, mode_opts: mode_opts)
+        transfer(versionfile.path, filename, mode_opts: mode_opts)
 
         versionfile.unlink
     end
 
+    def download_versionfile(deploystage, mode_opts: nil)
+        filename = ".punt_#{deploystage}"
+
+        versionfile = Tempfile.new(filename)
+
+        download(versionfile.path, filename, mode_opts: mode_opts, verbose: false)
+
+        version = versionfile.read
+
+        versionfile.unlink
+
+        return version
+    end
+
     private
 
     def scp_common_options(scp_opts, scp_args)

data/lib/punt/remote.rb

@@ -0,0 +1,27 @@
+class Remote
+    include PuntfileHelper
+    include ModeHelper
+
+    def remote(env: nil)
+
+
+        environment = punt_environment(env: env)
+
+        mode = get_mode(environment)
+        mode_opts = mode.mode_opts(environment)
+
+        puts "Fetching Version for #{env}"
+        puts ""
+
+        start_version = mode.download_versionfile("start", mode_opts: mode_opts)
+        success_version = mode.download_versionfile("success", mode_opts: mode_opts)
+
+        if (success_version == start_version)
+            puts "Currently deployed version: #{success_version}"
+        else
+            puts "An aborted deployement was detected!"
+            puts "\tLast Success: #{success_version}"
+            puts "\tLast Attempt: #{start_version}"
+        end
+    end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: punt
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Noah Callaway
@@ -31,6 +31,7 @@ files:
 - lib/punt/helper/puntfile_helper.rb
 - lib/punt/helper/repo_helper.rb
 - lib/punt/mode/mode_scp.rb
+- lib/punt/remote.rb
 - lib/punt/repo/repo_git.rb
 homepage: http://rubygems.org/gems/punt
 licenses: