vzcdn 0.1.4 → 0.1.5

data/lib/argtest.rb

@@ -0,0 +1,29 @@
+require_relative 'args'
+require_relative 'command'
+
+
+class MyCommand < Command
+  
+end
+
+flow = Flow.new
+flow.add(Arg.new("name", desc: "Entry name", required: true, validator: /.*/))
+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(MyCommand.new("hello", "says hello"))
+
+flow = Flow.new
+flow.add(Arg.new("name", desc: "Entry name", required: true, validator: /.*/))
+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"]))
+
+puts flow.to_s
+
+result, rest = flow.parse(ARGV)
+
+puts "parse result=#{result}, remaining args=#{rest}"
+
+puts "after args:"
+puts flow.to_s
+

data/lib/cloptions.rb

@@ -4,27 +4,32 @@ class ClOptions
     @options = options
   end
 
-  def handle_options(name, value)
-    puts "inside handle_options, name is " + name.to_s + ", value is " + value.to_s
-    took_value = false
-    valid = false
-    @options.each{|option|
-      if (option[:long_name] == name) || (option[:short_name] == name)
-        valid = true
-        if (option[:takes_value]) && (value == nil)
-          raise "option " + name + " requires value"
-          break
-        elsif option[:takes_value]
-          @obj.send(option[:method], value)
-          took_value = true
+  def handle_option(type, name, attached, nextarg)
+    need_shift = false
+    valid_option = false
+    value = attached.nil? ? nextarg : attached
+    @options.each { |option|
+      if option[type] == name
+        valid_option = true
+        if option[:takes_value]
+          need_shift = attached.nil?
+          if value
+            @obj.send(option[:method], value)
+          else
+            return "value required for option"
+          end
         else
-          @obj.send(option[:method])
+          if attached.nil?
+            @obj.send(option[:method])
+          else
+            return "Invalid option"
+          end
         end
         break
       end
     }
-    raise "Invalid option: " + name if !valid
-    took_value
+    return "Invalid option" unless valid_option 
+    need_shift
   end
 
   def parse_longname(arg, m)
@@ -37,13 +42,16 @@ class ClOptions
   end
 
   def parse_shortname (arg)
-    short_name = arg[1]
-    option_value = nil
-    if arg[2] == '='
-      option_value = arg[3...arg.length]
-    elsif arg.length > 2
-      short_name = arg[1...arg.length]
-    end
+    short_name = if arg.length > 1
+                   arg[1]
+                 else
+                   raise "no option given"
+                 end
+    option_value = if arg.length > 2 
+                     arg[2...arg.length]
+                   else
+                     nil
+                   end
     return short_name, option_value
   end
 
@@ -52,30 +60,33 @@ class ClOptions
     i = 0
     while i < args.length
       arg = args[i]
-      
-      if arg == '--'
+      found = nil
+      if arg.class != String
+        @args.concat args[i...args.length]
+        break
+      elsif arg == '--'
         @args.concat args[i+1...args.length]
         break
       elsif m = arg.match(/\A--([a-z]+(-[a-z]+)*)/)
-        long_name, option_value = parse_longname(arg, m)
-        next_captured = false # next argument may be options argument
-        if (option_value == nil) && (i+1 < args.length)
-          option_value = args[i+1] 
-          next_captured = true
-        end
-        took_value = handle_options long_name, option_value
-        i += 1 if took_value && next_captured 
+        name, attached = parse_longname(arg, m)
+        found = :long_name
       elsif arg[0] == '-' 
-        short_name, option_value = parse_shortname(arg)
-        next_captured = false # next argument may be options argument
-        if (option_value == nil) && (i+1 < args.length)
-          option_value = args[i+1] 
-          next_captured = true
-        end
-        took_value = handle_options short_name, option_value
-        i += 1 if took_value && next_captured 
+        name, attached  = parse_shortname(arg)
+        found = :short_name
       else
-        @args << arg
+        @args.concat args[i...args.length]
+        break
+      end
+      if found
+        next_arg = (i+1 < args.length) ? args[i+1] : nil
+        begin
+          need_shift = handle_option found, name, attached, next_arg 
+          if need_shift.class == String
+            errmsg = need_shift
+            return errmsg + ": " + arg.to_s
+          end
+        end
+        i += 1 if need_shift == true
       end
       i += 1
     end
@@ -83,21 +94,4 @@ class ClOptions
   end
 end
 
-def parse_option(arg)
-  
-end
-
-options = [ { short_name: 'd', long_name: 'debug', method: :set_debug, takes_value: false},
-            { short_name: 'o', long_name: 'output-file', method: :set_output, takes_value: true}]
 
-$debug=false
-def set_debug
-  $debug = true
-end
-def set_output(file_name)
-  puts "file name = " + file_name
-end
-opts = ClOptions.new(self, options)
-args = opts.handle(ARGV)
-puts "args are:" + args.to_s
-puts "$debug = " + $debug.to_s

data/lib/clui_config.rb

@@ -1,45 +1,84 @@
 require 'fileutils'
-require_relative 'command_proc'
+require_relative 'command'
+require_relative 'config_reader'
 
-class ConfigCommand
-  include CommandProc
+class ConfigInit < Command
 
-  def initialize(name)
-    @handler = ConfigHandler.new
+  include ConfigReader
+
+  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)
   end
 
-  def init(args)
-    if (args.length != 2)
-      puts "usage: init <account-num> <token>"
-      puts "go to my.edgecast.com --> Settings to find it"
-    else
-      @handler.set("acct-num", args[0])
-      @handler.set("token", args[1])
-      @handler.set("rest_base_url", "https://api.edgecast.com/v2/")
-    end
+  def execute(args, ignore)
+    handler = ConfigHandler.new
+    handler.set("acct-num", args["acct-num"])
+    handler.set("token", args["token"])
+    handler.set("rest_base_url", "https://api.edgecast.com/v2/")
+    
+    print_cfg = {
+      "zone" => ["ZoneId", "DomainName", "ZoneType", "Status", "Version", "Records", "FailoverGroups", "LoadBalancingGroups"],
+      "zone.FailoverGroups.Group.AAAA" => ["Record", "IsPrimary", "HealthCheck"]
+    }
+    File.open(config_file("print.cfg"), "w").write(JSON.pretty_generate print_cfg)
   end
+end
 
-  def get(args)
-    if (args.length != 1)
-      puts "usage: get <name>"
-      error
-    end
-    puts @handler.get(args[0])
+class ConfigGet < Command
+  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)
   end
 
-  def set(args)
-    if (args.length != 2)
-      puts "usage: set <name> <value>"
-      error
-    end
-    @handler.set(args[0], args[1])
+  def execute(args, ignore)
+    handler = ConfigHandler.new
+    puts handler.get(args["param"])
+  end
+end
+
+class ConfigDelete < Command
+  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)
+  end
+
+  def execute(args, ignore)
+    handler = ConfigHandler.new
+    handler.delete(args["param"])
+  end
+end
+
+class ConfigSet < Command
+  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)
+  end
+
+  def execute(args, ignore)
+    handler = ConfigHandler.new
+    handler.set(args["param"], args["value"])
+  end
+end
+
+class ConfigCommand < Command
+  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")))
   end
 
-  def delete(args)
-    if (args.length != 1)
-      puts "usage: delete <name>"
-      error
+  def execute(args, subargs)
+    command = args["command"]
+    if command
+      command.run(subargs)
     end
-    @handler.delete(args[0])
   end
 end

data/lib/command.rb

@@ -0,0 +1,126 @@
+# template for a vzcdn command
+require_relative 'args'
+require_relative 'cloptions'
+
+class Command
+  attr_reader :name, :desc
+
+  class CancelExecution < StandardError
+  end
+
+  def initialize(name, description)
+    @name = name
+    @desc = description
+    @options = [{ short_name: 'h', long_name: 'help', method: :show_help_option, takes_value: false }]
+    init
+    @flows = [ ]
+    @arghash = { }
+    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
+  end
+
+  def add_options
+  end
+
+  def create_args
+  end
+
+  def create_flows
+  end
+
+  def add_option(option)
+    @options << option
+  end
+
+  def show_help_option
+    show_help
+    raise CancelExecution
+  end
+
+  def show_help
+    puts "#{@name} - #{@desc}"
+    @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 ""
+        end
+      end
+    }
+  end
+
+  def add_arg(name, arg)
+    @arghash[name] = arg
+  end
+
+  def add_flow_from_args(*keys)
+    flow = Flow.new
+    keys.each { |key|
+      flow.add(@arghash[key])
+    }
+    add_flow(flow)
+  end
+
+  def add_flow(flow)
+    @flows << flow
+  end
+
+  def run(args)
+    begin
+      args = ClOptions.new(self, @options).handle(args)
+    rescue CancelExecution
+      return nil
+    end  
+    if args.class == String
+      error = args
+      raise error
+    end
+    
+    @flows.each { |flow|
+      error, rest = flow.parse args, self
+      if error.nil?
+        execute(flow.args, rest)
+        return
+      end
+    }
+    puts "ERROR:no usage of #{@name} recognized"
+    puts ""
+    show_help
+  end
+end

data/lib/common.rb

@@ -37,6 +37,7 @@ class CommonRestUtils
       raise "Bad response code:" + response.code.to_s
     end
     if (response.length > 0)
+      File.open("raw.json", "w").write(response)
       JSON.parse response
     else
       nil

data/lib/config_handler.rb

@@ -1,3 +1,5 @@
+require 'util'
+
 class ConfigHandler
   CONFIG_DIRECTORY = ".vdms.d"
   CONFIG_FILENAME = "config"
@@ -9,20 +11,12 @@ class ConfigHandler
     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, orig_file)
     new_config_line = name + '=' + value.to_s
     wrote_line = false
     orig_file.each { |line|
-      old_name, old_value = parse_line(line)
+      old_name, old_value = Util.parse_line(line)
       if (old_name == name)
         if ! value.nil?
           new_file.puts(new_config_line)
@@ -48,9 +42,9 @@ class ConfigHandler
       File.open(get_config_file).each { |line|
         line = line.strip
         if line[0] == '#'
-          continue
+          next
         end
-        name, value = parse_line(line)
+        name, value = Util.parse_line(line)
         if value
           @@config_values[name] = value
         end