capistrano-autoscaling 0.0.6 → 0.0.7

data/README.md

@@ -36,11 +36,6 @@ To enable this recipe, add following in your `config/deploy.rb`.
     set(:autoscaling_security_groups, %w(default))
     set(:autoscaling_min_size, 2)
     set(:autoscaling_max_size, 10)
-    after "deploy:setup", "autoscaling:setup"
-    after "deploy", "autoscaling:update"
-    after "deploy:cold", "autoscaling:update"
-    after "deploy:rollback", "autoscaling:update"
-    after "autoscaling:update", "autoscaling:cleanup"
 
 The following options are preserved to manage AutoScaling.
 

data/capistrano-autoscaling.gemspec

@@ -17,6 +17,6 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency("capistrano")
+  gem.add_dependency("capistrano", "< 3")
   gem.add_dependency("aws-sdk", ">= 1.5.4")
 end

data/lib/capistrano-autoscaling/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module AutoScaling
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

data/lib/capistrano-autoscaling.rb

@@ -297,6 +297,12 @@ module Capistrano
           task(:setup, :roles => :app, :except => { :no_release => true }) {
             update_elb
           }
+          _cset(:autoscaling_setup_after_hooks, ["deploy:setup"])
+          on(:load) {
+            [ autoscaling_setup_after_hooks ].flatten.each do |t|
+              after t, "autoscaling:setup" if t
+            end
+          }
 
           desc("Remove AutoScaling settings.")
           task(:destroy, :roles => :app, :except => { :no_release => true }) {
@@ -316,6 +322,12 @@ module Capistrano
             update_alarm
             resume
           }
+          _cset(:autoscaling_update_after_hooks, ["deploy", "deploy:cold", "deploy:rollback"])
+          on(:load) {
+            [ autoscaling_update_after_hooks ].flatten.each do |t|
+              after t, "autoscaling:update" if t
+            end
+          }
 
           task(:update_elb, :roles => :app, :except => { :no_release => true }) {
             if autoscaling_create_elb
@@ -679,6 +691,9 @@ module Capistrano
             if autoscaling_group and autoscaling_group.exists?
               images = images.reject { |image| autoscaling_group.launch_configuration.image_id == image.id }
             end
+            if autoscaling_image and autoscaling_image.exists?
+              images = images.reject { |image| autoscaling_image.id == image.id }
+            end
             (images - images.last(autoscaling_keep_images-1)).each do |image|
               if autoscaling_create_image and ( image and image.exists? )
                 snapshots = image.block_device_mappings.map { |device, block_device| block_device.snapshot_id }
@@ -713,6 +728,12 @@ module Capistrano
               end
             end
           }
+          _cset(:autoscaling_cleanup_after_hooks, ["autoscaling:update"])
+          on(:load) {
+            [ autoscaling_cleanup_after_hooks ].flatten.each do |t|
+              after t, "autoscaling:cleanup" if t
+            end
+          }
         }
       }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-autoscaling
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2013-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -85,4 +85,3 @@ specification_version: 3
 summary: A Capistrano recipe that configures AutoScaling on Amazon Web Services infrastructure
   for your application.
 test_files: []
-has_rdoc: