zabcon 0.0.6 → 0.0.327

data/libs/zabcon_globals.rb

@@ -18,8 +18,8 @@
 
 ##########################################
 # Subversion information
-# $Id: zabcon_globals.rb 272 2011-01-06 21:04:22Z nelsonab $
-# $Revision: 272 $
+# $Id: zabcon_globals.rb 325 2011-09-26 08:57:00Z nelsonab $
+# $Revision: 325 $
 ##########################################
 
 #------------------------------------------------------------------------------
@@ -30,11 +30,34 @@
 #
 #------------------------------------------------------------------------------
 
-require 'libs/zdebug'
+require 'zbxapi/zdebug'
 
 require 'singleton'
 require 'parseconfig'
 
+#This class is for containing responses from the Command tree
+class Response
+
+   class InvalidType < Exception
+   end
+
+   attr_accessor :data    #response data
+   attr_accessor :message
+   attr_reader :type
+
+   def initialize(val=nil, data_class=nil)
+     data=val
+     @type=nil
+     @message=nil
+   end
+
+  def type=(type)
+    raise InvalidType.new("Response.type must be a symbol") if type.class!=Symbol
+    @type=type
+  end
+ end
+
+
 # This class is for storing global variables.  This is accomplished by inheriting
 # the singleton class.  To use a global variable it must be registered and then
 # if some part of the program needs to be notified of a change a notifier can
@@ -50,7 +73,7 @@ class GlobalsBase
 
   # overload the assignment operator
   def []=(key,val)
-    debug(9,[key,val],"Entering []= (key,val)",nil,true)
+    debug(9,:var=>[key,val],:msg=>"Entering []= (key,val)",:overload=>true)
     if val.nil?
       delete(key) if !@hash[key].nil?
     else
@@ -70,7 +93,7 @@ class GlobalsBase
 
   # overload the array operator
   def [](key)
-    debug(9,key,"Entering [] (key)",nil,true)
+    debug(9,:var=>key,:msg=>"Entering [] (key)",:overload=>true)
     if @hash[key].nil?
       return nil
     else
@@ -92,7 +115,7 @@ class GlobalsBase
 
   # Register a function to be called when the value of key changes.
   def register_notifier(key,proc)
-    debug(9,[key,proc],"Entering register_notifier (key,proc)")
+    debug(9,:var=>[key,proc],:msg=>"Entering register_notifier (key,proc)")
     if @callbacks[key].nil?
       @callbacks[key]=[proc]
     else

data/zabcon.conf.default

@@ -1,6 +1,41 @@
 server=http://localhost
 username=admin
 password=zabbix
-lines=24
-debug=0
-language=english
+
+# The following is a list of user editable config file options, the following
+# values are the defaults.  These can be changed as needed.
+
+# Set the debug level.  0=off
+#debug=0
+
+# Attempt to show help for a bad command.
+#show_help=false
+
+# How many lines to print when running interactively before pausing output
+#lines=24
+
+# The default language
+#language="english"
+
+# When debugging api calls, how many characters in the output from the Zabbix
+# server should be displayed before truncation occurs?  When the truncation
+# limit is reached the output is split into two.  The first n/2 characters
+# are printed followed by " ... " then the last n/2 characters are displayed.
+# 0 = do not truncate
+#truncate_length=5000
+
+#output related environment variables
+
+# Are we displaying a well formatted table or csv?  Zabcon will automatically
+# set this variable to true for intaractive use.
+# true = table   false = csv
+#table_output=true
+
+# Print the table header?
+#table_header=true
+
+# The default seperator character for csv output.
+#table_separator=","
+
+# File to store custom commands
+#custom_commands=sample_custom_commands

data/zabcon.rb

@@ -20,11 +20,10 @@
 
 ##########################################
 # Subversion information
-# $Id: zabcon.rb 281 2011-04-06 18:10:16Z nelsonab $
-# $Revision: 281 $
+# $Id: zabcon.rb 325 2011-09-26 08:57:00Z nelsonab $
+# $Revision: 325 $
 ##########################################
 
-
 #setup our search path or libraries
 ZABCON_PATH=File.expand_path(File.join(File.dirname(__FILE__), '.'))
 
@@ -38,9 +37,60 @@ rescue LoadError
   exit 1
 end
 
+REQUIRED_RUBY_VER="1.8.6"
+DEPENDENCIES={
+  "parseconfig"=>true,
+  "json"=>true,
+  "highline"=>true,
+  "zbxapi"=>Gem::Version.new("0.1.294")
+}
+
+
+required_rev=REQUIRED_RUBY_VER.split('.')
+ruby_rev=RUBY_VERSION.split('.')
+items=ruby_rev.length < required_rev.length ? ruby_rev.length : required_rev.length
+
+for i in 0..items-1 do
+  if ruby_rev[i].to_i<required_rev[i].to_i
+    puts
+    puts "Zabcon requires Ruby version #{required_rev.join('.')} or higher."
+    puts "you are using Ruby version #{RUBY_VERSION}."
+    puts
+    exit(1)
+  end
+end
+
+
+depsok=true  #assume we will not fail dependencies
+
+DEPENDENCIES.each_key {|dep|
+  gem=Gem.source_index.find_name(dep)
+  if gem.empty?
+    puts " #{dep} : Not Installed"
+    depsok=false
+    break
+  end
+  gem=gem[0]
+  if DEPENDENCIES[dep].class==Gem::Version && gem.version<DEPENDENCIES[dep]
+    puts "#{dep} needs to be at least version #{DEPENDENCIES[dep]}, found #{gem.version}"
+    depsok=false
+  end
+}
+if !depsok
+  puts
+  puts "One or more dependencies failed"
+  puts "Please see the dependencies file for instructions on installing the"
+  puts "required dependencies"
+  puts
+  exit(1)
+end
+
+require 'libs/utility_items'
+require 'libs/revision'
 require 'optparse'
 require 'ostruct'
-require 'libs/zdebug'
+require 'strscan'
+require 'zbxapi/zdebug'
 require 'libs/zabcon_globals'
 
 if RUBY_VERSION=="1.8.6"  #Ruby 1.8.6 lacks the each_char function in the string object, so we add it here
@@ -57,7 +107,6 @@ if RUBY_VERSION=="1.8.6"  #Ruby 1.8.6 lacks the each_char function in the string
   end
 end
 
-
 class ZabconApp
 
   def initialize
@@ -107,7 +156,7 @@ class ZabconApp
   end
 
   def setup_globals
-    env=EnvVars.instance  # we must instantiate a singleton before using it
+#    env=EnvVars.instance  # we must instantiate a singleton before using it
     vars=GlobalVars.instance
 
     env["debug"]=0
@@ -123,6 +172,7 @@ class ZabconApp
     env["config_file"]=:default
     env["load_config"]=true
     env["truncate_length"]=5000
+    env["custom_commands"]=nil
 
     #output related environment variables
     env["table_output"]=STDIN.tty?   # Is the output a well formatted table, or csv like?
@@ -135,46 +185,6 @@ class ZabconApp
   # exit code of 1 if the dependency check fails
   # * ruby_rev is a string denoting the minimum version of ruby suitable
   # * *dependencies is an array of libraries which are required
-  def check_dependencies(required_rev,*dependencies)
-    puts "Checking dependencies" if EnvVars.instance["echo"]
-    depsok=true  #assume we will not fail dependencies
-
-    required_rev=required_rev.split('.')
-    ruby_rev=RUBY_VERSION.split('.')
-    items=ruby_rev.length < required_rev.length ? ruby_rev.length : required_rev.length
-
-    for i in 0..items-1 do
-      if ruby_rev[i].to_i<required_rev[i].to_i
-        puts
-        puts "Zabcon requires Ruby version #{required_rev.join('.')} or higher."
-        puts "you are using Ruby version #{RUBY_VERSION}."
-        puts
-        exit(1)
-      elsif ruby_rev[i].to_i>required_rev[i].to_i
-        break
-      end
-    end
-
-    #Convert the inbound array to a hash
-    deps = Hash[*dependencies.collect { |v|
-      [v,true]
-    }.flatten]
-
-    deps.each_key {|dep|
-      val=Gem.source_index.find_name(dep).map {|x| x.name}==[]
-      puts " #{dep} : Not Installed" if val
-      depsok=false if val
-    }
-    if !depsok
-      puts
-      puts "One or more dependencies failed"
-      puts "Please see the dependencies file for instructions on installing the"
-      puts "required dependencies"
-      puts
-      exit(1)
-    end
-  end
-
 
   def run
     begin
@@ -208,8 +218,6 @@ class ZabconApp
 
     puts RUBY_PLATFORM if EnvVars.instance["echo"]
 
-    check_dependencies("1.8.6","parseconfig", "json", "highline")
-
     begin
       require 'readline'
     rescue LoadError
@@ -235,5 +243,19 @@ class ZabconApp
   end
 end
 
-zabconapp=ZabconApp.new()
-zabconapp.run()
+begin
+  zabconapp=ZabconApp.new()
+  zabconapp.run()
+rescue Exception => e
+  puts "Runtime error detected"
+  puts "(#{e.class}): #{e.message}"
+  puts
+  puts "Top 10 items in backtrace"
+  n=1
+  e.backtrace.first(10).each {|i|
+    puts "#{n}: #{i}"
+    n+=1
+  }
+end
+
+

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zabcon
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 6
-  version: 0.0.6
+  version: 0.0.327
 platform: ruby
 authors: 
 - A. Nelson
@@ -15,53 +9,39 @@ autorequire:
 bindir: .
 cert_chain: []
 
-date: 2011-04-06 00:00:00 -04:00
+date: 2011-09-26 00:00:00 -04:00
 default_executable: zabcon
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: zbxapi
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 1
-        - 1
-        version: 0.1.1
-  type: :runtime
-  version_requirements: *id001
+        version: 0.1.324
+    version: 
 - !ruby/object:Gem::Dependency 
   name: parseconfig
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id002
+    version: 
 - !ruby/object:Gem::Dependency 
   name: highline
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id003
+    version: 
 description: Zabcon is a command line interface for Zabbix written in Ruby
 email: nelsonab@red-tux.net
 executables: 
@@ -75,16 +55,19 @@ files:
 - zabcon.conf.default
 - README
 - libs/argument_processor.rb
+- libs/revision.rb
 - libs/command_help.rb
 - libs/command_tree.rb
 - libs/help.xml
 - libs/input.rb
+- libs/lexer.rb
 - libs/printer.rb
+- libs/zabcon_commands.rb
 - libs/zabcon_core.rb
 - libs/zabcon_exceptions.rb
 - libs/zabcon_globals.rb
-- libs/zbxcliserver.rb
-- ./zabcon.rb
+- libs/zabbix_server.rb
+- libs/utility_items.rb
 has_rdoc: true
 homepage: http://trac.red-tux.net/
 licenses: 
@@ -95,29 +78,21 @@ rdoc_options: []
 require_paths: 
 - .
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 59
-      segments: 
-      - 1
-      - 8
-      - 6
       version: 1.8.6
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: 
 - Requires zbxapi, parseconfig and highline
 rubyforge_project: zabcon
-rubygems_version: 1.3.7
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Zabcon command line interface for Zabbix