roadworker 0.3.10 → 0.4.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YjIzOTY2MjJjYmYzODVjMDE0NzFkZTIyMzhiNjRlNzJlZjYwMjljNA==
-  data.tar.gz: !binary |-
-    NWNiMzA2Nzk5YmE4NTllY2ZlMDFiMWNjZTYxYjYxYmM4MGEzNTRkMQ==
+SHA1:
+  metadata.gz: efa1def64b9857b4163dec7834451bd043691b02
+  data.tar.gz: 22896a3d8aec83cbe1e8cd35902a19bae813a9ff
 SHA512:
-  metadata.gz: !binary |-
-    MmU4Y2U0MTYyYThhYzcwZDBiODFlMmYzZWFkOTY0YWExMTVlM2ViNWVlYjUy
-    OGMzYzc2YzNlN2E1NjJjNGIwM2FmM2UxOTBlYTI4YjA4OTNiY2RlZThjOTZi
-    ZmYwNDUyMjVhMDQyNDhhNGU0MDVhYmRjMTU4NmI0Yzk4MjQ5OGI=
-  data.tar.gz: !binary |-
-    ZGYxMzFkZGY5M2M0YjM5YWYyZWJlODc1YmU0MzNmODE3ZWRjOWQyODhkZDEw
-    ZGZiMmIyNTFmOWFhNjJhMzgxMjZiNWRhMDMzNmYyNmY4MWNmMzM3MDcyNmZj
-    MjE2ZDUyMTVhNTM0NTA3YzUzMjA2NzM5MzM3NjNmOTE5OTdhZjA=
+  metadata.gz: 0ff0d8d411d8946dcf5d6c603176fec39ce612ad9ff0b32ef5d197735c9e697d6d5f7c1bb20c26dbacec5fa498145a44877fc015cd61711df2d11d3772149ce3
+  data.tar.gz: 58a926b9dd085d59a817cd0a4b8a72fe922daddee9f1b1199f3b00f63598eece18d88dcc2b4d006d249c58ef7c85d08e5e422d4c1b01ffd3ff039577a007402f

data/README.md

@@ -4,6 +4,7 @@ Roadworker is a tool to manage Route53.
 
 It defines the state of Route53 using DSL, and updates Route53 according to DSL.
 
+[![Gem Version](https://badge.fury.io/rb/roadworker.png)](http://badge.fury.io/rb/roadworker)
 [![Build Status](https://drone.io/bitbucket.org/winebarrel/roadworker/status.png)](https://drone.io/bitbucket.org/winebarrel/roadworker/latest)
 
 **Notice**
@@ -66,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"
+    health_check "http://192.0.43.10:80/path", :host => "example.com", :search_string => "ANY_RESPONSE_STRING"
     ttl 456
     resource_records(
       "127.0.0.1",

data/lib/roadworker/dsl-converter.rb

@@ -33,8 +33,14 @@ module Roadworker
               end
             when :health_check_id
               config = HealthCheck.config_to_hash(@health_checks[value])
-              hc_args = config[:url].inspect
-              hc_args << ", #{config[:host_name].inspect}" if config[:host_name]
+              hc_args = config[:url].sub(/\A(https?)_str_match:/) { $1 + ':' }.inspect
+
+              [:host, :search_string].each do |key|
+                if config[key]
+                  hc_args << ", :#{key} => #{config[key].inspect}"
+                end
+              end
+
               "health_check #{hc_args}"
             else
               "#{key} #{value.inspect}"

data/lib/roadworker/dsl-tester.rb

@@ -91,8 +91,9 @@ module Roadworker
               expected_value = expected_value.map {|i| i.downcase.sub(/\.\Z/, '') }
               actual_value = actual_value.map {|i| i.downcase.sub(/\.\Z/, '') }
             when 'TXT', 'SPF'
-              expected_value = expected_value.map {|i| i.scan(/"([^"]+)"/).join.strip.gsub(/\s+/, ' ') }
-              actual_value = actual_value.map {|i| i.strip.gsub(/\s+/, ' ') }
+              # see https://github.com/bluemonk/net-dns/blob/651dc1006d9ee0c167fa515e4b9d2494af415ae9/lib/net/dns/rr/txt.rb#L46
+              expected_value = expected_value.map {|i| i.scan(/"([^"]+)"/).join(' ').strip }
+              actual_value = actual_value.map {|i| i.strip }
             end
 
             expected_message = record.resource_records ? expected_value.map {|i| "#{i}(#{expected_ttl})" }.join(',') : "#{record.dns_name}(#{expected_ttl})"

data/lib/roadworker/dsl.rb

@@ -120,18 +120,34 @@ module Roadworker
           @result.failover = value
         end
 
-        def health_check(url, options = nil)
+        def health_check(url, *options)
           config = HealthCheck.parse_url(url)
 
-          if options
-            if options.kind_of?(Hash)
-              config[:fully_qualified_domain_name] = options.fetch(:host)
-            else
-              config[:fully_qualified_domain_name] = options.to_s
+          if options.length == 1 and options.first.kind_of?(Hash)
+            options = options.first
+
+            {
+              :host          => :fully_qualified_domain_name,
+              :search_string => :search_string,
+            }.each do |option_key, config_key|
+              config[config_key] = options[option_key] if options[option_key]
+            end
+          else
+            options.each_with_index do |value, i|
+              key = [
+                :fully_qualified_domain_name,
+                :search_string,
+              ][i]
+
+              config[key] = value
             end
           end
 
-           @result.health_check = config
+          if config[:search_string]
+            config[:type] += '_STR_MATCH'
+          end
+
+          @result.health_check = config
         end
 
         def resource_records(*values)

data/lib/roadworker/route53-ext.rb

@@ -1,6 +1,52 @@
 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'
+            replace_api_version(yaml)
+          end
+
+          return yaml
+        end
+
+        private
+
+        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,
+                }
+              end
+
+              replace_api_version(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

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

data/lib/roadworker/route53-wrapper.rb

@@ -61,7 +61,7 @@ module Roadworker
         HostedZoneWrapper.new(zone, @options)
       end
     end # HostedZoneCollection
- 
+
     class HostedZoneWrapper
       include Roadworker::Log
 
@@ -115,7 +115,7 @@ module Roadworker
       end
 
       def create(name, type, expected_record)
-        log(:info, 'Create ResourceRecordSet', :cyan) do 
+        log(:info, 'Create ResourceRecordSet', :cyan) do
           log_id = [name, type].join(' ')
           rrset_setid = expected_record.set_identifier
           rrset_setid ? (log_id + " (#{rrset_setid})") : log_id

data/lib/roadworker/string-ext.rb

@@ -13,11 +13,11 @@ class String
     end
   end # of class method
 
-  Term::ANSIColor::Attribute.named_attributes.map do |attr|
+  Term::ANSIColor::Attribute.named_attributes.map do |attribute|
     class_eval(<<-EOS, __FILE__, __LINE__ + 1)
-      def #{attr.name}
+      def #{attribute.name}
         if @@colorize
-          Term::ANSIColor.send(#{attr.name.inspect}, self)
+          Term::ANSIColor.send(#{attribute.name.inspect}, self)
         else
           self
         end

data/lib/roadworker/version.rb

@@ -1,5 +1,5 @@
 module Roadworker
-  VERSION = "0.3.10"
+  VERSION = "0.4.0"
 end
 
 Version = Roadworker::VERSION

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: roadworker
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.4.0
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-10 00:00:00.000000000 Z
+date: 2014-02-01 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.14.1
+        version: 1.33.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.14.1
+        version: 1.33.0
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.2
 - !ruby/object:Gem::Dependency
@@ -56,14 +56,14 @@ dependencies:
   name: uuid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.3.7
 - !ruby/object:Gem::Dependency
@@ -84,14 +84,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
@@ -142,17 +142,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.5
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Roadworker is a tool to manage Route53.