roadworker 0.2.2 → 0.2.3

data/bin/roadwork

@@ -5,9 +5,11 @@ require 'roadworker'
 require 'optparse'
 require 'logger'
 
+mode = nil
 file = 'Routefile'
 output_file = '-'
-mode = nil
+split = false
+
 logger = Logger.new($stdout)
 
 logger.formatter = proc {|severity, datetime, progname, msg|
@@ -35,6 +37,7 @@ ARGV.options do |opt|
   opt.on(''  , '--force')                 {    options[:force]       = 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   }
@@ -67,14 +70,39 @@ begin
 
   case mode
   when :export
-    exported = client.export
+    if split
+      logger.info('Export Route53')
+
+      output_file = 'Routefile' if output_file == '-'
+      requires = []
+
+      client.export do |hosted_zones, converter|
+        hosted_zones.each do |zone|
+          route_file = File.join(File.dirname(output_file), "#{zone[:name].sub(/\.\Z/, '')}.route")
+          requires << route_file
+
+          logger.info("  write `#{route_file}`")
+          open(route_file, 'wb') {|f| f.puts converter.call([zone]) }
+        end
+      end
+
+      logger.info("  write `#{output_file}`")
 
-    if output_file == '-'
-      logger.info('# Export Route53')
-      puts client.export
+      open(output_file, 'wb') do |f|
+        requires.each do |route_file|
+          f.puts "require '#{File.basename route_file}'"
+        end
+      end
     else
-      logger.info("Export Route53 to `#{output_file}`")
-      open(output_file, 'wb') {|f| f.puts client.export }
+      exported = client.export
+
+      if output_file == '-'
+        logger.info('# Export Route53')
+        puts client.export
+      else
+        logger.info("Export Route53 to `#{output_file}`")
+        open(output_file, 'wb') {|f| f.puts client.export }
+      end
     end
   when :test
     # XXX:

data/lib/roadworker/client.rb

@@ -36,7 +36,12 @@ module Roadworker
 
     def export
       exported = AWS.memoize { @route53.export }
-      DSL.convert(exported)
+
+      if block_given?
+        yield(exported, DSL.method(:convert))
+      else
+        DSL.convert(exported)
+      end
     end
 
     def test(file)

data/lib/roadworker/dsl-tester.rb

@@ -33,6 +33,7 @@ module Roadworker
         records = fetch_records(dsl)
         failures = 0
         error_messages = []
+        warning_messages = []
 
         records.each do |key, rrs|
           errors = []
@@ -42,7 +43,7 @@ module Roadworker
 
           log(:debug, 'Check DNS', :white, "#{name} #{type}")
 
-          response = query(name, type)
+          response = query(name, type, warning_messages)
 
           unless response
             failures += 1
@@ -77,7 +78,7 @@ module Roadworker
             if record.dns_name
               # A(Alias)
               is_same = response.answer.all? {|a|
-                query(a.value, 'PTR').answer.all? do |ptr|
+                query(a.value, 'PTR', warning_messages).answer.all? do |ptr|
                   ptr.value =~ /\.compute\.amazonaws\.com\.\Z/
                 end
               }
@@ -115,6 +116,10 @@ module Roadworker
           log(:warn, msg, :intense_red)
         end
 
+        warning_messages.each do |msg|
+          log(:warn, "WARNING #{msg}", :intense_yellow)
+        end
+
         [records.length, failures]
       end
 
@@ -151,14 +156,14 @@ module Roadworker
         name.gsub('*', "#{ASTERISK_PREFIX}-#{rand_str}")
       end
 
-      def query(name, type)
+      def query(name, type, warning_messages)
         ctype = Net::DNS.const_get(type)
         response = nil
 
         begin
           response = @resolver.query(name, ctype)
         rescue => e
-          log(:warn, "WARNING #{e.message}", :yellow, "#{name} #{type}")
+          warning_messages << "#{name} #{type}: #{e.message}"
         end
 
         return response

data/lib/roadworker/version.rb

@@ -1,5 +1,5 @@
 module Roadworker
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end
 
 Version = Roadworker::VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roadworker
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors: