zabcon 0.0.4 → 0.0.5

data/libs/command_help.rb

@@ -36,7 +36,7 @@ class CommandHelp
   include ZDebug
 
   def initialize(language)
-    @file = File.new("libs/help.xml")
+    @file = File.new(ZABCON_PATH+"/libs/help.xml")
 
     @doc=REXML::Document.new(@file).elements["//help[@language='#{language}']"]
 #    puts @doc.root.attributes

data/libs/printer.rb

@@ -19,8 +19,8 @@
 
 ##########################################
 # Subversion information
-# $Id: printer.rb 258 2010-12-28 22:49:21Z nelsonab $
-# $Revision: 258 $
+# $Id: printer.rb 269 2011-01-02 19:14:58Z richlv $
+# $Revision: 269 $
 ##########################################
 
 require 'libs/zdebug'
@@ -357,7 +357,7 @@ class OutputPrinter
       elsif dataset[:result].class==Hash then
         print_hash(dataset,cols_to_show)
       elsif dataset[:result].class!=NilClass then
-        puts "Unknown object received by the print routint"
+        puts "Unknown object received by the print routine"
         puts "Class type: #{dataset[:result].class}"
         puts "Data:"
         p dataset[:result]

data/libs/zabcon_core.rb

@@ -31,7 +31,7 @@ require 'libs/zbxcliserver'
 require 'libs/printer'
 require 'libs/zdebug'
 require 'libs/input'
-require 'libs/defines'
+#require 'libs/defines'
 require 'libs/command_tree'
 require 'libs/argument_processor'
 require 'libs/command_help'

data/zabcon.rb

@@ -20,13 +20,13 @@
 
 ##########################################
 # Subversion information
-# $Id: zabcon.rb 264 2010-12-30 07:21:01Z nelsonab $
-# $Revision: 264 $
+# $Id: zabcon.rb 272 2011-01-06 21:04:22Z nelsonab $
+# $Revision: 272 $
 ##########################################
 
 
 #setup our search path or libraries
-$: << File.expand_path(File.join(File.dirname(__FILE__), '.'))
+ZABCON_PATH=File.expand_path(File.join(File.dirname(__FILE__), '.'))
 
 begin
   require 'rubygems'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zabcon
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - A. Nelson
@@ -15,7 +15,7 @@ autorequire:
 bindir: .
 cert_chain: []
 
-date: 2011-01-06 00:00:00 -05:00
+date: 2011-01-09 00:00:00 -05:00
 default_executable: zabcon
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,8 +76,6 @@ files:
 - libs/argument_processor.rb
 - libs/command_help.rb
 - libs/command_tree.rb
-- libs/defines.rb
-- libs/exceptions.rb
 - libs/help.xml
 - libs/input.rb
 - libs/printer.rb
@@ -85,7 +83,6 @@ files:
 - libs/zabcon_exceptions.rb
 - libs/zabcon_globals.rb
 - libs/zbxcliserver.rb
-- libs/zdebug.rb
 - ./zabcon.rb
 has_rdoc: true
 homepage: http://trac.red-tux.net/

data/libs/defines.rb

@@ -1,46 +0,0 @@
-#!/usr/bin/ruby
-
-#GPL 2.0  http://www.gnu.org/licenses/gpl-2.0.html
-#Zabbix CLI Tool and associated files
-#Copyright (C) 2009,2010 Andrew Nelson nelsonab(at)red-tux(dot)net
-#
-#This program is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public License
-#as published by the Free Software Foundation; either version 2
-#of the License, or (at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU General Public License
-#along with this program; if not, write to the Free Software
-#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-##########################################
-# Subversion information
-# $Id: defines.rb 215 2010-09-25 21:22:37Z richlv $
-# $Revision: 215 $
-##########################################
-
-# Zabbix constants
-
-# Sysmap elements (Create Element Type drop down menu):
-ME_HOST=0
-ME_MAP=1
-ME_TRIGGER=2
-ME_HOSTGROUP=3
-ME_IMAGE=4
-
-# Sysmap connection draw type
-MC_DT_LINE=1
-MC_DT_BOLD=2
-MC_DT_DOT=3
-MC_DT_DASHED=4
-
-# Sysmap label location
-ML_BOTTOM=0
-ML_LEFT=1
-ML_RIGHT=2
-ML_TOP=3

data/libs/exceptions.rb

@@ -1,119 +0,0 @@
-#License:: LGPL 2.1   http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
-#Copyright:: Copyright (C) 2009,2010 Andrew Nelson nelsonab(at)red-tux(dot)net
-#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU Lesser General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
-#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#Lesser General Public License for more details.
-#
-#You should have received a copy of the GNU Lesser General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-##########################################
-# Subversion information
-# $Id: exceptions.rb 258 2010-12-28 22:49:21Z nelsonab $
-# $Revision: 258 $
-##########################################
-
-require 'libs/zdebug'
-
-#------------------------------------------------------------------------------
-#
-# Class ZError
-#
-# This is the superclass for all Zabcon and ZabbixAPI exceptions.
-#
-#------------------------------------------------------------------------------
-class ZError < RuntimeError
-
-  include ZDebug
-
-  attr_reader :help_func, :message, :retry
-
-  # list of valid params
-  # :help_func, the help function with more information for the exception
-  # : retry, is the exception eligable for retry?
-  def initialize(message=nil, params=nil)
-    debug(2,self.class,"Exception raised")
-    debug(2,params,"params")
-    raise "Exception not called correctly" if params.class!=Hash if !params.nil?
-    params={} if params.nil?
-    @help_func=params[:help_func]
-    @message=message
-    @local_msg="Error"
-    @retry = params[:retry]
-    super(message)
-  end
-
-  def show_message
-    puts "** #{self.class}"
-    if @message.nil? && @help_func.nil?
-      puts "** #{@local_msg}"
-      puts
-    else
-      if !@message.nil?
-        @message.each_line {|line|
-          puts "** #{line}"
-        }
-        puts
-        puts "---" if !@help_func.nil?
-      end
-      @help_func.call if !@help_func.nil?
-    end
-  end
-
-  #show the backtrace, if override is true it will be shown even if there is a help function
-  def show_backtrace(override=false)
-    if @help_func.nil? || override
-      puts "Backtrace:"
-      puts backtrace.join("\n")
-    end
-  end
-  def retry?
-    #the following may be worthy of a sig on "The Daily WTF", but this guarantees a boolean gets returned.
-    #@retry is not guaranteed to be a boolean.
-    if @retry
-      return true
-    else
-      return false
-    end
-  end
-end
-
-class ParameterError < ZError
-  def initialize(message=nil, params=nil)
-    super(message, params)
-    @local_msg="Parameter Error"
-  end
-end
-
-#----------------------------------------------------------
-
-class ParameterError_Invalid < ZError
-  def initialize(message=nil, params=nil)
-    super(message, params)
-    @local_msg="Invalid Parameters"
-  end
-end
-
-class ParameterError_Missing < ZError
-  def initialize(message=nil, params=nil)
-    super(message, params)
-    @local_msg="Missing required parameters"
-  end
-end
-
-#----------------------------------------------------------
-
-class ParseError < ZError
-  def initialize(message=nil, params=nil)
-    super(message, params)
-    @local_msg="Parse Error"
-  end
-end

data/libs/zdebug.rb

@@ -1,163 +0,0 @@
-#License:: LGPL 2.1   http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
-#Copyright:: Copyright (C) 2009,2010 Andrew Nelson nelsonab(at)red-tux(dot)net
-#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU Lesser General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
-#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#Lesser General Public License for more details.
-#
-#You should have received a copy of the GNU Lesser General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-##########################################
-# Subversion information
-# $Id: zdebug.rb 222 2010-10-07 14:25:08Z nelsonab $
-# $Revision: 222 $
-##########################################
-
-module ZDebug
-
-  # Either set_debug_level or set_facility_debug_level must be called before
-  # the debug functions can be used.
-  def set_debug_level(level)   # sets the current debug level for printing messages
-    @@debug_level=level
-
-    # Create faciltiy_level if it's not created already
-    @@facility_level= {} if !defined?(@@facility_level)
-  end
-
-  # facility is a symbol, level is an integer
-  def set_facility_debug_level(facility,level)
-    # Create faciltiy_level if it's not created already
-    @@facility_level= {} if !defined?(@@facility_level)
-
-    @@facility_level[facility]=level
-
-    # Create debug level if it's not already created
-    @@debug_level=0 if !defined?(@@debug_level)
-  end
-
-  def debug_level
-    @@debug_level
-  end
-
-  # level - level to show message (Integer)
-  # variable - variable to show (Object)
-  # message - message to be prepended before variable  (String)
-  # overload - do show or error if debug_level is not set
-  def debug(level,variable="",message=nil,truncate=nil,overload=false)
-    return if overload
-    raise "Call set_debug before using debug" if !defined?(@@debug_level)
-    if level<=@@debug_level
-      #parse the caller array to determine who called us, what line, and what file
-      caller[0]=~/(.*):(\d+):.*`(.*?)'/
-
-      #sometimes the debug function gets called from within an exception block, in which cases the backtrace is not
-      #available.
-      file_tmp=$1.nil? ? "n/a" : $1
-      debug_line=$2.nil? ? "" : $2
-      debug_func=$3.nil? ? "" : $3
-      tmp_split=file_tmp.split("/")
-
-      if (len=tmp_split.length)>2
-        debug_file=".../#{tmp_split[len-2]}/#{tmp_split[len-1]}"
-      else
-        debug_file=file_tmp
-      end
-
-      strval=""
-      if variable.nil?
-        strval="nil"
-      elsif variable.class==String
-        strval=variable
-        if !truncate.nil?
-          if truncate<strval.length then
-            o_strval=strval
-            strval=o_strval[0..(truncate/2)]
-            strval+= "  .....  "
-            strval+=o_strval[(o_strval.length-(truncate/2))..o_strval.length]
-          end
-        end
-      else
-        strval=variable.inspect
-        if !truncate.nil?
-          if truncate<strval.length then
-            o_strval=strval
-            strval=o_strval[0..(truncate/2)]
-            strval+= "  .....  "
-            strval+=o_strval[(o_strval.length-(truncate/2))..o_strval.length]
-          end
-        end
-      end
-
-      if !message.nil?
-        strval = message + ": " + strval
-      end
-      puts "D#{level} #{debug_file}:#{debug_func}:#{debug_line} #{strval}"
-    end
-  end
-
-  # Debug_facility is a copy of the above function in an effort to shorten
-  # code path.
-  # facility - symbol denoting logging facility
-  # level - level to show message (Integer)
-  # variable - variable to show (Object)
-  # message - message to be prepended before variable  (String)
-  def debug_facility(facility,level,variable="",message=nil,truncate=nil)
-    facility_level=@@facility_level[facility]
-    raise "Call set_debug before using debug" if !defined?(@@debug_level)
-    raise "Unknown facility type: #{facility.to_s}" if facility_level.nil?
-    if level<=facility_level
-      #parse the caller array to determine who called us, what line, and what file
-      caller[0]=~/(.*):(\d+):.*`(.*?)'/
-
-      file_tmp=$1
-      debug_line=$2
-      debug_func=$3
-      tmp_split=file_tmp.split("/")
-
-      if (len=tmp_split.length)>2
-        debug_file=".../#{tmp_split[len-2]}/#{tmp_split[len-1]}"
-      else
-        debug_file=file_tmp
-      end
-
-      strval=""
-      if variable.nil?
-        strval="nil"
-      elsif variable.class==String
-        strval=variable
-        if !truncate.nil?
-          if truncate<strval.length then
-            o_strval=strval
-            strval=o_strval[0..(truncate/2)]
-            strval+= "  .....  "
-            strval+=o_strval[(o_strval.length-(truncate/2))..o_strval.length]
-          end
-        end
-      else
-        strval=variable.inspect
-        if !truncate.nil?
-          if truncate<strval.length then
-            o_strval=strval
-            strval=o_strval[0..(truncate/2)]
-            strval+= "  .....  "
-            strval+=o_strval[(o_strval.length-(truncate/2))..o_strval.length]
-          end
-        end
-      end
-
-      if !message.nil?
-        strval = message + ": " + strval
-      end
-      puts "D#{level}(#{facility.to_s}) #{debug_file}:#{debug_func}:#{debug_line} #{strval}"
-    end
-  end
-
-end  # end Debug module