alpha_omega 0.0.48 → 0.0.49

data/{recipes → lib}/alpha_omega/deploy.rb

@@ -1,4 +1,4 @@
-$:.unshift File.expand_path(File.join(File.dirname(__FILE__),'..','..','recipes'))
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__),'..','..','lib'))
 
 require 'benchmark'
 require 'yaml'
@@ -46,6 +46,9 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
 
   _cset (:figlet) { [%x(which figlet).strip].reject {|f| !(File.executable? f)}.first || echo }
 
+  _cset :admin_hosts, /^/
+  _cset :gateway_host, "localhost"
+
   # =========================================================================
   # These variables should NOT be changed unless you are very confident in
   # what you are doing. Make sure you understand all the implications of your
@@ -72,21 +75,25 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
 
   _cset(:current_release)   { release_path }
   _cset(:current_workarea)  { capture("readlink #{current_path} || true").strip.split("/")[-1] }
-  _cset(:previous_release)  { if releases.length > 0
-    w = current_workarea
-    releases.index(w) && releases[(releases.index(w)-1)%releases.length] || nil
-else
-  ""
-end
+
+  _cset(:previous_release) { 
+    if releases.length > 0
+      w = current_workarea
+      releases.index(w) && releases[(releases.index(w)-1)%releases.length] || nil
+    else
+      ""
+    end
   }
-  _cset(:release_name)      { if releases.length > 0
-    w = current_workarea
-    stage = releases[((releases.index(w)?releases.index(w):-1)+1)%releases.length]
-    system "#{figlet} -w 200 on #{stage}"
-    stage
-                              else
-                                ""
-                              end
+
+  _cset(:release_name) { 
+    if releases.length > 0
+      w = current_workarea
+      stage = releases[((releases.index(w)?releases.index(w):-1)+1)%releases.length]
+      system "#{figlet} -w 200 on #{stage}"
+      stage
+    else
+      ""
+    end
   }
 
   _cset(:current_revision)  { capture("cat #{current_path}/REVISION",     :except => { :no_release => true }).chomp }
@@ -545,6 +552,18 @@ end
     end
   end
 
+  task :no_gateway do
+    unset :gateway
+  end
+
+  task :ssh_gateway do
+    # set gateway on non-admin servers, defaulting to the developer admin host
+    if ENV["GATEWAY"] || !admin_hosts.match(Socket.gethostname) 
+      ssh_options[:forward_agent] = true
+      set :gateway, ENV["GATEWAY"] ? ENV["GATEWAY"] : gateway_host
+    end
+  end
+
   on :exit do
     put full_log, "#{log_path}/#{application}_last_deploy-#{release_name}-#{branch.gsub(/\W+/,"_")}.log-#{Time.now.strftime('%Y%m%d-%H%M')}"
   end

data/{recipes → lib}/alpha_omega/version.rb

@@ -1,3 +1,3 @@
 module AlphaOmega
-  Version = "0.0.48"
+  Version = "0.0.49"
 end

data/libexec/compare

@@ -1,8 +1,4 @@
 #!/bin/bash -e
 
 bundle check || { bundle --local --path vendor/bundle && bundle check; }
-if [[ -z $1 ]]; then
-  exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=0,$(basename $0)=1
-else
-  exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=0,$(basename $0)=1 --args "$@"
-fi
+exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=0,$(basename $0)=1 --args ssh_gateway "$@"

data/libexec/deploy

@@ -1,8 +1,4 @@
 #!/bin/bash -e
 
 bundle check || { bundle --local --path vendor/bundle && bundle check; }
-if [[ -z $1 ]]; then
-  exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=0,$(basename $0)=1
-else
-  exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=0,$(basename $0)=1 --args "$@"
-fi
+exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=0,$(basename $0)=1 --args ssh_gateway "$@"

data/libexec/major

@@ -1,8 +1,4 @@
 #!/bin/bash -e
 
 bundle check || { bundle --local --path vendor/bundle && bundle check; }
-if [[ -z $1 ]]; then
-  exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=0,$(basename $0)=1
-else
-  exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=0,$(basename $0)=1 --args "$@"
-fi
+exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=0,$(basename $0)=1 --args ssh_gateway "$@"

data/libexec/patch

@@ -1,8 +1,4 @@
 #!/bin/bash -e
 
 bundle check || { bundle --local --path vendor/bundle && bundle check; }
-if [[ -z $1 ]]; then
-  exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=0,$(basename $0)=1
-else
-  exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=0,$(basename $0)=1 --args "$@"
-fi
+exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=0,$(basename $0)=1 --args ssh_gateway "$@"

data/libexec/rollback

@@ -1,8 +1,4 @@
 #!/bin/bash -e
 
 bundle check || { bundle --local --path vendor/bundle && bundle check; }
-if [[ -z $1 ]]; then
-  exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=0,$(basename $0)=1
-else
-  exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=0,$(basename $0)=1 --args "$@"
-fi
+exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=0,$(basename $0)=1 --args ssh_gateway "$@"

data/libexec/shell

@@ -1,4 +1,4 @@
 #!/bin/bash -e
 
 bundle check || { bundle --local --path vendor/bundle && bundle check; }
-exec bundle exec cap "$@" shell
+exec bundle exec cap ssh_gateway "$@" shell

data/libexec/stage

@@ -1,8 +1,4 @@
 #!/bin/bash -e
 
 bundle check || { bundle --local --path vendor/bundle && bundle check; }
-if [[ -z $1 ]]; then
-  exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=0,$(basename $0)=1
-else
-  exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=0,$(basename $0)=1 --args "$@"
-fi
+exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=0,$(basename $0)=1 --args ssh_gateway "$@"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: alpha_omega
 version: !ruby/object:Gem::Version 
-  hash: 127
+  hash: 125
   prerelease: 
   segments: 
   - 0
   - 0
-  - 48
-  version: 0.0.48
+  - 49
+  version: 0.0.49
 platform: ruby
 authors: 
 - David Nghiem
@@ -109,20 +109,20 @@ files:
 - libexec/rollback
 - libexec/shell
 - libexec/stage
-- recipes/alpha_omega/deploy/dependencies.rb
-- recipes/alpha_omega/deploy/local_dependency.rb
-- recipes/alpha_omega/deploy/remote_dependency.rb
-- recipes/alpha_omega/deploy/scm/base.rb
-- recipes/alpha_omega/deploy/scm/git.rb
-- recipes/alpha_omega/deploy/scm.rb
-- recipes/alpha_omega/deploy/strategy/base.rb
-- recipes/alpha_omega/deploy/strategy/checkout.rb
-- recipes/alpha_omega/deploy/strategy/remote.rb
-- recipes/alpha_omega/deploy/strategy.rb
-- recipes/alpha_omega/deploy/templates/maintenance.rhtml
-- recipes/alpha_omega/deploy.rb
-- recipes/alpha_omega/utils.rb
-- recipes/alpha_omega/version.rb
+- lib/alpha_omega/deploy/dependencies.rb
+- lib/alpha_omega/deploy/local_dependency.rb
+- lib/alpha_omega/deploy/remote_dependency.rb
+- lib/alpha_omega/deploy/scm/base.rb
+- lib/alpha_omega/deploy/scm/git.rb
+- lib/alpha_omega/deploy/scm.rb
+- lib/alpha_omega/deploy/strategy/base.rb
+- lib/alpha_omega/deploy/strategy/checkout.rb
+- lib/alpha_omega/deploy/strategy/remote.rb
+- lib/alpha_omega/deploy/strategy.rb
+- lib/alpha_omega/deploy/templates/maintenance.rhtml
+- lib/alpha_omega/deploy.rb
+- lib/alpha_omega/utils.rb
+- lib/alpha_omega/version.rb
 - bin/deploy
 homepage: https://github.com/HeSYINUvSBZfxqA/alpha_omega
 licenses: []
@@ -131,7 +131,7 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-- recipes
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: