deploy-cli 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7cf3270481ef86c63b8cfd3f2cac965e6fba3aa
-  data.tar.gz: 7755eabaa18391a01b05c4dfc2d1925de50fa34f
+  metadata.gz: 8fdca0bc0a30fe6a4b98de52c518f3e7ab85778c
+  data.tar.gz: d2765b70eeb9d42d6f70a7f05dcb45c5427ba971
 SHA512:
-  metadata.gz: 38dd6ff3b78a678ec056af244749ba2ada9c7d16bf014741f711a5ca2b8a2f000cdc035d5771db34c7290fdb6bbc3ba5612d051a6031b654abf0209b86b1880e
-  data.tar.gz: 41c26213d1b484ba6f5a789436f203e527390997fb2e54a44dc8bcae264b552d7763074ad55d5b1a8230488be0fe4d2b2be9673d37afad675ccd71711d2e2653
+  metadata.gz: facfb01b5210a795e564ed0202e1a7fc78005c4a770725f44d1a81fe4cbf4b05d4393ca777edf5ea42bb4c25ef1a0b00a157635adeef0d95edaa1e230bc8cd17
+  data.tar.gz: d6475471cb610ba4b56d4c2240645236b73b34894046a0e67ddf88ce3c90f130364aaf9d3bdc52d5e4db69ba1bfe50b042ec160f4657cfa0c3a4b7e5575b7b24

data/app.rb

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+require "sinatra" 
+
+
+get "/" do 
+  return <<-EOS
+    <h1>Deploy</h1>
+    <a href="/deploy/live">KMK Live</a>
+    <a href="/deploy/stage">KMK Stage</a>
+  EOS
+  asa
+end
+
+get "/deploy/:name" do
+  name = params[:name]
+  out = `./bin/deploy to #{name} --key ./keys/heroku`
+  "<h1>Deploy to #{name}</h1><pre>#{out}</pre>"
+end

data/bin/deploy

@@ -8,7 +8,8 @@ require "deploy"
 
 module Deploy
   class Cli < Thor
-    class_option :file
+    class_option :file, :type => :string
+    class_option :key,  :type => :string
 
     desc "version", "Show the current version"
     def version
@@ -65,6 +66,7 @@ module Deploy
     def _from_yaml file, stage
       data = YAML.load_file(file)
       spec = data[stage.to_s]
+      spec[:key] = options[:key] if options[:key]
       Deploy::Runner.run spec
     end
 

data/deploy-completion.bash

@@ -0,0 +1,10 @@
+
+
+__autocomplete_deploy() {
+    COMPREPLY=()
+    local current="${COMP_WORDS[COMP_CWORD]}"
+    local options="$(deploy ls)"
+    COMPREPLY=($(compgen -W "$options" -- "$current"))
+}
+
+complete -F __autocomplete_deploy deploy

data/keys/heroku

@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----

data/keys/heroku.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDZx1RTrIHnN+YdU8/nIWlk7qTkuKUgSV+knlemwf5rsk5UcffnGWtr4fXd52BkmfQnBuK63pZ/lO+2hcNq4FibB3iggb4rD1vVHe6s/iR2PCggi0I8I9LpjbA5oBbLLpjx8bxGlmbB7oZcXQurpByQlglkgccGW+Eycvx29gNE6jypG0DMOTHsRjzU0Fq/M/nc3+WJfzy5UUVCGW9PdCDgJUfuQC2HjGhnofSI5qCG8Zs8VOuGjcwBdkr8JN5bQhjV0ZpRCm+SGwRkQq6Frp0EQELoySsHxHS0IoNEcg8WTxB6dhzYSx/uUj9DdrXqyF2iqxtq38FwsXaQ8SqT6im0Rm9pE85+Gn0pi2dT3hFOfAMe6dX+0vPr85zWRyLSipvkNzxMzYSHT4klbJB1gfRHYz/Es0t95OmhGY33YsAx3SFVw8ox8aWaDPj3xUU7dCIhcVvGSDN4tewile459Exh3M1hQvjLEbrI28QQ3Tv17M/DdsnRuMlHfz+k/WJSAIAD1JGvKUcLXZhR34R4j+5k+q6XqHRhU1H5jekw9xtOSxvLNlnE6lLzBUniRlyKMnq2UAQrxeWCpBGWIku9Wju4FkqtIgaGTZfqnLDsYtFdarGod2qNKbIlzBhLspJISkBlKHJ0IBXP3gk6ByKiCqlZutGa9RyP4T2UlVOmA8OUnw== heroku

data/lib/deploy/runner.rb

@@ -23,6 +23,8 @@ module Deploy
       ok = true
       tasks "BEFORE", @before
 
+      cmd "ssh-add #{@spec[:key]} 2>/dev/null" if @spec[:key]
+
       @spec["servers"].each do |server|
         log "[Server #{server}]", BLUE
 
@@ -151,27 +153,27 @@ module Deploy
         ]
       }.to_json
 
-      # puts "curl -s -X POST --data-urlencode 'payload=#{payload}' #{url}"
       `curl -s -X POST --data-urlencode 'payload=#{payload}' #{url}`
     end
 
     private
     def ssh(server, cmd)
       full   = "ssh -A #{@spec['user']}@#{server}"
+      full  += " -i #{@spec['key']}" if @spec['key']
       full  += " 'cd #{@spec['path']} && #{cmd}'"
       output = `#{full}`.chomp
+      puts full
       code   = $?.exitstatus
       abort "Command <#{full}> failed with status #{code}." if code != 0
       output
     end
 
-    # def which_branch
-    #   ssh "git rev-parse --abbrev-ref HEAD"
-    # end
-    #
-    # def which_remote
-    #   ssh "git rev-parse --abbrev-ref HEAD"
-    # end
+    def cmd(cmd)
+      output = `#{cmd}`.chomp
+      code   = $?.exitstatus
+      abort "Command <#{full}> failed with status #{code}." if code != 0
+      output
+    end
 
     def log(message, color = BLACK)
       puts "\033[#{color}m#{message}\033[0m"

data/lib/deploy/version.rb

@@ -1,5 +1,5 @@
 module Deploy
 
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deploy-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - ptdorf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -51,8 +51,12 @@ files:
 - Gemfile.lock
 - Rakefile
 - Readme.md
+- app.rb
 - bin/deploy
 - deploy-cli.gemspec
+- deploy-completion.bash
+- keys/heroku
+- keys/heroku.pub
 - lib/deploy.rb
 - lib/deploy/runner.rb
 - lib/deploy/version.rb