zbxapi 0.1.352 → 0.1.369

data/zbxapi.rb

@@ -19,8 +19,8 @@
 #--
 ##########################################
 # Subversion information
-# $Id: zbxapi.rb 344 2011-11-18 01:44:36Z nelsonab $
-# $Revision: 344 $
+# $Id: zbxapi.rb 369 2011-12-22 05:17:06Z nelsonab $
+# $Revision: 369 $
 ##########################################
 #++
 
@@ -43,6 +43,7 @@ require 'uri'
 require 'net/https'
 require 'rubygems'
 require 'json'
+require 'pp'
 
 require "api_classes/application"
 require "api_classes/history"
@@ -109,12 +110,18 @@ class ZabbixAPI
     @sysmap = ZbxAPI_Sysmap.new(self)
     @history = ZbxAPI_History.new(self)
     @id=0
+    @proxy=nil
 
     debug(6,:msg=>"protocol: #{@url.scheme}, host: #{@url.host}")
     debug(6,:msg=>"port: #{@url.port}, path: #{@url.path}")
     debug(6,:msg=>"query: #{@url.query}, fragment: #{@url.fragment}")
   end
 
+  def set_proxy(address,port,user=nil,password=nil)
+    @proxy={:address=>address, :port=>port,
+            :user=>user, :password=>password}
+  end
+
   def self.get_version
     "#{ZBXAPI_VERSION}.#{ZBXAPI_REVISION}"
   end
@@ -195,7 +202,6 @@ class ZabbixAPI
     rescue Errno::ECONNREFUSED
       raise ZbxAPI_ExceptionBadServerUrl
     end
-
   end
 
   def logout
@@ -267,15 +273,16 @@ class ZabbixAPI
   #truncate_length determines how many characters at maximum should be displayed while debugging before
   #truncation should occur.
   def do_request(json_obj,truncate_length=5000)
-    #puts json_obj
     redirects=0
     begin  # This is here for redirects
-      http = Net::HTTP.new(@url.host, @url.port)
+      if @proxy
+        http = Net::HTTP::Proxy(@proxy[:address],@proxy[:port],
+              @proxy[:user],@proxy[:password]).new(@url.host,@url.port)
+      else
+        http = Net::HTTP.new(@url.host, @url.port)
+      end
       http.use_ssl=true if @url.class==URI::HTTPS
       response = nil
-#    http.set_debug_output($stderr)                                  #Uncomment to see low level HTTP debug
-#    http.use_ssl = @url.scheme=='https' ? true : false
-#    http.start do |http|
       headers={'Content-Type'=>'application/json-rpc',
         'User-Agent'=>'Zbx Ruby CLI'}
       debug(4,:msg=>"Sending: #{json_obj}")

data/zbxapi/revision.rb

@@ -4,4 +4,4 @@
 #the rakefile was run
 
 ZBXAPI_VERSION="0.1"
-ZBXAPI_REVISION="352"
+ZBXAPI_REVISION="369"

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zbxapi
 version: !ruby/object:Gem::Version 
-  version: 0.1.352
+  hash: 761
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 369
+  version: 0.1.369
 platform: ruby
 authors: 
 - A. Nelson
@@ -9,19 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-25 00:00:00 -05:00
+date: 2011-12-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: Provides a straight forward interface to manipulate Zabbix servers using the Zabbix API.
 email: nelsonab@red-tux.net
 executables: []
@@ -58,21 +68,27 @@ rdoc_options: []
 require_paths: 
 - .
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: 
 - Requires json
 rubyforge_project: zbxapi
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper to the Zabbix API