vzcdn 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a57e7a8b331b7ded73bccae8a4d2fccc3640ab6
-  data.tar.gz: 5442f2e2e84bf6df14f05b498eee315f9bbe2dc0
+  metadata.gz: 908fd60bab73ffcb6b51ee5800cf18bc1f342497
+  data.tar.gz: e5977af1560fc83e7f2065c2665a70fc36faeec0
 SHA512:
-  metadata.gz: 0f7424dd530ce0dbf3f53221510dfdc4a5522bc4a9feb1d730d6ab0452b5a4bc411d07b9c1268f8aa4e25af8fd8d4020281add0561f9b358e9ef2a6f5a4c8199
-  data.tar.gz: 3d8dbc180663af1207657cc9fdd7f14b27f1d39b5adf0817b2fbf5e21e88bfe738ac7c1bdb8e1c077074f601b9db6f483c3856c6a68093ff26621eda4b8cdeaa
+  metadata.gz: 1157b4228fd58982be432b0a67f1a3c73ed1cd7850a2fd6f584afd305f2b935e68a375583879c4936ec1e18940267f567235cbae7d93f6c235e6bf01874304b1
+  data.tar.gz: f55a563fcb6999f967f4a14e3260635095275ec1191a734a23eb08c986e65e7a8978dffbc5e2de127bc5ca03870ef088036e02616e95aca68e8fdcabab93e166

data/README.md

@@ -4,6 +4,10 @@ Commandline UI for Edgecast API
 
 ##RELEASE NOTES
 
+2014/05/02      0.2.0
+ * Add/Update/Delete for groups/records/health-checks in zone.
+ * Zone-list with local status
+
 2014/04/22      0.1.9
  * Create zone support
  * Add record support
@@ -39,7 +43,7 @@ Or install it yourself as:
     $ gem install vzcdn
 
 ## Usage
-
+   http://youtu.be/y8MnWYxZiiA
 
 ## Contributing
 

data/bin/ec

@@ -2,7 +2,7 @@
 
 require 'vzcdn'
 
-# $debug = true
+$debug = 0
 
 def add_prefix(prefix, text)
   result = ""
@@ -13,18 +13,28 @@ def add_prefix(prefix, text)
 end
 
 def dputs(*args)
-  if $debug
+  if $debug > 0
     puts *args
   end
 end
 
+def ddputs(*args)
+  if $debug > 1
+    puts *args
+  end
+end
+
+
 begin
-  VzcdnApp.new("vzcdn", "vzcdn").run(ARGV)
+  scriptname = File.basename $0
+  $USER_ENTERED_COMMAND = scriptname + ' ' + ARGV.join(' ')
+  VzcdnApp.new(scriptname, "(vzcdn or ec) EdgeCast command line interface").run(ARGV)
   exit 0
 rescue Exception => e
   if e.class != SystemExit
     puts add_prefix("ERROR:", e.message)
-    if $debug
+    dputs e.backtrace[0]
+    if $debug > 1
       raise e
     else
       exit 1

data/bin/vzcdn

@@ -2,7 +2,7 @@
 
 require 'vzcdn'
 
-# $debug = true
+$debug = 0
 
 def add_prefix(prefix, text)
   result = ""
@@ -13,18 +13,28 @@ def add_prefix(prefix, text)
 end
 
 def dputs(*args)
-  if $debug
+  if $debug > 0
     puts *args
   end
 end
 
+def ddputs(*args)
+  if $debug > 1
+    puts *args
+  end
+end
+
+
 begin
-  VzcdnApp.new("vzcdn", "vzcdn").run(ARGV)
+  scriptname = File.basename $0
+  $USER_ENTERED_COMMAND = scriptname + ' ' + ARGV.join(' ')
+  VzcdnApp.new(scriptname, "(vzcdn or ec) EdgeCast command line interface").run(ARGV)
   exit 0
 rescue Exception => e
   if e.class != SystemExit
     puts add_prefix("ERROR:", e.message)
-    if $debug
+    dputs e.backtrace[0]
+    if $debug > 1
       raise e
     else
       exit 1

data/lib/args.rb

@@ -55,7 +55,12 @@ class Cell
       set(@default, nil)
     end
     return false unless @required
-    @value.nil?
+    # @required is true
+    if @repeatable && @value == [ ]
+      true
+    else
+      @value.nil?
+    end
   end
 
   def name
@@ -92,9 +97,9 @@ class Arg
       test = @validator.has_key? value
       on_error = "Invalid choice for #{@name}, must be one of #{@validator.keys}"
     elsif vclass == String
-      result = {}
+      result = [ ]
       Route.new.send("get_available_" + @validator).each { |hash|
-        result[hash["Name"]] = hash["Id"]
+        result << hash["Name"]
       }
       @validator = result
       test = validate?(value, obj)
@@ -119,7 +124,7 @@ class Arg
 end
 
 class Flow
-  attr_accessor :usage_string
+  attr_accessor :usage_string, :pre_cond, :rest, :error
 
   def initialize
     @cells = [ ]
@@ -133,30 +138,35 @@ class Flow
 
   def parse(args, obj = nil)
     @target = obj
-    rest = [ ]
+    @rest = [ ]
     args.each_with_index { |arg, index|
+      if finished  || @error
+        @rest = args[index..-1]
+        break
+      end
       name, value = Util.parse_line(arg)
       if value.nil?
         value = name
-        error, finished = setvalue(value)
+        setvalue(value)
       else
-        error, finished = set(name, value)
-      end
-      if error
-        result = add_errline(result, error)
-        finished = :finished
-      end
-      if finished
-        rest = args[index..-1]
-        break
+        set(name, value)
       end
     }
     missing = missing_args
-    unless missing.empty?
-      result = add_errline(result, "missing args: #{missing}")
+    @error.nil?
+  end
+
+  def finished
+    if command && @cells[-1].full?
+      # the command was seen
+      return true
     end
-    # dputs "parse for class #{obj.class} result=#{result}, rest=#{rest}"
-    return result, rest
+    @cells.each { |cell|
+      if ! cell.full?
+        return false
+      end
+    }
+    return true
   end
 
   def setvalue(value)
@@ -165,13 +175,18 @@ class Flow
         next
       else
         error = cell.set(value, @target)
-        if error && cell.repeatable
-          next
-        end
-        return error, nil
+        if error
+          if cell.repeatable
+            next   # repeatable cell is now full; try to set next cell
+          else
+            add_errline(error)
+            return
+          end
+        end            
+        return
       end
     }
-    return nil, :finished
+    return
   end
 
   def missing_args
@@ -181,16 +196,19 @@ class Flow
         missing << cell.name
       end
     }
-    missing
+    if missing.length > 0
+      add_errline("missing args: #{missing}")
+    end
   end
 
   def set(name, value)
     @cells.each { |cell|
       if cell.name == name
-        return cell.set(value, @target), nil
+        add_errline(cell.set(value, @target))
+        return
       end
     }
-    return "argument named #{name} not found", nil
+    add_errline("argument named #{name} not found")
   end
 
   def command
@@ -218,11 +236,12 @@ class Flow
     return names, desc
   end
 
-  def add_errline(str, error)
-    if str
-      str + "\n" + error
+  def add_errline(errmsg)
+    return if errmsg.nil?
+    if @error.nil?
+      @error = errmsg
     else
-      error
+      @error = @error + "\n" + errmsg
     end
   end
 end

data/lib/clui_config.rb

@@ -8,7 +8,7 @@ class ConfigInit < Command
 
   def create_args
     add_arg("acct-num", "EdgeCast account number", /[[:alnum:]]+/)
-    add_arg("token", "Web Services REST API Token (see my.edgecase.com)", /.*/)
+    add_arg("token", "Web Services REST API Token (see my.edgecast.com)", /.*/)
   end
 
   def create_flows
@@ -23,7 +23,6 @@ class ConfigInit < Command
     
     print_cfg = {
       "zone" => ["ZoneId", "DomainName", "ZoneType", "Status", "Version", "Records", "FailoverGroups", "LoadBalancingGroups"],
-      "zone.FailoverGroups.Group.AAAA" => ["Record", "IsPrimary", "HealthCheck"],
       "zonelist" => ["DomainName", "ZoneId", "Status"]
     }
     File.open(config_file("print.cfg"), "w").write(JSON.pretty_generate print_cfg)

data/lib/command.rb

@@ -45,28 +45,18 @@ class Command
     @options << option
   end
 
-  def show_help_option
-    show_help
-    raise CancelExecution
-  end
-
-  def get_args_used(usage, args_used)
-    line = usage
-    re = /<(?<argname>[[:alnum:]-]+)>/
-    while m = re.match(line)
-      argname = m[:argname]
-      unless args_used.include? argname 
-        args_used << argname
-      end
-      line = line[m.end(0)..-1]
-    end
-  end
-
   def show_help
     puts "#{@name} - #{@desc}"
+    valid_flows = @flows.select { |flow|
+      flow_passes_preconditions(flow)
+    }
+    if valid_flows.length == 0
+      puts "No usage of #{@name} is valid in this context"
+      valid_flows = @flows
+    end
     puts "Usage:"
     args_used = [ ]
-    @flows.each { |flow|
+    valid_flows.each { |flow|
       puts "  #{@name} #{flow.usage_string}"
       get_args_used(flow.usage_string, args_used)
     }
@@ -87,6 +77,27 @@ class Command
         puts "  #{arg.name} : #{arg.desc}#{choice}"
       }
     end
+    puts "Options:"
+    @options.each { | o |
+      puts "  -#{o[:short_name]} or --#{o[:long_name]}" + (o[:takes_value] ? " (takes value)" : "")
+    }
+  end
+
+  def show_help_option
+    show_help
+    raise CancelExecution
+  end
+
+  def get_args_used(usage, args_used)
+    line = usage
+    re = /<(?<argname>[[:alnum:]-]+)>/
+    while m = re.match(line)
+      argname = m[:argname]
+      unless args_used.include? argname 
+        args_used << argname
+      end
+      line = line[m.end(0)..-1]
+    end
   end
 
   def add_arg(name, desc, validator)
@@ -106,9 +117,10 @@ class Command
     @subcommands.include?(str.to_s)
   end
 
-  def add_flow_from_usage(usage)
+  def add_flow_from_usage(usage, *pre_cond)
     flow = Flow.new
     flow.usage_string = usage
+    flow.pre_cond = pre_cond
     line = usage
     re = /\A
          (                                 # matches one arg spec
@@ -137,6 +149,34 @@ class Command
     @flows << flow
   end
 
+  def flow_passes_parse(flow, args)
+    desc = "usage \'#{@name} #{flow.usage_string}\'"
+    result = true
+    success = flow.parse args, self
+    if success
+      if flow.command.nil? && flow.rest.length > 0
+        result = false
+        ddputs "#{desc} failed (args=#{args}) due to superfluous arguments (#{flow.rest})"
+      else
+        ddputs "#{desc} passed parse, adding to candidate list (rest=#{flow.rest})"
+      end
+    else
+      result = false
+      ddputs "#{desc} failed to parse arguments (args=#{args}), #{flow.error}"
+    end
+    return result
+  end
+
+  def flow_passes_preconditions(flow)
+    if flow.pre_cond && flow.pre_cond.length > 0 && (error = send(*flow.pre_cond))
+      dputs "usage \'#{@name} #{flow.usage_string}\' failed due to precondition failure:#{error}"
+      false
+    else
+      ddputs "usage \'#{@name} #{flow.usage_string}\' passed any precondition"
+      true
+    end
+  end
+
   def run(args)
     begin
       args = ClOptions.new(self, @options).handle(args)
@@ -148,15 +188,28 @@ class Command
       raise error
     end
     
-    @flows.each { |flow|
-      error, rest = flow.parse args, self
-      if error.nil?
-        execute(flow.arghash, rest)
-        return
-      end
+    candidate_flows = @flows.select { |flow|
+      flow_passes_parse(flow, args)
     }
-    puts "ERROR:no usage of #{@name} recognized"
-    puts ""
-    show_help
+    
+    valid_flows = candidate_flows.select { |flow|
+      flow_passes_preconditions(flow)
+    }
+    
+    if valid_flows.length == 1
+      flow = valid_flows[0]
+      ddputs "usage \'#{@name} #{flow.usage_string}\' matched, executing"
+      execute(flow.arghash, flow.rest)
+    elsif valid_flows.length > 1
+      puts "BUG FOUND: arguments #{args} match the following flows in class #{self.class}"
+      valid_flows.each { |flow|
+        puts "  usage \'#{@name} #{flow.usage_string}\'"
+      }
+    else
+      unless args.length == 0 
+        puts "ERROR:no usage of #{@name} recognized or allowed\n\n" 
+      end
+      show_help
+    end
   end
 end

data/lib/common.rb

@@ -39,7 +39,7 @@ class CommonRestUtils
         end  
       end
       exit
-      if $debug
+      if $debug > 0
         puts "full URL is:" + url
         if (body)
           puts "body is: json_body"
@@ -51,7 +51,7 @@ class CommonRestUtils
       raise "Bad response code:" + response.code.to_s
     end
     if (response.length > 0)
-      if $debug
+      if $debug > 1
         File.open("raw.json", "w").write(response)
       end
       JSON.parse response

data/lib/config_reader.rb

@@ -8,26 +8,18 @@ module ConfigReader
     ConfigHandler::CONFIG_DIRECTORY
   end
 
-  def imkdir(path)
-    if ! Dir.exists?(path)
-      Dir.mkdir path
-    end
-    path
-  end
-
-  def mk_user_dir(*dirs)
-    imkdir user_file(*dirs)
-  end
-
-  def mk_config_dir(*dirs)
-    imkdir config_file(*dirs)
+  def mkdir(filename)
+    FileUtils.mkdir_p(File.dirname(filename))
+    filename
   end
 
   def user_file(*dirs_file)
-    File.join(*dirs_file)
+    result = File.join(*dirs_file)
+    mkdir result
   end
 
   def config_file(*dirs_file)
-    File.join(config_dir, *dirs_file)
+    filename = File.join(config_dir, *dirs_file)
+    mkdir filename
   end
 end