roadworker 0.2.0 → 0.2.1

data/README.md

@@ -40,28 +40,19 @@ shell> roudwork -a
 require 'other/routefile'
 
 hosted_zone "winebarrel.jp." do
-  rrset "winebarrel.jp.", "MX" do
+  rrset "winebarrel.jp.", "A" do
     ttl 300
     resource_records(
-      "10 mx.winebarrel.jp",
-      "10 mx2.winebarrel.jp"
+      "127.0.0.1",
+      "127.0.0.2"
     )
   end
 
-  rrset "winebarrel.jp.", "NS" do
-    ttl 86400
-    resource_records(
-      "ns-XXX.awsdns-XX.com.",
-      "ns-XXX.awsdns-XX.org.",
-      "ns-XXX.awsdns-XX.net.",
-      "ns-XXX.awsdns-XX.co.uk."
-    )
-  end
-
-  rrset "winebarrel.jp.", "SOA" do
-    ttl 86400
+  rrset "winebarrel.jp.", "MX" do
+    ttl 300
     resource_records(
-      "ns-XXX.awsdns-XX.com. awsdns-hostmaster.amazon.com. 1 7200 900 1209600 86400"
+      "10 mx.winebarrel.jp",
+      "10 mx2.winebarrel.jp"
     )
   end
 end

data/bin/roadwork

@@ -15,28 +15,30 @@ logger.formatter = proc {|severity, datetime, progname, msg|
 }
 
 options = {
-  :logger  => logger,
-  :dry_run => false,
-  :debug   => false,
-  :force   => false,
-  :color   => true,
+  :logger      => logger,
+  :dry_run     => false,
+  :force       => false,
+  :with_soa_ns => false,
+  :color       => true,
+  :debug       => false,
 }
 
 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('-f', '--file FILE')             {|v| file              = v       }
-  opt.on('-a', '--apply')                 {|v| mode              = :apply  }
-  opt.on('-e', '--export')                {|v| mode              = :export }
-  opt.on('-o', '--output FILE')           {|v| output_file       = v       }
-  opt.on('-t', '--test')                  {|v| mode              = :test   }
-  opt.on('',   '--dry-run')               {|v| options[:dry_run] = true    }
-  opt.on(''  , '--force')                 {    options[:force]   = true    }
-  opt.on(''  , '--no-color')              {    options[:color]   = false   }
-  opt.on(''  , '--debug')                 {    options[:debug]   = true    }
+  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| fil                   = v       }
+  opt.on('',   '--dry-run')               {|v| options[:dry_run]     = true    }
+  opt.on(''  , '--force')                 {    options[:force]       = true    }
+  opt.on('-e', '--export')                {|v| mode                  = :export }
+  opt.on('-o', '--output FILE')           {|v| output_file           = v       }
+  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

data/lib/roadworker/route53-exporter.rb

@@ -11,14 +11,14 @@ module Roadworker
       end
     end # of class method
 
-    def initialize(route53)
-      @route53 = route53
+    def initialize(options)
+      @options = options
     end
 
     def export
       result = []
 
-      Collection.batch(@route53.hosted_zones) do |zone|
+      Collection.batch(@options.route53.hosted_zones) do |zone|
         zone_h = item_to_hash(zone, :name)
         result << zone_h
 
@@ -26,6 +26,10 @@ module Roadworker
         zone_h[:rrsets] = rrsets
 
         Collection.batch(zone.rrsets) do |record|
+          if record.name == zone.name and %w(SOA NS).include?(record.type) and not @options.with_soa_ns
+            next
+          end
+
           attrs = [
             :name,
             :type,

data/lib/roadworker/route53-wrapper.rb

@@ -22,7 +22,7 @@ module Roadworker
     end
 
     def export
-      Exporter.export(@options.route53)
+      Exporter.export(@options)
     end
 
     def hosted_zones

data/lib/roadworker/version.rb

@@ -1,5 +1,5 @@
 module Roadworker
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end
 
 Version = Roadworker::VERSION

metadata

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