roadworker 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efa1def64b9857b4163dec7834451bd043691b02
-  data.tar.gz: 22896a3d8aec83cbe1e8cd35902a19bae813a9ff
+  metadata.gz: a0d3f642ddf0b9f28e2c6607a14c70f71a05d6e3
+  data.tar.gz: 2068acde30d38e452d3a3840f7d136ce0d5b4ae0
 SHA512:
-  metadata.gz: 0ff0d8d411d8946dcf5d6c603176fec39ce612ad9ff0b32ef5d197735c9e697d6d5f7c1bb20c26dbacec5fa498145a44877fc015cd61711df2d11d3772149ce3
-  data.tar.gz: 58a926b9dd085d59a817cd0a4b8a72fe922daddee9f1b1199f3b00f63598eece18d88dcc2b4d006d249c58ef7c85d08e5e422d4c1b01ffd3ff039577a007402f
+  metadata.gz: 9a6142c0e48b09eb6ac983ad9abb34e157c2dcd7c8518d49c44b196f7d909c2cd0340115e36060631507db12e85c02bea8bf1a9e65dcc1d34f3780f801241f79
+  data.tar.gz: 3dc7c2db81defc7750e085c44f2b35db93d24bf4bb8c3315bf46f8ae511fc3f0187a4a688f1cb7cb90e8b9447ff5d7855e0e860dedd805961e340433c09dcb2e

data/lib/roadworker/dsl-tester.rb

@@ -92,7 +92,7 @@ module Roadworker
               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(' ').strip }
+              expected_value = expected_value.map {|i| i.scan(/(?:\\\\|(?:\\"|(?:[^\\"]|[^"])))*"((?:\\\\|(?:\\"|(?:\\"|(?:[^\\"]|[^"]))))*)"/).join(' ').gsub(/\\(.)/) { $1 }.strip }
               actual_value = actual_value.map {|i| i.strip }
             end
 

data/lib/roadworker/route53-exporter.rb

@@ -72,9 +72,9 @@ module Roadworker
     def item_to_hash(item, *attrs)
       h = {}
 
-      attrs.each do |attr|
-        value = item.send(attr)
-        h[attr] = value if value
+      attrs.each do |attribute|
+        value = item.send(attribute)
+        h[attribute] = value if value
       end
 
       return h

data/lib/roadworker/route53-wrapper.rb

@@ -126,20 +126,20 @@ module Roadworker
         else
           opts = {}
 
-          Route53Wrapper::RRSET_ATTRS.each do |attr|
-            value = expected_record.send(attr)
+          Route53Wrapper::RRSET_ATTRS.each do |attribute|
+            value = expected_record.send(attribute)
             next unless value
 
-            case attr
+            case attribute
             when :dns_name
-              attr = :alias_target
+              attribute = :alias_target
               value = AWS::Route53.dns_name_to_alias_target(value, @hosted_zone.id, @hosted_zone.name || @options.hosted_zone_name)
             when :health_check
-              attr = :health_check_id
+              attribute = :health_check_id
               value = @options.health_checks.find_or_create(value)
             end
 
-            opts[attr] = value
+            opts[attribute] = value
           end
 
           record = @resource_record_sets.create(name, type, opts)
@@ -160,16 +160,16 @@ module Roadworker
       end
 
       def eql?(expected_record)
-        Route53Wrapper::RRSET_ATTRS_WITH_TYPE.all? do |attr|
-          expected = expected_record.send(attr)
+        Route53Wrapper::RRSET_ATTRS_WITH_TYPE.all? do |attribute|
+          expected = expected_record.send(attribute)
           expected = nil if expected.kind_of?(Array) && expected.empty?
-          actual = self.send(attr)
+          actual = self.send(attribute)
           actual = nil if actual.kind_of?(Array) && actual.empty?
 
           if !expected and !actual
             true
           elsif expected and actual
-            case attr
+            case attribute
             when :dns_name
               expected = expected.downcase.sub(/\.\Z/, '')
               actual = actual.downcase.sub(/\.\Z/, '')
@@ -191,19 +191,19 @@ module Roadworker
 
         log(:info, 'Update ResourceRecordSet', :green, &log_id_proc)
 
-        Route53Wrapper::RRSET_ATTRS_WITH_TYPE.each do |attr|
-          expected = expected_record.send(attr)
+        Route53Wrapper::RRSET_ATTRS_WITH_TYPE.each do |attribute|
+          expected = expected_record.send(attribute)
           expected = nil if expected.kind_of?(Array) && expected.empty?
-          actual = self.send(attr)
+          actual = self.send(attribute)
           actual = nil if actual.kind_of?(Array) && actual.empty?
 
           if (expected and !actual) or (!expected and actual)
-            log(:info, "  set #{attr}=#{expected.inspect}" , :green)
-            self.send(:"#{attr}=", expected) unless @options.dry_run
+            log(:info, "  set #{attribute}=#{expected.inspect}" , :green)
+            self.send(:"#{attribute}=", expected) unless @options.dry_run
           elsif expected and actual
             if expected != actual
-              log(:info, "  set #{attr}=#{expected.inspect}" , :green)
-              self.send(:"#{attr}=", expected) unless @options.dry_run
+              log(:info, "  set #{attribute}=#{expected.inspect}" , :green)
+              self.send(:"#{attribute}=", expected) unless @options.dry_run
             end
           end
         end

data/lib/roadworker/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roadworker
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-01 00:00:00.000000000 Z
+date: 2014-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk