roadworker 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fef636e5f5260004b8f0ae4ea2d0317f55ec0710
-  data.tar.gz: 455d3e06cc7b47ab3e6498086b72b27da0f7b7a2
+  metadata.gz: fd03e0d8f36c19ab9db21c3f8e986f0c6c4ccade
+  data.tar.gz: 115d1f3e386a881711dc728fee5c56103723b46e
 SHA512:
-  metadata.gz: f3a5039ae8e9e1a9e77111e0d7db1e553823162c9b554f76a54dea9ad0f7c034d17e343e9c8281bf3fbd438fbfb27d6584230415c69e44c865f1520e5f3e4c65
-  data.tar.gz: c8e470596d1c761577289fa12fa3a7839a130c7617a805e983a84b16736e187f655de41a9c537720519fc1d2ed68df54da2d246831cc0efa0e812f2ceb39ec51
+  metadata.gz: 72737b3db7d92bb79398411b97768b5174bd5a24b6e43e22ca8a0b91a40422193eeb26a09fad702b86e7e772bcffa1b854d2935c1c8b6b12c0b9c3dfed1f217d
+  data.tar.gz: db4ef001931289b171596608facc0f4696dafe9f8035b8583f4c60cd26d3299fc7f621500fa19ee0fadcb8f2b29732e1058a3d8e9ceb8944ac01906fb71845e5

data/README.md

@@ -59,6 +59,7 @@ Usage: roadwork [options]
         --nameservers SERVERS
         --port PORT
         --target-zone REGEXP
+        --exclude-zone REGEXP
         --no-color
         --debug
 ```
@@ -178,3 +179,6 @@ info.winebarrel.jp. A:
 
 ## Link
 * [RubyGems.org site](http://rubygems.org/gems/roadworker)
+
+## Similar tools
+* [Codenize.tools](http://codenize.tools/)

data/bin/roadwork

@@ -58,6 +58,7 @@ ARGV.options do |opt|
     opt.on(''  , '--nameservers SERVERS', Array) {|v| options[:nameservers]        = v             }
     opt.on(''  , '--port PORT', Integer)         {|v| options[:port]               = v             }
     opt.on(''  , '--target-zone REGEXP')         {|v| options[:target_zone]        = Regexp.new(v) }
+    opt.on(''  , '--exclude-zone REGEXP')        {|v| options[:exclude_zone]       = Regexp.new(v) }
     opt.on(''  , '--no-color')                   {    options[:color]              = false         }
     opt.on(''  , '--debug')                      {    options[:debug]              = true          }
     opt.parse!

data/lib/roadworker/client.rb

@@ -1,14 +1,7 @@
-require 'roadworker/string-ext'
-require 'roadworker/dsl'
-require 'roadworker/log'
-require 'roadworker/route53-wrapper'
-
-require 'logger'
-require 'ostruct'
-
 module Roadworker
   class Client
     include Roadworker::Log
+    include Roadworker::Utils::Helper
 
     def initialize(options = {})
       @options = OpenStruct.new(options)
@@ -77,11 +70,7 @@ module Roadworker
 
       expected.each do |keys, expected_zone|
         name = keys[0]
-
-        if @options.target_zone
-          next unless name =~ @options.target_zone
-        end
-
+        next unless matched_zone?(name)
         actual_zone = actual.delete(keys) || @route53.hosted_zones.create(name, :vpc => expected_zone.vpcs.first)
         walk_vpcs(expected_zone, actual_zone)
         walk_rrsets(expected_zone, actual_zone)
@@ -89,11 +78,7 @@ module Roadworker
 
       actual.each do |keys, zone|
         name = keys[0]
-
-        if @options.target_zone
-          next unless name =~ @options.target_zone
-        end
-
+        next unless matched_zone?(name)
         zone.delete
       end
     end

data/lib/roadworker/dsl-tester.rb

@@ -1,5 +1,3 @@
-require 'roadworker/log'
-
 require 'tempfile'
 require 'socket'
 
@@ -27,6 +25,7 @@ module Roadworker
   class DSL
     class Tester
       include Roadworker::Log
+      include Roadworker::Utils::Helper
 
       DEFAULT_NAMESERVERS = ['8.8.8.8', '8.8.4.4']
       ASTERISK_PREFIX = 'asterisk-of-wildcard'
@@ -283,9 +282,7 @@ module Roadworker
         record_list = {}
 
         dsl.hosted_zones.each do |zone|
-          if @options.target_zone
-            next unless zone.name =~ @options.target_zone
-          end
+          next unless matched_zone?(zone.name)
 
           zone.rrsets.each do |record|
             key = [record.name, record.type]

data/lib/roadworker/dsl.rb

@@ -1,10 +1,3 @@
-require 'roadworker/dsl-converter'
-require 'roadworker/dsl-tester'
-require 'roadworker/route53-health-check'
-
-require 'ostruct'
-require 'uri'
-
 module Roadworker
   class DSL
 

data/lib/roadworker/route53-exporter.rb

@@ -1,10 +1,6 @@
-require 'roadworker/collection'
-require 'roadworker/route53-health-check'
-
-require 'ostruct'
-
 module Roadworker
   class Exporter
+    include Roadworker::Utils::Helper
 
     class << self
       def export(route53)
@@ -32,11 +28,7 @@ module Roadworker
     def export_hosted_zones(hosted_zones)
       Collection.batch(@options.route53.hosted_zones) do |zone|
         zone_h = item_to_hash(zone, :name, :vpcs)
-
-        if @options.target_zone
-          next unless zone_h[:name] =~ @options.target_zone
-        end
-
+        next unless matched_zone?(zone.name)
         hosted_zones << zone_h
 
         rrsets = []

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

@@ -1,6 +1,3 @@
-require 'uri'
-require 'uuid'
-
 module Roadworker
   class HealthCheck
 

data/lib/roadworker/route53-wrapper.rb

@@ -1,10 +1,3 @@
-require 'roadworker/collection'
-require 'roadworker/log'
-require 'roadworker/route53-exporter'
-require 'roadworker/route53-ext'
-
-require 'ostruct'
-
 module Roadworker
   class Route53Wrapper
 

data/lib/roadworker/utils.rb

@@ -0,0 +1,19 @@
+module Roadworker
+  class Utils
+    module Helper
+      def matched_zone?(name)
+        result = true
+
+        if @options.exclude_zone
+          result &&= name !~ @options.exclude_zone
+        end
+
+        if @options.target_zone
+          result &&= name =~ @options.target_zone
+        end
+
+        result
+      end
+    end # of class methods
+  end
+end

data/lib/roadworker/version.rb

@@ -1,3 +1,3 @@
 module Roadworker
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

data/lib/roadworker.rb

@@ -1,2 +1,22 @@
+require 'logger'
+require 'ostruct'
+require 'socket'
+require 'tempfile'
+require 'uri'
+require 'uuid'
+
+require 'roadworker/string-ext'
+require 'roadworker/route53-ext'
+
 require 'roadworker/version'
+require 'roadworker/log'
+require 'roadworker/utils'
+
 require 'roadworker/client'
+require 'roadworker/collection'
+require 'roadworker/dsl'
+require 'roadworker/dsl-converter'
+require 'roadworker/dsl-tester'
+require 'roadworker/route53-exporter'
+require 'roadworker/route53-health-check'
+require 'roadworker/route53-wrapper'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roadworker
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-04 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1
@@ -185,9 +185,10 @@ files:
 - lib/roadworker/route53-health-check.rb
 - lib/roadworker/route53-wrapper.rb
 - lib/roadworker/string-ext.rb
+- lib/roadworker/utils.rb
 - lib/roadworker/version.rb
 - lib/roadworker.rb
-homepage: https://github.com/winebarrel/roadworker
+homepage: http://roadworker.codenize.tools/
 licenses:
 - MIT
 metadata: {}