capistrano-autoscaling 0.0.2 → 0.0.3

data/README.md

@@ -38,6 +38,9 @@ To enable this recipe, add following in your `config/deploy.rb`.
     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"
 
 TODO: Write usage instructions here
 

data/lib/capistrano-autoscaling.rb

@@ -161,7 +161,8 @@ module Capistrano
           _cset(:autoscaling_ec2_instance_private_dns_names) { autoscaling_ec2_instances.map { |instance| instance.private_dns_name } }
 
 ## AMI
-          _cset(:autoscaling_image_name) { "#{autoscaling_ec2_instance_name}/#{autoscaling_timestamp}" }
+          _cset(:autoscaling_image_name_prefix) { "#{autoscaling_application}/" }
+          _cset(:autoscaling_image_name) { "#{autoscaling_image_name_prefix}#{autoscaling_timestamp}" }
           _cset(:autoscaling_image_instance) {
             if 0 < autoscaling_ec2_instances.length
               autoscaling_ec2_instances.reject { |instance| instance.root_device_type != :ebs }.last
@@ -174,10 +175,10 @@ module Capistrano
           }
           _cset(:autoscaling_image_tag_name) { autoscaling_application }
           _cset(:autoscaling_image) {
-            autoscaling_ec2_client.images.with_owner("self").tagged("Name").tagged_values(autoscaling_image_name).to_a.first
+            autoscaling_ec2_client.images.with_owner("self").filter("name", autoscaling_image_name).to_a.first
           }
           _cset(:autoscaling_images) {
-            autoscaling_ec2_client.images.with_owner("self").tagged(autoscaling_image_tag_name).reject { |image| image.state != :available }
+            autoscaling_ec2_client.images.with_owner("self").filter("name", "#{autoscaling_image_name_prefix}*").to_a
           }
 
 ## LaunchConfiguration
@@ -554,9 +555,10 @@ module Capistrano
 
           desc("Delete old AMIs.")
           task(:cleanup, :roles => :app, :except => { :no_release => true }) {
-            images = autoscaling_images.sort { |x, y| x.name <=> y.name }.reject { |image|
-              autoscaling_group.launch_configuration.image_id == image.id
-            }
+            images = autoscaling_images.sort { |x, y| x.name <=> y.name }
+            if autoscaling_group and autoscaling_group.exists?
+              images = images.reject { |image| autoscaling_group.launch_configuration.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 }

data/lib/capistrano-autoscaling/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module AutoScaling
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-autoscaling
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-22 00:00:00.000000000 Z
+date: 2012-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano