zabcon 0.0.5 → 0.0.6

data/libs/argument_processor.rb

@@ -18,8 +18,8 @@
 
 ##########################################
 # Subversion information
-# $Id: argument_processor.rb 266 2010-12-30 11:03:54Z richlv $
-# $Revision: 266 $
+# $Id: argument_processor.rb 281 2011-04-06 18:10:16Z nelsonab $
+# $Revision: 281 $
 ##########################################
 
 require 'libs/zdebug'
@@ -315,7 +315,7 @@ class ArgumentProcessor
     debug(7,args,"default helper")
      api_params = args
     show_params = {}
-    if !args["show"].nil?
+    if args.class!=Array && !args["show"].nil?
        show_params={:show=>args["show"]}
        api_params.delete("show")
        api_params.merge({"extendoutput"=>true})
@@ -328,28 +328,52 @@ class ArgumentProcessor
   # 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
+  # If :use_array_processor is passed as an option the array processor will be used
+  # In :num_args is passed with a value, and error will be returned if more than that many args are passed
+
   def default_processor(help_func,valid_args,args,user_vars,*options)
-    debug(7,args,"default argument processor")
+    debug(5,args,"default_processor args")
+    debug(5,options,"default_processor options")
 
-    args=substitute_vars(args)
-    args=params_to_hash(args)
-    if !(invalid=check_parameters(args, valid_args)).empty?
-      msg="Invalid parameters:\n"
-      msg+=invalid.join(", ")
-      raise ParameterError_Invalid.new(msg,:retry=>true, :help_func=>help_func)
+    #if the intersection of options and [:array] is not empty then we will return an array
+    return_array = !(options[0] & [:use_array_processor]).empty?
+    check_not_empty = !(options[0] & [:not_empty]).empty?
+
+    num_args=options[0].map { |i|
+      i[:num_args] if i.class==Hash
+    }.compact[0]   # will be nil if :num_args not found
+
+    if check_not_empty
+      raise ParameterError.new("No arguments",:retry=>true, :help_func=>help_func) if args==""
     end
 
-    valid_user_vars = {}
+    if return_array
+      args=safe_split(args)
+    else
+      args=substitute_vars(args)
+      args=params_to_hash(args)
+      if !(invalid=check_parameters(args, valid_args)).empty?
+        msg="Invalid parameters:\n"
+        msg+=invalid.join(", ")
+        raise ParameterError_Invalid.new(msg,:retry=>true, :help_func=>help_func)
+      end
 
-    if !valid_args.nil?
-      valid_args.each {|item|
-        valid_user_vars[item]=user_vars[item] if !user_vars[item].nil?
-      }
+      valid_user_vars = {}
+
+      if !valid_args.nil?
+        valid_args.each {|item|
+          valid_user_vars[item]=user_vars[item] if !user_vars[item].nil?
+        }
+      end
+      args = valid_user_vars.merge(args)
+    end
+
+    if !num_args.nil?
+      eval_exp="#{args.length}#{num_args}"
+      raise ParameterError.new("Too many arguments (#{args.length})",:retry=>true, :help_func=>help_func) if !eval(eval_exp)
     end
-    args = valid_user_vars.merge(args)
-    
-    default_helper(args)
 
+    default_helper(args)
   end
 
   # This processor does not do anything fancy.  All items passed in via args are passed back in api_params
@@ -437,15 +461,6 @@ class ArgumentProcessor
     end
   end
 
-  # array_process is a helper function which takes the incoming arguments
-  # and puts them into an array and returns that result.
-  # empty input results in an empty array
-  # does not perform variable substitution
-  def array_processor(help_func,valid_args,args,user_vars,*options)
-
-    return_helper(safe_split(args))
-  end
-
   ##############################################################################################
   # End of default and helper functions
   ##############################################################################################

data/libs/command_help.rb

@@ -18,8 +18,8 @@
 
 ##########################################
 # Subversion information
-# $Id: command_help.rb 270 2011-01-04 06:13:31Z nelsonab $
-# $Revision: 270 $
+# $Id: command_help.rb 274 2011-01-10 01:01:31Z nelsonab $
+# $Revision: 274 $
 ##########################################
 
 require 'libs/zdebug'

data/libs/command_tree.rb

