roadworker 0.5.5.beta → 0.5.5.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e81543d9e90eef15df2c4a3704d80e19c2851926
-  data.tar.gz: 9f22483761620b00c83b8f04113a74ade49dd894
+  metadata.gz: 0b7b069b89e59b84f3f3c4a8aa58128ba434520a
+  data.tar.gz: 819173c4d7bdec535d7807d1e3066fe566630c67
 SHA512:
-  metadata.gz: abb57434d742e5c4dd05e25c02a36ac9db3f828dfb75a3fba4c6522ce4fe65f0569931ec2b702fb23c7aaa7b376025c3d27f1f0df902fa3542f3f6927118297d
-  data.tar.gz: 470652b668e4e257e0b8af7b6d51e0205fb9b105b33283176431821bbff036c1effa8a1721d0056801131243fcb99b3686af00b8f0bf63c974497ecab012efb0
+  metadata.gz: d65f03eaf82f516b3434c1b1d7792c775ec36dc2d1bfe9c2a367031fbe4f5fd732cf2b85a24169b42fa49064e350dbf5be38e85866d1d3da16fd7292f69b91c3
+  data.tar.gz: 3bf5cdd51a192f49916af6d9e2e82120dcfba1d0f541dd64a101c7edc846097f2a5fd13600616af6e9143aa42bb317ba16ac8de598d11aa04b2cd35082200066

data/README.md

@@ -12,6 +12,8 @@ It defines the state of Route53 using DSL, and updates Route53 according to DSL.
 
 * Roadworker cannot update TTL of two or more same weighted A records (with different SetIdentifier) after creation.
 * `>= 0.4.3` compare resource records ignoring the order.
+* `>= 0.5.5`
+  * **Disable Divided HostedZone**
 
 ## Installation
 

data/lib/roadworker/client.rb

@@ -65,13 +65,15 @@ module Roadworker
     end
 
     def walk_hosted_zones(dsl)
-      expected = collection_to_hash(dsl.hosted_zones, :name)
-      actual   = collection_to_hash(@route53.hosted_zones, :name)
+      expected = collection_to_hash(dsl.hosted_zones) {|i| [normalize_name(i.name), i.vpcs.empty?] }
+      actual   = collection_to_hash(@route53.hosted_zones) {|i| [normalize_name(i.name), i.vpcs.empty?] }
 
       expected.each do |keys, expected_zone|
         name = keys[0]
         next unless matched_zone?(name)
-        actual_zone = actual.delete(keys) || @route53.hosted_zones.create(name, :vpc => expected_zone.vpcs.first)
+        actual_zone = actual.delete(keys)
+        actual_zone ||= @route53.hosted_zones.create(name, :vpc => expected_zone.vpcs.first)
+
         walk_vpcs(expected_zone, actual_zone)
         walk_rrsets(expected_zone, actual_zone)
       end
@@ -140,9 +142,13 @@ module Roadworker
       hash = {}
 
       collection.each do |item|
-        key_list = keys.map do |k|
-          value = item.send(k)
-          (k == :name && value) ? value.downcase.sub(/\.\Z/, '') : value
+        if block_given?
+          key_list = yield(item)
+        else
+          key_list = keys.map do |k|
+            value = item.send(k)
+            (k == :name && value) ? normalize_name(value) : value
+          end
         end
 
         hash[key_list] = item
@@ -151,5 +157,9 @@ module Roadworker
       return hash
     end
 
+    def normalize_name(name)
+      name.downcase.sub(/\.\Z/, '')
+    end
+
   end # Client
 end # Roadworker

data/lib/roadworker/dsl.rb

@@ -40,12 +40,7 @@ module Roadworker
     end
 
     def hosted_zone(name, &block)
-      if (hz = @result.hosted_zones.find {|i| i.name == name })
-        @result.hosted_zones.reject! {|i| i.name == name }
-        @result.hosted_zones << HostedZone.new(name, hz.rrsets, &block).result
-      else
-        @result.hosted_zones << HostedZone.new(name, [], &block).result
-      end
+      @result.hosted_zones << HostedZone.new(name, [], &block).result
     end
 
     class HostedZone

data/lib/roadworker/version.rb

@@ -1,3 +1,3 @@
 module Roadworker
-  VERSION = "0.5.5.beta"
+  VERSION = "0.5.5.beta2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roadworker
 version: !ruby/object:Gem::Version
-  version: 0.5.5.beta
+  version: 0.5.5.beta2
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-15 00:00:00.000000000 Z
+date: 2015-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1
@@ -84,16 +84,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -112,16 +112,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec-instafail
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +164,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: transpec
+  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
   using DSL, and updates Route53 according to DSL.
 email: sgwr_dts@yahoo.co.jp