zabcon 0.0.370 → 0.0.392

data/libs/argument_processor.rb

@@ -18,8 +18,8 @@
 
 ##########################################
 # Subversion information
-# $Id: argument_processor.rb 345 2011-11-23 04:28:53Z nelsonab $
-# $Revision: 345 $
+# $Id: argument_processor.rb 384 2012-04-23 04:50:17Z nelsonab $
+# $Revision: 384 $
 ##########################################
 
 require 'zbxapi/zdebug'
@@ -252,376 +252,6 @@ module ArgumentProcessor
     Command::Arguments.new(args, flags)
   end
 
-#  # This processor does not do anything fancy.  All items passed in via args are passed back in api_params
-#  def simple_processor(help_func,valid_args,args,user_vars,*options)
-#
-#    args=substitute_vars(args)
-#    args=params_to_hash(args)
-#
-#    {:api_params=>args, :show_params=>{}}
-#  end
-#
-#  # This is the default processor for get commands.  It adds "limit" and "extendoutput" as needed
-#  def default_get_processor(help_func, valid_args, args, user_vars, *options)
-#
-#    # let the default processor set things up
-#    retval=default_processor(help_func,valid_args,args,user_vars,options)
-#
-#    if retval[:api_params]["limit"].nil?
-#      retval[:api_params]["limit"]=100
-#    end
-#    if retval[:api_params]["show"].nil?
-#      retval[:api_params]["extendoutput"]=true
-#    end
-#
-#      retval
-#  end
-#
-#  #Helper function to ensure the proper hash is returned
-#  def return_helper(parameters,show_parameters=nil)
-#    {:api_params=>parameters, :show_params=>show_parameters}
-#  end
-#
-#  # Helper function the check for required parameters.
-#  # Parameters is the hash of parameters from the user
-#  # required_parameters is an array of parameters which are required
-#  # returns an array of missing required items
-#  # if the returned array is empty all required items found
-#  def check_required(parameters,required_parameters)
-#    r_params=required_parameters.clone    # Arrays are pass by reference
-#    parameters.keys.each{|key| r_params.delete(key)}
-#    r_params
-#  end
-#
-#  # Helper function to check the validity of the parameters from the user
-#  # Parameters is the hash of parameters from the user
-#  # valid_parameters is an array of parameters which are valid
-#  # returns an array of invalid parameters
-#  # if the returned array is empty all parameters are valid
-#  def check_parameters(parameters,valid_parameters)
-#    if !valid_parameters.nil?
-#      keys=parameters.keys
-#      valid_parameters.each {|key| keys.delete(key)}
-#      return keys
-#    else
-#      return []
-#    end
-#  end
-#
-#  # hash_processor is a helper function which takes the incoming arguments
-#  # and chunks them into a hash of pairs
-#  # example:
-#  # input:  one two three four
-#  # result:  "one"=>"two", "three"=>"four"
-#  # Exception will be raised when error found
-#  # processor does not do variable substitution
-#  # TODO: Consider removing function as it appears not be used
-#  def hash_processor(help_func,valid_args,args,user_vars,*options)
-#    debug(6,options,"Options")
-#    items=args.split2
-#    if items.count % 2 == 0
-#      rethash={}
-#      while items.count!=0
-#        rethash[items[0]]=items[1]
-#        items.delete_at(0)
-#        items.delete_at(0)   #make sure we delete the first two items
-#      end
-#      return_helper(rethash)
-#    else
-#      msg="Invalid input\n"
-#      msg+="Odd number of arguments found"
-#      raise ParameterError.new(msg,:retry=>true)
-#    end
-#  end
-#
-#  ##############################################################################################
-#  # End of default and helper functions
-#  ##############################################################################################
-#
-#  def add_user(help_func,valid_args,args, user_vars, *options)
-#    debug(4,args,"args")
-#
-#    if args.empty?
-#      call_help(help_func)
-#      raise ParameterError.new("No arguments",:retry=>true, :help_func=>help_func)
-#    end
-#
-#    valid_parameters=['name', 'surname', 'alias', 'passwd', 'url', 'autologin',
-#                      'autologout', 'lang', 'theme', 'refresh', 'rows_per_page', 'type']
-#    default_processor(help_func,valid_parameters,args,user_vars,options)
-#  end
-#
-#  def add_host(help_func,valid_args,args,user_vars,*options)
-#    debug(4,args,"args")
-#    debug(4,options,"options")
-#
-#    if args.empty?
-#      call_help(help_func)
-#      return nil
-#    end
-#
-#    #TODO, add the ability for both groups and groupids
-#
-#    valid_parameters=['host', 'groups', 'port', 'status', 'useip', 'dns', 'ip',
-#                       'proxy_hostid', 'useipmi', 'ipmi_ip', 'ipmi_port', 'ipmi_authtype',
-#                       'ipmi_privilege', 'ipmi_username', 'ipmi_password', 'templates']
-#
-#    parameters=default_processor(help_func,valid_parameters,args,user_vars,options)[:api_params]
-#
-#    required_parameters=[ 'host', 'groups' ]
-#
-##    p required_parameters
-##    p parameters
-#
-##    if !parameters["dns"].nil? and !required_parameters.find("ip")
-##      required_parameters.delete("ip")
-##    elsif !parameters["ip"].nil? and !required_parameters["dns"]
-##      required_parameters.delete("dns")
-##    end
-#
-#    if !(missing=check_required(parameters,required_parameters)).empty?
-##      if !required_parameters["ip"].nil? and !required_parameters["dns"].nil?
-##        puts "Missing parameter dns and/or ip"
-##        required_parameters["ip"].delete
-##        required_parameters["dns"].delete
-##      end
-#      msg = "Required parameters missing\n"
-#      msg += missing.join(", ")
-#
-#      raise ParameterError_Missing.new(msg,:retry=>true, :help_func=>help_func)
-#    end
-#
-#    groups=convert_or_parse(parameters['groupids'])
-#    if groups.class==Fixnum
-#      parameters['groups']=[{"groupid"=>groups}]
-#    end
-#
-#    return_helper(parameters)
-#  end
-#
-#  def add_item_active(help_func,parameters,*options)
-#    valid_parameters = ['hostid','description','key','delta','history','multiplier','value_type', 'data_type',
-#                         'units','delay','trends','status','valuemapid','applications']
-#    required_parameters = ['hostid','description','key']
-#  end
-#
-#  def add_item(help_func,valid_args,args,user_vars,*options)
-#    debug(4,args,"args")
-#    debug(4,options,"options")
-#    debug(4,user_vars,"User Variables")
-#
-#    if args.empty?
-#      call_help(help_func)
-#      return nil
-#    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
-#    #  7 Zabbix agent (active)    - Active
-#    #  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
-#
-#    #value types
-#    # 0 Numeric (float)
-#    # 1 Character
-#    # 2 Log
-#    # 3 Numeric (unsigned)
-#    # 4 Text
-#
-#    # Data Types
-#    # 0 Decimal
-#    # 1 Octal
-#    # 2 Hexadecimal
-#
-#    # Status Types
-#    # 0 Active
-#    # 1 Disabled
-#    # 2 Not Supported
-#
-#    # Delta Types
-#    # 0 As is
-#    # 1 Delta (Speed per second)
-#    # 2 Delta (simple change)
-#
-#
-#    valid_parameters= ['hostid', 'snmpv3_securitylevel','snmp_community', 'publickey', 'delta', 'history', 'key_',
-#                        'key', 'snmp_oid', 'delay_flex', 'multiplier', 'delay', 'mtime', 'username', 'authtype',
-#                        'data_type', 'ipmi_sensor','snmpv3_authpassphrase', 'prevorgvalue', 'units', 'trends',
-#                        'snmp_port', 'formula', 'type', 'params', 'logtimefmt', 'snmpv3_securityname',
-#                        'trapper_hosts', 'description', 'password', 'snmpv3_privpassphrase',
-#                        'status', 'privatekey', 'valuemapid', 'templateid', 'value_type', 'groups']
-#
-#    parameters=default_processor(help_func,valid_parameters,args,user_vars,options)[:api_params]
-#
-##    valid_user_vars = {}
-##
-##    valid_parameters.each {|item|
-##      valid_user_vars[item]=user_vars[item] if !user_vars[item].nil?
-##    }
-##    p parameters
-##    p valid_user_vars
-##    parameters = valid_user_vars.merge(parameters)
-##    p parameters
-#
-#    required_parameters=[ 'type' ]
-#
-#    if parameters["type"].nil?
-#      puts "Missing required parameter 'type'"
-#      return nil
-#    end
-#
-#    if !(invalid=check_parameters(parameters,valid_parameters)).empty?
-#      puts "Invalid items"
-#      puts invalid.join(", ")
-#      return nil
-#    end
-#
-#    case parameters["type"].downcase
-#      when "passive"
-#        parameters["type"]=0
-#        required_parameters = ['hostid','description','key']
-#      when "active"
-#        parameters["type"]=7
-#        required_parameters = ['hostid','description','key']
-#      when "trapper"
-#        parameters["type"]=2
-#        required_parameters = ['hostid','description','key']
-#    end
-#
-#    if !(missing=check_required(parameters,required_parameters)).empty?
-#      puts "Required parameters missing"
-#
-#      puts missing.join(", ")
-#
-#      return nil
-#    end
-#
-#    # perform some translations
-#
-#    parameters["key_"]=parameters["key"]
-#    parameters.delete("key")
-#
-#    return_helper(parameters)
-# end
-#
-#
-#  def delete_host(help_func,valid_args,args,user_vars,*options)
-#    debug(6,args,"args")
-#
-#    args=default_processor(help_func,valid_args,args,user_vars,options)[:api_params]
-#
-#    if args["id"].nil?
-#      puts "Missing parameter \"id\""
-#      call_help(help_func)
-#      return nil
-#    end
-#
-#    return_helper(args["id"])
-#  end
-#
-#  def delete_user(help_func,valid_args,args,user_vars,*options)
-#    debug(6,args,"args")
-#    if (args.split(" ").length>1) or (args.length==0)
-#      raise ParameterError("Incorrect number of parameters",:retry=>true, :help_func=>help_func)
-#    end
-#
-#    args=default_processor(help_func,valid_args,args,user_vars)[:api_params]
-#
-#    if !args["id"].nil?
-#      return return_helper(args) if args["id"].class==Fixnum
-#      puts "\"id\" must be a number"
-#      call_help(help_func)
-#      return nil
-#    end
-#
-#    puts "Invalid arguments"
-#    call_help(help_func)
-#    return nil
-#
-#  end
-#
-#  #TODO: Document why this function does not use the default processor
-#  def get_group_id(help_func,valid_args,args,user_vars,*options)
-#    debug(4,valid_args,"valid_args")
-#    debug(4,args,"args")
-#
-#    args=substitute_vars(args)
-#    args=params_to_hash(args)
-#
-#    {:api_params=>args.keys, :show_params=>nil}
-#  end
-#
-#  def get_user(help_func,valid_args,args,user_vars,*options)
-#    debug(4,valid_args,"valid_args")
-#    debug(4,args, "args")
-#
-#    retval=default_get_processor(help_func,valid_args,args,user_vars)
-#    error=false
-#    msg=''
-#
-#    if !retval[:show_params][:show].nil?
-#      show_options=retval[:show_params][:show]
-#      if !show_options.include?("all")
-#        valid_show_options=['name','attempt_clock','theme','autologout','autologin','url','rows_per_page','attempt_ip',
-#                            'refresh','attempt_failed','type','userid','lang','alias','surname','passwd']
-#
-#        invalid_show_options=show_options-valid_show_options
-#
-#        if invalid_show_options.length!=0
-#          error=true
-#          msg = "Invalid show options: #{invalid_show_options}"
-#        end
-#      elsif show_options.length!=1
-#        error=true
-#        msg = "Show header option \"all\" cannot be included with other headers"
-#      end
-#    end
-##    raise ParameterError(msg,help_func) if error
-#
-#    return retval
-#  end
-#
-#  #TODO: Use helper functions to make login more robust
-#  def login(help_func,valid_args,args,user_vars,*options)
-#    debug(4,args, "args")
-#    args=args.split
-#    if args.length!=3
-#      call_help(help_func)
-#      return nil
-#    end
-#    params={}
-#    params[:server]=args[0]
-#    params[:username]=args[1]
-#    params[:password]=args[2]
-#    return {:api_params=>params}
-#  end
-#
-#  def raw_api(help_func,valid_args,args,user_vars,*options)
-#    debug(7,args,"raw_api argument processor")
-#
-#    args=substitute_vars(args)
-#
-#    items=args.split2
-#    method=items[0]
-#    items.delete_at(0)
-#    args=items.join(" ")
-#    args=params_to_hash(args)
-#    args=nil if args=={}
-#
-#    {:api_params=>{:method=>method, :params=>args}, :show_params=>{}}
-#  end
-
 end
 
 

