capify-ec2 1.4.1.pre3 → 1.4.2.pre4

data/Changelog.md

@@ -1,3 +1,15 @@
+## 1.4.2.pre4 (Mar 28, 2013)
+
+Features:
+
+  - Added the ability to run multiple healthchecks per role by specifying an array of them when defining the role.
+  - Improved readability of output from rolling deployments.
+
+Bugfixes:
+
+  - Error handling improved when working with the 'ec2:ssh' command.
+
+
 ## 1.4.1.pre3 (Mar 1, 2013)
 
 Features:

data/capify-ec2.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.name        = "capify-ec2"
   s.version     = Capify::Ec2::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Noah Cantor", "Siddharth Dawara"]
+  s.authors     = ["Noah Cantor", "Siddharth Dawara", "Jon Spalding", "Ryan Conway"]
   s.email       = ["capify-ec2@forwardtechnology.co.uk"]
   s.homepage    = "http://github.com/forward/capify-ec2"
   s.summary     = %q{Capify-EC2 is used to generate Capistrano namespaces and tasks from Amazon EC2 instance tags, dynamically building the list of servers to be deployed to.}

data/lib/capify-ec2.rb

@@ -45,6 +45,11 @@ class CapifyEc2
   end
     
   def display_instances
+    unless desired_instances and desired_instances.any?
+      puts "[Capify-EC2] No instances were found using your 'ec2.yml' configuration.".red.bold
+      return
+    end
+    
     # Set minimum widths for the variable length instance attributes.
     column_widths = { :name_min => 4, :type_min => 4, :dns_min => 5, :roles_min => 5, :options_min => 6 }
 
@@ -216,8 +221,10 @@ class CapifyEc2
   def instance_health_by_url(dns, port, path, expected_response, options = {})
     protocol = options[:https] ? 'https://' : 'http://'
     uri = URI("#{protocol}#{dns}:#{port}#{path}")
-    http = Net::HTTP.new(uri.host, uri.port)
 
+    puts "[Capify-EC2] Checking '#{uri}' for the content '#{expected_response}'..."    
+
+    http = Net::HTTP.new(uri.host, uri.port)
     result = nil
 
     begin

data/lib/capify-ec2/capistrano.rb

@@ -39,13 +39,19 @@ Capistrano::Configuration.instance(:must_exist).load do
     desc "Allows ssh to instance by id. cap ssh <INSTANCE NAME>"
     task :ssh do
       server = variables[:logger].instance_variable_get("@options")[:actions][1]
-      instance = numeric?(server) ? capify_ec2.desired_instances[server.to_i] : capify_ec2.get_instance_by_name(server)
-
-      if instance and instance.contact_point then
-        port = ssh_options[:port] || 22 
-        command = "ssh -p #{port} #{user}@#{instance.contact_point}"
-        puts "Running `#{command}`"
-        exec(command)
+      
+      if server
+        instance = numeric?(server) ? capify_ec2.desired_instances[server.to_i] : capify_ec2.get_instance_by_name(server)
+
+        if instance and instance.contact_point then
+          port = ssh_options[:port] || 22 
+          command = "ssh -p #{port} #{user}@#{instance.contact_point}"
+          puts "Running `#{command}`"
+          exec(command)
+        else
+          puts "[Capify-EC2] Error: No instances were found with instance number '#{server}'.".bold.red
+          exit 1
+        end
       else
         puts "[Capify-EC2] Error: You did not specify the instance number, which can be found via the 'ec2:status' command as follows:".bold.red
         top.ec2.status
@@ -99,26 +105,32 @@ Capistrano::Configuration.instance(:must_exist).load do
         load_balancer_to_reregister = capify_ec2.deregister_instance_from_elb_by_dns(server_dns) if is_load_balanced
         
         # Call the standard 'cap deploy' task with our redefined role containing a single server.
-        top.deploy.default
+        # top.deploy.default
 
         server_roles.each do |a_role|
           
-          # If a healthcheck is defined for this role, run it.
+          # If healthcheck(s) are defined for this role, run them.
           if all_roles[a_role][:options][:healthcheck]
