capistrano-autoscaling 0.0.7 → 0.0.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7363699523a99cdf60e981b3e759fffda434b8e5
+  data.tar.gz: 814e02ab14f068b077f4a13685cdfb06b0d5ab51
+SHA512:
+  metadata.gz: 5570b9dcb3245e50d8f83f58cd8388dd102f717394554d27c7f41ca17359dd0f32038e3e26ccf906cbe4fdd4630d867f2b538557385b8c192d940d42be3d4510
+  data.tar.gz: 616cd32fc692b576a1b45b9307de9a4ce5e61105fd6f57a9f2ca9250d0732df91bd2db323a5d661563bbc9668ff3d24b6f71c4bd2c45cfffbe9d6fa09a9297c7

data/capistrano-autoscaling.gemspec

@@ -18,5 +18,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency("capistrano", "< 3")
-  gem.add_dependency("aws-sdk", ">= 1.5.4")
+  gem.add_dependency("aws-sdk", ">= 1.9.0")
 end

data/lib/capistrano-autoscaling.rb

@@ -4,59 +4,12 @@ require "yaml"
 
 module Capistrano
   module AutoScaling
+    
     def self.extended(configuration)
       configuration.load {
         namespace(:autoscaling) {
 ## AWS
-          _cset(:autoscaling_region, nil)
-          _cset(:autoscaling_autoscaling_endpoint) {
-            case autoscaling_region
-            when "us-east-1"      then "autoscaling.us-east-1.amazonaws.com"
-            when "us-west-1"      then "autoscaling.us-west-1.amazonaws.com"
-            when "us-west-2"      then "autoscaling.us-west-2.amazonaws.com"
-            when "sa-east-1"      then "autoscaling.sa-east-1.amazonaws.com"
-            when "eu-west-1"      then "autoscaling.eu-west-1.amazonaws.com"
-            when "ap-southeast-1" then "autoscaling.ap-southeast-1.amazonaws.com"
-            when "ap-southeast-2" then "autoscaling.ap-southeast-2.amazonaws.com"
-            when "ap-northeast-1" then "autoscaling.ap-northeast-1.amazonaws.com"
-            end
-          }
-          _cset(:autoscaling_cloudwatch_endpoint) {
-            case autoscaling_region
-            when "us-east-1"      then "monitoring.us-east-1.amazonaws.com"
-            when "us-west-1"      then "monitoring.us-west-1.amazonaws.com"
-            when "us-west-2"      then "monitoring.us-west-2.amazonaws.com"
-            when "sa-east-1"      then "monitoring.sa-east-1.amazonaws.com"
-            when "eu-west-1"      then "monitoring.eu-west-1.amazonaws.com"
-            when "ap-southeast-1" then "monitoring.ap-southeast-1.amazonaws.com"
-            when "ap-southeast-2" then "monitoring.ap-southeast-2.amazonaws.com"
-            when "ap-northeast-1" then "monitoring.ap-northeast-1.amazonaws.com"
-            end
-          }
-          _cset(:autoscaling_ec2_endpoint) {
-            case autoscaling_region
-            when "us-east-1"      then "ec2.us-east-1.amazonaws.com"
-            when "us-west-1"      then "ec2.us-west-1.amazonaws.com"
-            when "us-west-2"      then "ec2.us-west-2.amazonaws.com"
-            when "sa-east-1"      then "ec2.sa-east-1.amazonaws.com"
-            when "eu-west-1"      then "ec2.eu-west-1.amazonaws.com"
-            when "ap-southeast-1" then "ec2.ap-southeast-1.amazonaws.com"
-            when "ap-southeast-2" then "ec2.ap-southeast-2.amazonaws.com"
-            when "ap-northeast-1" then "ec2.ap-northeast-1.amazonaws.com"
-            end
-          }
-          _cset(:autoscaling_elb_endpoint) {
-            case autoscaling_region
-            when "us-east-1"      then "elasticloadbalancing.us-east-1.amazonaws.com"
-            when "us-west-1"      then "elasticloadbalancing.us-west-1.amazonaws.com"
-            when "us-west-2"      then "elasticloadbalancing.us-west-2.amazonaws.com"
-            when "sa-east-1"      then "elasticloadbalancing.sa-east-1.amazonaws.com"
-            when "eu-west-1"      then "elasticloadbalancing.eu-west-1.amazonaws.com"
-            when "ap-southeast-1" then "elasticloadbalancing.ap-southeast-1.amazonaws.com"
-            when "ap-southeast-2" then "elasticloadbalancing.ap-southeast-2.amazonaws.com"
-            when "ap-northeast-1" then "elasticloadbalancing.ap-northeast-1.amazonaws.com"
-            end
-          }
+          _cset(:autoscaling_region, "us-east-1")
           _cset(:autoscaling_access_key_id) {
             fetch(:aws_access_key_id, ENV["AWS_ACCESS_KEY_ID"]) or abort("AWS_ACCESS_KEY_ID is not set")
           }
@@ -64,20 +17,18 @@ module Capistrano
             fetch(:aws_secret_access_key, ENV["AWS_SECRET_ACCESS_KEY"]) or abort("AWS_SECRET_ACCESS_KEY is not set")
           }
           _cset(:autoscaling_aws_options) {
-            {
+            options = {
               :access_key_id => autoscaling_access_key_id,
               :secret_access_key => autoscaling_secret_access_key,
               :log_level => fetch(:autoscaling_log_level, :debug),
-              :auto_scaling_endpoint => autoscaling_autoscaling_endpoint,
-              :cloud_watch_endpoint => autoscaling_cloudwatch_endpoint,
-              :ec2_endpoint => autoscaling_ec2_endpoint,
-              :elb_endpoint => autoscaling_elb_endpoint,
+              :region => autoscaling_region,
             }.merge(fetch(:autoscaling_aws_extra_options, {}))
           }
-          _cset(:autoscaling_autoscaling_client) { AWS::AutoScaling.new(fetch(:autoscaling_autoscaling_aws_options, autoscaling_aws_options)) }
-          _cset(:autoscaling_cloudwatch_client) { AWS::CloudWatch.new(fetch(:autoscaling_cloudwatch_options, autoscaling_aws_options)) }
-          _cset(:autoscaling_ec2_client) { AWS::EC2.new(fetch(:autoscaling_ec2_options, autoscaling_aws_options)) }
-          _cset(:autoscaling_elb_client) { AWS::ELB.new(fetch(:autoscaling_elb_options, autoscaling_aws_options)) }
+          _cset(:autoscaling_aws) { AWS.tap { |aws| aws.config(autoscaling_aws_options) } }
+          _cset(:autoscaling_autoscaling_client) { autoscaling_aws.auto_scaling(fetch(:autoscaling_autoscaling_aws_options, {})) }
+          _cset(:autoscaling_cloudwatch_client) { autoscaling_aws.cloud_watch(fetch(:autoscaling_cloudwatch_options,{})) }
+          _cset(:autoscaling_ec2_client) { autoscaling_aws.ec2(fetch(:autoscaling_ec2_options, {})) }
+          _cset(:autoscaling_elb_client) { autoscaling_aws.elb(fetch(:autoscaling_elb_options, {})) }
 
           def autoscaling_name_mangling(s)
             s.to_s.gsub(/[^0-9A-Za-z]/, "-")
@@ -200,6 +151,11 @@ module Capistrano
             autoscaling_ec2_client.images.with_owner("self").filter("name", "#{autoscaling_image_name_prefix}*").to_a
           }
 
+          def self.proto_instance(task)
+            ec2_dns = (find_servers_for_task(current_task)[0]).host
+            autoscaling_ec2_instances.find { |instance| instance.public_dns_name == ec2_dns }
+          end
+
 ## LaunchConfiguration
           _cset(:autoscaling_launch_configuration) {
             autoscaling_autoscaling_client.launch_configurations[autoscaling_launch_configuration_name] rescue nil
@@ -242,16 +198,16 @@ module Capistrano
           _cset(:autoscaling_shrink_policy_name) { "#{autoscaling_shrink_policy_name_prefix}#{autoscaling_application}" }
           _cset(:autoscaling_expand_policy_options) {
             {
-              :adjustment => fetch(:autoscaling_expand_policy_adjustment, 1),
+              :scaling_adjustment => fetch(:autoscaling_expand_policy_adjustment, 1),
               :cooldown => fetch(:autoscaling_expand_policy_cooldown, 300),
-              :type => fetch(:autoscaling_expand_policy_type, "ChangeInCapacity"),
+              :adjustment_type => fetch(:autoscaling_expand_policy_type, "ChangeInCapacity"),
             }.merge(fetch(:autoscaling_expand_policy_extra_options, {}))
           }
           _cset(:autoscaling_shrink_policy_options) {
             {
-              :adjustment => fetch(:autoscaling_shrink_policy_adjustment, -1),
+              :scaling_adjustment => fetch(:autoscaling_shrink_policy_adjustment, -1),
               :cooldown => fetch(:autoscaling_shrink_policy_cooldown, 300),
-              :type => fetch(:autoscaling_shrink_policy_type, "ChangeInCapacity"),
+              :adjustment_type => fetch(:autoscaling_shrink_policy_type, "ChangeInCapacity"),
             }.merge(fetch(:autoscaling_shrink_policy_extra_options, {}))
           }
           _cset(:autoscaling_expand_policy) { autoscaling_group.scaling_policies[autoscaling_expand_policy_name] rescue nil }
@@ -304,6 +260,21 @@ module Capistrano
             end
           }
 
+          desc("Add the EC2 Instance used as the AMI prototype to the load balancer from :app")
+          task(:add_proto_instance, :roles => :app, :except => { :no_release => true }) {
+            # Find the host name for :app and get its instance
+            ec2_dns = (find_servers_for_task(current_task)[0]).host
+            app_instance = autoscaling_aws.ec2.instances.find { |instance| instance.public_dns_name == ec2_dns }
+
+            autoscaling_elb_instance.instances.register app_instance            
+          }
+          _cset(:autoscaling_add_proto_instance_after_hooks, ["autoscaling:setup"])
+          on(:load) {
+            [ autoscaling_add_proto_instance_after_hooks ].flatten.each do |t|
+              after t, "autoscaling:add_proto_instance" if t
+            end
+          }
+
           desc("Remove AutoScaling settings.")
           task(:destroy, :roles => :app, :except => { :no_release => true }) {
             destroy_alarm
@@ -373,8 +344,9 @@ module Capistrano
                 logger.debug("Creating AMI: #{autoscaling_image_name}")
                 run("sync; sync; sync") # force flushing to disk
                 set(:autoscaling_image, autoscaling_ec2_client.images.create(
-                  autoscaling_image_options.merge(:name => autoscaling_image_name, :instance_id => autoscaling_image_instance.id)))
-                sleep(autoscaling_wait_interval) until autoscaling_image.exists?
+                  autoscaling_image_options.merge(:name => autoscaling_image_name, 
+                  :instance_id => self.proto_instance(current_task).id)))
+                sleep(autoscaling_wait_interval) until autoscaling_image.state == :available
                 logger.debug("Created AMI: #{autoscaling_image.name} (#{autoscaling_image.id})")
                 [["Name", {:value => autoscaling_image_name}], [autoscaling_image_tag_name]].each do |tag_name, tag_options|
                   begin
