vzcdn 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ab3dde228779094870d79d8794f4b40128a7910
-  data.tar.gz: 819e89b69b19dee444471a32227cf9652576b6a7
+  metadata.gz: 5defb8c0d907a56ce79b0d129ca104687c4e1db1
+  data.tar.gz: 122ceba67885edbdacba2d6178b1cc3a2889afef
 SHA512:
-  metadata.gz: b0e14f296d6df37b7c8b0fe6c32516da978fbd00adcf3a9160df96829b558d655b386052a82fb5236deb00d8e3ffa320b1ff5cd3677b2ad03679a5a99721e79e
-  data.tar.gz: 09a23650f5a1cef68ae69868ab83ecd9d461df13676be3ad1b790ceb598ed8e652185008a0ad9704cd163a2abc66369b09e6187c3f5aca203bf4f75ba433909f
+  metadata.gz: 432815ea229141614d538475134234d79412b2e1d402b0a0de6b393aa744fafd8ce5c008996591b3815dcae8b3e119232b86c042928e0865a33bba5d1817552f
+  data.tar.gz: 24e95955bbeff970bead4b7061f8d38952a36abe86f273cb3922a2fb6c6a809a458c545958c7e9948bb42b65143de2191522267cf38f2a7077a1e67ce6364ed3

data/README.md

@@ -4,6 +4,10 @@ Commandline UI for Edgecast API
 
 ##RELEASE NOTES
 
+2014/04/22      0.1.8
+ * Create zone support
+ * Add record support
+
 2014/04/17      0.1.7
  * Default action - print
  * Presentation changes for zone display ( <object> to "...", array elements to [num] etc)

data/bin/ec

@@ -2,6 +2,8 @@
 
 require 'vzcdn'
 
