roadworker 0.4.3 → 0.4.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MjI3MjBjYzIzMmY0OWNiZDNmMjhjNmVlNmQzYzM1ZGQ4MDZhYTkwNw==
-  data.tar.gz: !binary |-
-    OGYyYTk0ZGYyOWY1NDM2MDM1ZjBmMGY1YzdiNTFjN2QwNzZkZmYwYQ==
+SHA1:
+  metadata.gz: 6f694d04bb0eda4bc71551dd53e709123d8d7f81
+  data.tar.gz: 3970732f55fc1f556cd65f1393480bd996feac05
 SHA512:
-  metadata.gz: !binary |-
-    MGY2MDMzZTJlYjlmM2UxMzZiMjFiY2QzNzAzZTAyNDI0ODA2NDA4YjI0N2Ni
-    NTgzZTcwMmI4ZDg1YzBkNDQxYmI4ZmFjNjQwMjg1ZTdjYWRkMjM3YWI0NGEz
-    N2U0Yjc4MWU0Mjc2NTE5NDY2NGM5NDdjYTM1OWE5MmY3MTM2MzU=
-  data.tar.gz: !binary |-
-    Yjc2OThlOWM2N2EyNWQ4NzllNWQxMDkyOGVmZTZjOTk5ZTAxOGE4YzRhZGQy
-    MGI2MWZjM2VhNGNjYjI2MDJhMGYzNjljMjI1YmY5ODAzYTJjODljZTZkZDgx
-    ZmYyZWIwMjlhMTI3ZjRiYzAyYjdkM2IyYjU4OTg1OTA1YWJlNjg=
+  metadata.gz: c4133a0c6f348ac2dc5fbeaaf0150f446400af9c5f68ca65b4731eaf56d2d0b290c2ee40267cf0bbd77343de16742da877becdfbb3a6f981534863e49445ff97
+  data.tar.gz: a2deb137b51610117ef0792a71d5e72ab97525f85d0a29c95f038cc2e89528b9839b700f0c84f6672048470f26896ca4c85ef72f3d9a8f930d5d44b1364fcd42

data/README.md

@@ -68,7 +68,9 @@ 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", :request_interval => 30, :failure_threshold => 3
+    health_check "http://example.com:80/path", :search_string => "ANY_RESPONSE_STRING", :request_interval => 30, :failure_threshold => 3
+    # If you want to specify the IP address:
+    #health_check "http://192.0.43.10:80/path", :host => "example.com",...
     ttl 456
     resource_records(
       "127.0.0.1",

data/lib/roadworker/route53-ext.rb

@@ -1,6 +1,45 @@
 require 'aws-sdk'
 
 module AWS
+  module Core
+    class Client
+
+      # PTF:
+      class << self
+        alias load_api_config_orig load_api_config
+
+        def load_api_config(api_version)
+          yaml = load_api_config_orig(api_version)
+
+          if service_name == 'Route53'
+            rewrite_api(yaml)
+          end
+
+          return yaml
+        end
+
+        private
+
+        def rewrite_api(value)
+          case value
+          when Array
+            value.each {|v| rewrite_api(v) }
+          when Hash
+            value.each do |k, v|
+              case k
+              when :health_check_config
+                v[:members][:ip_address][:required] = false
+              end
+
+              rewrite_api(v)
+            end
+          end
+        end
+      end # of class method
+
+    end # Client
+  end # Core
+
   class Route53
 
     # http://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region

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

@@ -24,7 +24,15 @@ module Roadworker
         request_interval  = config[:request_interval]
         failure_threshold = config[:failure_threshold]
 
-        url = "#{type}://#{ipaddr}:#{port}"
+        ulr = nil
+
+        if ipaddr
+          url = "#{type}://#{ipaddr}:#{port}"
+        else
+          url = "#{type}://#{fqdn}:#{port}"
+          fqdn = nil
+        end
+
         url << path if path && path != '/'
 
         {
@@ -47,7 +55,6 @@ module Roadworker
         config = {}
 
         {
-          :ip_address    => url.host,
           :port          => url.port,
           :type          => url.scheme.upcase,
           :resource_path => path,
@@ -55,6 +62,12 @@ module Roadworker
           config[key] = value if value
         }
 
+        if url.host =~ /\A\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\Z/
+          config[:ip_address] = url.host
+        else
+          config[:fully_qualified_domain_name] = url.host
+        end
+
         return config
       end
     end # of class method

data/lib/roadworker/version.rb

@@ -1,5 +1,5 @@
 module Roadworker
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end
 
 Version = Roadworker::VERSION

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: roadworker
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-08 00:00:00.000000000 Z
+date: 2014-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.36.0
+        version: 1.39.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.36.0
+        version: 1.39.0
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   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
@@ -56,28 +56,28 @@ dependencies:
   name: uuid
   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: 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
@@ -98,14 +98,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -126,14 +126,14 @@ dependencies:
   name: rspec-instafail
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Roadworker is a tool to manage Route53. It defines the state of Route53
@@ -170,17 +170,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Roadworker is a tool to manage Route53.