zabcon 0.0.3 → 0.0.4

data/libs/argument_processor.rb

@@ -18,8 +18,8 @@
 
 ##########################################
 # Subversion information
-# $Id: argument_processor.rb 258 2010-12-28 22:49:21Z nelsonab $
-# $Revision: 258 $
+# $Id: argument_processor.rb 266 2010-12-30 11:03:54Z richlv $
+# $Revision: 266 $
 ##########################################
 
 require 'libs/zdebug'
@@ -291,7 +291,7 @@ class ArgumentProcessor
 
     debug(2,args,"Pre substitution")
     args=unescape(substitute(split(args)).join)
-    debug(2,args,"Post Substitution")
+    debug(2,args,"Post substitution")
 
     return args
   end
@@ -325,7 +325,7 @@ class ArgumentProcessor
   end
 
   # This is the default Parameter processor.  This is passed to the Command Tree object when it is instantiated
-  # The default processor also checks the incoming parameters against the a list of valid arguments, and merges
+  # The default processor also checks the incoming parameters against a list of valid arguments, and merges
   # the user variables with the inbound arguments with the inbound arguments taking precedence, raises an
   # exception if there is an error
   def default_processor(help_func,valid_args,args,user_vars,*options)
@@ -528,21 +528,21 @@ class ArgumentProcessor
     end
 
     #  Item types
-    #  0 Zabbix agent                  - Passive
-    #  1 SNMPv1 agent                - SNMP
-    #  2 Zabbix trapper                - Trapper
-    #  3 Simple check                   - Simple
-    #  4 SNMPv2 agent                - SNMP2
-    #  5 Zabbix internal               - Internal
-    #  6 SNMPv3 agent                - SNMP3
+    #  0 Zabbix agent             - Passive
+    #  1 SNMPv1 agent             - SNMP
+    #  2 Zabbix trapper           - Trapper
+    #  3 Simple check             - Simple
+    #  4 SNMPv2 agent             - SNMP2
+    #  5 Zabbix internal          - Internal
+    #  6 SNMPv3 agent             - SNMP3
     #  7 Zabbix agent (active)    - Active
-    #  8 Zabbix aggregate          - Aggregate
-    # 10 External check               - External
+    #  8 Zabbix aggregate         - Aggregate
+    # 10 External check           - External
     # 11 Database monitor         - Database
-    # 12 IPMI agent                     - IPMI
-    # 13 SSH agent                      - SSH
-    # 14 TELNET agent                - Telnet
-    # 15 Calculated                      - Calculated
+    # 12 IPMI agent               - IPMI
+    # 13 SSH agent                - SSH
+    # 14 TELNET agent             - Telnet
+    # 15 Calculated               - Calculated
 
     #value types
     # 0 Numeric (float)
@@ -759,10 +759,3 @@ if __FILE__ == $0
   p arg='hosts=[{hostid=10017}] name="zzz"'
   pp arg_processor.params_to_hash(arg)
 end
-
-
-
-
-
-
-

data/libs/command_help.rb

@@ -18,8 +18,8 @@
 
 ##########################################
 # Subversion information
-# $Id: command_help.rb 258 2010-12-28 22:49:21Z nelsonab $
-# $Revision: 258 $
+# $Id: command_help.rb 270 2011-01-04 06:13:31Z nelsonab $
+# $Revision: 270 $
 ##########################################
 
 require 'libs/zdebug'
@@ -76,29 +76,26 @@ class CommandHelp
   end
 
   def help(command_tree,input)
+    input=input.gsub(/^\s*help\s*/,"")  #strip out the help statement at the start
     debug(6,command_tree.commands,"command_tree",350)
     debug(6,input,"input")
 
     items=input.split(" ")
-    if items.length==1
-      debug(6)
-
+    if items.length==0
       puts @doc.elements["//item[@command='help']"].text
     else # more than "help" was typed by the user
-      items.delete("help")
       help_cmd=items.join(" ").lstrip.chomp
 
-      if help_cmd=="commands"
+      if help_cmd.downcase=="commands"
         puts @doc.elements["//item[@command='help_commands']"].text
       else
         debug(4,help_cmd,"Searching for help on")
 
         cmd=command_tree.search(help_cmd)[0]  #search returns an array
