engineyard-serverside 1.5.23.ruby19.14 → 1.5.23.ruby19.15

data/lib/engineyard-serverside/configuration.rb

@@ -192,6 +192,10 @@ module EY
         File.join(deploy_to, "releases")
       end
 
+      def failed_release_dir
+        File.join(deploy_to, "releases_failed")
+      end
+
       def release_path
         @release_path ||= File.join(release_dir, Time.now.utc.strftime("%Y%m%d%H%M%S"))
       end

data/lib/engineyard-serverside/deploy.rb

@@ -213,9 +213,19 @@ WRAP
 
       # task
       def cleanup_old_releases
+        clean_release_directory(c.release_dir)
+        clean_release_directory(c.failed_release_dir)
+      end
+
+      # Remove all but the most-recent +count+ releases from the specified
+      # release directory.
+      # IMPORTANT: This expects the release directory naming convention to be
+      # something with a sensible lexical order. Violate that at your peril.
+      def clean_release_directory(dir, count = 3)
         @cleanup_failed = true
-        info "~> Cleaning up old releases"
-        sudo "ls #{c.release_dir} | head -n -3 | xargs -I{} rm -rf #{c.release_dir}/{}"
+        ordinal = count.succ.to_s
+        info "~> Cleaning release directory: #{dir}"
+        sudo "ls -r #{dir} | tail -n +#{ordinal} | xargs -I@ rm -rf #{dir}/@"
         @cleanup_failed = false
       end
 
@@ -389,7 +399,8 @@ Deploy again if your services configuration appears incomplete or out of date.
       def with_failed_release_cleanup
         yield
       rescue Exception
-        sudo "rm -rf #{c.release_path}"
+        info "~> Release #{c.release_path} failed, saving release to #{c.failed_release_dir}."
+        sudo "mkdir -p #{c.failed_release_dir} && mv #{c.release_path} #{c.failed_release_dir}"
         raise
       end
 

data/lib/engineyard-serverside/future.rb

@@ -20,10 +20,10 @@ module EY
       end
     end
 
-    if RUBY_VERSION =~ /1\.8/
-      require 'engineyard-serverside/futures/dataflow'
-    else
+    if defined?(Fiber)
       require 'engineyard-serverside/futures/celluloid'
+    else
+      require 'engineyard-serverside/futures/dataflow'
     end
   end
 end

data/lib/engineyard-serverside/server.rb

@@ -108,7 +108,8 @@ module EY
       end
 
       def install_gem(path)
-        run("#{gem_command} install -q --no-ri --no-rdoc #{path}")
+        # resin + ruby 1.8.6 need sudo privileges to install gems
+        run("sudo #{gem_command} install -q --no-ri --no-rdoc #{path}")
       end
 
       def gem_command

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '1.5.23.ruby19.14'
+    VERSION = '1.5.23.ruby19.15'
   end
 end

data/spec/deploy_hook_spec.rb

@@ -54,13 +54,14 @@ describe "the deploy-hook API" do
 
   context "capistrano-ish methods" do
     it "has them" do
-      run_hook { respond_to?(:latest_release)   }.should be_true
-      run_hook { respond_to?(:previous_release) }.should be_true
-      run_hook { respond_to?(:all_releases)     }.should be_true
-      run_hook { respond_to?(:current_path)     }.should be_true
-      run_hook { respond_to?(:shared_path)      }.should be_true
-      run_hook { respond_to?(:release_dir)      }.should be_true
-      run_hook { respond_to?(:release_path)     }.should be_true
+      run_hook { respond_to?(:latest_release)    }.should be_true
+      run_hook { respond_to?(:previous_release)  }.should be_true
+      run_hook { respond_to?(:all_releases)      }.should be_true
+      run_hook { respond_to?(:current_path)      }.should be_true
+      run_hook { respond_to?(:shared_path)       }.should be_true
+      run_hook { respond_to?(:release_dir)       }.should be_true
+      run_hook { respond_to?(:failed_release_dir)}.should be_true
+      run_hook { respond_to?(:release_path)      }.should be_true
     end
   end
 

data/spec/rails31_deploy_spec.rb

@@ -77,6 +77,27 @@ EOF
     end
   end
 
+  context "and failing with errors" do
+    before(:all) do
+      begin
+        deploy_test_application(with_assets = false) do
+          deploy_dir = File.join(@config.shared_path, 'cached-copy', 'deploy')
+          FileUtils.mkdir_p(deploy_dir)
+          hook = File.join(deploy_dir, 'before_migrate.rb')
+          hook_contents = %Q[raise 'aaaaaaahhhhh']
+          File.open(hook, 'w') {|f| f.puts(hook_contents) }
+          File.chmod(0755, hook)
+        end
+      rescue EY::Serverside::RemoteFailure
+      end
+    end
+
+    it "retains the failed release" do
+      release_name = File.basename(@config.release_path)
+      File.directory?(File.join(@deploy_dir, 'releases_failed', release_name)).should be_true
+    end
+  end
+
   context "with existing precompilation in a deploy hook" do
     before(:all) do
       deploy_test_application do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-serverside
 version: !ruby/object:Gem::Version
-  version: 1.5.23.ruby19.14
+  version: 1.5.23.ruby19.15
   prerelease: 7
 platform: ruby
 authors:
@@ -9,8 +9,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-10 00:00:00.000000000 Z
-dependencies: []
+date: 2012-01-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2153140660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.3.2
+  type: :development
+  prerelease: false
+  version_requirements: *2153140660
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2153138160 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
+  type: :development
+  prerelease: false
+  version_requirements: *2153138160
 description: 
 email: cloud@engineyard.com
 executables: