vzcdn 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9553f5ffbf91a52d204bb02bb1ee54279d79cc5c
-  data.tar.gz: 77b658f0f08c733c4911d64c060edb852bb4d3a3
+  metadata.gz: c28ee09c103b4974e38dba49773a359e40ce951c
+  data.tar.gz: 5d0d324809e812c3ae1f72ade9eec631b9208ef7
 SHA512:
-  metadata.gz: 19ac2c9d596ee6c4b053037971b9b821e8ae46d84af885751fcb1343646bb4e5223f0230c8a4566f312d4dc2e1ed5c05c6a8ddad76cb85ea7a510d196c38b5b6
-  data.tar.gz: a8b69bac8d65998236be840021784a53dda7d37bacb6683a8393b5f0c424caac32f9e5fa6c26c4063b01764a6d3f7a896eb287a7e788a3eb63c30edf5ae988e7
+  metadata.gz: bd6e695da176af1359ecd409a4d8f40b4ae5c3fc0e6af82060004ae7c3f6910b110d9a508977f396db78b82f48cad43ef10504e85a7ce1f5719c56f6e6234831
+  data.tar.gz: 7eeb4be4cf567de6ea2eab1e103c62d5897b09527c7d570b005c1c50b39ee3473301bed9d84310a48495e569517e99a1880fe8560bd571bae42e8aa9e3b163a7

data/bin/ec

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+require 'vzcdn'
+require 'vzcdn/version'
+
+if ARGV[0] == "-v"
+  puts "vzcdn version:" + Vzcdn::VERSION
+  exit
+end
+
+args = []
+ARGV.each { |arg|
+  args << arg
+}
+
+VzcdnApp.invoke(args)

data/bin/vzcdn

@@ -1,10 +1,16 @@
-#!user/bin/env/ruby
+#!/usr/bin/env ruby
 
 require 'vzcdn'
+require 'vzcdn/version'
+
+if ARGV[0] == "-v"
+  puts "vzcdn version:" + Vzcdn::VERSION
+  exit
+end
 
 args = []
 ARGV.each { |arg|
   args << arg
 }
 
-Vzcdn.invoke(args)
+VzcdnApp.invoke(args)

data/lib/args.rb

@@ -0,0 +1,280 @@
+require_relative 'route'
+
+class Arg
+  attr_accessor :desc, :required, :default, :validator, :name, :next_node, :value
+
+  def initialize(name, hash={ })
+    @name = name
+    hash.each {|k,v| instance_variable_set("@#{k}",v)}
+  end
+
+  # return true on success
+  # error message on failure
+
+  def validate?(value)
+    vclass = @validator.class
+    if vclass == Regexp
+      test = (value =~ @validator)
+      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
+    elsif vclass == Hash
+      test = @validator.has_key? value
+      on_error = "Invalid choice for " + @name + ", must be one of " + @validator.keys.to_s
+    elsif vclass == String
+      result = {}
+      Route.new.send("get_available_" + @validator).each { |hash|
+        result[hash["Name"]] = hash["Id"]
+      }
+      @validator = result
+      test = validate? value
+      if (test.class == String)
+        on_error = test
+        test = false
+      end
+    else
+      test = false
+      on_error = "unknown type of validator:" + @validator.to_s + ", class=" + @validator.class.to_s
+    end
+    if test
+      true
+    else
+      on_error
+    end
+  end
+end
+
+class Decision
+  attr_accessor :flow
+
+  def initialize(decider, *symbols)
+    @decider = decider
+    @tree = { }
+    symbols.each { |symbol|
+      @tree[symbol] = Flow.new(nil)
+    }
+  end
+
+  def chosen
+    vars = @flow.find(self)
+    arr = @decider.decide(vars, @tree.keys).map { |symbol|
+      @tree[symbol].root
+    }
+    arr
+  end
+
+  def children
+    @tree.values
+  end
+
+  def add(child, arg)
+    @tree[child].add arg
+  end
+
+  def to_s
+    result = "branch names:"
+    @tree.keys.each { |child|
+      result = result + child.to_s + " "
+    }
+    result += "\nbranches are of classes:"
+    @tree.keys.each { |child|
+      result = result + @tree[child].class.to_s + " "
+    }
+    result
+  end
+end
+
+class Flow
+  attr_reader :root
+
+  def initialize(root)
+    @root = root
+  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.class == Decision)
+      node.chosen.each { |child|
+        return iargs(child, args)
+      }
+    end
+  end
+
+  def ifind(elt, node, args)
+    if node.nil?
+      return nil
+    end
+    if (node == elt)
+      return args
+    elsif (node.class == Arg)
+      if node.value
+        new_args = args.clone
+        new_args[node.name] = node.value
+        args = new_args
+      end
+      ifind(elt, node.next_node, args)
+    elsif (node.class == Decision)
+      found = false
+      node.children.each { |child|
+        result = ifind(elt, child, args)
+        if (result)
+          return result
+        end
+      }
+      return nil
+    end
+  end
+  
+
+  def find(elt)
+    return ifind(elt, @root, {})
+  end
+
+  # return true for success
+  #        false for unable to find arg name
+  #        String for invalid arg
+
+  def iset(name, value, node)
+    if node.nil?
+      return false
+    end
+    if (node.class == Arg )
+      if (node.name == name)
+        response = node.validate?(value)
+        if (response.class == String)
+          return response
+        else
+          node.value = value
+          return true
+        end
+      else
+        iset(name, value, node.next_node)
+      end
+    elsif (node.class == Decision)
+      result = false
+      node.children.each { |flow|
+        response = iset(name, value, flow.root)
+        if (response == true)
+          result = true
+        elsif (response.class == String)
+          return response
+        end
+      }
+      result
+    end    
+  end
+
+  def set(name, value)
+    response = iset(name, value, @root)
+    if (response == false)
+      puts "ERROR: could not find argument with name " + name
+    elsif (response.class == String)
+      puts "ERROR: " + response
+    end
+    response
+  end
+
+  def iadd(arg, node)
+    if node.next_node.nil?
+      node.next_node = arg
+    else
+      iadd(arg, node.next_node)
+    end      
+  end
+
+  def add(arg)
+    if @root.nil?
+      @root = arg
+    else
+      iadd(arg, @root)
+    end  
+  end
+
+  def to_s
+    args = iargs(@root, {})
+    args.each { |name, value|
+      puts name + ":" + value
+    }
+  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)
+  end
+end
+
+
+def get_named(array, name)
+  array.each { |elt|
+    if elt.name == name
+      return elt
+    end
+  }
+end
+
+class HTTPDecider
+  def decide(args, children)
+    result = children
+    if (args.has_key? "type")
+      result = 
+        if (args["type"] == "CNAME")
+          [:url]
+        else
+          [:ip]
+        end  
+    end
+    result
+  end
+end
+
+http_decider = HTTPDecider.new
+
+flow = Flow.new(Arg.new("root", desc: "description of method"))
+flow.add(Arg.new("ttl", desc: "time to live in seconds", required: true, validator: /\A\d+\Z/))
+flow.add(Arg.new("ipv", desc: "ip version", required: true, validator: "ip_versions"))
+flow.add(Arg.new("type", desc: "record type", required: true, validator: ["A", "AAAA", "CNAME"]))
+http_decision = Decision.new(http_decider, :ip, :url)
+flow.add(http_decision)
+http_decision.add(:ip, Arg.new("ip", desc: "IP address", required: false, validator: /\A\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\Z/))
+http_decision.add(:url, Arg.new("url", desc: "URL of cname", required: false, validator: /.*/))
+email = Arg.new("email", desc: "Email Address", required: false, validator: /.*/)
+http_decision.add(:url, email)
+http_decision.add(:ip, email)
+
+http_decision.flow = flow
+
+puts flow.to_s
+
+def parse_line(line)
+  idx = line.index('=')
+  if (idx)
+    return line[0...idx], line[idx+1..-1]
+  else
+    line
+  end
+end
+
+ARGV.each { |arg|
+  name, value = parse_line(arg)
+  flow.set(name,value)
+}
+
+puts "after args:"
+puts flow.to_s

data/lib/clui_config.rb

@@ -1,59 +1,11 @@
 require 'fileutils'
 require_relative 'command_proc'
 
-class Configure
+class ConfigCommand
   include CommandProc
 
   def initialize(name)
-    @usage = {
-      :init => "Initializes config file with <acct-num> and <token>.", 
-      :get => "get a configuration parameter.",
-      :set => "set a configuration parameter."
-    }
-  end
-
-  CONFIG_DIRECTORY = ".vdms.d"
-  CONFIG_FILENAME = "config"
-
-  def get_config_file
-    if (! File.directory?(CONFIG_DIRECTORY))
-      FileUtils.mkdir(CONFIG_DIRECTORY)
-    end
-    CONFIG_DIRECTORY + File::SEPARATOR + CONFIG_FILENAME
-  end
-
-  def parse_line(line)
-    idx = line.index('=')
-    if (idx)
-      return line[0...idx], line[idx+1..-1]
-    else
-      line
-    end
-  end
-
-  def replace_nv(name, value, new_file, old_file_contents)
-    new_config_line = name + '=' + value
-    wrote_line = false
-    old_file_contents.each { |line|
-      old_name, old_value = parse_line(line)
-      if (old_name == name)
-        new_file.puts(new_config_line)
-        wrote_line = true
-      else
-        new_file.puts(line)
-      end
-    }
-    if ( ! wrote_line)
-      new_file.puts(new_config_line)
-    end
-  end
-
-  def file_contents(filename)
-    if (File.file? filename)
-      File.open(filename, "r")
-    else
-      []
-    end
+    @handler = ConfigHandler.new
   end
 
   def init(args)
@@ -61,42 +13,18 @@ class Configure
       puts "usage: init <account-num> <token>"
       puts "go to my.edgecast.com --> Settings to find it"
     else
-      set(["acct-num", args[0]])
-      set(["token", args[1]])
-      set(["rest_base_url", "https://api.edgecast.com/v2/"])
+      @handler.set("acct-num", args[0])
+      @handler.set("token", args[1])
+      @handler.set("rest_base_url", "https://api.edgecast.com/v2/")
     end
   end
 
-  def load_config_values
-    if defined? @@config_values
-      return
-    else
-      @@config_values = {}
-      if (! File.file?(get_config_file))
-        return
-      end
-      File.open(get_config_file).each { |line|
-        line = line.strip
-        if line[0] == '#'
-          continue
-        end
-        name, value = parse_line(line)
-        if value
-          @@config_values[name] = value
-        end
-      }
-    end
-  end
-
-  def self.config_parameter(name)
-    instance = get_instance(nil)
-    instance.load_config_values
-    result = @@config_values[name]
-    result = result ? result : ""
-  end
-
   def get(args)
-    
+    if (args.length != 1)
+      puts "usage: get <name>"
+      error
+    end
+    puts @handler.get(args[0])
   end
 
   def set(args)
@@ -104,13 +32,14 @@ class Configure
       puts "usage: set <name> <value>"
       error
     end
-    name = args[0]
-    value = args[1]
-    config_file = get_config_file
-    new_config_file = config_file + ".tmp"
-    updated_file = File.open(new_config_file, "w")
-    replace_nv(name, value, updated_file, file_contents(config_file))
-    updated_file.close
-    FileUtils.mv(new_config_file, config_file, :force => true)
+    @handler.set(args[0], args[1])
+  end
+
+  def delete(args)
+    if (args.length != 1)
+      puts "usage: delete <name>"
+      error
+    end
+    @handler.delete(args[0])
   end
 end

data/lib/command_proc.rb

@@ -1,8 +1,4 @@
-require_relative 'config_reader'
-
 module CommandProc
-  include ConfigReader
-
   def help(args)
     puts "Available commands:"
     @usage.each { |method|
@@ -48,7 +44,8 @@ module CommandProc
       else
         name = command
         instance = get_instance(name)
-        puts "instance is " + instance.to_s
+        command = args.shift
+        instance.send(command, args)
       end
     end
 

data/lib/common.rb

@@ -1,7 +1,9 @@
 require 'rest_client'
 require 'json'
+require 'config_reader'
 
 class CommonRestUtils
+  include ConfigReader
   def callMethod(url_suffix, http_method, body=nil)
     url = @uri_prefix + url_suffix
     if (body)
@@ -40,12 +42,12 @@ class CommonRestUtils
 
   def initialize(uri_prefix)
     @uri_prefix = uri_prefix
-    proxy = Configure.config_parameter("proxy")
+    proxy = param("proxy")
     if proxy != ""
       RestClient.proxy = proxy
     end
     @headers = {:Content_type => "Application/json",
-      :Authorization => "TOK:" + Configure.config_parameter("token"),
+      :Authorization => "TOK:" + param("token"),
       :Accept => "Application/json"}
   end
 

data/lib/config_handler.rb

@@ -0,0 +1,94 @@
+class ConfigHandler
+  CONFIG_DIRECTORY = ".vdms.d"
+  CONFIG_FILENAME = "config"
+
+  def get_config_file
+    if (! File.directory?(CONFIG_DIRECTORY))
+      FileUtils.mkdir(CONFIG_DIRECTORY)
+    end
+    CONFIG_DIRECTORY + File::SEPARATOR + CONFIG_FILENAME
+  end
+
+  def parse_line(line)
+    idx = line.index('=')
+    if (idx)
+      return line[0...idx], line[idx+1..-1]
+    else
+      line
+    end
+  end
+
+  def replace_nv(name, value, new_file, old_file_contents)
+    new_config_line = name + '=' + value
+    wrote_line = false
+    old_file_contents.each { |line|
+      old_name, old_value = parse_line(line)
+      if (old_name == name)
+        if ! value.nil?
+          new_file.puts(new_config_line)
+        end
+        wrote_line = true
+      else
+        new_file.puts(line)
+      end
+    }
+    if ( ! wrote_line)
+      new_file.puts(new_config_line)
+    end
+  end
+
+  def file_contents(filename)
+    if (File.file? filename)
+      File.open(filename, "r")
+    else
+      []
+    end
+  end
+
+  def load_config_values
+    if defined? @@config_values
+      return
+    else
+      @@config_values = {}
+      if (! File.file?(get_config_file))
+        return
+      end
+      File.open(get_config_file).each { |line|
+        line = line.strip
+        if line[0] == '#'
+          continue
+        end
+        name, value = parse_line(line)
+        if value
+          @@config_values[name] = value
+        end
+      }
+    end
+  end
+
+  def self.config_parameter(name)
+    instance = ConfigHandler.new
+    instance.load_config_values
+    result = @@config_values[name]
+    result = result ? result : ""
+  end
+
+  def get(name)
+    load_config_values
+    @@config_values[name]
+  end
+
+  def set(name, value)
+    config_file = get_config_file
+    new_config_file = config_file + ".tmp"
+    updated_file = File.open(new_config_file, "w")
+    replace_nv(name, value, updated_file, file_contents(config_file))
+    updated_file.close
+    FileUtils.mv(new_config_file, config_file, :force => true)
+  end
+
+  def delete(name)
+    set(name, nil)
+  end
+
+end

data/lib/config_reader.rb

@@ -1,5 +1,6 @@
+require_relative 'config_handler'
 module ConfigReader
   def param(name)
-    Configure.config_parameter(name)
+    ConfigHandler.config_parameter(name)
   end
 end

data/lib/route.rb

@@ -1,12 +1,24 @@
 #!/usr/bin/env ruby
-require_relative 'common.rb'
+require_relative 'config_reader'
+require_relative 'common'
 require 'pp'
 
 class Route
   include ConfigReader
 
+  @@instance = nil
+
+  def self.do
+    if @@instance
+      @@instance
+    else
+      @@instance = Route.new
+    end
+  end
+
   def initialize
     @common = CommonRestUtils.new(param("rest_base_url") + "mcc/")
+    @availables = { }
   end
    
   def customer_suffix(suffix)
@@ -31,52 +43,85 @@ class Route
 
   def get_zone(id, name)
     suffix = "dns/routezone?id=" + id + "&name=" + name
-    callMethod(customer_suffix(suffix), :get)
+    @common.callMethod(customer_suffix(suffix), :get)
   end
 
   def copy_zone(from, to)
     suffix = customer_suffix("dns/routezone/copy")
     body = {:FromDomainName => from, :ToDomainName => to}
-    callMethod(suffix, :post, body)
+    @common.callMethod(suffix, :post, body)
   end
 
   def delete_zone(id)
     suffix = customer_suffix("dns/routezone/" + id)
-    callMethod(suffix, :delete)
+    @common.callMethod(suffix, :delete)
   end
 
   def add_zone()
   end
 
+  def xlate_name(symbol, name)
+    get_available(symbol).each { |hash|
+      if hash["Name"] == name
+        return hash["Id"]
+      end
+    }
+  end
+
+  def xlate_id(symbol, id)
+    get_available(symbol).each { |hash|
+      if hash["Id"] == id
+        return hash["Name"]
+      end
+    }
+  end
+
+  def get_available(data)
+    if @availables[data]
+      @availables[data]
+    else
+      suffix =
+        {:zone_type => "routezonetypes",
+        :record_type => "routezonerecordtypes",
+        :zone_status => "routezonestatus",
+        :route_group => "routegrouptypes",
+        :http_method => "routehttpmethodtypes",
+        :ip_version => "routehealthcheckipversion",
+        :hc_type => "routehealthchecktypes",
+        :hc_rm => "routereintegrationmethodtypes"}[data]
+      @availables[data] = @common.callMethod(non_customer_suffix(suffix), :get)
+    end
+  end
+
   def get_available_zone_types()
-    callMethod(non_customer_suffix("routezonetypes"), :get)
+    get_available(:zone_type)
   end  
 
   def get_available_record_types()
-    callMethod(non_customer_suffix("routezonerecordtypes"), :get)
+    get_available(:record_type, "routezonerecordtypes")
   end  
 
   def get_available_zone_statuses()
-    callMethod(non_customer_suffix("routezonestatus"), :get)
+    get_available(:zone_status, "routezonestatus")
   end
 
   def get_available_route_groups()
-    callMethod(non_customer_suffix("routegrouptypes"), :get)
+    get_available(:route_group, "routegrouptypes")
   end
 
   def get_available_http_methods()
-    callMethod(non_customer_suffix("routehttpmethodtypes"), :get)
+    get_available(:http_method, "routehttpmethodtypes")
   end
 
   def get_available_ip_versions()
-    callMethod(non_customer_suffix("routehealthcheckipversion"), :get)
+    get_available(:ip_version, "routehealthcheckipversion")
   end
 
-  def get_available_health_check_types()
-    callMethod(non_customer_suffix("routehealthchecktypes"), :get)
+  def get_available_hc_types()
+    get_available(:hc_type, "routehealthchecktypes")
   end
 
-  def get_available_health_check_reintegration_methods()
-    callMethod(non_customer_suffix("routereintegrationmethodtypes"), :get)
+  def get_available_hc_rm()
+    get_available(:hc_rm, "routereintegrationmethodtypes")
   end
 end

data/lib/vzcdn.rb

@@ -3,7 +3,7 @@ require_relative 'command_proc'
 require_relative 'clui_config'
 require_relative 'zone'
 
-class Vzcdn
+class VzcdnApp
   include CommandProc
 
   def initialize(name)
@@ -11,6 +11,8 @@ class Vzcdn
       :zone => "zone related command",
       :config => "config related command"
     }
+    @argtree = [ {:name => "zone", :usage => "zone related commands", :args=>[]},
+                 {:name => "config", :usage => "config related commands", :args=>[]}]
   end
 
   def zone(args)
@@ -18,7 +20,7 @@ class Vzcdn
   end
 
   def config(args)
-    Configure.invoke(args)
+    ConfigCommand.invoke(args)
   end
 end
 

data/lib/vzcdn/version.rb

@@ -1,3 +1,3 @@
 module Vzcdn
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/zone.rb

@@ -4,38 +4,156 @@ class Zone
   include CommandProc
 
   def initialize(name)
+    @lines = nil
     @zname = name
     @usage = { :list => "list zones"}
-      
+    @argflows = [ {:name => "list", :usage => "list zones", :args=>[]},
+                 {:name => "add", :usage => "", :args=>[]}]      
   end
   
   def list(args)
     if @zname
       puts "unimplemented"
     else
-      zones = Route.new.get_all_zones
-      lines = []
-      lines << ["ZONE", "ID"]
+      zones = Route.do.get_all_zones
+      pp_table_start("ZONE", "ID", "STATUS")
       zones.each {|zone|
-        lines << [zone["DomainName"],  zone["ZoneId"].to_s]
+        pp_table_append(zone["DomainName"],  zone["ZoneId"].to_s, Route.do.xlate_id(:zone_status, zone["Status"]))
+      }
+      pp_table
+    end
+  end
+
+  def structure_print(struct, args, header)
+    if (struct.class == Array)
+      # puts "printing array of " + struct.length.to_s + " elts"
+      struct.each { |elt|
+        # puts "calling struct_print with header = " + header.to_s + ", and elt = " + elt.to_s
+        structure_print(elt, args, header)
+        header = false
+      }
+    elsif (struct.class == Hash)
+      if (args.length == 0)
+        # print top level elements of hash
+        if (header)
+          pp_table_start_cols struct.keys
+        end
+        values = []
+        struct.keys.each { |key|
+          value = struct[key]
+          if (value.class == Array)
+            value = value.length.to_s + " elements"
+          elsif (value.class == String)
+          elsif (value.class == Fixnum)
+            value = value.to_s
+          elsif (value.class == Hash)
+            value = "object"
+          else
+            value = "<" + value.class.to_s + ">"
+          end
+          values << value
         }
-      pp_table lines
+        pp_table_append_cols(values)
+      else
+        key = args.shift
+        structure_print(struct[key], args, header)
+      end
+    else
+      if (args.length == 0)
+        puts struct.to_s
+      else
+        puts "unknown class <" + struct.class.to_s + ">"
+      end
+    end
+  end
+
+  def print(args)
+    if @zname
+      if  @zname =~ /\d+/
+        zone = Route.do.get_zone(@zname, "")
+      else
+        zone = Route.do.get_zone("", @zname)
+      end
+      if (args.length > 0 && args[0] == "-l")
+        puts JSON.pretty_generate(zone)
+      else
+        structure_print(zone, args, true)
+        pp_table
+      end
+    else
+      puts "pull command needs zone name or id"
+    end
+  end
+
+  def add(args)
+    if @zname 
+      puts "unimplemented"
+    else
+     @zone =  {
+        :Comment => "",
+        :DomainName => @zname,
+        :FailoverGroups => [ ],
+        :LoadBalancingGroups => [ ],
+        :Records => null,
+        :Status => 1,
+        :ZoneType => 1
+      }
+
     end
   end
 
-  def pp_table(lines)
-    ncols = lines[0].length
+  def char_repeat(n, char)
+    result = ""
+    (1..n).each { |i|
+      result = result + char
+    }
+    result
+  end
+
+  def spaces(n)
+    char_repeat(n, ' ')
+  end
+
+  def pp_table_start_cols(titles)
+    @lines = []
+    @lines << titles
+    separator = []
+    titles.each { |title|
+      separator << char_repeat(title.length, '-')
+    }
+    @lines << separator
+  end
+
+  def pp_table_start(*titles)
+    pp_table_start_cols(titles)
+  end
+
+  def pp_table_append_cols(columns)
+    @lines << columns
+  end
+
+  def pp_table_append(*columns)
+    @lines << columns
+  end
+
+  def pp_table
+    if @lines.nil?
+      return
+    end
+    ncols = @lines[0].length
     maxwidths = Array.new(ncols, 0)
-    lines.each { |line|
+    @lines.each { |line|
       line.each_with_index { |col, index|
-        maxwidths[index] = [col.length, maxwidths[index]].max
+        maxwidths[index] = [col.to_s.length, maxwidths[index]].max
       }
     }
-    lines.each { |line|
+    @lines.each { |line|
+      output = ""
       line.each_with_index {|col, index|
-        printf("%#{maxwidths[index]}s ", col)
-        }
-      printf("\n")
+        output = output + col.to_s + spaces(maxwidths[index] - col.to_s.length + 2)
+      }
+      puts output
     }
+    @lines = nil
   end
 end

data/test/test_clui.rb

@@ -1,8 +1,28 @@
 require 'clui_config'
+require 'route'
 require 'test/unit'
+require 'tmpdir'
+require 'tempfile'
 
 class TestClui < Test::Unit::TestCase
   def test_config
-    CluiConfig.set("aname", "anothervalue")
+    Dir.mktmpdir do |dir|
+      Dir.chdir(dir)
+      `ec config init BED3 e22db149-7369-4d7b-9c53-38d38746ccea`
+      assert(File.directory?(".vdms.d"), "missing .vdms.d directory")
+      assert(File.exists?(".vdms.d/config"), "missing config file")
+      assert_equal("BED3", `ec config get acct-num`.chomp, "get account-num failed")
+    end
+  end
+  def ctest_availables
+    route = Route.new
+    puts "zone types:" + route.get_available_zone_types.to_s
+    puts "record types:" + route.get_available_record_types.to_s
+    puts "zone status:" + route.get_available_zone_statuses.to_s
+    puts "route groups:" + route.get_available_route_groups.to_s
+    puts "http:" + route.get_available_http_methods.to_s
+    puts "ip vers:" + route.get_available_ip_versions.to_s
+    puts "hc types:" + route.get_available_health_check_types.to_s
+    puts "hc reints:" + route.get_available_health_check_reintegration_methods.to_s
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vzcdn
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Steve Preston
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -60,6 +60,7 @@ email:
 - thomas.goes@verizon.com
 - nitin.khanna@verizon.com
 executables:
+- ec
 - vzcdn
 extensions: []
 extra_rdoc_files: []
@@ -68,10 +69,13 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/ec
 - bin/vzcdn
+- lib/args.rb
 - lib/clui_config.rb
 - lib/command_proc.rb
 - lib/common.rb
+- lib/config_handler.rb
 - lib/config_reader.rb
 - lib/mediaManagment.rb
 - lib/realTimeStats.rb