r53z 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a6328887d088f1a0290e8212e2d2616a39447d8
-  data.tar.gz: 65af835f05379a6a2b4453b539a8dea21427c7fd
+  metadata.gz: 4a76e281d58be3c97125591da8dd480f32cc6cb5
+  data.tar.gz: 68e49615f4b31b8f390e2c92c0b4eeb7d36251e4
 SHA512:
-  metadata.gz: 84ced6e36baa5d2e5585d95547290fffc620f5426d60e953cf10644e7a5ba8deadcb9818aa8d88cf77b2863d9f6163477f13934972228a6f078ebcb7553358ff
-  data.tar.gz: f085d157ffd9150ebc1c9c12558cada1db5a30e563f782d1bd607df472a995c5f0bc8897467ea7fda4e8d27e712f5a1497a7125ed84db04f4507aa487274c9f1
+  metadata.gz: 0f3e3e61987f2387d890147b5d71945b6cbb8a815ec35640f6d7c773943651d075eadd0ef19f1b7569f4dbb0f883cf30451325332e170802e98a0ef6233277a5
+  data.tar.gz: 90e2b3812b188c15a6f556eda3d3047eecf70fd4eeafbff9df995f2f8c671ddc71933a809433e9caa6d11afccc8b0a6e840371365d23562279f213e2d9fe561d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    r53z (0.3.0)
+    r53z (0.3.1)
       aws-sdk
       inifile
       methadone (~> 1.9.2)

data/bin/r53z

@@ -17,8 +17,8 @@ class App
   description "Simple CLI to manage, backup, and restore, Route 53 zones"
   #
   # Accept flags via:
-  on("-x", "--export", "Export zones to files in specified directory, optionally specify one or more zones.")
-  on("-r", "--restore", "Restore zone from directory, optionally specify one or more zones.")
+  on("-x DIR", "--export", "Export zones to files in specified directory, optionally specify one or more zones.")
+  on("-r DIR", "--restore", "Restore zone from directory, optionally specify one or more zones.")
   on("-l", "--list", "List name and ID of one or all zones.")
   on("-s", "--record-sets", "List record sets for the given zone.")
   on("-c NAME", "--create", "Create a zone with the given name and optional --comment and --delegation-set.")

data/lib/r53z/cli.rb

@@ -14,12 +14,14 @@ module R53z
       # XXX Dispatch table seems smarter...can't figure out how to call methods based
       # directly on hash keys at the moment.
       if options[:export]
-        help_now! "Export requires a directory path for zone files" if args.length < 1
+        unless Dir.exists?(File.expand_path(options[:export]))
+          help_now! "Export requires a directory path for zone files."
+        end
         export(:options => options, :args => args)
       end
 
       if options[:restore]
-        if args.empty?
+        unless Dir.exists?(File.expand_path(options[:restore]))
           help_now! "Restore requires a directory containing zone files and optionally one or more zones to restore."
         end
         restore(:options => options, :args => args)
@@ -73,15 +75,18 @@ module R53z
     end
 
     def export(options:, args:)
-      path = args.shift
+      path = File.expand_path(options[:export])
       # If no zones, dump all zones
       zones = []
       # One zone, multiple, or all?
       if args.empty?
-        @client.list.each do |zone|
+        @client.list(:delegation_set_id => options['delegation-set']).each do |zone|
           zones.push(zone[:name])
         end
       else
+        if options['delegation-set']
+          puts "--delegation-set is overridden when one or more zones are provided"
+        end
         zones = args
       end
 
@@ -91,7 +96,7 @@ module R53z
     end
 
     def restore(options:, args:)
-      path = args.shift
+      path = File.expand_path(options[:restore])
       # If no zones, restore all zones in directory
       zones = []
       if args.empty?

data/lib/r53z/version.rb

@@ -1,3 +1,3 @@
 module R53z
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: r53z
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Joe Cooper