-
-        if !cmd.helpproc.nil?
-          cmd.helpproc.call(nil)  #TODO: need to fix, see line 67 above
-        else
+        if cmd.nil? or cmd[:helpproc].nil?
           puts "Unable to find help for \"#{help_cmd}\""
+        else
+          cmd[:helpproc].call(nil)  #TODO: need to fix, see line 67 above
         end
       end
     end

data/libs/command_tree.rb

@@ -18,8 +18,8 @@
 
 ##########################################
 # Subversion information
-# $Id: command_tree.rb 258 2010-12-28 22:49:21Z nelsonab $
-# $Revision: 258 $
+# $Id: command_tree.rb 270 2011-01-04 06:13:31Z nelsonab $
+# $Revision: 270 $
 ##########################################
 
 require 'libs/zdebug'
@@ -32,7 +32,7 @@ class Parser
   attr_reader :commands
 
   def initialize(default_argument_processor)
-    @commands=CommandTree.new("",nil,0,nil,nil,nil,nil)
+    @commands=NewCommandTree.new
     @default_argument_processor=default_argument_processor
   end
 
@@ -53,13 +53,11 @@ class Parser
 
     str=strip_comments(str)
 
-    nodes = [""]+str.split
 
-    cmd_node=@commands.search(nodes)  # a side effect of the function is that it also manipulates nodes
+#    cmd_node=@commands.search(nodes)  # a side effect of the function is that it also manipulates nodes
+     cmd_node=@commands.get_command(str)
     debug(7,cmd_node,"search result")
-    args=nodes.join(" ")
-
-    return cmd_node,args
+    return cmd_node[:command],cmd_node[:parameters]
 
   end
 
@@ -80,17 +78,20 @@ class Parser
     debug(7,str,"Parsing")
 #    options=
     debug(7,user_vars,"User Variables")
-    cmd_node,args=search(str)
 
-    if cmd_node.commandproc.nil? then
+    result=@commands.get_command(str)
+
+    cmd=result[:command]
+
+    if cmd.nil? or cmd[:commandproc].nil? then
       raise ParseError.new("Parse error, incomplete/unknown command: #{str}",:retry=>true)
     else
       # The call here to the argument process requires one argument as it's a lambda block which is setup when the
       # command node is created
-      debug(6,args,"calling argument processor")
-      args=cmd_node.argument_processor.call(args,user_vars)
+      debug(6,result[:parameters],"calling argument processor")
+      args=cmd[:argument_processor].call(result[:parameters],user_vars)
       debug(6,args,"received from argument processor")
-      retval = args.nil? ? nil : {:proc=>cmd_node.commandproc, :helpproc=>cmd_node.helpproc, :options=>cmd_node.options}.merge(args)
+      retval = args.nil? ? nil : {:proc=>cmd[:commandproc], :helpproc=>cmd[:helpproc], :options=>cmd[:options]}.merge(args)
       return retval
     end
   end
@@ -119,19 +120,142 @@ class Parser
     end
   end
 
-  def insert(insert_path,command,commandproc,arguments=[],helpproc=nil,argument_processor=nil,*options)
-    debug(10,{"insert_path"=>insert_path, "command"=>command, "commandproc"=>commandproc, "arguments"=> arguments, "helpproc"=>helpproc, "argument_processor"=>argument_processor, "options"=>options})
-   insert_path_arr=[""]+insert_path.split   # we must pre-load our array with a blank node at the front
+  def insert(insert_path,commandproc,arguments=[],helpproc=nil,argument_processor=nil,*options)
+    debug(10,{"insert_path"=>insert_path, "commandproc"=>commandproc, "arguments"=> arguments, "helpproc"=>helpproc, "argument_processor"=>argument_processor, "options"=>options})
+#   insert_path_arr=[""]+insert_path.split   # we must pre-load our array with a blank node at the front
 #    p insert_path_arr
 
     # If the parameter "argument_processor" is nil use the default argument processor
     arg_processor = argument_processor.nil? ? @default_argument_processor : argument_processor
-    @commands.insert(insert_path_arr,command,commandproc,arguments,helpproc,arg_processor,options)
+    @commands.insert(insert_path,commandproc,arguments,helpproc,arg_processor,options)
   end
 
 end
 
+#{"add"=>{:node=>proc, "host"=>{:node=>proc,"group"=>{:node=>proc}}},"delete"=>...}
+
+class NewCommandTree
+  include ZDebug
+
+  def initialize
+    @tree = {}
+  end
+
+  def insert(insert_path,commandproc,arguments,helpproc,argument_processor,options)
+    tree_node=@tree
+    path_length=insert_path.length-1
+    insert_path.each_index do |index|
+      if tree_node[insert_path[index]].nil?
+        if index<path_length
+          tree_node[insert_path[index]]={}
+          tree_node=tree_node[insert_path[index]]
+        else
+          local_arg_processor=lambda do |params,user_vars|
+  	        if argument_processor.nil?
+	            nil
+	          else
+	            argument_processor.call(helpproc,arguments,params,user_vars,options)  # We pass the list of valid arguments to
+	         end
+          end
+          if options.nil?
+  	        local_options=nil
+	        else
+	          local_options = Hash[*options.collect { |v|
+	            [v, true]
+	          }.flatten]
+	        end
+          tree_node[insert_path[index]]={:node=>
+            {:commandproc=>commandproc, :arguments=>arguments, :helpproc=>helpproc,
+             :argument_processor=>local_arg_processor,:options=>local_options}}
+        end
+      else
+        tree_node=tree_node[insert_path[index]]
+      end
+    end
+  end
+
+  #get_command(String)
+  #returns a Hash with two items: :command and :parameters
+  #:command is a hash denoting all of the components of a the command when it was inserted
+  #:parameters is the remainder of the String passed in.
+  #
+  #example:
+  #  get_command("get host show=all")
+  #  {:command=>{hash created from insert}, :parameters=>"show=all"}
+  #
+  #  get_command("get host test           test2")
+  #  {:command=>{hash created from insert}, :parameters=>"test           test2"
+    def get_command(str)
+    str_array=str.downcase.split  #ensure all comparisons are done in lower case
+    str_items=str_array.length
+
+    cur_node=@tree
+    count=0
+
+    str_array.collect do |item|
+      break if cur_node[item].nil?
+      count+=1
+
+      cur_node=cur_node[item]
+    end
+
+    cmd= cur_node.nil? ? nil : cur_node[:node]
+
+    #remove preceding items found so we can return the remainder
+    #as the parameters
+    count.times do |i|
+      str=str.gsub(/^#{str_array[i]}/,"")
+      str=str.gsub(/^\s*/,"")
+    end
+
+    {:command=>cmd,:parameters=>str}
+  end
+
+end
+  def search(search_path)
+      debug(10,search_path,"search_path")
+    return retval if results.empty?  # no more children to search, return retval which may be self or nil, see logic above
+        debug(10)
+
+        return results[0].search(search_path)
+        debug(10,"Not digging deeper")
+
+        return self if search_path[0]==@command
+
+      end
+
+  def insert(insert_path,command,commandproc,arguments,helpproc,argument_processor,options)
+      do_insert(insert_path,command,commandproc,arguments,helpproc,argument_processor,options,0)
+      end
 
+  # Insert path is the path to insert the item into the tree
+  # Insert path is passed in as an array of names which associate with pre-existing nodes
+  # The function will recursively insert the command and will remove the top of the input path stack at each level until it
+  # finds the appropraite level.  If the appropriate level is never found an exception is raised.
+  def do_insert(insert_path,command,commandproc,arguments,helpproc,argument_processor,options,depth)
+      debug(11,{"insert_path"=>insert_path, "command"=>command, "commandproc"=>commandproc, "arguments"=> arguments,
+                  "helpproc"=>helpproc, "verify_func"=>argument_processor, "depth"=>depth})
+        debug(11,@command,"self.command")
+#    debug(11,@children.map {|child| child.command},"children")
+
+      if insert_path[0]==@command then
+          debug(11,"Found node")
+            if insert_path.length==1 then
+                debug(11,command,"inserting")
+                  @children << CommandTree.new(command,commandproc,depth+1,arguments,helpproc,argument_processor,options)
+                else
+                    debug(11,"Not found walking tree")
+                      insert_path.shift
+                      if !@children.empty? then
+                          @children.each { |node| node.do_insert(insert_path,command,commandproc,arguments,helpproc,argument_processor,options,depth+1)}
+                          else
+                              raise(Command_Tree_Exception,"Unable to find insert point in Command Tree")
+                              end
+                    end
+          end
+  end
+
+=begin
 class CommandTree
 
   include ZDebug
@@ -191,72 +315,31 @@ class CommandTree
   # or the immediate children nodes.  It does not search the tree beyond one level.
   # The loggedin argument is used to differentiate searching for commands which require a valid
   # login or not.  If loggedin is false it will return commands which do not require a valid login.
-  def search(search_path)
-    debug(10,search_path,"search_path")
-    debug(10,self,"self",300)
+  debug(10,self,"self",300)
 
-    return nil if search_path.nil?
-    return nil if search_path.empty?
+  return nil if search_path.nil?
+  return nil if search_path.empty?
 
-    retval=nil
+  retval=nil
 
-    retval=self if search_path[0]==@command
+  retval=self if search_path[0]==@command
 
 
-    search_path.shift
-    debug(10,search_path, "shifted search path")
+  search_path.shift
+  debug(10,search_path, "shifted search path")
 
-    return retval if search_path.length==0
+  return retval if search_path.length==0
 
 #    p search_path
 #    p @children.map {|child| child.command}
-    debug(10,@children.map{|child| child.command},"Current children")
-
-    results=@children.map {|child| child.command==search_path[0] ? child : nil }
-    results.compact!
-    debug(10,results,"Children search results",200)
-    return retval if results.empty?  # no more children to search, return retval which may be self or nil, see logic above
-    debug(10)
-
-    return results[0].search(search_path)
-    debug(10,"Not digging deeper")
-
-    return self if search_path[0]==@command
-
-  end
+  debug(10,@children.map{|child| child.command},"Current children")
 
-  def insert(insert_path,command,commandproc,arguments,helpproc,argument_processor,options)
-    do_insert(insert_path,command,commandproc,arguments,helpproc,argument_processor,options,0)
-  end
-
-  # Insert path is the path to insert the item into the tree
-  # Insert path is passed in as an array of names which associate with pre-existing nodes
-  # The function will recursively insert the command and will remove the top of the input path stack at each level until it
-  # finds the appropraite level.  If the appropriate level is never found an exception is raised.
-  def do_insert(insert_path,command,commandproc,arguments,helpproc,argument_processor,options,depth)
-    debug(11,{"insert_path"=>insert_path, "command"=>command, "commandproc"=>commandproc, "arguments"=> arguments,
-              "helpproc"=>helpproc, "verify_func"=>argument_processor, "depth"=>depth})
-    debug(11,@command,"self.command")
-#    debug(11,@children.map {|child| child.command},"children")
-
-    if insert_path[0]==@command then
-      debug(11,"Found node")
-      if insert_path.length==1 then
-        debug(11,command,"inserting")
-        @children << CommandTree.new(command,commandproc,depth+1,arguments,helpproc,argument_processor,options)
-      else
-        debug(11,"Not found walking tree")
-        insert_path.shift
-        if !@children.empty? then
-          @children.each { |node| node.do_insert(insert_path,command,commandproc,arguments,helpproc,argument_processor,options,depth+1)}
-        else
-          raise(Command_Tree_Exception,"Unable to find insert point in Command Tree")
-        end
-      end
-    end
-  end
+  results=@children.map {|child| child.command==search_path[0] ? child : nil }
+  results.compact!
+  debug(10,results,"Children search results",200)
 
 end
+=end
 
 
 if __FILE__ == $0

data/libs/zabcon_core.rb

@@ -21,7 +21,7 @@
 ##########################################
 # Subversion information
 # $Id: $
-# $Revision: 258 $
+# $Revision: 270 $
 ##########################################
 
 require 'parseconfig'
@@ -109,104 +109,92 @@ class ZabconCore
     # parameters for insert:  insert_path, command, commandproc, arguments=[], helpproc=nil, verify_func=nil, options
 
     # These commands do not require a valid login
-    @commands.insert "", "quit", :exit
-    @commands.insert "", "exit", :exit
-    @commands.insert "", "help", :help,no_args,no_help,@arg_processor.help, :suppress_printer
-
-    @commands.insert "", "hisotry", self.method(:do_history),no_args,no_help,no_verify,:suppress_printer
-    @commands.insert "", "info", self.method(:do_info),no_args,no_help,no_verify,:suppress_printer
-    @commands.insert "", "load", no_cmd,no_args,no_help,no_verify,:suppress_printer
-    @commands.insert "", "login", self.method(:do_login),nil,nil,@arg_processor.method(:login), :suppress_printer
-    @commands.insert "", "set", no_cmd
-    @commands.insert "", "show", no_cmd
-    @commands.insert "", "unset", no_cmd
-    @commands.insert "load", "config", @env.method(:load_config),no_args,no_help,no_verify,:suppress_printer
-    @commands.insert "set", "debug", self.method(:set_debug),no_args,no_help,no_verify,:suppress_printer
-    @commands.insert "set", "lines", self.method(:set_lines),no_args,no_help,no_verify,:suppress_printer
-    @commands.insert "set", "pause", self.method(:set_pause),no_args,no_help,no_verify,:suppress_printer
-    @commands.insert "set", "var", self.method(:set_var), no_args, no_help, @arg_processor.method(:simple_processor),:suppress_printer
-    @commands.insert "set", "env", self.method(:set_env), no_args, no_help, @arg_processor.method(:simple_processor), :suppress_printer
-    @commands.insert "show", "var", self.method(:show_var), no_args, no_help, @arg_processor.method(:array_processor), :suppress_printer
-    @commands.insert "show", "env", self.method(:show_env), no_args, no_help, @arg_processor.method(:array_processor), :suppress_printer
-    @commands.insert "unset", "var", self.method(:unset_var), no_args, no_help, @arg_processor.method(:array_processor), :suppress_printer
+    @commands.insert ["quit"], :exit
+    @commands.insert ["exit"], :exit
+    @commands.insert ["help"], :help,no_args,no_help,@arg_processor.help, :suppress_printer
+
+    @commands.insert ["hisotry"], self.method(:do_history),no_args,no_help,no_verify,:suppress_printer
+    @commands.insert ["info"], self.method(:do_info),no_args,no_help,no_verify,:suppress_printer
+    @commands.insert ["load"], no_cmd,no_args,no_help,no_verify,:suppress_printer
+    @commands.insert ["login"], self.method(:do_login),nil,nil,@arg_processor.method(:login), :suppress_printer
+    @commands.insert ["load","config"], @env.method(:load_config),no_args,no_help,no_verify,:suppress_printer
+    @commands.insert ["set","debug"], self.method(:set_debug),no_args,no_help,no_verify,:suppress_printer
+    @commands.insert ["set","lines"], self.method(:set_lines),no_args,no_help,no_verify,:suppress_printer
+    @commands.insert ["set","pause"], self.method(:set_pause),no_args,no_help,no_verify,:suppress_printer
+    @commands.insert ["set","var"], self.method(:set_var), no_args, no_help, @arg_processor.method(:simple_processor),:suppress_printer
+    @commands.insert ["set","env"], self.method(:set_env), no_args, no_help, @arg_processor.method(:simple_processor), :suppress_printer
+    @commands.insert ["show","var"], self.method(:show_var), no_args, no_help, @arg_processor.method(:array_processor), :suppress_printer
+    @commands.insert ["show","env"], self.method(:show_env), no_args, no_help, @arg_processor.method(:array_processor), :suppress_printer
+    @commands.insert ["unset","var"], self.method(:unset_var), no_args, no_help, @arg_processor.method(:array_processor), :suppress_printer
+
 
     if loggedin then
       debug(5,"Inserting commands which require login")
       # This command tree is for a valid login
-      @commands.insert "", "raw", no_cmd
-      @commands.insert "", "add", no_cmd
-      @commands.insert "", "delete", no_cmd
-      @commands.insert "", "get", no_cmd, no_args, @cmd_help.method(:get)
-      @commands.insert "", "import", self.method(:do_import),no_args,no_help,no_verify
-      @commands.insert "", "update", no_cmd
-
-      @commands.insert "add", "app", @server.method(:addapp),no_args,no_help,no_verify
-      @commands.insert "add app", "id", @server.method(:getappid),no_args,no_help,no_verify
-      @commands.insert "add", "host", @server.method(:addhost), no_args, @cmd_help.method(:add_host), @arg_processor.method(:add_host), :server => @server
-      @commands.insert "add host", "group", @server.method(:addhostgroup),no_args,no_help,no_verify
-      @commands.insert "add", "item", @server.method(:additem), no_args, @cmd_help.method(:add_item), @arg_processor.method(:add_item)
-      @commands.insert "add", "link", @server.method(:addlink),no_args,no_help,no_verify
-      @commands.insert "add link", "trigger", @server.method(:addlinktrigger),no_args,no_help,no_verify
-      @commands.insert "add", "sysmap", @server.method(:addsysmap),no_args,no_help,no_verify
-      @commands.insert "add sysmap", "element", @server.method(:addelementtosysmap),no_args,no_help,no_verify
-      @commands.insert "add", "trigger", @server.method(:addtrigger),no_args,no_help,no_verify
-      @commands.insert "add", "user", @server.method(:adduser), no_args, @cmd_help.method(:add_user), @arg_processor.method(:add_user)
-      @commands.insert "add user", "media", @server.method(:addusermedia),no_args,@cmd_help.method(:add_user_media),no_verify
-
-      @commands.insert "get", "app", @server.method(:getapp), no_args, no_help, @arg_processor.default_get
-      @commands.insert "get", "host", @server.method(:gethost), no_args, no_help, @arg_processor.default_get
-      @commands.insert "get host", "group", @server.method(:gethostgroup), no_args, no_help, @arg_processor.default_get
-      @commands.insert "get host group", "id", @server.method(:gethostgroupid), no_args, no_help, @arg_processor.method(:get_group_id)
-      @commands.insert "get", "item", @server.method(:getitem),
+      @commands.insert ["get"], no_cmd, no_args, @cmd_help.method(:get)
+      @commands.insert ["import"], self.method(:do_import),no_args,no_help,no_verify
+
+      @commands.insert ["add","app"], @server.method(:addapp),no_args,no_help,no_verify
+      @commands.insert ["add","app","id"], @server.method(:getappid),no_args,no_help,no_verify
+      @commands.insert ["add","host"], @server.method(:addhost), no_args, @cmd_help.method(:add_host), @arg_processor.method(:add_host), :server => @server
+      @commands.insert ["add","host","group"], @server.method(:addhostgroup),no_args,no_help,no_verify
+      @commands.insert ["add","item"], @server.method(:additem), no_args, @cmd_help.method(:add_item), @arg_processor.method(:add_item)
+      @commands.insert ["add","link"], @server.method(:addlink),no_args,no_help,no_verify
+      @commands.insert ["add","link","trigger"], @server.method(:addlinktrigger),no_args,no_help,no_verify
+      @commands.insert ["add","sysmap"], @server.method(:addsysmap),no_args,no_help,no_verify
+      @commands.insert ["add","sysmap","element"], @server.method(:addelementtosysmap),no_args,no_help,no_verify
+      @commands.insert ["add","trigger"], @server.method(:addtrigger),no_args,no_help,no_verify
+      @commands.insert ["add","user"], @server.method(:adduser), no_args, @cmd_help.method(:add_user), @arg_processor.method(:add_user)
+      @commands.insert ["add","user","media"], @server.method(:addusermedia),no_args,@cmd_help.method(:add_user_media),no_verify
+
+      @commands.insert ["get","app"], @server.method(:getapp), no_args, no_help, @arg_processor.default_get
+      @commands.insert ["get","host"], @server.method(:gethost), no_args, no_help, @arg_processor.default_get
+      @commands.insert ["get","host","group"], @server.method(:gethostgroup), no_args, no_help, @arg_processor.default_get
+      @commands.insert ["get","host","group","id"], @server.method(:gethostgroupid), no_args, no_help, @arg_processor.method(:get_group_id)
+      @commands.insert ["get","item"], @server.method(:getitem),
           ['itemids','hostids','groupids', 'triggerids','applicationids','status','templated_items','editable','count','pattern','limit','order', 'show'],
           @cmd_help.method(:get_item), @arg_processor.default_get
-      @commands.insert "get", "seid", @server.method(:getseid), no_args, no_help, @arg_processor.default_get
-      @commands.insert "get", "trigger", @server.method(:gettrigger), no_args, no_help, @arg_processor.default_get
-      @commands.insert "get", "user", @server.method(:getuser),['show'], @cmd_help.method(:get_user), @arg_processor.method(:get_user)
+      @commands.insert ["get","seid"], @server.method(:getseid), no_args, no_help, @arg_processor.default_get
+      @commands.insert ["get","trigger"], @server.method(:gettrigger), no_args, no_help, @arg_processor.default_get
+      @commands.insert ["get","user"], @server.method(:getuser),['show'], @cmd_help.method(:get_user), @arg_processor.method(:get_user)
 
-      @commands.insert "delete", "user", @server.method(:deleteuser), ['id'], @cmd_help.method(:delete_user), @arg_processor.method(:delete_user)
-      @commands.insert "delete", "host", @server.method(:deletehost), no_args, @cmd_help.method(:delete_host), @arg_processor.method(:delete_host)
-      @commands.insert "delete", "item", @server.method(:deleteitem), ['itemid'], @cmd_help.method(:delete_item), @arg_processor.default
+      @commands.insert ["delete","user"], @server.method(:deleteuser), ['id'], @cmd_help.method(:delete_user), @arg_processor.method(:delete_user)
+      @commands.insert ["delete","host"], @server.method(:deletehost), no_args, @cmd_help.method(:delete_host), @arg_processor.method(:delete_host)
+      @commands.insert ["delete","item"], @server.method(:deleteitem), ['itemid'], @cmd_help.method(:delete_item), @arg_processor.default
 
-      @commands.insert "raw", "api", @server.method(:raw_api), no_args, @cmd_help.method(:raw_api), @arg_processor.method(:raw_api)
-      @commands.insert "raw", "json", @server.method(:raw_json), no_args, @cmd_help.method(:raw_json), @arg_processor.method(:raw_processor)
+      @commands.insert ["raw","api"], @server.method(:raw_api), no_args, @cmd_help.method(:raw_api), @arg_processor.method(:raw_api)
+      @commands.insert ["raw","json"], @server.method(:raw_json), no_args, @cmd_help.method(:raw_json), @arg_processor.method(:raw_processor)
 
-      @commands.insert "update", "user", @server.method(:updateuser), no_args, no_help, no_verify
+      @commands.insert ["update","user"], @server.method(:updateuser), no_args, no_help, no_verify
     else
       debug(5,"Inserting commands which do not require login")
       # This command tree is for no login
-      @commands.insert "", "add", no_cmd
-      @commands.insert "", "delete", no_cmd
-      @commands.insert "", "get", no_cmd
-      @commands.insert "", "import", no_cmd,no_args,no_help
-      @commands.insert "", "update", no_cmd
-
-      @commands.insert "add", "app", login_required,no_args,no_help
-      @commands.insert "add app", "id", login_required,no_args,no_help
-      @commands.insert "add", "host", login_required, no_args, @cmd_help.method(:add_host)
-      @commands.insert "add host", "group", login_required,no_args,no_help
-      @commands.insert "add", "item", login_required, no_args, no_help
-      @commands.insert "add", "link", login_required,no_args,no_help
-      @commands.insert "add link", "trigger", login_required,no_args,no_help
-      @commands.insert "add", "sysmap", login_required,no_args,no_help
-      @commands.insert "add sysmap", "element", login_required,no_args,no_help
-      @commands.insert "add", "trigger", login_required,no_args,no_help
-      @commands.insert "add", "user", login_required, no_args, @cmd_help.method(:add_user)
-      @commands.insert "add user", "media", login_required,no_args,no_help
-
-      @commands.insert "get", "app", login_required, no_args, no_help
-      @commands.insert "get", "host", login_required, no_args, no_help
-      @commands.insert "get host", "group", login_required, no_args, no_help
-      @commands.insert "get host group", "id", login_required, no_args, no_help
-      @commands.insert "get", "item", login_required, no_args, no_help
-      @commands.insert "get", "seid", login_required, no_args, no_help
-      @commands.insert "get", "trigger", login_required, no_args, no_help
-      @commands.insert "get", "user", login_required,no_args, @cmd_help.method(:get_user)
-
-      @commands.insert "delete", "user", login_required, no_args, @cmd_help.method(:delete_user)
-      @commands.insert "delete", "host", login_required, no_args, @cmd_help.method(:delete_host)
-
-      @commands.insert "update", "user", login_required, no_args, no_help
+      @commands.insert ["add","app"], login_required,no_args,no_help
+      @commands.insert ["add","app","id"], login_required,no_args,no_help
+      @commands.insert ["add","host"], login_required, no_args, @cmd_help.method(:add_host)
+      @commands.insert ["add","host","group"], login_required,no_args,no_help
+      @commands.insert ["add","item"], login_required, no_args, no_help
+      @commands.insert ["add","link"], login_required,no_args,no_help
+      @commands.insert ["add","link","trigger"], login_required,no_args,no_help
+      @commands.insert ["add","sysmap"], login_required,no_args,no_help
+      @commands.insert ["add","sysmap","element"], login_required,no_args,no_help
+      @commands.insert ["add","trigger"], login_required,no_args,no_help
+      @commands.insert ["add","user"], login_required, no_args, @cmd_help.method(:add_user)
+      @commands.insert ["add","user","media"], login_required,no_args,no_help
+
+      @commands.insert ["get","app"], login_required, no_args, no_help
+      @commands.insert ["get","host"], login_required, no_args, no_help
+      @commands.insert ["get","host","group"], login_required, no_args, no_help
+      @commands.insert ["get","host","group","id"], login_required, no_args, no_help
+      @commands.insert ["get","item"], login_required, no_args, no_help
+      @commands.insert ["get","seid"], login_required, no_args, no_help
+      @commands.insert ["get","trigger"], login_required, no_args, no_help
+      @commands.insert ["get","user"], login_required,no_args, @cmd_help.method(:get_user)
+
+      @commands.insert ["delete","user"], login_required, no_args, @cmd_help.method(:delete_user)
+      @commands.insert ["delete","host"], login_required, no_args, @cmd_help.method(:delete_host)
+
+      @commands.insert ["update","user"], login_required, no_args, no_help
     end
   end
 

data/libs/zabcon_globals.rb

@@ -18,8 +18,8 @@
 
 ##########################################
 # Subversion information
-# $Id: zabcon_exceptions.rb 181 2010-04-08 03:33:18Z nelsonab $
-# $Revision: 181 $
+# $Id: zabcon_globals.rb 264 2010-12-30 07:21:01Z nelsonab $
+# $Revision: 264 $
 ##########################################
 
 #------------------------------------------------------------------------------

data/zabcon.rb

@@ -20,8 +20,8 @@
 
 ##########################################
 # Subversion information
-# $Id: zabcon.rb 250 2010-12-24 06:56:38Z nelsonab $
-# $Revision: 250 $
+# $Id: zabcon.rb 264 2010-12-30 07:21:01Z nelsonab $
+# $Revision: 264 $
 ##########################################
 
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zabcon
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - A. Nelson
@@ -15,7 +15,7 @@ autorequire:
 bindir: .
 cert_chain: []
 
-date: 2010-12-30 00:00:00 -05:00
+date: 2011-01-06 00:00:00 -05:00
 default_executable: zabcon
 dependencies: 
 - !ruby/object:Gem::Dependency