-            options = {}
-            options[:https]   = all_roles[a_role][:options][:healthcheck][:https]   ||= false
-            options[:timeout] = all_roles[a_role][:options][:healthcheck][:timeout] ||= 60
-            puts "[Capify-EC2] Starting healthcheck for role '#{a_role}'..."
-            healthcheck = capify_ec2.instance_health_by_url( server_dns,
-                                                             all_roles[a_role][:options][:healthcheck][:port], 
-                                                             all_roles[a_role][:options][:healthcheck][:path], 
-                                                             all_roles[a_role][:options][:healthcheck][:result], 
-                                                             options )
-            if healthcheck
-              puts "[Capify-EC2] Healthcheck for role '#{a_role}' successful.".green.bold
-            else
-              puts "[Capify-EC2] Healthcheck for role '#{a_role}' failed!".red.bold
-              raise CapifyEC2RollingDeployError.new("Healthcheck timeout exceeded", server_dns)
+            healthchecks_for_role = [ all_roles[a_role][:options][:healthcheck] ].flatten
+
+            puts "[Capify-EC2] Starting #{pluralise(healthchecks_for_role.size, 'healthcheck')} for role '#{a_role}'..."
+
+            healthchecks_for_role.each_with_index do |healthcheck_for_role, i|
+              options = {}
+              options[:https]   = healthcheck_for_role[:https]   ||= false
+              options[:timeout] = healthcheck_for_role[:timeout] ||= 60
+
+              healthcheck = capify_ec2.instance_health_by_url( server_dns,
+                                                               healthcheck_for_role[:port], 
+                                                               healthcheck_for_role[:path], 
+                                                               healthcheck_for_role[:result], 
+                                                               options )
+              if healthcheck
+                puts "[Capify-EC2] Healthcheck #{i+1} of #{healthchecks_for_role.size} for role '#{a_role}' successful.".green.bold
+              else
+                puts "[Capify-EC2] Healthcheck #{i+1} of #{healthchecks_for_role.size} for role '#{a_role}' failed!".red.bold
+                raise CapifyEC2RollingDeployError.new("Healthcheck timeout exceeded", server_dns)
+              end
             end
           end
 
@@ -142,11 +154,13 @@ Capistrano::Configuration.instance(:must_exist).load do
       failed_deploys << e.dns
       puts "[Capify-EC2]"
       puts "[Capify-EC2] Deployment aborted due to error: #{e}!".red.bold
+      puts "[Capify-EC2]" if load_balancer_to_reregister
       puts "[Capify-EC2] Note: Instance '#{instance_dns_with_name_tag(e.dns)}' was removed from the ELB '#{load_balancer_to_reregister.id}' and should be manually checked and reregistered.".red.bold if load_balancer_to_reregister
     rescue => e
       failed_deploys << roles.values.first.servers.first.host
       puts "[Capify-EC2]"
       puts "[Capify-EC2] Deployment aborted due to error: #{e}!".red.bold
+      puts "[Capify-EC2]" if load_balancer_to_reregister
       puts "[Capify-EC2] Note: Instance '#{instance_dns_with_name_tag(roles.values.first.servers.first.host)}' was removed from the ELB '#{load_balancer_to_reregister.id}' and should be manually checked and reregistered.".red.bold if load_balancer_to_reregister
     else
       puts "[Capify-EC2]"
@@ -265,6 +279,16 @@ Capistrano::Configuration.instance(:must_exist).load do
   def numeric?(object)
     true if Float(object) rescue false
   end
+
+  def pluralise(n, singular, plural=nil)
+    if n == 1
+        "#{singular}"
+    elsif plural
+        "#{plural}"
+    else
+        "#{singular}s"
+    end
+  end
   
   def remove_default_roles	 	
     roles.reject! { true }

data/lib/capify-ec2/version.rb

@@ -1,6 +1,6 @@
 module Capify
   module Ec2
-    VERSION = "1.4.1.pre3"
+    VERSION = "1.4.2.pre4"
   end
 end
 

data/readme.md

@@ -2,6 +2,10 @@
 
 Capify-EC2 is used to generate Capistrano namespaces and tasks from Amazon EC2 instance tags, dynamically building the list of servers to be deployed to.
 
+### Pre-release
+
+This pre-release version of Capify-EC2 is currently in public testing, please open a Github issue if you are experiencing difficulties.
+
 
 ### Installation
 
@@ -356,6 +360,23 @@ ec2_roles :name => "web",
 
 Sets a 10 second timeout, and performs the health check over HTTPS.
 
+You can run multiple different healthchecks for a role by specifying the healthcheck as an array instead:
+
+```ruby
+ec2_roles :name => "web",
+          :variables => { 
+            :healthcheck => [{
+              :path   => '/status',
+              :port   => 80, 
+              :result => 'OK'
+            }, {
+              :path   => '/other_status',
+              :port   => 81, 
+              :result => 'OK'
+            }]
+          }
+```
+
 ##### Usage with Elastic Load Balancers
 
 You can have Capify-EC2 automatically deregister and reregister an instance from whichever ELB it is associated with, before and after the deployment, by setting ':load_balanced' to 'true' in the role definition, for example:

metadata

@@ -1,24 +1,26 @@
 --- !ruby/object:Gem::Specification 
 name: capify-ec2
 version: !ruby/object:Gem::Version 
-  hash: 382858687
+  hash: 967365859
   prerelease: 6
   segments: 
   - 1
   - 4
-  - 1
+  - 2
   - pre
-  - 3
-  version: 1.4.1.pre3
+  - 4
+  version: 1.4.2.pre4
 platform: ruby
 authors: 
 - Noah Cantor
 - Siddharth Dawara
+- Jon Spalding
+- Ryan Conway
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2013-03-01 00:00:00 Z
+date: 2013-03-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fog