data/libs/command_tree.rb

@@ -19,8 +19,8 @@
 #--
 ##########################################
 # Subversion information
-# $Id: command_tree.rb 365 2011-12-22 04:26:54Z nelsonab $
-# $Revision: 365 $
+# $Id: command_tree.rb 392 2012-05-17 22:24:15Z nelsonab $
+# $Revision: 392 $
 ##########################################
 #++
 
@@ -131,12 +131,12 @@ class ZabconExecuteContainer
     end
 
     cmd_str=tokens.map{|i|
-      if i.kind==:variable
-        name=/^\$(.*)/.match(i.value)[1]
-        GlobalVars.instance[name] || env[name]
-      else
+    #  if i.kind==:variable
+    #    name=/^\$(.*)/.match(i.value)[1]
+    #    GlobalVars.instance[name] || env[name]
+    #  else
         i.value
-      end
+    #  end
       }.join
 
     debug(5,:msg=>"Command String",:var=>cmd_str)
@@ -215,7 +215,8 @@ class Command
           show=args["show"] || flags[:default_cols]
           @show_params={:show=>show}
           @cmd_params.delete("show") if args["show"]
-          @cmd_params.merge!({"extendoutput"=>true})
+          #@cmd_params.merge!({"extendoutput"=>true})
+          @cmd_params.merge!({"output"=>"extend"})
         end
       end
     end

data/libs/lexer.rb

@@ -19,8 +19,8 @@
 #--
 ##########################################
 # Subversion information
-# $Id: lexer.rb 361 2011-12-19 00:21:52Z richlv $
-# $Revision: 361 $
+# $Id: lexer.rb 378 2012-04-21 03:06:30Z nelsonab $
+# $Revision: 378 $
 ##########################################
 #++
 
@@ -140,26 +140,61 @@ class Lexr
 		@text[@position..-1]
 	end
 
-	class Token
-		attr_reader :value, :kind, :opts
+  #class Token
+  #Token dynamically generates sub classes when Token.new is called
+  #The sub classes are descendant from Lexr::Token::Sub
+  class Token
+    class Sub
+      attr_reader :value
 
-		def initialize(value, kind = nil, opts={})
-#			@opts, @value, @kind = value, kind, opts
-      @value, @kind, @opts = value, kind, opts
-		end
+    		def initialize(value)
+          @value = value
+        end
 
-		def self.method_missing(sym, *args)
-			self.new(args.first, sym)
-		end
+        def to_s
+    			"#{kind}(#{value})"
+    		end
 
-		def to_s
-			"#{kind}(#{value})"
-		end
+    		def ==(other)
+        	self.class == other.class && @value == other.value
+        end
 
-		def ==(other)
-    	@kind == other.kind && @value == other.value
-		end
-	end
+        def is_a?(obj)
+          if obj.class==Symbol
+            obj==self.class.to_s.split("::")[-1].downcase.intern
+          else
+            super(obj)
+          end
+        end
+
+        def kind
+          self.class.to_s.split("::")[-1].downcase.intern
+        end
+    end
+
+    class Variable < Sub
+      def set_value(val)
+        @value=val
+      end
+    end
+
+    def self.new(value,kind=nil)
+      obj_name=kind.to_s.capitalize
+      begin
+        #    self::Sub.new(value,kind,opts)
+        obj=self.const_get(obj_name)
+        obj.new(value)
+      rescue NameError
+        self.const_set(obj_name,Class.new(Token::Sub))
+        retry
+      end
+    end
+
+  	def self.method_missing(sym, *args)
+  		self.new(args.first, sym)
+    end
+
+  end
 
 	class Rule
 		attr_reader :pattern, :symbol, :raises
@@ -450,6 +485,7 @@ class BasicExpressionTokenizer < Tokenizer
 
 end
 
+#TODO Clean up code now that Lexr::Token is a dynamic class generator
 class ExpressionTokenizer < Tokenizer
 
   class UnexpectedClose < InvalidCharacter
@@ -1015,7 +1051,7 @@ class ExpressionTokenizerHash < ExpressionTokenizer
       elsif item.is_a?(Numeric) || item.is_a?(String)
         val={item.to_s=>@default_val}
       else
-        raise InvaliItem.new("Invalid token for hash key",:invalid_item=>item.to_s)
+        raise InvalidItem.new("Invalid token for hash key",:invalid_item=>item.to_s)
       end
       ret_hash.merge!(val)
     end
@@ -1047,16 +1083,86 @@ class SimpleTokenizerString < SimpleTokenizer
 end
 
 
+def walk(tokens,pos,skip=[:whitespace])
+  pos+=1 while (pos<tokens.length &&
+      !(skip & [tokens[pos].kind]).empty? &&
+      tokens[pos].kind!=:end)
+  pos
+end
 
-#p test_str="\"test\"=test1,2.0,3, 4 \"quote test\" value = { a = { b = [ c = { d = [1,a,g=f,3,4] }, e=5,6,7,8] } }"
-#p test_str="value = { a = { b = [ c = { d = [1,a,g=f,3,4] }, e=5,6,7,8] } }"
-#p test_str="test=4, 5, 6, 7  {a={b=4,c=5}} test2=[1,2,[3,[4]],5] value=9, 9"
-#p test_str="a=[1,2] b={g=2} c 1,two,[1.1,1.2,1.3,[A]],three,4 d e[1,2] "
-#p test_str="word1 word2,word3 , d , e,"
-#p test_str="  test   a=1, bla {b={c=2}}"
-#p test_str="a=b \\(a=c\\)"
-#p test_str="\\)"
+def group(tokens)
+  retval,=group2(tokens,[])
+  retval
+end
 
-#p tokens=ExpressionTokenizer.new(test_str)
-#p result=tokens.parse
+def group2(tokens,stack)
+  raise "Empty tokens" if tokens.empty?
+
+  retval=[]
+  need_comma=stack.length>0
+
+  pos=-1
+  while ((pos+=1)<tokens.length)
+    case tokens[pos].kind
+      when stack[-1]
+        return retval,pos+1
+      when :end
+        return retval,pos+1
+      when :word, :number, :variable, :escape
+        lpos= stack[-1]==:whitespace ? pos+1 : lpos=walk(tokens,pos+1)
+        if tokens[lpos].kind==:equals
+          new_stack=stack.empty? ? [:whitespace] : stack+[stack[-1]]
+          lside=tokens[pos]
+          rside, lpos=group2(tokens[lpos+1..-1], new_stack)
+          pos+=lpos
+          retval<<{lside => rside}
+        elsif tokens[lpos].kind==:comma && !need_comma
+          new_stack=stack.empty? ? [:whitespace] : stack+[stack[-1]]
+          ret, pos=group2(tokens[pos..-1], new_stack)
+          retval<<ret
+        else
+          retval<<tokens[pos]
+        end
+      when :l_square
+        rside, lpos=group2(tokens[pos+1..-1],stack+[:r_square])
+        pos+=lpos
+        retval<<rside
+      when :comma
+        raise "Unexpected comma" if !need_comma
+      when :whitespace
+        #do nothing
+      else
+        puts "pos: #{pos}"
+        puts "tokens[pos]: #{tokens[pos].inspect}"
+        puts "stack: #{stack.inspect}"
+        exit
+    end
+  end
+
+  return retval,pos
+end
+
+
+if ($0==__FILE__)
+
+  include ZDebug
+  set_debug_level(1)
+  require "pp"
+  #p test_str="\"test\"=test1,2.0,3, 4 \"quote test\" value = { a = { b = [ c = { d = [1,a,g=f,3,4] }, e=5,6,7,8] } }"
+  #p test_str="value = { a = { b = [ c = { d = [1,a,g=f,3,4] }, e=5,6,7,8] } }"
+  #p test_str="test=4, 5, 6, 7  {a={b=4,c=5}} test2=[1,2,[3,[4]],5] value=9, 9"
+  p test_str="a=[1,2] b={g=2}   c 1,two,[1.1,1.2,1.3,[A]],three,4 d e[1,2] $var"
+  #p test_str="word1 word2,word3 , d , e,"
+  #p test_str="  test   a=1, bla {b={c=2}}"
+  #p test_str="a=b \\(a=c\\)"
+  #p test_str="\\)"
+  #p test_str="a=b=[c, d] a [1,2] $var=5"
+
+  pp tokens=ExpressionTokenizer.new(test_str)
+  puts "----"
+
+  pp result=tokens.parse
+  #puts "----"
+  #pp group(tokens)
+end