snmp 1.0.2 → 1.0.3

data/README

@@ -9,7 +9,7 @@ that Ruby can run.
 
 See snmplib.rubyforge.org[http://snmplib.rubyforge.org/] for more info.
 
-Version 1.0.2 of this software supports the following:
+Version 1.0.3 of this software supports the following:
 
 * The GetRequest, GetNextRequest, GetBulkRequest, SetRequest, Response
   SNMPv1_Trap, SNMPv2_Trap, and Inform PDUs
@@ -26,6 +26,12 @@ examples below for more details.
 
 == Changes
 
+Changes for version 1.0.3:
+
+* Minor changes to Manager class.  The :Transport option may now be an
+object or a class.  Explicity call Timeout.timeout so that a timeout
+method may be defined in subclasses.  Thanks to Eric Monti.
+ 
 Changes for version 1.0.2:
 
 * Internal code changes to make this library compatible with both Ruby 1.8
@@ -121,13 +127,13 @@ formats.
 From the .gem file you can install using
 RubyGems[http://rubyforge.org/projects/rubygems].
 
-  gem install snmp-1.0.2.gem
+  gem install snmp-1.0.3.gem
 
 From the .tgz or .zip file you can install using
 setup.rb[http://i.loveruby.net/en/prog/setup.html].  Uncompress the archive
 and then run setup.
 
-  cd snmp-1.0.2
+  cd snmp-1.0.3
   ruby setup.rb (may require root privilege)  
 
 == Testing
@@ -238,7 +244,7 @@ Log traps to STDOUT.
    
 == License
 
-This SNMP Library is Copyright (c) 2004-2007 by David R. Halliday.  It is free
+This SNMP Library is Copyright (c) 2004-2010 by David R. Halliday.  It is free
 software.  Redistribution is permitted under the same terms and conditions as
 the standard Ruby distribution.  See the COPYING file in the Ruby distribution
 for details.

data/Rakefile

@@ -10,7 +10,7 @@ Rake::TestTask.new do |test|
 end
 
 # package target
-PKG_VERSION = '1.0.2'
+PKG_VERSION = '1.0.3'
 PKG_FILES = FileList[
     'Rakefile',
     'README',

data/lib/snmp/manager.rb

@@ -160,7 +160,8 @@ class Manager
         @snmp_version = @config[:Version]
         @timeout = @config[:Timeout]
         @retries = @config[:Retries]
-        @transport = @config[:Transport].new 
+        transport = @config[:Transport]
+        @transport = transport.respond_to?(:new) ? transport.new : transport 
         @max_bytes = @config[:MaxReceiveBytes]
         @mib = MIB.new
         load_modules(@config[:MibModules], @config[:MibDir])
@@ -461,7 +462,7 @@ class Manager
         (@retries + 1).times do |n|
             send_request(request, community, host, port)
             begin
-                timeout(@timeout) do
+                Timeout.timeout(@timeout) do
                     return get_response(request)
                 end
             rescue Timeout::Error

data/test/test_manager.rb

@@ -49,7 +49,13 @@ class TestManager < Test::Unit::TestCase
         assert_equal('test', @manager.config[:Community])
         assert_equal('private', @manager.config[:WriteCommunity])
     end
-
+    
+    def test_transport_instance
+        @manager = Manager.new(:Transport => EchoTransport.new)
+        response = @manager.get("1.2.3.4")
+        assert_equal("1.2.3.4", response.varbind_list.first.name.to_s)
+    end
+    
     def test_get
         response = @manager.get("1.2.3.4")
         assert_equal("1.2.3.4", response.varbind_list.first.name.to_s)

data/test/test_retry.rb

@@ -1,4 +1,5 @@
-require 'snmp/manager'
+require 'test/unit'
+require 'snmp'
 
 class TimeoutManager  < SNMP::Manager
   attr_accessor :response_count
@@ -39,7 +40,7 @@ class MismatchIdTransport
     
     def send(data, host, port)
         bad_id_data = data.dup
-        bad_msg = Message.decode(data)
+        bad_msg = SNMP::Message.decode(data)
         bad_msg.pdu.request_id -= 3  # corrupt request_id  
         @data << bad_msg.encode # insert corrupted PDU before real data
         @data << data

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: snmp
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  hash: 17
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Dave Halliday
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2007-12-29 00:00:00 -05:00
+date: 2010-05-27 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -244,6 +250,8 @@ files:
 - data/ruby/snmp/mibs/WWW-MIB.yaml
 has_rdoc: true
 homepage: http://snmplib.rubyforge.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -253,23 +261,29 @@ rdoc_options:
 require_paths: 
 - lib
 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: []
 
 rubyforge_project: snmplib
-rubygems_version: 1.0.1
+rubygems_version: 1.3.7
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A Ruby implementation of SNMP (the Simple Network Management Protocol).
 test_files: []