roadworker 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0d3f642ddf0b9f28e2c6607a14c70f71a05d6e3
-  data.tar.gz: 2068acde30d38e452d3a3840f7d136ce0d5b4ae0
+  metadata.gz: 350788a5b2ef5a814cd94293bc57a1ab2a00ccae
+  data.tar.gz: 3b35781838eba79372bbcd133296b88bc72a1ff7
 SHA512:
-  metadata.gz: 9a6142c0e48b09eb6ac983ad9abb34e157c2dcd7c8518d49c44b196f7d909c2cd0340115e36060631507db12e85c02bea8bf1a9e65dcc1d34f3780f801241f79
-  data.tar.gz: 3dc7c2db81defc7750e085c44f2b35db93d24bf4bb8c3315bf46f8ae511fc3f0187a4a688f1cb7cb90e8b9447ff5d7855e0e860dedd805961e340433c09dcb2e
+  metadata.gz: 1e6a82d161555742cb920bfe3aab250457d01c7b0b12bb9d4d2ef0ddddff6c79eed27c084f32fea5bce60499232808511d2e812b78a365984e5c90821353bcbb
+  data.tar.gz: e1d1331e101166c603be402abc9e1883d885ae9a86f7c24f684bbb66961c28b7b10b412c20b4730a294904e23af06cb0a5752bb1c890d9ae303a38c89bdfd444

data/README.md

@@ -67,7 +67,7 @@ hosted_zone "info.winebarrel.jp." do
   rrset "zzz.info.winebarrel.jp", "A" do
     set_identifier "Primary"
     failover "PRIMARY"
-    health_check "http://192.0.43.10:80/path", :host => "example.com", :search_string => "ANY_RESPONSE_STRING"
+    health_check "http://192.0.43.10:80/path", :host => "example.com", :search_string => "ANY_RESPONSE_STRING", :request_interval => 30, :failure_threshold => 3
     ttl 456
     resource_records(
       "127.0.0.1",
@@ -78,7 +78,7 @@ hosted_zone "info.winebarrel.jp." do
   rrset "zzz.info.winebarrel.jp", "A" do
     set_identifier "Secondary"
     failover "SECONDARY"
-    health_check "tcp://192.0.43.10:3306"
+    health_check "tcp://192.0.43.10:3306", :request_interval => 30, :failure_threshold => 3
     ttl 456
     resource_records(
       "127.0.0.3",

data/lib/roadworker/dsl-converter.rb

@@ -35,7 +35,7 @@ module Roadworker
               config = HealthCheck.config_to_hash(@health_checks[value])
               hc_args = config[:url].sub(/\A(https?)_str_match:/) { $1 + ':' }.inspect
 
-              [:host, :search_string].each do |key|
+              [:host, :search_string, :request_interval, :failure_threshold].each do |key|
                 if config[key]
                   hc_args << ", :#{key} => #{config[key].inspect}"
                 end

data/lib/roadworker/dsl.rb

@@ -127,8 +127,10 @@ module Roadworker
             options = options.first
 
             {
-              :host          => :fully_qualified_domain_name,
-              :search_string => :search_string,
+              :host              => :fully_qualified_domain_name,
+              :search_string     => :search_string,
+              :request_interval  => :request_interval,
+              :failure_threshold => :failure_threshold,
             }.each do |option_key, config_key|
               config[config_key] = options[option_key] if options[option_key]
             end
@@ -137,6 +139,8 @@ module Roadworker
               key = [
                 :fully_qualified_domain_name,
                 :search_string,
+                :request_interval,
+                :failure_threshold,
               ][i]
 
               config[key] = value
@@ -147,6 +151,9 @@ module Roadworker
             config[:type] += '_STR_MATCH'
           end
 
+          config[:request_interval]  ||= 30
+          config[:failure_threshold] ||= 3
+
           @result.health_check = config
         end
 

data/lib/roadworker/route53-ext.rb

@@ -22,19 +22,32 @@ module AWS
 
         def replace_api_version(value)
           case value
-          when String
-            if value =~ /2012-12-12/
-              value.gsub!(/2012-12-12/, '2013-04-01')
-            end
           when Array
             value.each {|v| replace_api_version(v) }
           when Hash
             value.each do |k, v|
-              if k == :health_check_config
-                v[:members][:search_string] = {
-                  :name     => 'SearchString',
-                  :type     => :string,
-                  :position => 5,
+              case k
+              when :health_check_config
+                {
+                  :request_interval => {
+                    :name     => 'RequestInterval',
+                    :type     => :integer,
+                    :position => 6,
+                  },
+                  :failure_threshold => {
+                    :name     => 'FailureThreshold',
+                    :type     => :integer,
+                    :position => 7,
+                  },
+                }.each {|name, attrs|
+                  v[:members][name] = attrs
+                }
+              when 'HealthCheckConfig'
+                {
+                  'RequestInterval'  => {:type => :integer},
+                  'FailureThreshold' => {:type => :integer},
+                }.each {|name, attrs|
+                  v[:children][name] = attrs
                 }
               end
 

data/lib/roadworker/route53-health-check.rb

@@ -20,12 +20,20 @@ module Roadworker
         path   = config[:resource_path]
         fqdn   = config[:fully_qualified_domain_name]
         fqdn   = fqdn.downcase if fqdn
-        search_string = config[:search_string]
+        search_string     = config[:search_string]
+        request_interval  = config[:request_interval]
+        failure_threshold = config[:failure_threshold]
 
         url = "#{type}://#{ipaddr}:#{port}"
         url << path if path && path != '/'
 
-        {:url => url, :host => fqdn, :search_string => search_string}
+        {
+          :url               => url,
+          :host              => fqdn,
+          :search_string     => search_string,
+          :request_interval  => request_interval,
+          :failure_threshold => failure_threshold,
+        }
       end
 
       def parse_url(url)

data/lib/roadworker/version.rb

@@ -1,5 +1,5 @@
 module Roadworker
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end
 
 Version = Roadworker::VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roadworker
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-02 00:00:00.000000000 Z
+date: 2014-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.33.0
+        version: 1.34.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.33.0
+        version: 1.34.1
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: net-dns
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,28 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.3.7
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.3.7
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: systemu
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -157,3 +171,4 @@ signing_key:
 specification_version: 4
 summary: Roadworker is a tool to manage Route53.
 test_files: []
+has_rdoc: