snmp 1.2.0 → 1.3.0

data/lib/snmp/manager.rb

@@ -144,6 +144,7 @@ module SNMP
       option :mib_dir, :MibDir, MIB::DEFAULT_MIB_PATH
       option :mib_modules, :MibModules, default_modules
       option :use_IPv6, :use_IPv6, lambda { |c| ipv6_address?(c) }
+      option :ignore_oid_order, :IgnoreOidOrder, false
 
       def create_transport
         transport.respond_to?(:new) ? transport.new(socket_address_family) : transport
@@ -183,6 +184,7 @@ module SNMP
     #   :mib_dir            MIB::DEFAULT_MIB_PATH
     #   :mib_modules        SNMPv2-SMI, SNMPv2-MIB, IF-MIB, IP-MIB, TCP-MIB, UDP-MIB
     #   :use_IPv6           false, unless :host is formatted like an IPv6 address
+    #   :ignore_oid_order   false
     #
     # Use {:version => :SNMPv1} for SNMP v1.  SNMP v3 is not supported.
     #
@@ -203,6 +205,7 @@ module SNMP
       @max_bytes = config.max_recv_bytes
       @mib = MIB.new
       load_modules(config.mib_modules, config.mib_dir)
+      @ignore_oid_order = config.ignore_oid_order
       @config = config.applied_config
     end
 
@@ -440,7 +443,7 @@ module SNMP
         index_vb = vb_list[index_column]
         break if EndOfMibView == index_vb.value
         stop_oid = index_vb.name
-        if stop_oid <= last_oid
+        if !@ignore_oid_order && stop_oid <= last_oid
           warn "OIDs are not increasing, #{last_oid} followed by #{stop_oid}"
           break
         end

data/lib/snmp/mib.rb

@@ -112,7 +112,7 @@ module SNMP
       # known version of the tool is available.
       #
       def import_supported?
-        `smidump --version` =~ /^smidump 0.4/  && $? == 0
+        `smidump --version` =~ /^smidump 0.[45]/  && $? == 0
       end
 
       ##

data/lib/snmp/varbind.rb

@@ -86,11 +86,12 @@ module SNMP
     end
 
     def <=>(other)
+      return nil unless other.respond_to? :to_i
       @value <=> other.to_i
     end
 
     def coerce(other)
-      if other.kind_of? Fixnum
+      if other.kind_of? ::Integer
         return [other, @value]
       else
         return [other.to_f, self.to_f]

data/lib/snmp/version.rb

@@ -1,3 +1,3 @@
 module SNMP
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/test/test_ber.rb

@@ -4,7 +4,7 @@ require 'minitest/autorun'
 require 'snmp/varbind'
 require 'snmp/ber'
 
-class ASN1_Test < MiniTest::Unit::TestCase
+class ASN1_Test < Minitest::Test
 
   include SNMP::BER
 

data/test/test_manager.rb

@@ -17,7 +17,7 @@ class EchoTransport
   end
 end
 
-class TestConfig < MiniTest::Unit::TestCase
+class TestConfig < Minitest::Test
 
   include SNMP
 
@@ -56,7 +56,7 @@ class TestConfig < MiniTest::Unit::TestCase
   end
 end
 
-class TestManager < MiniTest::Unit::TestCase
+class TestManager < Minitest::Test
 
   include SNMP
 
@@ -274,7 +274,7 @@ class TrapTestTransport
 end
 
 
-class TestTrapListener < MiniTest::Unit::TestCase
+class TestTrapListener < Minitest::Test
   include SNMP
 
   def test_init_no_handlers

data/test/test_mib.rb

@@ -3,7 +3,7 @@ require 'snmp/mib'
 
 module SNMP
 
-  class TestMib < MiniTest::Unit::TestCase
+  class TestMib < Minitest::Test
 
     def setup
       @mib = MIB.new

data/test/test_pdu.rb

@@ -3,7 +3,7 @@
 require 'snmp/pdu'
 require 'minitest/autorun'
 
-class TestProtocol < MiniTest::Unit::TestCase
+class TestProtocol < Minitest::Test
 
   include SNMP
 

data/test/test_retry.rb

@@ -53,7 +53,7 @@ class MismatchIdTransport
 end
 
 
-class TestRetry < MiniTest::Unit::TestCase
+class TestRetry < Minitest::Test
   def test_retry_count
     assert_response_count(0, 1, SNMP::RequestTimeout)
     assert_response_count(1, 2, SNMP::RequestTimeout)

data/test/test_varbind.rb

@@ -3,7 +3,7 @@
 require 'snmp/varbind'
 require 'minitest/autorun'
 
-class TestVarBind < MiniTest::Unit::TestCase
+class TestVarBind < Minitest::Test
 
   include SNMP
 
@@ -214,7 +214,7 @@ class TestVarBind < MiniTest::Unit::TestCase
   end
 
   def test_integer_create_from_string
-    i = Integer.new("12345")
+    i = SNMP::Integer.new("12345")
     assert_equal(12345, i.to_i)
   end
 
@@ -243,6 +243,8 @@ class TestVarBind < MiniTest::Unit::TestCase
     assert(123 < i1)
     assert(123.0 < i1)
     assert(i2 > 54000)
+    assert(i1 != NoSuchInstance)
+    assert(NoSuchInstance != i1)
   end
 
   def test_integer_to_oid

data/test/test_walk.rb

@@ -65,7 +65,7 @@ class YamlDataTransport
   end
 end
 
-class TestTransport < MiniTest::Unit::TestCase
+class TestTransport < Minitest::Test
 
   def test_get
     YamlDataTransport.load_data(File.dirname(__FILE__) + "/if_table6.yaml")
@@ -85,7 +85,7 @@ class TestTransport < MiniTest::Unit::TestCase
 
 end
 
-class TestWalk < MiniTest::Unit::TestCase
+class TestWalk < Minitest::Test
 
   ##
   # A single string or single ObjectId can be passed to walk()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snmp
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Dave Halliday
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-15 00:00:00.000000000 Z
+date: 2018-08-31 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby implementation of SNMP (the Simple Network Management Protocol).
 email: hallidave@gmail.com
@@ -316,8 +316,9 @@ files:
 - test/test_smi.rb
 - test/test_varbind.rb
 - test/test_walk.rb
-homepage: http://snmplib.rubyforge.org
-licenses: []
+homepage: https://github.com/hallidave/ruby-snmp
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
@@ -331,15 +332,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: snmplib
-rubygems_version: 2.2.2
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A Ruby implementation of SNMP (the Simple Network Management Protocol).