alpha_omega 0.0.152 → 0.0.153

data/VERSION

@@ -1 +1 @@
-0.0.152
+0.0.153

data/lib/alpha_omega/deploy.rb

@@ -47,6 +47,8 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
   _cset :bundler_options, "--deployment --without development:test"
   _cset :ruby_loader, ""
 
+  _cset(:run_method)        { fetch(:use_sudo, true) ? :sudo : :run }
+
   _cset :current_pod, "default"
   _cset :last_pod, nil
   _cset :local_only, ENV['LOCAL_ONLY'] ? true : false
@@ -63,7 +65,23 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
   _cset(:strategy)          { Capistrano::Deploy::Strategy.new(deploy_via, self) }
   _cset(:real_revision)     { source.local.query_revision(revision) { |cmd| with_env("LC_ALL", "C") { run_locally(cmd) } } }
 
-  _cset(:current_workarea)  { capture("readlink #{current_path} || true").strip.split("/")[-1] }
+  _cset :releases,          [ "alpha", "beta", "omega" ]
+  _cset(:releases_dir)      { releases.length > 0 ? "releases" : "" }
+  _cset(:current_workarea)  { capture("readlink #{current_path} || true").strip.split("/")[-1] || releases[0] }
+
+  _cset :previous_dir,        "previous"
+  _cset :current_dir,         "current"
+  _cset :next_dir,            "next"
+  _cset :compare_dir,         "compare"
+  _cset :migrate_dir,         "migrate"
+
+  _cset :service_dir,         "service"
+  _cset :log_dir,             "log"
+
+  _cset(:service_path)      { File.join(deploy_to, service_dir) }
+  _cset(:service_drop)      { File.join(deploy_to, ".#{service_dir}.d") }
+  _cset(:log_path)          { File.join(deploy_to, log_dir) }
+
   _cset(:rollback_release_name) { 
     if releases.length > 0
       w = current_workarea
@@ -90,7 +108,6 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
       ""
     end
   }
-  _cset (:release_name) { current_release_name } # compact
   _cset(:next_release_name) { 
     if releases.length > 0
       w = current_workarea
@@ -99,31 +116,23 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
       ""
     end
   }
-
-  _cset :releases,          [ "alpha", "beta", "omega" ]
-  _cset(:releases_dir)      { releases.length > 0 ? "releases" : "" }
-  _cset :previous_dir,        "previous"
-  _cset :current_dir,         "current"
-  _cset :next_dir,            "next"
-  _cset :service_dir,         "service"
-  _cset :log_dir,             "log"
-
+  _cset :compare_release_name, compare_dir
+  _cset :migrate_release_name, migrate_dir
 
   _cset(:releases_path)     { File.join(deploy_to, releases_dir) }
   _cset(:previous_path)     { File.join(deploy_to, previous_dir) }
   _cset(:current_path)      { File.join(deploy_to, current_dir) }
   _cset(:external_path)     { current_path }
   _cset(:next_path)         { File.join(deploy_to, next_dir) }
-  _cset(:service_path)      { File.join(deploy_to, service_dir) }
-  _cset(:service_drop)      { File.join(deploy_to, ".#{service_dir}.d") }
-  _cset(:log_path)          { File.join(deploy_to, log_dir) }
+  _cset(:compare_path)      { File.join(deploy_to, compare_dir) }
+  _cset(:migrate_path)      { File.join(deploy_to, migrate_dir) }
 
   _cset(:rollback_revision) { capture("cat #{rollback_release}/REVISION", :except => { :no_release => true }).strip }
   _cset(:previous_revision) { capture("cat #{previous_release}/REVISION", :except => { :no_release => true }).strip }
   _cset(:current_revision)  { capture("cat #{current_release}/REVISION",  :except => { :no_release => true }).strip }
   _cset(:next_revision)     { capture("cat #{next_release}/REVISION",     :except => { :no_release => true }).strip }
-
-  _cset(:run_method)        { fetch(:use_sudo, true) ? :sudo : :run }
+  _cset(:compare_revision)  { capture("cat #{compare_release}/REVISION",  :except => { :no_release => true }).strip }
+  _cset(:migrate_revision)  { capture("cat #{migrate_release}/REVISION",  :except => { :no_release => true }).strip }
 
   # formerly:
   #
@@ -139,6 +148,8 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
   _cset(:previous_release)  { File.join(releases_path, previous_release_name) }
   _cset(:current_release)   { File.join(releases_path, current_release_name) }
   _cset(:next_release)      { File.join(releases_path, next_release_name) }
+  _cset(:compare_release)   { File.join(releases_path, compare_release_name) }
+  _cset(:migrate_release)   { File.join(releases_path, migrate_release_name) }
 
   # =========================================================================
   # deploy:lock defaults
@@ -388,7 +399,9 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
       Compares your application.
     DESC
     task :compare, :roles => :app, :except => { :no_release => true } do
+      set :current_release_name, "compare"
       update_code
+      run "ln -vnfs #{compare_release} #{compare_path}"
     end
 
     namespace :rollback do
@@ -615,4 +628,3 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
   end
 
 end # Capistrano::Configuration
-

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: alpha_omega
 version: !ruby/object:Gem::Version 
-  hash: 303
+  hash: 301
   prerelease: 
   segments: 
   - 0
   - 0
-  - 152
-  version: 0.0.152
+  - 153
+  version: 0.0.153
 platform: ruby
 authors: 
 - David Nghiem
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-31 00:00:00 +00:00
-default_executable: 
+date: 2011-08-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: grit
@@ -119,44 +118,43 @@ files:
 - LICENSE
 - VERSION
 - README.mkd
-- libexec/unlock
-- libexec/proxy
-- libexec/build
-- libexec/restart
-- libexec/stage
 - libexec/activate
-- libexec/rollback
-- libexec/plan
-- libexec/compare
-- libexec/shell
-- libexec/migrate
-- libexec/deploy
-- libexec/config
+- libexec/build
 - libexec/bump
-- libexec/dna
 - libexec/check
+- libexec/compare
+- libexec/config
 - libexec/debug
-- libexec/lock
-- libexec/invoke
+- libexec/deploy
+- libexec/dist
+- libexec/dna
 - libexec/hosts
+- libexec/invoke
+- libexec/lock
+- libexec/migrate
+- libexec/plan
+- libexec/proxy
 - libexec/release
-- libexec/dist
-- lib/alpha_omega/utils.rb
-- lib/alpha_omega/deploy.rb
-- lib/alpha_omega/version.rb
+- libexec/restart
+- libexec/rollback
+- libexec/shell
+- libexec/stage
+- libexec/unlock
+- 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/scm.rb
-- lib/alpha_omega/deploy/templates/maintenance.rhtml
 - lib/alpha_omega/deploy/strategy.rb
-- lib/alpha_omega/deploy/scm/base.rb
-- lib/alpha_omega/deploy/scm/git.rb
-- lib/alpha_omega/deploy/dependencies.rb
-- lib/alpha_omega/deploy/remote_dependency.rb
+- lib/alpha_omega/deploy/templates/maintenance.rhtml
+- lib/alpha_omega/deploy.rb
+- lib/alpha_omega/utils.rb
+- lib/alpha_omega/version.rb
 - bin/alpha_omega
-has_rdoc: true
 homepage: https://github.com/HeSYINUvSBZfxqA/alpha_omega
 licenses: []
 
@@ -186,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: alpha_omega capistrano recipes