@@ -18,8 +18,8 @@
 
 ##########################################
 # Subversion information
-# $Id: command_tree.rb 270 2011-01-04 06:13:31Z nelsonab $
-# $Revision: 270 $
+# $Id: command_tree.rb 272 2011-01-06 21:04:22Z nelsonab $
+# $Revision: 272 $
 ##########################################
 
 require 'libs/zdebug'

data/libs/help.xml

@@ -21,8 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 ##########################################
 Subversion information
-$Id: help.xml 243 2010-11-11 15:59:02Z nelsonab $
-$Revision: 243 $
+$Id: help.xml 281 2011-04-06 18:10:16Z nelsonab $
+$Revision: 281 $
 ##########################################
 
  Zabcon help file
@@ -246,6 +246,17 @@ syntax: delete item itemid=num
  itemid must be a number
  </item>
 
+<!-- 80 Col Marker ######################################################## -->
+
+  <item command="import">
+import
+syntax: import &lt;filename&gt;
+
+Import an XML file into Zabbix.  Requires one file name to be passed.
+An error will be returned for 0 or 2+ arguments passed.
+  </item>
+
+
 <!-- 80 Col Marker ######################################################## -->
 
   <item command="raw_api">

data/libs/input.rb

@@ -18,8 +18,8 @@
 
 ##########################################
 # Subversion information
-# $Id: input.rb 215 2010-09-25 21:22:37Z richlv $
-# $Revision: 215 $
+# $Id: input.rb 272 2011-01-06 21:04:22Z nelsonab $
+# $Revision: 272 $
 ##########################################
 
 require 'readline'

data/libs/printer.rb

@@ -19,8 +19,8 @@
 
 ##########################################
 # Subversion information
-# $Id: printer.rb 269 2011-01-02 19:14:58Z richlv $
-# $Revision: 269 $
+# $Id: printer.rb 272 2011-01-06 21:04:22Z nelsonab $
+# $Revision: 272 $
 ##########################################
 
 require 'libs/zdebug'

data/libs/zabcon_core.rb

@@ -21,7 +21,7 @@
 ##########################################
 # Subversion information
 # $Id: $
-# $Revision: 270 $
+# $Revision: 281 $
 ##########################################
 
 require 'parseconfig'
@@ -123,16 +123,17 @@ class ZabconCore
     @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 ["show","var"], self.method(:show_var), no_args, no_help, @arg_processor.default, :use_array_processor, :suppress_printer
+    @commands.insert ["show","env"], self.method(:show_env), no_args, no_help, @arg_processor.default, :use_array_processor, :suppress_printer
+    @commands.insert ["unset","var"], self.method(:unset_var), no_args, no_help, @arg_processor.default, :use_array_processor, :suppress_printer
 
 
     if loggedin then
       debug(5,"Inserting commands which require login")
       # This command tree is for a valid login
       @commands.insert ["get"], no_cmd, no_args, @cmd_help.method(:get)
-      @commands.insert ["import"], self.method(:do_import),no_args,no_help,no_verify
+      #Import commented out until fixed
+      #@commands.insert ["import"], self.method(:do_import),no_args,@cmd_help.method(:import),@arg_processor.default,:not_empty, :use_array_processor, :num_args=>"==1"
 
       @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
@@ -265,7 +266,7 @@ class ZabconCore
         puts "A fatal error occurred."
       end
       e.show_message
-      e.show_backtrace
+#      e.show_backtrace
       retry if e.retry?
     end  #end of exception block
   end # def
@@ -441,31 +442,29 @@ class ZabconCore
 # Import config from an XML file:
 #
   def do_import(input)
-    if input.nil?
-      puts "Run requires a file name as argument."
-      return
-    end
+    debug(5,input,"args")
+
+    input=input[0]
 
     begin
-      xml_import = REXML::Document.new File.new(input[:filename])
+      xml_import = REXML::Document.new(File.new(input)).root
     rescue Errno::ENOENT
-      puts "Failed to open import file #{input[:filename]}."
-      return
+      raise ZabconError.new("Failed to open import file #{input}.",:retry=>true)
     end
 
     if xml_import.nil?
-      puts "Failed to parse import file #{input[:filename]}."
-      return
+      raise ZabconError.new("Failed to parse import file #{input}.",:retry=>true)
     end
 
-    host=xml_import.elements['import/hosts']
-    if !host.nil?
-      host = host[1]
+    p hosts=xml_import.elements.to_a("//hosts")[0]
+    p hosts = hosts.elements.to_a("//host")
+    if !hosts.empty?
+      host = hosts[0]
     end
 
     # Loop for the host tags:
     while !host.nil?
-      host_params = { 'host' => host.attributes["name"],
+      p host_params = { 'host' => host.attributes["name"],
                  'port' => host.elements["port"].text }
       if host.elements["useip"].text.to_i == 0 # This is broken in Zabbix export (always 0).
         host_params['dns']=host.elements["dns"].text

data/libs/zabcon_exceptions.rb

@@ -18,8 +18,8 @@
 
 ##########################################
 # Subversion information
-# $Id: zabcon_exceptions.rb 258 2010-12-28 22:49:21Z nelsonab $
-# $Revision: 258 $
+# $Id: zabcon_exceptions.rb 272 2011-01-06 21:04:22Z nelsonab $
+# $Revision: 272 $
 ##########################################
 
 #------------------------------------------------------------------------------

data/libs/zabcon_globals.rb

@@ -18,8 +18,8 @@
 
 ##########################################
 # Subversion information
-# $Id: zabcon_globals.rb 264 2010-12-30 07:21:01Z nelsonab $
-# $Revision: 264 $
+# $Id: zabcon_globals.rb 272 2011-01-06 21:04:22Z nelsonab $
+# $Revision: 272 $
 ##########################################
 
 #------------------------------------------------------------------------------

data/libs/zbxcliserver.rb

@@ -18,14 +18,29 @@
 
 ##########################################
 # Subversion information
-# $Id: zbxcliserver.rb 258 2010-12-28 22:49:21Z nelsonab $
-# $Revision: 258 $
+# $Id: zbxcliserver.rb 281 2011-04-06 18:10:16Z nelsonab $
+# $Revision: 281 $
 ##########################################
 
 require 'zbxapi'
 require 'libs/zdebug'
 require 'libs/zabcon_globals'
 
+class ZabbixServer < ZabbixAPI
+  alias zbxapi_initialize initialize
+  alias zbxapi_do_request do_request
+
+  def initialize(url,debug_level=0)
+    @env = EnvVars.instance
+    zbxapi_initialize(url,debug_level)
+  end
+
+  #truncate_length is set to the symbol :not_used as do_request is passed a different variable
+  def do_request(json_obj,truncate_length=:not_used)
+    zbxapi_do_request(json_obj,@env["truncate_length"])
+  end
+end
+
 class ZbxCliServer
 
   include ZDebug
@@ -38,7 +53,7 @@ class ZbxCliServer
     @password=password
     @debuglevel=debuglevel
     # *Note* Do not rescue errors here, rescue in function that calls this block
-    @server=ZabbixAPI.new(@server_url,@debuglevel)
+    @server=ZabbixServer.new(@server_url,@debuglevel)
     @server.login(@user, @password)
     GlobalVars.instance["auth"]=@server.auth
   end

data/zabcon.rb

@@ -20,8 +20,8 @@
 
 ##########################################
 # Subversion information
-# $Id: zabcon.rb 272 2011-01-06 21:04:22Z nelsonab $
-# $Revision: 272 $
+# $Id: zabcon.rb 281 2011-04-06 18:10:16Z nelsonab $
+# $Revision: 281 $
 ##########################################
 
 
@@ -122,6 +122,7 @@ class ZabconApp
     env["echo"]=STDIN.tty? ? true: false
     env["config_file"]=:default
     env["load_config"]=true
+    env["truncate_length"]=5000
 
     #output related environment variables
     env["table_output"]=STDIN.tty?   # Is the output a well formatted table, or csv like?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zabcon
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - A. Nelson
@@ -15,7 +15,7 @@ autorequire:
 bindir: .
 cert_chain: []
 
-date: 2011-01-09 00:00:00 -05:00
+date: 2011-04-06 00:00:00 -04:00
 default_executable: zabcon
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 25
         segments: 
         - 0
         - 1
-        version: "0.1"
+        - 1
+        version: 0.1.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency