arpdb 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb885013b5a04ca2912a9ad3258f9e6bb328f9f7
-  data.tar.gz: 31de24183490c2065f51ff1afab4a10200c64f96
+  metadata.gz: 53646bc60980e1ce48e0786b20f190246279483e
+  data.tar.gz: 71eedb4dbf2ec67ea029c60f63e482849cddfb79
 SHA512:
-  metadata.gz: f9294f9a98b874aba5885ae42a851ff70c749ea2791d8b55377f5ccf98a28f6efe4b4d6e7b6339022b0545c72b955abfaf883de1b59fd81d85fc07d254dcba65
-  data.tar.gz: 5e6b4bfb330950762a47c45b2c968f2fc53e14c53a460a3c7573ae6758e4445333f4156b77512936047da716ab2a833cf8c4628ceedbf4a92482f7336821da22
+  metadata.gz: 8b1eb1491c7b49ad666a44c6562d69ebf44e366ac6d4cb0ec1daffaeba1af267eb6ee82d2b0c0fdc8c20fc933b999c398ac0ce18f68549d060e8a0091f5ff25a
+  data.tar.gz: 677aa71fc85228140e06d624065973872019e9755d4ac28877fea247ffa0212315a7c2fb0b5f3a5a77c1fa469818a595a4c12644cd40e51f7f3f0faaf2d13793

data/lib/arpdb/arp.rb

@@ -14,7 +14,7 @@ module Arpdb
     # Arpdb::SNMPTransport or array of those. This way we can easily pass
     # mocked SNMPTransport here for off-the-hook testing.
     def initialize(snmp_transports)
-      snmp_transports.is_a?(Array) ? @snmp_transports = snmp_transports : @snmp_transports = [snmp_transports]
+      @snmp_transports = Array(snmp_transports)
       @db = Array.new
     end
 
@@ -23,16 +23,26 @@ module Arpdb
     end
 
     def scan
+      sys_location = '1.3.6.1.2.1.1.6.0'
+      ip_net_to_media_phys_address = '1.3.6.1.2.1.4.22.1.2'
+      ip_net_to_media_net_address = '1.3.6.1.2.1.4.22.1.3'
+      @db = Array.new
       handle_exceptions do
+        dirty = false
         snmp_transports.each do |st|
-          location = st.get('1.3.6.1.2.1.1.6.0')
-
-          st.walk(%w(1.3.6.1.2.1.4.22.1.2 1.3.6.1.2.1.4.22.1.3)).each do |row|
-            @db << {mac: row.first, ip: row.last, host: st.host, location: location}
+          begin
+            st.walk([ip_net_to_media_phys_address, ip_net_to_media_net_address]).each do |mac, ip|
+              @db << {mac: mac, ip: ip, host: st.host, location: st.get(sys_location)}
+            end
+          rescue => e
+            dirty = true
+            msgs ||= []
+            msgs << "SNMPTransport error while scanning #{st.host}; moving to next host (if any)"
+            next
           end
         end
+        raise msgs.join("; ") if dirty
       end
-
       self
     end
 
@@ -75,4 +85,4 @@ module Arpdb
     end
 
   end
-end
+end

data/lib/arpdb/version.rb

@@ -1,3 +1,3 @@
 module Arpdb
-  VERSION = "0.2.2"
+  VERSION = '0.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arpdb
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - J.K.Valk
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-20 00:00:00.000000000 Z
+date: 2016-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler