roadworker 0.5.6.beta4 → 0.5.6.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db3ac2066005e181c435f8df80cc25e5b03921ef
-  data.tar.gz: 633dafe00c8d6c752f449d709b134e77eb36f7df
+  metadata.gz: f704ca0ddbe2ecec12884f5f0a2303e92ce94936
+  data.tar.gz: c07c66533c03a73f17be918f6da9ae05c53a8dfa
 SHA512:
-  metadata.gz: baac0b5bdfb40c9937e32c083b7d6ee9a1c9bac0b27338d6e490dcfe04d75120f3913ad34754c32c60bdbd4bc067e90a69220ab2048993979df3632f77346b67
-  data.tar.gz: 740caf8e217a8d0d14f12f1e248a620905603cf646b0d89e022119b75da436c72ee426d4d2c4290e145ec7f739f764118917e3f3a2d0825c066fab9ebea513a9
+  metadata.gz: 5498a358be59907f492c8e8f17542da3ae7710c203f787a60fdd7e82bc62efb5052e912f850be7b834a08eaee00a24e0ac53eac5f12b23bda4d82b732e6a732d
+  data.tar.gz: 189612e79f32c335732ec98d13adc80d8d144f185d2f350b2a5204c3099f106be2391ac2f1bbad13af6c3712b4610b287a7d24524d6dbb2e702897719d60f304

data/lib/roadworker/client.rb

@@ -156,7 +156,7 @@ module Roadworker
     end
 
     def normalize_name(name)
-      name.downcase.sub(/\.\Z/, '')
+      name.downcase.sub(/\.\z/, '')
     end
 
   end # Client

data/lib/roadworker/dsl-converter.rb

@@ -48,6 +48,7 @@ module Roadworker
                 :failure_threshold,
                 :measure_latency,
                 :inverted,
+                :enable_sni,
               ].each do |key|
                 unless config[key].nil?
                   hc_args << ", :#{key} => #{config[key].inspect}"
@@ -58,11 +59,11 @@ module Roadworker
             when :dns_name
               if value.kind_of?(Array) and value.length > 1
                 dns_name_opts = value.pop
-                value = value.inspect.sub(/\A\[/, '').sub(/\]\Z/, '')
-                dns_name_opts = dns_name_opts.inspect.sub(/\A\{/, '').sub(/\}\Z/, '')
+                value = value.inspect.sub(/\A\[/, '').sub(/\]\z/, '')
+                dns_name_opts = dns_name_opts.inspect.sub(/\A\{/, '').sub(/\}\z/, '')
                 "#{key} #{value}, #{dns_name_opts}"
               else
-                value = [value].flatten.inspect.sub(/\A\[/, '').sub(/\]\Z/, '')
+                value = [value].flatten.inspect.sub(/\A\[/, '').sub(/\]\z/, '')
                 "#{key} #{value}"
               end
             else

data/lib/roadworker/dsl-tester.rb

@@ -95,8 +95,8 @@ module Roadworker
 
             case type
             when 'NS', 'PTR', 'MX', 'CNAME', 'SRV'
-              expected_value = expected_value.map {|i| i.downcase.sub(/\.\Z/, '') }
-              actual_value = actual_value.map {|i| i.downcase.sub(/\.\Z/, '') }
+              expected_value = expected_value.map {|i| i.downcase.sub(/\.\z/, '') }
+              actual_value = actual_value.map {|i| i.downcase.sub(/\.\z/, '') }
             when 'TXT', 'SPF'
               # 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(' ').gsub(/\\(.)/) { $1 }.strip }
@@ -118,20 +118,20 @@ module Roadworker
 
             if fetch_dns_name(record.dns_name)
               # A(Alias)
-              case fetch_dns_name(record.dns_name).sub(/\.\Z/, '')
+              case fetch_dns_name(record.dns_name).sub(/\.\z/, '')
               when /\.elb\.amazonaws\.com/i
                 is_same = response.answer.all? {|a|
                   response_query_ptr = query(a.value, 'PTR', error_messages)
 
                   if response_query_ptr
                     response_query_ptr.answer.all? do |ptr|
-                      ptr.value =~ /\.compute\.amazonaws\.com\.\Z/
+                      ptr.value =~ /\.compute\.amazonaws\.com\.\z/
                     end
                   else
                     false
                   end
                 }
-              when /\As3-website-(?:[^.]+)\.amazonaws\.com\Z/
+              when /\As3-website-(?:[^.]+)\.amazonaws\.com\z/
                 response_answer_ip_1_2 = response.answer.map {|a| a.value.split('.').slice(0, 2) }.uniq
 
                 # try 3 times
@@ -148,13 +148,13 @@ module Roadworker
                     response_answer_ip_1_2.include?(ip.split('.').slice(0, 2))
                   }
                 end
-              when /\.cloudfront\.net\Z/
+              when /\.cloudfront\.net\z/
                 is_same = response.answer.all? {|a|
                   response_query_ptr = query(a.value, 'PTR', error_messages)
 
                   if response_query_ptr
                     response_query_ptr.answer.all? do |ptr|
-                      ptr.value =~ /\.cloudfront\.net\.\Z/
+                      ptr.value =~ /\.cloudfront\.net\.\z/
                     end
                   end
                 }
@@ -184,9 +184,9 @@ module Roadworker
             if asterisk_answers
               asterisk_answers.each do |ast_key, answers|
                 ast_name = ast_key[0]
-                ast_regex = Regexp.new('\A' + ast_name.sub(/\.\Z/, '').gsub('.', '\.').gsub('*', '.+') + '\Z')
+                ast_regex = Regexp.new('\A' + ast_name.sub(/\.\z/, '').gsub('.', '\.').gsub('*', '.+') + '\Z')
 
-                if ast_regex =~ name.sub(/\.\Z/, '') and actual_value.any? {|i| answers.include?(i) }
+                if ast_regex =~ name.sub(/\.\z/, '') and actual_value.any? {|i| answers.include?(i) }
                   warning_messages << "#{name} #{type}: same as `#{ast_name}`"
                 end
               end
@@ -252,8 +252,8 @@ module Roadworker
       def fix_srv_host(query_name, host)
         if (host || '').strip.empty?
           query_name
-        elsif host =~ /\x1A\Z/
-          host = host.sub(/\x1A\Z/, '')
+        elsif host =~ /\x1A\z/
+          host = host.sub(/\x1A\z/, '')
           query_name = query_name.split('.')
           query_name.slice!(0, host.count('.'))
           host + query_name.join('.')
@@ -295,7 +295,7 @@ module Roadworker
       end
 
       def asterisk_to_anyname(name)
-        rand_str = (("a".."z").to_a + ("A".."Z").to_a + (0..9).to_a).shuffle[0..7].join
+        rand_str = (("a".."z").to_a + ("A".."z").to_a + (0..9).to_a).shuffle[0..7].join
         name.gsub('*', "#{ASTERISK_PREFIX}-#{rand_str}")
       end
 

data/lib/roadworker/dsl.rb

@@ -51,10 +51,10 @@ module Roadworker
     end
 
     def hosted_zone(name, &block)
-      @result.hosted_zones << HostedZone.new(@context, name, [], &block).result
+      @result.hosted_zones << Hostedzone.new(@context, name, [], &block).result
     end
 
-    class HostedZone
+    class Hostedzone
       include Roadworker::TemplateHelper
 
       attr_reader :result
@@ -94,7 +94,7 @@ module Roadworker
       end
 
       def resource_record_set(rrset_name, type, &block)
-        if rrset_name.sub(/\.\Z/, '') !~ /#{Regexp.escape(@name.sub(/\.\Z/, ''))}\Z/i
+        if rrset_name.sub(/\.\z/, '') !~ /#{Regexp.escape(@name.sub(/\.\Z/, ''))}\Z/i
           raise "Invalid ResourceRecordSet Name: #{rrset_name}"
         end
 
@@ -179,7 +179,8 @@ module Roadworker
             :health_threshold  => :health_threshold,
             :failure_threshold => :failure_threshold,
             :measure_latency   => :measure_latency,
-            :inverted          => :inverted
+            :inverted          => :inverted,
+            :enable_sni        => :enable_sni,
           }.each do |option_key, config_key|
             config[config_key] = options[option_key] unless options[option_key].nil?
           end
@@ -193,6 +194,7 @@ module Roadworker
             config[:failure_threshold] ||= 3
             config[:measure_latency]   ||= false
             config[:inverted]          ||= false
+            config[:enable_sni]        ||= false
           end
 
           @result.health_check = config
@@ -208,7 +210,7 @@ module Roadworker
 
       end # ResourceRecordSet
 
-    end # HostedZone
+    end # Hostedzone
 
   end # DSL
 end # RoadWorker

data/lib/roadworker/route53-ext.rb

@@ -5,20 +5,20 @@ module Aws
 
     # http://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region
     S3_WEBSITE_ENDPOINTS = {
-      's3-website-us-east-1.amazonaws.com'      => 'Z3AQBSTGFYJSTF',
-      's3-website-us-west-2.amazonaws.com'      => 'Z3BJ6K6RIION7M',
-      's3-website-us-west-1.amazonaws.com'      => 'Z2F56UZL2M1ACD',
-      's3-website-eu-west-1.amazonaws.com'      => 'Z1BKCTXD74EZPE',
-      's3-website.eu-central-1.amazonaws.com'   => 'Z21DNDUVLTQW6Q',
-      's3-website-ap-southeast-1.amazonaws.com' => 'Z3O0J2DXBE1FTB',
-      's3-website-ap-southeast-2.amazonaws.com' => 'Z1WCIGYICN2BYD',
-      's3-website-ap-northeast-1.amazonaws.com' => 'Z2M4EHUR26P7ZW',
-      's3-website-sa-east-1.amazonaws.com'      => 'Z7KQH4QJS55SO',
-      's3-website-us-gov-west-1.amazonaws.com'  => 'Z31GFT0UA1I2HV',
+      's3-website-us-east-1.amazonaws.com'      => 'z3AQBSTGFYJSTF',
+      's3-website-us-west-2.amazonaws.com'      => 'z3BJ6K6RIION7M',
+      's3-website-us-west-1.amazonaws.com'      => 'z2F56UZL2M1ACD',
+      's3-website-eu-west-1.amazonaws.com'      => 'z1BKCTXD74EZPE',
+      's3-website.eu-central-1.amazonaws.com'   => 'z21DNDUVLTQW6Q',
+      's3-website-ap-southeast-1.amazonaws.com' => 'z3O0J2DXBE1FTB',
+      's3-website-ap-southeast-2.amazonaws.com' => 'z1WCIGYICN2BYD',
+      's3-website-ap-northeast-1.amazonaws.com' => 'z2M4EHUR26P7ZW',
+      's3-website-sa-east-1.amazonaws.com'      => 'z7KQH4QJS55SO',
+      's3-website-us-gov-west-1.amazonaws.com'  => 'z31GFT0UA1I2HV',
     }
 
     # http://docs.aws.amazon.com/Route53/latest/APIReference/API_ChangeResourceRecordSets.html
-    CF_HOSTED_ZONE_ID = 'Z2FDTNDATAQYW2'
+    CF_HOSTED_zONE_ID = 'Z2FDTNDATAQYW2'
 
     class << self
       def normalize_dns_name_options(src)
@@ -34,22 +34,22 @@ module Aws
       end
 
       def dns_name_to_alias_target(name, options, hosted_zone_id, hosted_zone_name)
-        hosted_zone_name = hosted_zone_name.sub(/\.\Z/, '')
-        name = name.sub(/\.\Z/, '')
+        hosted_zone_name = hosted_zone_name.sub(/\.\z/, '')
+        name = name.sub(/\.\z/, '')
         options ||= {}
 
-        if name =~ /([^.]+)\.elb\.amazonaws.com\Z/i
+        if name =~ /([^.]+)\.elb\.amazonaws.com\z/i
           region = $1.downcase
           alias_target = elb_dns_name_to_alias_target(name, region, options)
 
           # XXX:
           alias_target.merge(options)
-        elsif (s3_hosted_zone_id = S3_WEBSITE_ENDPOINTS[name.downcase]) and name =~ /\As3-website-([^.]+)\.amazonaws\.com\Z/i
+        elsif (s3_hosted_zone_id = S3_WEBSITE_ENDPOINTS[name.downcase]) and name =~ /\As3-website-([^.]+)\.amazonaws\.com\z/i
           region = $1.downcase
           s3_dns_name_to_alias_target(name, region, s3_hosted_zone_id)
-        elsif name =~ /\.cloudfront\.net\Z/i
+        elsif name =~ /\.cloudfront\.net\z/i
           cf_dns_name_to_alias_target(name)
-        elsif name =~ /\.#{Regexp.escape(hosted_zone_name)}\Z/i
+        elsif name =~ /(\A|\.)#{Regexp.escape(hosted_zone_name)}\z/i
           this_hz_dns_name_to_alias_target(name, hosted_zone_id)
         else
           raise "Invalid DNS Name: #{name}"
@@ -100,7 +100,7 @@ module Aws
 
       def cf_dns_name_to_alias_target(name)
         {
-          :hosted_zone_id         => CF_HOSTED_ZONE_ID,
+          :hosted_zone_id         => CF_HOSTED_zONE_ID,
           :dns_name               => name,
           :evaluate_target_health => false, # XXX:
         }

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

@@ -44,6 +44,7 @@ module Roadworker
           :failure_threshold,
           :measure_latency,
           :inverted,
+          :enable_sni,
         ].each do |key|
           hash[key] = config[key] unless config[key].nil?
         end
@@ -74,7 +75,7 @@ module Roadworker
           config[key] = value if value
         }
 
-        if url.host =~ /\A\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\Z/
+        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

data/lib/roadworker/route53-wrapper.rb

@@ -24,10 +24,10 @@ module Roadworker
     end
 
     def hosted_zones
-      HostedZoneCollectionWrapper.new(@options.route53.list_hosted_zones, @options)
+      HostedzoneCollectionWrapper.new(@options.route53.list_hosted_zones, @options)
     end
 
-    class HostedZoneCollectionWrapper
+    class HostedzoneCollectionWrapper
       include Roadworker::Log
 
       def initialize(hosted_zones_response, options)
@@ -38,7 +38,7 @@ module Roadworker
       def each
         Collection.batch(@hosted_zones_response, :hosted_zones) do |zone|
           resp = @options.route53.get_hosted_zone(id: zone.id)
-          yield(HostedZoneWrapper.new(resp.hosted_zone, resp.vp_cs, @options))
+          yield(HostedzoneWrapper.new(resp.hosted_zone, resp.vp_cs, @options))
         end
       end
 
@@ -50,7 +50,7 @@ module Roadworker
           opts.delete(:vpc)
         end
 
-        logmsg = 'Create HostedZone'
+        logmsg = 'Create Hostedzone'
         logmsg << " #{vpc.inspect}"
         log(:info, logmsg, :cyan, name)
 
@@ -70,11 +70,11 @@ module Roadworker
           @options.updated = true
         end
 
-        HostedZoneWrapper.new(zone, vpcs, @options)
+        HostedzoneWrapper.new(zone, vpcs, @options)
       end
-    end # HostedZoneCollection
+    end # HostedzoneCollection
 
-    class HostedZoneWrapper
+    class HostedzoneWrapper
       include Roadworker::Log
 
       def initialize(hosted_zone, vpcs, options)
@@ -92,7 +92,7 @@ module Roadworker
 
       def delete
         if @options.force
-          log(:info, 'Delete HostedZone', :red, @hosted_zone.name)
+          log(:info, 'Delete Hostedzone', :red, @hosted_zone.name)
 
           self.rrsets.each do |record|
             record.delete
@@ -103,7 +103,7 @@ module Roadworker
             @options.updated = true
           end
         else
-          log(:info, 'Undefined HostedZone (pass `--force` if you want to remove)', :yellow, @hosted_zone.name)
+          log(:info, 'Undefined Hostedzone (pass `--force` if you want to remove)', :yellow, @hosted_zone.name)
         end
       end
 
@@ -132,7 +132,7 @@ module Roadworker
       def method_missing(method_name, *args)
         @hosted_zone.send(method_name, *args)
       end
-    end # HostedZoneWrapper
+    end # HostedzoneWrapper
 
     class ResourceRecordSetCollectionWrapper
       include Roadworker::Log
@@ -223,8 +223,8 @@ module Roadworker
           elsif expected and actual
             case attribute
             when :dns_name
-              expected[0] = expected[0].downcase.sub(/\.\Z/, '')
-              actual[0] = actual[0].downcase.sub(/\.\Z/, '')
+              expected[0] = expected[0].downcase.sub(/\.\z/, '')
+              actual[0] = actual[0].downcase.sub(/\.\z/, '')
             end
 
             (expected == actual)
@@ -288,9 +288,9 @@ module Roadworker
       end
 
       def delete
-        if self.type =~ /\A(SOA|NS)\Z/i
-          hz_name = (@hosted_zone.name || @options.hosted_zone_name).downcase.sub(/\.\Z/, '')
-          rrs_name = @resource_record_set.name.downcase.sub(/\.\Z/, '')
+        if self.type =~ /\A(SOA|NS)\z/i
+          hz_name = (@hosted_zone.name || @options.hosted_zone_name).downcase.sub(/\.\z/, '')
+          rrs_name = @resource_record_set.name.downcase.sub(/\.\z/, '')
           return if hz_name == rrs_name
         end
 

data/lib/roadworker/version.rb

@@ -1,3 +1,3 @@
 module Roadworker
-  VERSION = "0.5.6.beta4"
+  VERSION = "0.5.6.beta5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roadworker
 version: !ruby/object:Gem::Version
-  version: 0.5.6.beta4
+  version: 0.5.6.beta5
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2016-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk