alpha_omega 0.0.153 → 0.0.154

data/VERSION

@@ -1 +1 @@
-0.0.153
+0.0.154

data/lib/alpha_omega/deploy/strategy/checkout.rb

@@ -11,7 +11,7 @@ module Capistrano
 
           # Returns the SCM's checkout command for the revision to deploy.
           def commands
-            @commands ||= source.checkout(revision, configuration[:current_release])
+            @commands ||= source.checkout(revision, configuration[:deploy_release])
           end
       end
 

data/lib/alpha_omega/deploy/strategy/remote.rb

@@ -35,7 +35,7 @@ module Capistrano
           # Returns the command which will write the identifier of the
           # revision being deployed to the REVISION file on each host.
           def mark
-            "echo #{revision} > #{configuration[:current_release]}/REVISION"
+            "echo #{revision} > #{configuration[:deploy_release]}/REVISION"
           end
       end
 

data/lib/alpha_omega/deploy.rb

@@ -74,6 +74,7 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
   _cset :next_dir,            "next"
   _cset :compare_dir,         "compare"
   _cset :migrate_dir,         "migrate"
+  _cset(:deploy_dir)        { current_dir }
 
   _cset :service_dir,         "service"
   _cset :log_dir,             "log"
@@ -118,6 +119,7 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
   }
   _cset :compare_release_name, compare_dir
   _cset :migrate_release_name, migrate_dir
+  _cset(:deploy_release_name) { current_release_name }
 
   _cset(:releases_path)     { File.join(deploy_to, releases_dir) }
   _cset(:previous_path)     { File.join(deploy_to, previous_dir) }
@@ -126,6 +128,7 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
   _cset(:next_path)         { File.join(deploy_to, next_dir) }
   _cset(:compare_path)      { File.join(deploy_to, compare_dir) }
   _cset(:migrate_path)      { File.join(deploy_to, migrate_dir) }
+  _cset(:deploy_path)       { File.join(deploy_to, deploy_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 }
@@ -133,6 +136,7 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
   _cset(:next_revision)     { capture("cat #{next_release}/REVISION",     :except => { :no_release => true }).strip }
   _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 }
+  _cset(:deploy_revision)   { capture("cat #{deploy_release}/REVISION",   :except => { :no_release => true }).strip }
 
   # formerly:
   #
@@ -150,6 +154,7 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
   _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) }
+  _cset(:deploy_release)    { File.join(releases_path, deploy_release_name) }
 
   # =========================================================================
   # deploy:lock defaults
@@ -355,7 +360,7 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
       files = (ENV["FILES"] || "").split(",").map { |f| Dir[f.strip] }.flatten
       abort "Please specify at least one file or directory to update (via the FILES environment variable)" if files.empty?
 
-      files.each { |file| top.upload(file, File.join(current_path, file)) }
+      files.each { |file| top.upload(file, File.join(deploy_path, file)) }
     end
 
     desc <<-DESC
@@ -387,21 +392,16 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
       Apply microwave tvdinners to a release directory.
     DESC
     task :cook, :roles => :app, :except => { :no_release => true } do
-      run_script = <<-SCRIPT
-        set -e; cd #{current_release};
-        if [[ -x bin/nuke ]]; then #{ruby_loader} bin/nuke; fi;
-      SCRIPT
-
-      run run_script.gsub(/[\n\r]+[ \t]+/, " ")
     end
 
     desc <<-DESC
       Compares your application.
     DESC
     task :compare, :roles => :app, :except => { :no_release => true } do
-      set :current_release_name, "compare"
+      set :deploy_dir, "compare"
+      set :deploy_release_name, "compare"
       update_code
-      run "ln -vnfs #{compare_release} #{compare_path}"
+      run "ln -vnfs #{deploy_release} #{deploy_path}"
     end
 
     namespace :rollback do
@@ -456,21 +456,10 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
       Override in deploy recipes.  Formerly a railsy rake db:migrate.
     DESC
     task :migrate, :roles => :db, :only => { :primary => true } do
-    end
-
-    desc <<-DESC
-      Deploy and run pending migrations. This will work similarly to the \
-      `deploy' task, but will also run any pending migrations (via the \
-      `deploy:migrate' task) prior to updating the symlink. Note that the \
-      update in this case it is not atomic, and transactions are not used, \
-      because migrations are not guaranteed to be reversible.
-    DESC
-    task :migrations do
-      set :migrate_target, :latest
+      set :deploy_dir, "migrate"
+      set :deploy_release_name, "migrate"
       update_code
-      migrate
-      symlink
-      restart
+      run "ln -vnfs #{deploy_release} #{deploy_path}"
     end
 
     desc <<-DESC

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: alpha_omega
 version: !ruby/object:Gem::Version 
-  hash: 301
+  hash: 299
   prerelease: 
   segments: 
   - 0
   - 0
-  - 153
-  version: 0.0.153
+  - 154
+  version: 0.0.154
 platform: ruby
 authors: 
 - David Nghiem