punt 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34dfefa7e3ce411685269697e3e481ea681315ca
-  data.tar.gz: 732aee71382e7b463e0875f5b763cc11759e77ab
+  metadata.gz: 731663b7801f951ac4b5913b4da4231a4137ab7c
+  data.tar.gz: 22006967717d5085d4428d0f444083b980b7e39b
 SHA512:
-  metadata.gz: be4525111464a98a12535b0f2a0a33125ab8d0c694436dbfa5a0b7dc19b213031a8f52b215cf6961c581a2069650ea0b2e5f8e4d64313eaa18646e04cd7972bb
-  data.tar.gz: d30fa67e9910700a468f970bb743791336b95d3de5a9253cbdabafd9f0ec401de866b75d59e2aa4a1cf116505e1c36c0e42f2fd82509c7e4752a94c8dc4cea4a
+  metadata.gz: 63f5af91463635ac47acf3e29e2310f0166835d6e88d75be4d2acc1598bfce278d221987cdfecdcacb45921dcee946a629af16141af7e62fcccef3abd85312f4
+  data.tar.gz: d4ba0c991da8054a27edd14ceebacb5e34f7bc9aa0554da9f5c1411ed9ff6cbe7270cb782b98a2b78950ff199b53a6037078bd0a7139239fd03335f918fade53

data/assets/init/puntfile.yml

@@ -1,8 +1,12 @@
 staging:
     mode: scp
+    repo: git
     host:
     cwd: clients/apsis
     username:
     files:
         - file1.txt: remote/file1.txt
-        - directory1: remote/directory1
+        - directory1:
+            path: remote/directory1
+            mod: 000
+            recursive: true

data/lib/punt/asset_helper.rb

@@ -0,0 +1,17 @@
+module AssetHelper
+    def copy_without_overwriting(src: nil, dst: nil)
+        FileUtils.cp(src_path(src), dst_path(dst)) unless File.exists?(dst_path(dst))
+    end
+
+    def src_path(*asset)
+        asset_path(asset)
+    end
+
+    def dst_path(*asset)
+        File.join(asset)
+    end
+
+    def asset_path(*path)
+        return File.join(File.dirname(__FILE__), "..", "..", "assets", path)
+    end
+end

data/lib/punt/cmd/cmd.rb

@@ -24,13 +24,4 @@ class Cmd
     def run(argv)
         nil
     end
-
-    protected
-
-    ### Asset Utilities ###
-
-    def asset_path(*path)
-        return File.join(File.dirname(__FILE__), "..", "..", "..", "assets", path)
-    end
-
 end

data/lib/punt/cmd/cmd_deploy.rb

