vzcdn 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec9cdba53621f9be97fde6eb72d0e923aa06db61
-  data.tar.gz: 0931da14e4d50284cf5daa83cc269c0bf308ca37
+  metadata.gz: ea3992e358c4d3ae986c6034772689c8f179bed3
+  data.tar.gz: 5ae5616ae6c38ba917b5385a2e886c5932743d4a
 SHA512:
-  metadata.gz: b9f20a06c369095c0cea23437d3321b936a0f6b72799f618bc1c1a699bc7a8aeeb224a0bb29eb4547488fc582054aea3e5751504a19783603294ba999fa96621
-  data.tar.gz: 05a60fe2606d87fea0d542647e8c4b518d3f4f90fdcb23f0872b27c9ecf50e40cdf1bdc09b9190976aa22f0af596ae80824d498d93c0a995d370a9a131eb6ad4
+  metadata.gz: 7dbc5bef2dfd8f9f36008e5e39af44822168a68d22e8ec79faf247a5247fdf2b9640237a78f7771b61b4171c626661c839aa115f197f343e84d852b0cbb37b05
+  data.tar.gz: 2420c36df9dec21484824c3097dcf44ea5ea3a8a43f46d7f1305101e8faa4306018c97d5d52a509b6b30c8d93b70a2622b40cc8f1c779262c5219264fb36bc7e

data/README.md

@@ -3,9 +3,22 @@
 Commandline UI for Edgecast API
 
 ##RELEASE NOTES
+
+2014/04/09      0.1.5
+ * Default action - print
+ * Presentation changes for zone display ( <object> to "...", array elements to [num] etc)
+ * Column customization in display
+ * directory structure changes
+ * improved help
+
 2014/04/09      0.1.4
-1. Bug fix for "ec zone <id> pull"
+ * Bug fix for "ec zone <id> pull"
 
+2014/04/08     0.1.3
+ *  Enabled command "ec zone <id> pull"
+ *  Supported command "ec zone <id> push"
+ *  Abbreviation support for "ec zone <id> print"
+ *  Support for option '-j' for "ec zone <id> print"
 
 ## Installation
 

data/bin/ec

@@ -1,31 +1,28 @@
 #!/usr/bin/env ruby
 
 require 'vzcdn'
-require 'vzcdn/version'
 
-$debug = false
-
-if ARGV[0] == "-v"
-  puts "vzcdn version:" + Vzcdn::VERSION
-  exit
+def add_prefix(prefix, text)
+  result = ""
+  text.each_line { |line|
+    result = result + prefix + line
+  }
+  result
 end
 
-if ARGV[0] == "-d"
-  $debug = true
-  ARGV.shift
+def dputs(*args)
+  if $debug
+    puts *args
+  end
 end
 
-args = []
-ARGV.each { |arg|
-  args << arg
-}
-
 begin
-  VzcdnApp.invoke(args)
+  VzcdnApp.new("vzcdn", "vzcdn").run(ARGV)
+  
   exit 0
 rescue Exception => e
   if e.class != SystemExit
-    puts "ERROR:" + e.message
+    puts add_prefix("ERROR:", e.message)
     if $debug
       raise e
     else

data/bin/vzcdn

@@ -1,31 +1,28 @@
 #!/usr/bin/env ruby
 
 require 'vzcdn'
-require 'vzcdn/version'
 
-$debug = false
-
-if ARGV[0] == "-v"
-  puts "vzcdn version:" + Vzcdn::VERSION
-  exit
+def add_prefix(prefix, text)
+  result = ""
+  text.each_line { |line|
+    result = result + prefix + line
+  }
+  result
 end
 
-if ARGV[0] == "-d"
-  $debug = true
-  ARGV.shift
+def dputs(*args)
+  if $debug
+    puts *args
+  end
 end
 
-args = []
-ARGV.each { |arg|
-  args << arg
-}
-
 begin
-  VzcdnApp.invoke(args)
+  VzcdnApp.new("vzcdn", "vzcdn").run(ARGV)
+  
   exit 0
 rescue Exception => e
   if e.class != SystemExit
-    puts "ERROR:" + e.message
+    puts add_prefix("ERROR:", e.message)
     if $debug
       raise e
     else

data/lib/args.rb

@@ -1,17 +1,38 @@
 require_relative 'route'
 
 class Arg
-  attr_accessor :desc, :required, :default, :validator, :name, :next_node, :value
+  attr_accessor :desc, :required, :default, :validator, :name, :next_node, :repeatable
+  attr_reader :value
 
   def initialize(name, hash={ })
     @name = name
     hash.each {|k,v| instance_variable_set("@#{k}",v)}
+    if @repeatable
+      @full = false
+    end
+  end
+
+  def full?
+    if @repeatable
+      @full
+    else
+      ! @value.nil?
+    end
+  end
+
+  def value=(value)
+    if @repeatable
+      @value = [ ] if @value.nil?
+      @value << value
+    else
+      @value = value
+    end
   end
 
   # return true on success
   # error message on failure
 
-  def validate?(value)
+  def validate?(value, obj)
     vclass = @validator.class
     if vclass == Regexp
       test = (value =~ @validator)
@@ -28,68 +49,34 @@ class Arg
         result[hash["Name"]] = hash["Id"]
       }
       @validator = result
-      test = validate? value
+      test = validate?(value, obj)
       if (test.class == String)
         on_error = test
         test = false
       end
+    elsif vclass == Symbol
+      on_error, test = obj.send(@validator, value)
     else
       test = false
       on_error = "unknown type of validator:" + @validator.to_s + ", class=" + @validator.class.to_s
     end
+    if not test && @repeatable
+      @full = true
+    end
     if test
-      true
+      nil
     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
+  attr_reader :root, :command
 
-  def initialize(root)
-    @root = root
+  def initialize(*args)
+    @root = nil
+    add(*args)
   end
 
   def iargs(node, args)
@@ -103,85 +90,71 @@ class Flow
         args = new_args
       end
       iargs(node.next_node, args)
-    elsif (node.class == Decision)
-      node.chosen.each { |child|
-        return iargs(child, args)
-      }
+    elsif node.is_a? Command
+      args["command"] = node
+      return args
     end
   end
 
-  def ifind(elt, node, args)
+  def args
+    iargs(@root, {})
+  end
+
+  def validate_and_set(value, node)
+    response = node.validate?(value, @target)
+    if response.nil?
+      node.value = value
+    end
+    response
+  end
+
+  def isetvalue(value, node)
     if node.nil?
-      return nil
+      return nil, :finished
     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
+    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)
+      else
+        return error, nil
+      end
+    elsif node.is_a? Command
+      if value == node.name.to_s
+        node.setfull
+        return nil, nil
+      else
+        return "incorrect command name", nil
       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, {})
+  def setvalue(value)
+    isetvalue(value, @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
+      return "could not find argument with name #{name}", :finished
     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
+        error = validate_and_set(value, node)
+        return error, nil
       else
-        iset(name, value, node.next_node)
+        return 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
   end
 
+  # return true for success
+  #        false for unable to find arg name
+  #        String for invalid arg
   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
+    iset(name, value, @root)
   end
 
   def iadd(arg, node)
@@ -192,19 +165,24 @@ class Flow
     end      
   end
 
-  def add(arg)
+  def add(*args)
+    return if args.length == 0
     if @root.nil?
-      @root = arg
-    else
-      iadd(arg, @root)
+      @root = args.shift
     end  
+    args.each { |arg|
+      iadd(arg, @root)
+    }
+    self
   end
 
   def to_s
+    result = ""
     args = iargs(@root, {})
     args.each { |name, value|
-      puts name + ":" + value
+      result = result + "\n#{name}:#{value}"
     }
+    result
   end
   
   def print_flow(node)
@@ -219,20 +197,73 @@ class Flow
     print_flow(node.next_node)
   end
 
-  def parse_line(line)
-    idx = line.index('=')
-    if (idx)
-      return line[0...idx], line[idx+1..-1]
+  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
+    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
+  end
+
+  def validate
+    ivalidate root, [ ]
+  end
+
+  def add_errline(str, error)
+    if str
+      str + "\n" + error
     else
-      line
+      error
     end
   end
 
-  def parse(args)
-    args.each { |arg|
-      name, value = parse_line(arg)
-      set(name, value)
+  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