@@ -418,8 +390,11 @@ module Capistrano
                 logger.debug("Found AutoScalingGroup: #{autoscaling_group.name} (#{autoscaling_group.launch_configuration_name})")
                 autoscaling_group.update(autoscaling_group_options.merge(:launch_configuration => autoscaling_launch_configuration))
               else
+                logger.debug("autoscaling_elb_instance name is #{autoscaling_elb_instance.name}")
+                logger.debug("autoscaling_launch_configuration name is #{autoscaling_launch_configuration.name}")
                 if autoscaling_elb_instance.exists? and autoscaling_launch_configuration.exists?
                   logger.debug("Creating AutoScalingGroup: #{autoscaling_group_name} (#{autoscaling_launch_configuration.name})")
+                  logger.debug("autoscaling_group_options = #{autoscaling_group_options.inspect}")
                   set(:autoscaling_group, autoscaling_autoscaling_client.groups.create(autoscaling_group_name,
                     autoscaling_group_options.merge(:launch_configuration => autoscaling_launch_configuration,
                     :load_balancers => [ autoscaling_elb_instance ])))
@@ -581,6 +556,8 @@ module Capistrano
           task(:status, :roles => :app, :except => { :no_release => true }) {
             status = {}
 
+            logger.info("Autoscaling Group: #{autoscaling_group.name}") if autoscaling_group
+            
             if autoscaling_group and autoscaling_group.exists?
               status[:name] = autoscaling_group.name
               status[:availability_zone_names] = autoscaling_group.availability_zone_names.to_a
@@ -591,7 +568,7 @@ module Capistrano
 
             launch_configuration = nil
             if autoscaling_group and autoscaling_group.exists?
-              launch_configuration = autoscaling_gruop.launch_configuration
+              launch_configuration = autoscaling_group.launch_configuration
             elsif autoscaling_launch_configuration and autoscaling_launch_configuration.exists?
               launch_configuration = autoscaling_launch_configuration
             end
@@ -616,6 +593,7 @@ module Capistrano
               load_balancers = [ autoscaling_elb_instance ]
             end
             if load_balancers
+              logger.info("Value of load_balancers: #{load_balancers.to_s}")
               status[:load_balancers] = load_balancers.map { |lb|
                 {
                   :name => lb.name,

data/lib/capistrano-autoscaling/version.rb

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

metadata

@@ -1,48 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-autoscaling
 version: !ruby/object:Gem::Version
-  version: 0.0.7
-  prerelease: 
+  version: 0.0.8
 platform: ruby
 authors:
 - Yamashita Yuu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-26 00:00:00.000000000 Z
+date: 2014-10-10 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: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.4
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.4
+        version: 1.9.0
 description: A Capistrano recipe that configures AutoScaling on Amazon Web Services
   infrastructure for your application.
 email:
@@ -51,7 +46,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -61,27 +56,26 @@ files:
 - lib/capistrano-autoscaling/version.rb
 homepage: https://github.com/yyuu/capistrano-autoscaling
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Capistrano recipe that configures AutoScaling on Amazon Web Services infrastructure
   for your application.
 test_files: []