@@ -0,0 +1,155 @@
+require 'optparse'
+require 'tempfile'
+
+class CmdDeploy < Cmd
+    include Puntfile
+
+    tag name: "deploy"
+    tag summary: "Deploy to the specified environment"
+
+    def run(argv)
+        opts = parse_opts(argv)
+
+        if (opts[:dry_run])
+            puts "Dry Run! Nothing will be deployed or modified. All commands that would cause side-effects will be printed below"
+        end
+
+        env = argv.shift
+        ref = 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
+
+
+        # Some Git Stuff
+        repo = environment["repo"]
+        if (repo != "git")
+            raise "No repo available for the given repository type #{repo}"
+        end
+
+        original_head = `git rev-parse --short HEAD`.strip
+        original_branch = `git rev-parse --abbrev-ref HEAD`.strip
+
+        ref = original_head unless ref
+        ref = `git rev-parse --short --verify #{ref}`.strip
+        ref_full = `git rev-parse --verify #{ref}`.strip
+
+        # TODO: Check to see if there are any changes! Yell and complain if there are any changes
+
+
+
+        puts "Deploying #{ref} to #{env}"
+        puts ""
+
+        # Checkout the code
+        if ref != original_head
+            if opts[:dry_run]
+                puts "git checkout #{ref}"
+            else
+                `git checkout #{ref}`
+            end
+        end
+
+        # Upload Version File
+        scp_versionfile(ref_full, "start", environment, dry_run: opts[:dry_run] || false)
+        if environment["files"]
+            environment["files"].each do |key, value|
+                scp_upload(key, value, environment, dry_run: opts[:dry_run] || false)
+            end
+        end
+        scp_versionfile(ref_full, "success", environment, dry_run: opts[:dry_run] || false)
+
+        # Revert to our previous checkout
+        if ref != original_head
+            if opts[:dry_run]
+                puts "git checkout #{original_branch}"
+            else
+                `git checkout #{original_branch}`
+            end
+        end
+    end
+
+    private
+
+    def scp_versionfile(ref, version_name, environment, dry_run: false)
+
+        if (!dry_run)
+            versionfile = Tempfile.new('foo')
+            versionfile.write("#{ref}")
+            versionfile.close()
+
+            scp_upload(versionfile.path, ".punt_#{version_name}", environment, dry_run: dry_run)
+
+            versionfile.unlink
+        end
+    end
+
+    def scp_upload(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 << local_file
+        scp << scp_remote_file(remote, environment)
+
+        scp_command = scp.join(" ")
+
+        puts scp_command
+        `#{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
+    end
+
+    def parse_opts(argv)
+        options = {}
+
+        opt_parser = OptionParser.new do |opts|
+            opts.banner = "Usage: punt deploy [options] [environment [git-ref]]"
+
+            opts.on("-d", "--dry-run", "Show the commands that punt would execute, but don't actually do anything.") do |d|
+                options[:dry_run] = d
+            end
+        end
+
+        opt_parser.parse!(argv)
+
+        return options
+    end
+end

data/lib/punt/cmd/cmd_init.rb

@@ -1,30 +1,10 @@
 class CmdInit < Cmd
+    include AssetHelper
+
     tag name: "init"
     tag summary: "Initializes the directory with a basic puntfile.yml"
 
     def run(argv)
-        copy_without_overwriting   "puntfile.yml"
-    end
-
-    private
-
-    def copy_without_overwriting(*asset)
-        p = paths(asset)
-        FileUtils.cp(p[:src], p[:dst]) unless File.exists?(p[:dst])
-    end
-
-    def paths(*asset)
-    {
-        src: src_path(asset),
-        dst: dst_path(asset)
-    }
-    end
-
-    def src_path(*asset)
-        asset_path("init", asset)
-    end
-
-    def dst_path(*asset)
-        File.join(asset)
+        copy_without_overwriting   src: ["init", "puntfile.yml"], dst: ["puntfile.yml"]
     end
 end

data/lib/punt/cmd/cmd_remote.rb

@@ -0,0 +1,104 @@
+require 'tempfile'
+
+class CmdRemote < Cmd
+    include Puntfile
+
+    tag name: "remote"
+    tag summary: "Return the SHA1 of the version deployed to the remote"
+
+    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
+    end
+end

data/lib/punt/puntfile.rb

@@ -0,0 +1,27 @@
+module Puntfile
+
+    SUPPORTED_PUNTFILES = ["puntfile.yml", "puntfile.yaml", "Puntfile.yml", "Puntfile.yaml", "puntfile", "Puntfile"]
+
+    def puntfile
+        load_puntfile
+
+        return @@puntfile
+    end
+
+    private
+
+    def load_puntfile
+        return if defined?(@@puntfile)
+
+        SUPPORTED_PUNTFILES.each do |puntfile|
+            if File.exists?(puntfile)
+                @@puntfile = YAML.load_file(puntfile)
+                return
+            end
+        end
+
+        raise "We couldn't find puntfile.yml in the current directory"
+    end
+
+
+end

data/lib/punt.rb

@@ -1,10 +1,18 @@
 require 'yaml'
 
+require 'punt/asset_helper'
+require 'punt/puntfile'
+
 require 'punt/cmd/cmd'
 require 'punt/cmd/cmd_init'
+require 'punt/cmd/cmd_deploy'
+require 'punt/cmd/cmd_remote'
 
 class Punt
-    CMDS = [CmdInit.new].sort { |first, second| first.name <=> second.name }
+    CMDS = [CmdInit.new,
+            CmdDeploy.new,
+            CmdRemote.new,
+    ].sort { |first, second| first.name <=> second.name }
 
     def self.cmd(argv)
         first = argv.shift

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: punt
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Noah Callaway
@@ -21,8 +21,12 @@ files:
 - assets/init/puntfile.yml
 - bin/punt
 - lib/punt.rb
+- lib/punt/asset_helper.rb
 - lib/punt/cmd/cmd.rb
+- lib/punt/cmd/cmd_deploy.rb
 - lib/punt/cmd/cmd_init.rb
+- lib/punt/cmd/cmd_remote.rb
+- lib/punt/puntfile.rb
 homepage: http://rubygems.org/gems/punt
 licenses:
 - MIT