roadworker 0.5.7 → 0.5.8.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fe9d5b0776331837b7cf6bd2ebbf040295fa597
-  data.tar.gz: 483e6c270f29fa43125663b8fe20c840f67d43e6
+  metadata.gz: 96ce8fe624182e9f1359bda2e4859d01cc574066
+  data.tar.gz: 40dc9668ed72d8571d504a6b006ed90d12975c3a
 SHA512:
-  metadata.gz: 5e6fc9d11b4b10d25a84c5aa5d10784640f950cae23f7ddd5740b157fcc0a5c8b57bebc5d99f0115e6d00f606cf5a39d6fbbacd1a7d62a061d02e356955d99a8
-  data.tar.gz: ae9b8d24576843ae3d36691e71603ce0919d4e6c9a07815013f6bb78291a135ec5742d460f105eda7fe01cd031907ee2917d2a6c5ff8373600dfdd3afa0cda8d
+  metadata.gz: feef75736ca96beae549fecf6edeee7daf4df51f21beaf176d6c4e1d780e5aa7e1aa1c2b7ae11836038dee3114769b3c10f4dffc94a4a941b22af440076d08bc
+  data.tar.gz: 29dcbb331bd6a942f812aec98812632d860b13c5c5ad9ab62a29435f8e62184fb000eec55d111eb582fc824e72d28393f619a76a3e08ca5a575e62f19c7a030f

data/README.md

@@ -197,6 +197,20 @@ hosted_zone "winebarrel.jp." do
 end
 ```
 
+### Exclude specific records from management under Roadworker
+
+Use this if your zone contains rrsets managed by other tools, and you want to ignore them in Roadworker.
+
+```ruby
+hosted_zone "winebarrel.jp." do
+  ignore "ignore.winebarrel.jp"
+  ignore /^regexp-ignore/
+
+  # *.ignore2.winebarrel.jp and ignore2.winebarrel.jp
+  ignore_under "ignore2.winebarrel.jp"
+end
+```
+
 ## Test
 
 Routefile compares the results of a query to the DNS and DSL in the test mode.

data/lib/roadworker/client.rb

@@ -122,6 +122,13 @@ module Roadworker
           actual_record = actual.delete([name, actual_type, set_identifier])
         end
 
+        if expected_zone.ignore_patterns.any? { |pattern| pattern === name }
+          log(:warn, "Ignoring defined record in DSL, because it is ignored record", :yellow) do
+            "#{name} #{type}" + (set_identifier ? " (#{set_identifier})" : '')
+          end
+          next
+        end
+
         if actual_record
           unless actual_record.eql?(expected_record)
             actual_record.update(expected_record)
@@ -132,6 +139,11 @@ module Roadworker
       end
 
       actual.each do |keys, record|
+        name = keys[0]
+        if expected_zone.ignore_patterns.any? { |pattern| pattern === name }
+          next
+        end
+        
         record.delete
       end
     end

data/lib/roadworker/dsl-tester.rb

@@ -298,7 +298,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

@@ -68,6 +68,7 @@ module Roadworker
           :vpcs => [],
           :resource_record_sets => rrsets,
           :rrsets => rrsets,
+          :ignore_patterns => [],
         })
 
         instance_eval(&block)
@@ -93,6 +94,19 @@ module Roadworker
         @result.vpcs << vpc_h
       end
 
+      def ignore(rrset_name)
+        @result.ignore_patterns << case rrset_name
+        when Regexp
+          rrset_name
+        else 
+          rrset_name.to_s.sub(/\.\z/, '')
+        end
+      end
+
+      def ignore_under(rrset_name)
+        ignore /(\A|\.)#{Regexp.escape(rrset_name.to_s.sub(/\.\z/, ''))}\z/
+      end
+
       def resource_record_set(rrset_name, type, &block)
         if rrset_name.sub(/\.\z/, '') !~ /#{Regexp.escape(@name.sub(/\.\Z/, ''))}\Z/i
           raise "Invalid ResourceRecordSet Name: #{rrset_name}"

data/lib/roadworker/version.rb

@@ -1,3 +1,3 @@
 module Roadworker
-  VERSION = "0.5.7"
+  VERSION = "0.5.8.beta"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roadworker
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8.beta
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2016-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -247,12 +247,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Roadworker is a tool to manage Route53.