+# $debug = true
+
 def add_prefix(prefix, text)
   result = ""
   text.each_line { |line|
@@ -18,7 +20,6 @@ end
 
 begin
   VzcdnApp.new("vzcdn", "vzcdn").run(ARGV)
-  
   exit 0
 rescue Exception => e
   if e.class != SystemExit

data/bin/vzcdn

@@ -2,6 +2,8 @@
 
 require 'vzcdn'
 
+# $debug = true
+
 def add_prefix(prefix, text)
   result = ""
   text.each_line { |line|
@@ -18,7 +20,6 @@ end
 
 begin
   VzcdnApp.new("vzcdn", "vzcdn").run(ARGV)
-  
   exit 0
 rescue Exception => e
   if e.class != SystemExit

data/lib/args.rb

@@ -1,37 +1,85 @@
 require_relative 'route'
 
-class Arg
-  attr_accessor :desc, :required, :default, :validator, :name, :next_node, :repeatable
-  attr_reader :value
+class Cell
+  attr_accessor :required, :repeatable, :value, :default
 
-  def initialize(name, hash={ })
-    @name = name
+  def initialize(object, hash = { })
+    @obj = object
     hash.each {|k,v| instance_variable_set("@#{k}",v)}
     if @repeatable
-      @full = false
+      @value = [ ]
     end
   end
 
   def full?
-    if @repeatable
-      @full
-    else
-      ! @value.nil?
+    @full
+  end
+
+  def command
+    @obj.class <= Command ? @obj : nil
+  end
+
+  # return nil on success, error message on failure
+  def set(value, target)
+    case
+    when @obj.class == Arg
+      error = @obj.validate?(value, target)
+      if error
+        if @repeatable
+          @full = true
+        end
+        return error
+      end
+      if @obj.validator.class == Hash
+        value = @obj.validator[value]
+      end
+      if @repeatable
+        @value << value
+      else
+        @value = value
+        @full = true
+      end
+    when @obj.class <= Command
+      if value == @obj.name
+        @value = @obj
+        @full = true
+      else
+        return "incorrect command name"
+      end  
     end
+    nil
   end
 
-  def value=(value)
-    if @repeatable
-      @value = [ ] if @value.nil?
-      @value << value
-    else
-      @value = value
+  def missing_value
+    if @value.nil? && @default
+      set(@default, nil)
     end
+    return false unless @required
+    @value.nil?
   end
 
-  # return true on success
-  # error message on failure
+  def name
+    @obj.name
+  end
+
+  def desc
+    @obj.desc
+  end
+
+end
 
+class Arg
+  attr_reader :name, :desc, :validator
+
+  def initialize(name, desc, validator)
+    @name = name
+    @desc = desc
+    @validator = validator
+  end
+
+
+  # return nil on success
+  # error message on failure
   def validate?(value, obj)
     vclass = @validator.class
     if vclass == Regexp
@@ -39,10 +87,10 @@ class Arg
       on_error = "Invalid Format for " + @name
     elsif vclass == Array
       test = @validator.include? value
-      on_error = "Invalid choice for " + @name + ", must be one of " + @validator.to_s
+      on_error = "Invalid choice for #{@name}, must be one of #{@validator}"
     elsif vclass == Hash
       test = @validator.has_key? value
-      on_error = "Invalid choice for " + @name + ", must be one of " + @validator.keys.to_s
+      on_error = "Invalid choice for #{@name}, must be one of #{@validator.keys}"
     elsif vclass == String
       result = {}
       Route.new.send("get_available_" + @validator).each { |hash|
@@ -55,13 +103,12 @@ class Arg
         test = false
       end
     elsif vclass == Symbol
-      on_error, test = obj.send(@validator, value)
+      if obj
+        on_error, test = obj.send(@validator, value)
+      end
     else
       test = false
-      on_error = "unknown type of validator:" + @validator.to_s + ", class=" + @validator.class.to_s
-    end
-    if not test && @repeatable
-      @full = true
+      on_error = "unknown type of validator:#{@validator}, class=#{@validator.class}"
     end
     if test
       nil
@@ -72,162 +119,103 @@ class Arg
 end
 
 class Flow
-  attr_reader :root, :command
-
-  def initialize(*args)
-    @root = nil
-    add(*args)
-  end
-
-  def iargs(node, args)
-    if node.nil?
-      return args
-    end
-    if (node.class == Arg)
-      if node.value
-        new_args = args.clone
-        new_args[node.name] = node.value
-        args = new_args
-      end
-      iargs(node.next_node, args)
-    elsif node.is_a? Command
-      args["command"] = node
-      return args
-    end
-  end
+  attr_accessor :usage_string
 
-  def args
-    iargs(@root, {})
+  def initialize
+    @cells = [ ]
   end
 
-  def validate_and_set(value, node)
-    response = node.validate?(value, @target)
-    if response.nil?
-      node.value = value
-    end
-    response
+  def add(*cells)
+    cells.each { |cell|
+      @cells << cell
+    }
   end
 
-  def isetvalue(value, node)
-    if node.nil?
-      return nil, :finished
-    end
-    if node.full?
-      return isetvalue(value, node.next_node)
-    end
-    if node.class == Arg
-      error = validate_and_set(value, node)
-      if error && node.repeatable
-        return isetvalue(value, node.next_node)
+  def parse(args, obj = nil)
+    @target = obj
+    rest = [ ]
+    args.each_with_index { |arg, index|
+      name, value = Util.parse_line(arg)
+      if value.nil?
+        value = name
+        error, finished = setvalue(value)
       else
-        return error, nil
+        error, finished = set(name, value)
       end
-    elsif node.is_a? Command
-      if value == node.name.to_s
-        node.setfull
-        return nil, nil
-      else
-        return "incorrect command name", nil
+      if error
+        result = add_errline(result, error)
+        finished = :finished
       end
+      if finished
+        rest = args[index..-1]
+        break
+      end
+    }
+    missing = missing_args
+    unless missing.empty?
+      result = add_errline(result, "missing args: #{missing}")
     end
+    # dputs "parse for class #{obj.class} result=#{result}, rest=#{rest}"
+    return result, rest
   end
 
   def setvalue(value)
-    isetvalue(value, @root)
-  end
-
-  def iset(name, value, node)
-    if node.nil?
-      return "could not find argument with name #{name}", :finished
-    end
-    if (node.class == Arg )
-      if (node.name == name)
-        error = validate_and_set(value, node)
-        return error, nil
+    @cells.each { |cell|
+      if cell.full?
+        next
       else
-        return iset(name, value, node.next_node)
+        error = cell.set(value, @target)
+        if error && cell.repeatable
+          next
+        end
+        return error, nil
       end
-    end
-  end
-
-  # return true for success
-  #        false for unable to find arg name
-  #        String for invalid arg
-  def set(name, value)
-    iset(name, value, @root)
-  end
-
-  def iadd(arg, node)
-    if node.next_node.nil?
-      node.next_node = arg
-    else
-      iadd(arg, node.next_node)
-    end      
+    }
+    return nil, :finished
   end
 
-  def add(*args)
-    return if args.length == 0
-    if @root.nil?
-      @root = args.shift
-    end  
-    args.each { |arg|
-      iadd(arg, @root)
+  def missing_args
+    missing = [ ]
+    @cells.each { |cell|
+      if cell.missing_value
+        missing << cell.name
+      end
     }
-    self
+    missing
   end
 
-  def to_s
-    result = ""
-    args = iargs(@root, {})
-    args.each { |name, value|
-      result = result + "\n#{name}:#{value}"
+  def set(name, value)
+    @cells.each { |cell|
+      if cell.name == name
+        return cell.set(value, @target), nil
+      end
     }
-    result
-  end
-  
-  def print_flow(node)
-    if node.nil?
-      return
-    end
-    result = node.name + " - " + node.desc
-    if (node.value)
-      result += ":" + node.value
-    end
-    puts result
-    print_flow(node.next_node)
+    return "argument named #{name} not found", nil
   end
 
-  def iusage(node, names, desc)
-    return names, desc if node.nil?
-    if node.class == Arg || node.is_a?(Command)
-      names << (node.class == Arg ? "<#{node.name}>" : node.name)
-      desc << node.desc
-      iusage node.next_node, names, desc
+  def command
+    if @cells[-1]
+      @cells[-1].command
     end
-    return names, desc
   end
 
-  def usage
-    names, desc = iusage root, [ ], [ ]
-  end
-
-  def ivalidate(node, missing)
-    return missing if node.nil?
-    if node.class == Arg
-      if (node.required) && (node.value.nil?) 
-        missing << node.name
-      end
-      ivalidate node.next_node, missing
-    elsif node.is_a? Command
-      if node.required? && (not node.full?)
-        missing << node.name
-      end
-    end
-    missing
+  def arghash
+    result = { }
+    @cells.each { |cell|
+      result[cell.name] = cell.value
+    }
+    result["command"] = command
+    result
   end
 
-  def validate
-    ivalidate root, [ ]
+  def usage
+    names = [ ]
+    desc = [ ]
+    @cells.each { |cell|
+      names << cell.name
+      desc << cell.desc
+    }
+    return names, desc
   end
 
   def add_errline(str, error)
@@ -237,33 +225,4 @@ class Flow
       error
     end
   end
-
-  def parse(args, obj = nil)
-    result = nil
-    rest = [ ]
-    @target = obj
-    args.each_with_index { |arg, index|
-      name, value = Util.parse_line(arg)
-      if value.nil?
-        value = name
-        error, finished = setvalue(value)
-      else
-        error, finished = set(name, value)
-      end
-
-      if error
-        result = add_errline(result, error)
-        finished = :finished
-      end
-      if finished
-        rest = args[index...args.length]
-        break
-      end
-    }
-    missing = validate
-    if ! missing.empty?
-      result = add_errline(result, "missing args:" + missing.to_s)
-    end
-    return result, rest
-  end
 end

data/lib/clui_config.rb

@@ -6,11 +6,13 @@ class ConfigInit < Command
 
   include ConfigReader
 
+  def create_args
+    add_arg("acct-num", "EdgeCast account number", /[[:alnum:]]+/)
+    add_arg("token", "Web Services REST API Token (see my.edgecase.com)", /.*/)
+  end
+
   def create_flows
-    flow = Flow.new
-    flow.add(Arg.new("acct-num", desc: "EdgeCast account number", required: true, validator: /[[:alnum:]]+/))
-    flow.add(Arg.new("token", desc: "Web Services REST API Token (see my.edgecase.com)", required: true, validator: /.*/))
-    add_flow(flow)
+    add_flow_from_usage("<acct-num> <token>")
   end
 
   def execute(args, ignore)
@@ -29,10 +31,12 @@ class ConfigInit < Command
 end
 
 class ConfigGet < Command
+  def create_args
+    add_arg("param", "name of configuration parameter", /[-a-zA-Z]+/)
+  end
+
   def create_flows
-    flow = Flow.new
-    flow.add(Arg.new("param", desc: "name of configuration parameter", required: true, validator: /[-a-zA-Z]+/))
-    add_flow(flow)
+    add_flow_from_usage("<param>")
   end
 
   def execute(args, ignore)
@@ -42,10 +46,12 @@ class ConfigGet < Command
 end
 
 class ConfigDelete < Command
+  def create_args
+    add_arg("param", "name of configuration parameter",  /[-a-zA-Z]+/)
+  end
+
   def create_flows
-    flow = Flow.new
-    flow.add(Arg.new("param", desc: "name of configuration parameter", required: true, validator: /[-a-zA-Z]+/))
-    add_flow(flow)
+    add_flow_from_usage("<param>")
   end
 
   def execute(args, ignore)
@@ -55,11 +61,13 @@ class ConfigDelete < Command
 end
 
 class ConfigSet < Command
+  def create_args
+    add_arg("param", "name of configuration parameter", /[-a-zA-Z]+/)
+    add_arg("value", "value of configuration parameter", /.*/)
+  end
+
   def create_flows
-    flow = Flow.new
-    flow.add(Arg.new("param", desc: "name of configuration parameter", required: true, validator: /[-a-zA-Z]+/))
-    flow.add(Arg.new("value", desc: "value of configuration parameter", required: true, validator: /.*/))
-    add_flow(flow)
+    add_flow_from_usage("<param> <value>")
   end
 
   def execute(args, ignore)
@@ -69,11 +77,18 @@ class ConfigSet < Command
 end
 
 class ConfigCommand < Command
+  def create_args
+    add_cmd(ConfigInit, "init", "initialize in current directory")
+    add_cmd(ConfigGet, "get", "print configuration parameter's value")
+    add_cmd(ConfigDelete, "delete", "delete configuration parameter")
+    add_cmd(ConfigSet, "set", "set (or reset) a configuration parameter to specified value")
+  end
+
   def create_flows
-    add_flow(Flow.new.add(ConfigInit.new(:init, "initialize in current directory")))
-    add_flow(Flow.new.add(ConfigGet.new(:get, "print configuration parameter's value")))
-    add_flow(Flow.new.add(ConfigDelete.new(:delete, "delete configuration parameter")))
-    add_flow(Flow.new.add(ConfigSet.new(:set, "set (or reset) a configuration parameter to specified value")))
+    add_flow_from_usage("init")
+    add_flow_from_usage("get")
+    add_flow_from_usage("delete")
+    add_flow_from_usage("set")
   end
 
   def execute(args, subargs)

data/lib/command.rb

@@ -12,36 +12,15 @@ class Command
     @name = name
     @desc = description
     @options = [{ short_name: 'h', long_name: 'help', method: :show_help_option, takes_value: false }]
-    init
     @flows = [ ]
-    @arghash = { }
+    @cellhash = { }
+    @subcommands = [ ]
+    @input = { }
+
+    init
     add_options
     create_args
     create_flows
-    @args = nil
-    @full = false
-    @required = true
-  end
-
-  # TODO: make Flow keep track of next_node and fullness
-  def next_node
-    nil
-  end
-
-  def full?
-    return @full
-  end
-
-  def setfull
-    @full = true
-  end
-
-  def required?
-    @required
-  end
-
-  def required=(value)
-    @required = value
   end
 
   def init
@@ -53,7 +32,13 @@ class Command
   def create_args
   end
 
+  # default is to have one flow with no arguments
   def create_flows
+    add_flow(Flow.new)
+  end
+
+  def add_input(name, value)
+    @input[name] = value
   end
 
   def add_option(option)
@@ -67,33 +52,69 @@ class Command
 
   def show_help
     puts "#{@name} - #{@desc}"
+    puts "Usage:" 
     @flows.each { |flow|
-      names, desc = flow.usage
-      if (names.length > 0)
-        puts "usage:" + @name.to_s + " " + "#{[names].join(" ")}"
-        where_clause = ""
-        names.zip(desc).each { |name, description|
-          if name =~ /\A<.*>\B/
-            where_clause = where_clause + "\n  #{name}: #{description}"
-          end
-        }
-        if where_clause.length > 0
-          puts "where:#{where_clause}"
-          puts ""
+      puts "  #{@name} #{flow.usage_string}"
+    }
+    puts "Where:"
+    @cellhash.each { |name,arg|
+      if arg.class == Arg
+        choice = ""
+        if arg.validator.class == String
+          error, ignore = arg.validate?("asdf", nil)
+        end
+        if arg.validator.class == Array
+          choice = " - value from #{arg.validator}"
+        elsif arg.validator.class == Hash
+          choice = " - value from #{arg.validator.keys}"
         end
+
+        puts "  #{arg.name} : #{arg.desc}#{choice}"
       end
     }
   end
 
-  def add_arg(name, arg)
-    @arghash[name] = arg
+  def add_arg(name, desc, validator)
+    name = name.to_s
+    arg = Arg.new(name, desc, validator)
+    @cellhash[name] = arg
   end
 
-  def add_flow_from_args(*keys)
+  def add_cmd(cmd_class, name, desc)
+    name = name.to_s
+    cmd = cmd_class.new(name, desc)
+    @cellhash[name] = cmd
+    @subcommands << name
+  end
+
+  def command_name?(str)
+    @subcommands.include?(str.to_s)
+  end
+
+  def add_flow_from_usage(usage)
     flow = Flow.new
-    keys.each { |key|
-      flow.add(@arghash[key])
-    }
+    flow.usage_string = usage
+    line = usage
+    re = /\A
+         (                                 # matches one arg spec
+           (?<optional>  \[)?              # turn on 'optional' if we see an open square bracket
+           <?(?<argname> [[:alnum:]-]+)>?  # argname is inside optional angle brackets and consists of alphanumerics and dashes
+           (=\'(?<default>[^\']+)\')?      # default value has form ='value'
+           (?<repeatable> \s*\.\.\.)?      # three dots turn on 'repeatable'
+           \]?                             # matching close square bracket
+         )                                 # end of arg spec
+         \s* /x                            # skips white space
+    index = 0
+    while(m = re.match(line))
+      argname = m[:argname]
+      required = m[:optional].nil?
+      repeatable = (not m[:repeatable].nil?)
+      default = m[:default]
+      index = m.end(0)
+      line = line[index..-1]
+      cell = Cell.new(@cellhash[argname], required: required, repeatable: repeatable, default: default)
+      flow.add(cell)
+    end
     add_flow(flow)
   end
 
@@ -115,7 +136,7 @@ class Command
     @flows.each { |flow|
       error, rest = flow.parse args, self
       if error.nil?
-        execute(flow.args, rest)
+        execute(flow.arghash, rest)
         return
       end
     }

data/lib/common.rb

@@ -1,6 +1,7 @@
 require 'rest_client'
 require 'json'
 require 'config_reader'
+require_relative 'proxy_credentials'
 
 class CommonRestUtils
   include ConfigReader
@@ -19,12 +20,25 @@ class CommonRestUtils
         when :post
           RestClient.post(url, json_body, @headers)
         when :delete
-          RestClient.(url, @headers)
+          RestClient.delete(url, @headers)
         else
           "unsupported http method:" + http_method
         end
     rescue Exception => e
-      puts "Unable to connect to REST server " + param("rest_base_url")
+      puts "Problem executing REST command to server " + param("rest_base_url")
+      puts e.message
+      puts "#{e.response}"
+      proxy_auth_req = (e.message =~ /\A407 /)
+      if e.message =~ /\A407 /
+        ProxyCredentials.proxy_credentials param("proxy")
+        if @proxy_retries && @proxy_retries > 3
+          raise e.message + " too many retries"
+        else
+          @proxy_retries = @proxy_retries ? @proxy_retries + 1 : 1
+          return callMethod(url_suffix, http_method, body)
+        end  
+      end
+      exit
       if $debug
         puts "full URL is:" + url
         if (body)

data/lib/config_handler.rb

@@ -83,5 +83,4 @@ class ConfigHandler
   def delete(name)
     set(name, nil)
   end
-
 end

data/lib/proxy_credentials.rb

@@ -0,0 +1,30 @@
+require 'net/http'
+require 'rubygems/user_interaction'
+
+class ProxyCredentials
+  include Gem::UserInteraction
+  def self.proxy_credentials(proxy)
+    new.get_credentials(proxy)
+  end
+
+  def get_credentials(proxy)
+    puts "need credentials for proxy #{proxy}"
+    uri = URI(proxy)
+    proxy_host = uri.hostname
+    proxy_port = uri.port
+    proxy_user = ask("username:")
+    proxy_password = ask_for_password("password:")
+
+    uri = URI("http://blogsearch.google.com/ping/RPC2")
+    req = Net::HTTP::Get.new(uri)
+    net = Net::HTTP.new(uri.hostname, uri.port, proxy_host, proxy_port, proxy_user, proxy_password)
+    puts "created net"
+    net.read_timeout = 20
+    net.open_timeout = 20
+
+    net.start { |http|
+      response = http.request(req)
+      puts "response code from internet web service is #{response.code}, message is #{response.message}"
+    }
+  end
+end

data/lib/route.rb

@@ -110,6 +110,7 @@ class Route
     return nil if zonelist.nil?
     zonelist.each { |zone|
       translate_value(:zone_status, zone, "Status")
+      translate_value(:zone_type, zone, "ZoneType")
     }
   end
 
@@ -136,16 +137,18 @@ class Route
   end
 
   def delete_zone(id)
-    suffix = customer_suffix("dns/routezone/" + id)
+    suffix = customer_suffix("dns/routezone/#{id}")
     @common.callMethod(suffix, :delete)
   end
 
-  def add_zone()
+  def add_zone(zone)
+    suffix = customer_suffix("dns/routezone")
+    @common.callMethod(suffix, :post, zone)
   end
   
   def update_zone(zone)
     suffix = customer_suffix("dns/routezone")
-    @common.callMethod(suffix, :put, zone)    
+    @common.callMethod(suffix, :put, zone)
   end
 
   def xlate_name(symbol, name)

data/lib/vzcdn.rb

@@ -14,7 +14,8 @@ class VzcdnApp < Command
   end
 
   def print_version
-    puts "vzcdn version:" + Vzcdn::VERSION
+    puts "vzcdn Version:" + Vzcdn::VERSION
+    exit
   end
 
   def set_debug
@@ -22,13 +23,13 @@ class VzcdnApp < Command
   end
 
   def create_args
-    add_arg(:zone, Zone.new("zone", "zone"))
-    add_arg(:config, ConfigCommand.new("config", "config description"))
+    add_cmd(Zone, "zone", "dns zone command")
+    add_cmd(ConfigCommand, "config", "configuration control")
   end
 
   def create_flows
-    add_flow_from_args(:zone)
-    add_flow_from_args(:config)
+    add_flow_from_usage("zone")
+    add_flow_from_usage("config")
   end
 
   def execute(args, subargs)

data/lib/vzcdn/version.rb

@@ -1,3 +1,3 @@
 module Vzcdn
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/lib/zone.rb

@@ -3,26 +3,38 @@ require_relative 'util'
 require_relative 'print'
 require_relative 'command'
 require_relative 'args'
+require_relative 'zone_add'
 
 class ZoneList < Command
-  def execute zone
-    zone.list
+  def execute(args, rest)
+    zones = Route.do.get_all_zones
+    Route.do.translate_zonelist(zones)
+    StructurePrint.new('~').structure_print(zones, "zonelist")
   end
 end
 
 class ZonePull < Command
-  def execute zone
+  def execute(args, rest)
+    zone = @input["zone"]
     zone.pull
   end
 end
 
-class ZonePrint < Command
-  attr_writer :struct, :level, :sep_char
+class ZonePush < Command
+  def execute(args, rest)
+    zone = @input["zone"]
+    zone.push
+  end
+end
 
-  def create_flows
-    add_flow(Flow.new)
+class ZoneDelete < Command
+  def execute(args, rest)
+    zone = @input["zone"]
+    zone.delete
   end
+end
 
+class ZonePrint < Command
   def add_options 
     add_option({ short_name: 'j', long_name: 'json', method: :set_format, takes_value: false})
     # add_option({ short_name: 'f', long_name: 'force-online', method: :force_online, takes_value: false})
@@ -32,18 +44,43 @@ class ZonePrint < Command
     @format = :json
   end
 
-  def execute(args, subargs)
+  def execute(args, rest)
+    struct = @input["struct"]
+    level = @input["level"]
+    sep_char = @input["sep_char"]
     if @format == :json
-      puts JSON.pretty_generate(@struct)
+      puts JSON.pretty_generate(struct)
     else
-      StructurePrint.new(@sep_char).structure_print(@struct, @level)
+      StructurePrint.new(sep_char).structure_print(struct, level)
     end
   end
 end
 
-class ZonePush < Command
-  def execute zone
-    zone.push
+class ZoneCreate < Command
+  def create_args
+    add_arg("name", "name of zone", /[[:alnum:]\.-]+/)
+    add_arg("comment", "zone comment", /.*/)
+    add_arg("status", "zone status", 'zone_statuses')
+    add_arg("type", "zone type", 'zone_types')
+  end
+
+  def create_flows
+    add_flow_from_usage("<name> <status> [comment] [type='Primary']")
+  end
+
+  def execute(arghash, rest)
+    name = arghash["name"]
+    if name[-1] != '.'
+      name = name + '.'
+    end
+    status = arghash["status"]
+    comment = arghash["comment"]
+    comment = "" if comment.nil?
+    type = arghash["type"]
+    puts "name = #{name}, comment=#{comment}, status=#{status}, type=#{type}"
+    zone = { "Comment" => comment, "DomainName" => name, "Status" => status, "ZoneType" => type, "Records" => {"A" => [] } }
+    puts "creating zone on server"
+    Route.do.add_zone(zone)
   end
 end
 
@@ -51,28 +88,31 @@ class Zone < Command
   include ConfigReader
 
   def create_args
-    add_arg(:list, ZoneList.new("list", "list all owned zones"))
-    add_arg(:pull, ZonePull.new(:pull, "retrieve local copy of zone data"))
-    add_arg(:push, ZonePush.new(:push, "push local changes to server"))
-    arg = ZonePrint.new(:print, "print zone data.  ~~~~ online, ---- local copy")
-    arg.required = false
-    add_arg(:print, arg)
-    add_arg(:zname, Arg.new("zname", desc: "name or id of zone to pull", required: true, validator: /[[:alnum:]]+/))
-    add_arg(:zname2, Arg.new("zname", desc: "name or id of zone to pull", required: true, validator: /[[:alnum:]]+/))
-    add_arg(:drill_down, Arg.new("drill-down-param", desc: "drill down the zone structure", required: true, repeatable: true, validator: :ddverify ))
+    add_cmd(ZoneList, "list", "list all owned zones")
+    add_cmd(ZonePull, "pull", "retrieve local copy of zone data")
+    add_cmd(ZonePush, "push", "push local changes to server")
+    add_cmd(ZonePrint, "print", "print zone data.  ~~~~ online, ---- local copy")
+    add_cmd(ZoneAdd, "add", "add record/group/healthcheck")
+    add_cmd(ZoneCreate, "create", "create new zone")
+    add_cmd(ZoneDelete, "delete", "delete zone")
+    add_arg("zname", "name or id of zone", :alnum_not_command)
+    add_arg("drill-down-param", "names of fields, or indexes of items, for drilling down", :alnum_not_command)
   end
 
   def create_flows
-    add_flow_from_args(:list)
-    add_flow_from_args(:zname, :pull)
-    add_flow_from_args(:zname2, :push)
-    add_flow_from_args(:drill_down, :print)
+    add_flow_from_usage("list")
+    add_flow_from_usage("create")
+    add_flow_from_usage("<zname> pull")
+    add_flow_from_usage("<zname> push")
+    add_flow_from_usage("<zname> delete")
+    add_flow_from_usage("<zname> [<drill-down-param>...] add")
+    add_flow_from_usage("<zname> [<drill-down-param>...] [print]")
   end
 
-  def ddverify(value)
+  def alnum_not_command(value)
     test = value =~ /[[:alnum:]]+/
     if test
-      if @arghash[value.to_sym].is_a? Command
+      if command_name? value
         return "name of command", false
       else
         return nil, true
@@ -81,36 +121,77 @@ class Zone < Command
     return "invalid argument", false
   end
 
-  def execute(args, subargs)
+  def execute(args, rest)
     @zname = args["zname"]
     command = args["command"]
     ddparams = args["drill-down-param"]
     if ddparams
-      @zname = ddparams.shift
       zone = get_zone
-      @struct, @level = drill_down(zone, ddparams, "zone")
-      if command.nil?
-        command = @arghash[:print]
-      end
-      command.struct = @struct
-      command.level = @level
-      command.sep_char = @sep_char
+      struct, level = drill_down(zone, ddparams, "zone")
+      command.add_input("struct", struct)
+      command.add_input("level", level)
+      command.add_input("sep_char", @sep_char)
+      command.add_input("toplevel", zone)
     end
-    if command.class == ZonePrint
-      command.run subargs
-    elsif command
-      command.execute self
+    if command
+      command.add_input("zone", self)
+      command.run(rest)
     else
       raise "error"
     end
   end
 
-  def list
-    zones = Route.do.get_all_zones
-    Route.do.translate_zonelist(zones)
-    StructurePrint.new('~').structure_print(zones, "zonelist")
+  def push
+    puts "pushing zone to server"
+    zone = get_zone
+    Route.do.untranslate_zone(zone)
+    if $debug
+      File.open("untranslated.zone","w").write(JSON.pretty_generate zone)
+    end
+    Route.do.update_zone(zone)
+  end
+
+  def local_filename(zone)
+    file_name = zone["DomainName"].sub(/\.\Z/, '')
+    file_name = file_name + '.' + zone["ZoneId"].to_s
+  end
+
+  def write_zone_file(zone, hide_dup = false)
+    basename = local_filename(zone)
+    if hide_dup
+      file_name = config_file("zones", basename)
+      File.delete(file_name) if File.exists?(file_name)
+      File.open(file_name, "w").write(JSON.pretty_generate zone)
+    end
+    file_name = user_file("zones", basename)
+    File.delete(file_name) if File.exists?(file_name)
+    File.open(file_name, "w").write(JSON.pretty_generate zone)
+    file_name
+  end
+
+  def pull
+    zone = get_zone(true)
+    file_name = write_zone_file(zone, true)
+    puts "'#{file_name}' saved locally"
+  end
+
+  def delete_local_zone_files(id)
+    files = Dir.glob(File.join("#{config_dir}", "zones", "*.#{id}"))
+    files.each { |file| File.delete(file) }
+    files = Dir.glob(File.join("zones", "*.#{id}"))
+    files.each { |file| File.delete(file) }
   end
 
+  def delete
+    id, name = id_and_name
+    if (id.nil?)
+      zone = get_zone(true)
+      id = zone["ZoneId"]
+    end
+    puts "deleting zone with id #{id}"
+    delete_local_zone_files(id)
+    Route.do.delete_zone(id)
+  end
 
   def id_and_name
     id = name = nil
@@ -147,6 +228,18 @@ class Zone < Command
         dputs "getting zone with id=#{id} and name=#{name}"
         @sep_char = "~"
         zone = Route.do.get_zone(id, name)
+        if zone['Records'].nil?
+          zone['Records'] = {
+            "A"=> [ ],
+            "AAAA"=> [ ],
+            "CNAME"=> [ ],
+            "MX"=> [ ],
+            "NS"=> [ ],
+            "SPF"=> [ ],
+            "SRV"=> [ ],
+            "TXT"=> [ ]
+          }
+        end
         if zone.nil?
           raise "zone doesn't exist or is empty"
         end
@@ -159,24 +252,6 @@ class Zone < Command
     zone
   end
 
-  def push
-    puts "in zone.push"
-    zone = get_zone
-    Route.do.untranslate_zone(zone)
-    File.open("untranslated.zone","w").write(JSON.pretty_generate zone)
-    Route.do.update_zone(zone)
-  end
-
-  def pull
-    zone = get_zone(true)
-    file_name = zone["DomainName"].sub(/\.\Z/, '')
-    file_name = file_name + '.' + zone["ZoneId"].to_s
-    file_name = user_file("zones", file_name)
-    File.delete(file_name) if File.exists?(file_name)
-    File.open(file_name, "w").write(JSON.pretty_generate zone)
-    puts "'#{file_name}' saved locally"
-  end
-
   # let user lowercase and abbreviate key; abbreviation must match one key
   def match_key(abbrev, struct)
     abbrev = abbrev.downcase
@@ -244,22 +319,4 @@ class Zone < Command
   def force_online
     @force_online = true
   end
-
-
-  def add(args)
-    if @zname 
-      puts "unimplemented"
-    else
-     @zone =  {
-        :Comment => "",
-        :DomainName => @zname,
-        :FailoverGroups => [ ],
-        :LoadBalancingGroups => [ ],
-        :Records => null,
-        :Status => 1,
-        :ZoneType => 1
-      }
-
-    end
-  end
 end

data/lib/zone_add.rb

@@ -0,0 +1,36 @@
+class ZoneAdd < Command
+  def create_args
+    # for level zone.Records.?
+    add_arg('name', 'Name of the node to which this record pertains', /[[:alnum:]]+/)
+    add_arg('rdata', 'Additional resource record data, such as IP Address', /.*/)
+    add_arg('ttl', 'Time to live, in seconds', /\d+/)
+  end
+
+  def create_flows
+    add_flow_from_usage("<name> <rdata> <ttl>")
+  end
+
+  def handle_level(level)
+    levels = level.split('.')
+    if levels.length == 3 && levels[1] == 'Records'
+      rtype = levels[2]
+      struct = @input["struct"] 
+      struct << @record
+      StructurePrint.new("-").structure_print(struct, level)
+    else
+      raise "Illegal or unimplemented add location"
+    end
+  end
+
+  def execute(arghash, rest)
+    struct = @input["struct"]
+    level = @input["level"]
+    @zone_struct = @input["toplevel"]
+    zone = @input["zone"]
+
+    @record = { "Name" => arghash["name"], "Rdata" => arghash["rdata"], "TTL" => arghash["ttl"].to_i }
+    handle_level(level)
+    zone.write_zone_file(@zone_struct)
+    
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vzcdn
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Steve Preston
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
+date: 2014-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -83,6 +83,7 @@ files:
 - lib/method.rb
 - lib/mkbind.sh
 - lib/print.rb
+- lib/proxy_credentials.rb
 - lib/realTimeStats.rb
 - lib/reporting.rb
 - lib/route.rb
@@ -94,6 +95,7 @@ files:
 - lib/vzcdn.rb
 - lib/vzcdn/version.rb
 - lib/zone.rb
+- lib/zone_add.rb
 - pkg/vzcdn-0.0.1.gem
 - test/test_all.rb
 - test/test_clui.rb