roadworker 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c89e85d2d1c41dc34abb5fe3373d01f9825f0d5
-  data.tar.gz: b706ac65aba1dcd92037a0557fb1da34478483cf
+  metadata.gz: 6728e9d481aa2975e230a25a60e2ad3a9607f94a
+  data.tar.gz: 0725f50ba8ae99e6b4c9e219763734eb1c9925bf
 SHA512:
-  metadata.gz: e4e279416186036dbd7120151fadc36367d28d53790203a02429a04ec7e9b300da37e82268bdbea5794afa492234b6a3ddb24a9f2ec8293aff22fbc9332a5601
-  data.tar.gz: 8b375a8a856d3905d04b57718d6923652123a1102396a3fdd25953a3e3fe4b1195e9aee712f116bd0217c0c8106e4530558ad9379fd2292da9e63cdd9c8391cc
+  metadata.gz: 0b009eb08fece5f8595cd3a5863ea5588c6f7858a95cd4dde574fd294728c620f79cba1db8e57fbb33c2e14edbdb926de1e3430f64014bdc7d9e1f80a068063a
+  data.tar.gz: 59237da6218cd64b1b85d40ab004de59e6730cf9c192acd2574096131a2cbedf408f1726f5582bc9207dcdc69483758ff757b3ef97650a1d28644d729b43a379

data/README.md

@@ -5,7 +5,7 @@ Roadworker is a tool to manage Route53.
 It defines the state of Route53 using DSL, and updates Route53 according to DSL.
 
 [![Gem Version](https://badge.fury.io/rb/roadworker.png)](http://badge.fury.io/rb/roadworker)
-[![Build Status](https://drone.io/bitbucket.org/winebarrel/roadworker/status.png)](https://drone.io/bitbucket.org/winebarrel/roadworker/latest)
+[![Build Status](https://travis-ci.org/winebarrel/roadworker.svg?branch=master)](https://travis-ci.org/winebarrel/roadworker)
 
 **Notice**
 
@@ -37,6 +37,28 @@ roadwork -a --dry-run
 roudwork -a
 ```
 
+## Help
+
+```
+Usage: roadwork [options]
+    -p, --profile PROFILE_NAME
+    -k, --access-key ACCESS_KEY
+    -s, --secret-key SECRET_KEY
+    -a, --apply
+    -f, --file FILE
+        --dry-run
+        --force
+        --no-health-check-gc
+    -e, --export
+    -o, --output FILE
+        --split
+        --with-soa-ns
+    -t, --test
+        --nameservers SERVERS
+        --no-color
+        --debug
+```
+
 ## Routefile example
 
 ```ruby
@@ -112,7 +134,7 @@ info.winebarrel.jp. A:
 
 ## Demo
 
-![Roadworker Demo](https://bitbucket.org/winebarrel/roadworker/downloads/roadworker-demo.gif)
+![Roadworker Demo](https://raw.githubusercontent.com/winebarrel/roadworker/master/etc/demo.gif)
 
 ## DNS management using GitHub/Bitbucket
 

data/bin/roadwork

@@ -45,6 +45,7 @@ ARGV.options do |opt|
     opt.on('',   '--with-soa-ns')                {    options[:with_soa_ns]        = true    }
     opt.on('-t', '--test')                       {    mode                         = :test   }
     opt.on(''  , '--nameservers SERVERS', Array) {|v| options[:nameservers]        = v       }
+    opt.on(''  , '--port PORT', Integer)         {|v| options[:port]               = v       }
     opt.on(''  , '--no-color')                   {    options[:color]              = false   }
     opt.on(''  , '--debug')                      {    options[:debug]              = true    }
     opt.parse!

data/lib/roadworker/dsl-tester.rb

@@ -82,11 +82,20 @@ module Roadworker
             expected_value = (record.resource_records || []).map {|i| i[:value].strip }.sort
             expected_ttl = fetch_dns_name(record.dns_name) ? 60 : record.ttl
 
-            actual_value = response.answer.map {|i| (%w(TXT SPF).include?(type) ? i.txt : i.value).strip }.sort
+            actual_value = response.answer.map {|i|
+              case type
+              when 'TXT', 'SPF'
+                i.txt
+              when 'SRV'
+                [i.priority, i.weight, i.port, fix_srv_host(name, i.host)].join(' ')
+              else
+                i.value
+              end
+            }.map {|i| i.strip }.sort
             actual_ttls = response.answer.map {|i| i.ttl }
 
             case type
-            when 'NS', 'PTR', 'MX', 'CNAME'
+            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/, '') }
             when 'TXT', 'SPF'
@@ -95,6 +104,11 @@ module Roadworker
               actual_value = actual_value.map {|i| i.strip }
             end
 
+            if ['SRV', 'MX'].include?(type)
+              expected_value = expected_value.map {|i| i.gsub(/\s+/, ' ') }
+              actual_value = actual_value.map {|i| i.gsub(/\s+/, ' ') }
+            end
+
             expected_message = record.resource_records ? expected_value.map {|i| "#{i}(#{expected_ttl})" }.join(',') : "#{fetch_dns_name(record.dns_name)}(#{expected_ttl})"
             actual_message = actual_value.zip(actual_ttls).map {|v, t| "#{v}(#{t})" }.join(',')
             logmsg_expected = "expected=#{expected_message}"
@@ -236,9 +250,23 @@ module Roadworker
 
       private
 
+      def fix_srv_host(query_name, host)
+        if (host || '').strip.empty?
+          query_name
+        elsif host =~ /\x1A\Z/
+          host = host.sub(/\x1A\Z/, '')
+          query_name = query_name.split('.')
+          query_name.slice!(0, host.count('.'))
+          host + query_name.join('.')
+        else
+          host
+        end
+      end
+
       def create_resolver
         log_file = @options.debug ? Net::DNS::Resolver::Defaults[:log_file] : '/dev/null'
         resolver_opts = {:log_file => log_file}
+        resolver_opts[:port] = @options.port if @options.port
 
         if File.exist?(Net::DNS::Resolver::Defaults[:config_file])
           resolver_opts[:nameservers] = @options.nameservers if @options.nameservers

data/lib/roadworker/version.rb

@@ -1,5 +1,5 @@
 module Roadworker
-  VERSION = "0.4.8"
+  VERSION = "0.4.9"
 end
 
 Version = Roadworker::VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roadworker
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -17,6 +17,9 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.48.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.48.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +142,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubydns
+  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
@@ -146,6 +166,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - bin/roadwork
+- lib/roadworker.rb
 - lib/roadworker/client.rb
 - lib/roadworker/collection.rb
 - lib/roadworker/dsl-converter.rb
@@ -158,7 +179,6 @@ files:
 - lib/roadworker/route53-wrapper.rb
 - lib/roadworker/string-ext.rb
 - lib/roadworker/version.rb
-- lib/roadworker.rb
 homepage: https://bitbucket.org/winebarrel/roadworker
 licenses:
 - MIT
@@ -179,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Roadworker is a tool to manage Route53.