arpdb 0.1.8 → 0.2.0

data/README.md

@@ -27,12 +27,10 @@ Or install it yourself as:
 require 'arpdb'
 include Arpdb
 
-devices = %w(10.40.5.1 10.43.5.1)
+hosts = %w(10.40.5.1 10.43.5.1)
 community = 'public'
 
-adb = Arp.new(devices, community)
-
-adb.scan
+adb = Arp.new(hosts.collect { |host| SNMPTransport.new(host, community) }).scan
 
 puts adb.mac_to_ip "7a70dec81b02"
 puts adb.ip_to_mac "172.27.50.2"
@@ -40,7 +38,7 @@ puts adb.ip_to_mac "172.27.50.2"
 puts adb.locate_mac "7a70dec81b02"
 puts adb.locate_ip "172.27.50.2"
 
-adb.refresh
+adb.rescan
 
 ```
 

data/lib/arpdb/arp.rb

@@ -7,11 +7,14 @@ module Arpdb
     class ArpdbError < StandardError
     end
 
-    attr_accessor :db
-
-    def initialize(hostlist, community = 'public')
-      @hostlist = hostlist
-      @community = community
+    attr_accessor :db, :snmp_transports
+
+    # Oh gimme my syringe, I want to do some dependency injection!
+    # On a more serious note: snmp_transports is expected to be either
+    # 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]
       @db = Array.new
     end
 
@@ -20,18 +23,16 @@ module Arpdb
     end
 
     def scan
-      @hostlist.each do |host|
-        handle_exceptions do
-          st = SNMPTransport.new(host, @community)
+      handle_exceptions do
+        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: host, location: location}
+            @db << {mac: row.first, ip: row.last, host: st.host, location: location}
           end
-          st.close
         end
-
       end
+
       self
     end
 

data/lib/arpdb/snmp_transport.rb

@@ -2,9 +2,10 @@ require 'snmp'
 
 class SNMPTransport
 
-  attr_accessor :manager
+  attr_accessor :manager, :host
 
   def initialize(host, community = 'public')
+    @host = host
     @manager = SNMP::Manager.new(host: host, community: community, mib_modules: [], retries: 1)
   end
 
@@ -24,10 +25,6 @@ class SNMPTransport
     manager.get(oid).each_varbind { |vb| return decode_value(vb) }
   end
 
-  def close
-    manager.close
-  end
-
   private
 
   def decode_value(vb)

data/lib/arpdb/version.rb

@@ -1,3 +1,3 @@
 module Arpdb
-  VERSION = "0.1.8"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arpdb
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors: