roadworker 0.3.1 → 0.3.2

data/README.md

@@ -102,6 +102,10 @@ info.winebarrel.jp. A:
 
 (Please note test of A(Alias) is not possible to perfection...)
 
+## Demo
+
+![Roadworker Demo](https://bitbucket.org/winebarrel/roadworker/downloads/roadworker-demo.gif)
+
 ## DNS management using GitHub/Bitbucket
 
 ![DNS management using Git](https://cacoo.com/diagrams/geJfslZqd8qne90t-BC7C7.png)

data/bin/roadwork

@@ -26,32 +26,37 @@ options = {
 }
 
 ARGV.options do |opt|
-  access_key = nil
-  secret_key = nil
-
-  opt.on('-k', '--access-key ACCESS_KEY') {|v| access_key                   = v       }
-  opt.on('-s', '--secret-key SECRET_KEY') {|v| secret_key                   = v       }
-  opt.on('-a', '--apply')                 {|v| mode                         = :apply  }
-  opt.on('-f', '--file FILE')             {|v| file                         = v       }
-  opt.on('',   '--dry-run')               {|v| options[:dry_run]            = true    }
-  opt.on(''  , '--force')                 {    options[:force]              = true    }
-  opt.on('',   '--no-health-check-gc')    {|v| options[:no_health_check_gc] = true    }
-  opt.on('-e', '--export')                {|v| mode                         = :export }
-  opt.on('-o', '--output FILE')           {|v| output_file                  = v       }
-  opt.on('',   '--split')                 {|v| split                        = true    }
-  opt.on('',   '--with-soa-ns')           {|v| options[:with_soa_ns]        = true    }
-  opt.on('-t', '--test')                  {|v| mode                         = :test   }
-  opt.on(''  , '--no-color')              {    options[:color]              = false   }
-  opt.on(''  , '--debug')                 {    options[:debug]              = true    }
-  opt.parse!
-
-  if access_key and secret_key
-    AWS.config({
-      :access_key_id     => access_key,
-      :secret_access_key => secret_key,
-    })
-  elsif (access_key and !secret_key) or (!access_key and secret_key) or mode.nil?
-    puts opt.help
+  begin
+    access_key = nil
+    secret_key = nil
+
+    opt.on('-k', '--access-key ACCESS_KEY') {|v| access_key                   = v       }
+    opt.on('-s', '--secret-key SECRET_KEY') {|v| secret_key                   = v       }
+    opt.on('-a', '--apply')                 {|v| mode                         = :apply  }
+    opt.on('-f', '--file FILE')             {|v| file                         = v       }
+    opt.on('',   '--dry-run')               {|v| options[:dry_run]            = true    }
+    opt.on(''  , '--force')                 {    options[:force]              = true    }
+    opt.on('',   '--no-health-check-gc')    {|v| options[:no_health_check_gc] = true    }
+    opt.on('-e', '--export')                {|v| mode                         = :export }
+    opt.on('-o', '--output FILE')           {|v| output_file                  = v       }
+    opt.on('',   '--split')                 {|v| split                        = true    }
+    opt.on('',   '--with-soa-ns')           {|v| options[:with_soa_ns]        = true    }
+    opt.on('-t', '--test')                  {|v| mode                         = :test   }
+    opt.on(''  , '--no-color')              {    options[:color]              = false   }
+    opt.on(''  , '--debug')                 {    options[:debug]              = true    }
+    opt.parse!
+
+    if access_key and secret_key
+      AWS.config({
+        :access_key_id     => access_key,
+        :secret_access_key => secret_key,
+      })
+    elsif (access_key and !secret_key) or (!access_key and secret_key) or mode.nil?
+      puts opt.help
+      exit 1
+    end
+  rescue => e
+    $stderr.puts e
     exit 1
   end
 end

data/lib/roadworker/dsl-tester.rb

@@ -35,10 +35,11 @@ module Roadworker
         error_messages = []
         warning_messages = []
 
-        records.each do |key, rrs|
+        validate_record = lambda do |key, rrs, asterisk_answers|
           errors = []
 
-          name = asterisk_to_anyname(key[0])
+          original_name = key[0]
+          name = asterisk_to_anyname(original_name)
           type = key[1]
 
           log(:debug, 'Check DNS', :white, "#{name} #{type}")
@@ -93,6 +94,18 @@ module Roadworker
             end
 
             errors << [logmsg_expected, logmsg_actual] unless is_same
+
+            if asterisk_answers
+              asterisk_answers.each do |ast_key, answers|
+                ast_name = ast_key[0]
+                ast_regex = Regexp.new('\A' + ast_name.sub(/\.\Z/, '').gsub('.', '\.').gsub('*', '.+') + '\Z')
+
+                if ast_regex =~ name.sub(/\.\Z/, '') and actual_value.any? {|i| answers.include?(i) }
+                  warning_messages << "#{name} #{type}: same as `#{ast_name}`"
+                end
+              end
+            end
+
             is_same
           }
 
@@ -106,8 +119,33 @@ module Roadworker
               error_messages << "#{name} #{type}:\n  #{logmsg_expected}\n  #{logmsg_actual}"
             end
           end
+        end
+
+        asterisk_records = {}
+        asterisk_answers = {}
+
+        records.keys.each do |key|
+          asterisk_records[key] = records.delete(key) if key[0]['*']
+        end
+
+        asterisk_records.map do |key, rrs|
+          original_name = key[0]
+          name = asterisk_to_anyname(original_name)
+          type = key[1]
+
+          response = query(name, type)
+
+          if response
+            asterisk_answers[key] = response.answer.map {|i| (type == 'TXT' ? i.txt : i.value).strip }
+          end
+        end
 
-          result &&= is_valid
+        asterisk_records.each do |key, rrs|
+          validate_record.call(key, rrs, nil)
+        end
+
+        records.each do |key, rrs|
+          validate_record.call(key, rrs, asterisk_answers)
         end
 
         puts unless @options.debug
@@ -156,14 +194,14 @@ module Roadworker
         name.gsub('*', "#{ASTERISK_PREFIX}-#{rand_str}")
       end
 
-      def query(name, type, warning_messages)
+      def query(name, type, warning_messages = nil)
         ctype = Net::DNS.const_get(type)
         response = nil
 
         begin
           response = @resolver.query(name, ctype)
         rescue => e
-          warning_messages << "#{name} #{type}: #{e.message}"
+          warning_messages << "#{name} #{type}: #{e.message}" if warning_messages
         end
 
         return response

data/lib/roadworker/version.rb

@@ -1,5 +1,5 @@
 module Roadworker
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end
 
 Version = Roadworker::VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roadworker
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-04 00:00:00.000000000 Z
+date: 2013-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk