arpdb 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 827b4e97497154154947b04056d2187502fc6a03
-  data.tar.gz: 0aee24d7e749beb26cc2be65a27e69a9f706fcbb
+  metadata.gz: 608b55c164203c7fed6e788fd36a8c63d4f444bc
+  data.tar.gz: a188629f558bf677b05079a53a752f3e20ea84f0
 SHA512:
-  metadata.gz: 8bf2b7158ce74ab84fcd31170fa5204025d3ea5b4178468752314b204f8e44fcf8d91413e84b3fc2209cafddb124a01fdb46fa134f3d5ccfcb7921272b4eb546
-  data.tar.gz: 2417d72cff3ebf1fbf02393f3145206907624821cb06e4c8e62296f7066368ba97b062654f7ddb8f11c34627dd02b80872ebebaa3f6c7ddef6603f37534aeac1
+  metadata.gz: d7876ea9bcf3484de7841bba5e4c2a428b5fb8a2da8ef59a29308ee13eb7ec4ef3ec3ba18557586e2bafe43461020037dfad6b459870c5d05cec9036010b2ea9
+  data.tar.gz: d5bef5453a3303995c23d9f93e10166c2bb59638533bbcc4d654f1969be78860c09d43a85602122b8f9f1a87c3bf3fd8b2e071f2f1e3cdbb4105b74f614341ac

data/.gitignore

@@ -9,3 +9,5 @@
 /spec/reports/
 /tmp/
 *.gem
+/spec_local/
+

data/README.md

@@ -1,5 +1,6 @@
 [![Build Status](https://travis-ci.org/jkvalk/arpdb.svg?branch=master)](https://travis-ci.org/jkvalk/arpdb)
 [![Gem Version](https://badge.fury.io/rb/arpdb.svg)](http://badge.fury.io/rb/arpdb)
+[![Coverage Status](https://coveralls.io/repos/jkvalk/arpdb/badge.svg?branch=master)](https://coveralls.io/r/jkvalk/arpdb?branch=master)
 
 # Arpdb
 

data/bin/console

@@ -3,13 +3,11 @@
 require "bundler/setup"
 require "arpdb"
 
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
+# reload a gem
+def reload(require_regex)
+  $".grep(/^#{require_regex}/).each {|e| load(e) }
+end
 
 require "pry"
 Pry.start
 
-#require "irb"
-#IRB.start

data/lib/arpdb/arp.rb

@@ -7,27 +7,36 @@ module Arpdb
 
   class Arp
 
+    class ArpdbError < StandardError
+    end
+
     attr_accessor :db
 
     # * +hostlist+ - Array of hostnames (strings) who's ARP tables to fetch
     def initialize(hostlist, community = 'public')
       @hostlist = hostlist
       @community = community
+      @db = Array.new
     end
 
-    # Just an alias for refresh()
-    def scan
+    # Just an alias for scan
+    def refresh
       refresh
     end
 
-    def refresh
-      @db = Array.new
+    def scan
       @hostlist.each do |host|
-        SNMP::Manager.open(host: host, community: @community) do |manager|
-          manager.walk(%w(1.3.6.1.2.1.4.22.1.2 1.3.6.1.2.1.4.22.1.3)) do |row|
-            mac = row[0].value.unpack('H*')[0]
-            ip = row[1].value.to_s
-            @db << {mac: mac, ip: ip, host: host}
+        handle_exceptions do
+          SNMP::Manager.open(host: host, community: @community, mib_modules: [], retries: 1) do |manager|
+
+            location = String.new
+            manager.get('1.3.6.1.2.1.1.6.0').each_varbind { |vb| location = vb.value }
+
+            manager.walk(%w(1.3.6.1.2.1.4.22.1.2 1.3.6.1.2.1.4.22.1.3)) do |row|
+              mac = row[0].value.unpack('H*').first
+              ip = row[1].value.to_s
+              @db << {mac: mac, ip: ip, host: host, location: location}
+            end
           end
         end
       end
@@ -38,7 +47,7 @@ module Arpdb
     #    mac_to_ip("a7fea790ffa9")
     def mac_to_ip(mac)
       db.each do |line|
-        if line[:mac].eql?(mac.downcase.gsub(':',''))
+        if line[:mac].eql?(mac.downcase.gsub(':', ''))
           return line[:ip]
         end
       end
@@ -56,29 +65,39 @@ module Arpdb
       ''
     end
 
-    # Returns the host that has given MAC in it's ARP table
+    # Returns the syslocation that has given MAC in it's ARP table
     # * +mac+ - MAC address. String, hex, lowercase, no byte separators.
     #    locate_mac("a7fea790ffa9")
     def locate_mac(mac)
       db.each do |line|
-        if line[:mac].eql?(mac)
-          return line[:host]
+        if line[:mac].eql?(mac.downcase.gsub(':', ''))
+          return line[:location]
         end
       end
       ''
     end
 
-    # Returns the host that has given IP in it's ARP table
+    # Returns the syslocation that has given IP in it's ARP table
     # * +ip+ - IP address. String, decimal.
     #    locate_mac("10.0.0.1")
     def locate_ip(ip)
       db.each do |line|
         if line[:ip].eql?(ip)
-          return line[:host]
+          return line[:location]
         end
       end
       ''
     end
 
+    private
+
+    def handle_exceptions
+      begin
+        yield
+      rescue => e
+        raise ArpdbError, "Exception in Arpdb::Arp: #{e.to_s}"
+      end
+    end
+
   end
 end

data/lib/arpdb/version.rb

@@ -1,3 +1,3 @@
 module Arpdb
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

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