capify-ec2 1.4.2.pre4 → 1.4.3.pre5

data/Changelog.md

@@ -1,3 +1,13 @@
+## 1.4.3.pre5 (Apr 9, 2013)
+
+Features:
+  
+  - Allowed the expected result for the rolling deployment healthcheck to be specified as a regex or an array in addition to a string.
+
+Bugfixes:
+
+  - Fixed an issue which was preventing the main deployment task from being executed during a rolling deployment.
+
 ## 1.4.2.pre4 (Mar 28, 2013)
 
 Features:

data/lib/capify-ec2/capistrano.rb

@@ -105,7 +105,7 @@ 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|
           

data/lib/capify-ec2/version.rb

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

data/lib/capify-ec2.rb

@@ -219,6 +219,16 @@ class CapifyEc2
   end
 
   def instance_health_by_url(dns, port, path, expected_response, options = {})
+    def response_matches_expected?(response, expected_response)
+      if expected_response.kind_of?(Array)
+        expected_response.any?{ |r| response_matches_expected?(response, r) }
+      elsif expected_response.kind_of?(Regexp)
+        (response =~ expected_response) != nil
+      else
+        response == expected_response
+      end
+    end
+
     protocol = options[:https] ? 'https://' : 'http://'
     uri = URI("#{protocol}#{dns}:#{port}#{path}")
 
@@ -231,7 +241,7 @@ class CapifyEc2
       Timeout::timeout(options[:timeout]) do
         begin
           result = http.get(uri.path)
-          raise "Server responded with '#{result.code}: #{result.body}', expected '#{expected_response}'" unless result.body == expected_response
+          raise "Server responded with '#{result.code}: #{result.body}', expected '#{expected_response}'" unless response_matches_expected?(result.body, expected_response)
         rescue => e
           puts "[Capify-EC2] Unexpected response: #{e}..."
           sleep 1
@@ -240,7 +250,7 @@ class CapifyEc2
       end
     rescue Timeout::Error => e
     end
-    result ? result.body == expected_response : false
+    result ? response_matches_expected?(result.body, expected_response) : false
   end
 end
 

data/readme.md

@@ -341,7 +341,33 @@ In this example, the following URL would be generated:
 http://EC2_INSTANCE_PUBLIC_DNS_HERE:80/status
 ```
 
-And the contents of the page at that URL must match 'OK' for the healthcheck to pass. If unsuccessful, the healthcheck is repeated every second, until a timeout of 60 seconds is reached, at which point the rolling deployment is aborted, and a progress summary displayed.
+And the contents of the page at that URL must match 'OK' exactly for the healthcheck to pass. If unsuccessful, the healthcheck is repeated every second, until a timeout of 60 seconds is reached, at which point the rolling deployment is aborted, and a progress summary displayed.
+
+The result can also be specified as a regular expression, which gives more flexibility. For example:
+
+```ruby
+ec2_roles :name => "web",
+          :variables => {
+            :healthcheck => {
+              :path   => '/status',
+              :port   => 80,
+              :result => /^(OK|Success)$/
+            }
+          }
+```
+
+The result can also be specified as an array (of strings and/or regular expressions), in which case the result of the health check is successful if the response matches any of the items in the array. For example:
+
+```ruby
+ec2_roles :name => "web",
+          :variables => {
+            :healthcheck => {
+              :path   => '/status',
+              :port   => 80,
+              :result => ['OK', /^\s*Success/]
+            }
+          }
+```
 
 The default timeout of 60 seconds can be overridden by setting ':timeout' to a custom value in seconds. The protocol used defaults to 'http://', however you can switch to 'https://' by setting ':https' equal to 'true'. For example:
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: capify-ec2
 version: !ruby/object:Gem::Version 
-  hash: 967365859
+  hash: -4040006510
   prerelease: 6
   segments: 
   - 1
   - 4
-  - 2
+  - 3
   - pre
-  - 4
-  version: 1.4.2.pre4
+  - 5
+  version: 1.4.3.pre5
 platform: ruby
 authors: 
 - Noah Cantor
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-28 00:00:00 Z
+date: 2013-04-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fog