copian 1.3.2 → 1.3.3

data/.gitignore

@@ -1,5 +1,18 @@
-*.sw?
-.DS_Store
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
 coverage
+doc/
+lib/bundler/man
 pkg
 rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+vendor/bundle

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in copian.gemspec
+gemspec

data/{README → README.rdoc}

@@ -22,7 +22,7 @@ Collecting the status of all the network interfaces on a Cisco Router
   # Port 1/e1 is 1 @ 100000000. mtu(1500)
   # ...
 
-presently the admin_status and oper_status are not interpreted, but equate to
+presently the +admin_status+ and +oper_status+ are not interpreted, but equate to
 
 1. up
 2. down
@@ -30,6 +30,11 @@ presently the admin_status and oper_status are not interpreted, but equate to
 
 == History
 
+=== 1.3.3 - 2012/02/20
+
+- 1 major enhancement
+  - Add interface description collector
+
 === 1.3.2 - 2009/10/06
 
 - 1 major correction

data/Rakefile

@@ -1,45 +1,2 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |s|
-    s.name = "copian"
-    s.summary = %Q{Suite of SNMP collectors for different types of network devices}
-    s.email = "geoff@geoffgarside.co.uk"
-    s.homepage = "http://github.com/geoffgarside/copian"
-    s.description = "Suite of SNMP collectors for different types of network devices"
-    s.authors = ["Geoff Garside"]
-    s.add_dependency('snmp', '>= 1.0.2')
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end
-
-Rake::TestTask.new do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'copian'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('LICENSE')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |t|
-    t.libs << 'test'
-    t.test_files = FileList['test/**/*_test.rb']
-    t.verbose = true
-  end
-rescue LoadError
-end
-
-task :default => :test
+#!/usr/bin/env rake
+require "bundler/gem_tasks"

data/copian.gemspec

@@ -0,0 +1,18 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path('../lib/copian/version', __FILE__)
+
+Gem::Specification.new do |gem|
+  gem.authors       = ["Geoff Garside"]
+  gem.email         = ["geoff@geoffgarside.co.uk"]
+  gem.description   = %q{Suite of SNMP collectors for different types of network devices}
+  gem.summary       = %q{SNMP Information statistics}
+  gem.homepage      = "http://github.com/geoffgarside/copian"
+
+  gem.files         = `git ls-files`.split("\n")
+  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.name          = "copian"
+  gem.require_paths = ["lib"]
+  gem.version       = Copian::VERSION
+
+  gem.add_dependency "snmp", ">= 1.0.4"
+end

data/lib/copian.rb

@@ -1,3 +1,6 @@
+require 'snmp'
+
+require 'copian/version'
 require 'copian/collector/abstract_collector'
 require 'copian/collector/addresses_collector'
 require 'copian/collector/bandwidth_collector'
@@ -9,8 +12,6 @@ require 'copian/collector/cisco'
 require 'copian/collector/dell'
 require 'copian/collector/hp'
 
-require 'snmp'
-
 # :stopdoc:
 class SNMP::Manager
   attr_reader :host, :community, :version

data/lib/copian/collector/cisco/addresses.rb

@@ -1,8 +1,12 @@
 module Copian
   module Collector
     class CiscoAddressesCollector < AddressesCollector # :nodoc:
+      IpNetToMediaPhysAddress     = SNMP::ObjectId.new('1.3.6.1.2.1.4.22.1.2')  # IPv4 only
+      IpNetToPhysicalPhysAddresss = SNMP::ObjectId.new('1.3.6.1.2.1.4.35.1.4')  # IP version agnostic
+
       def collect
-        oid = SNMP::ObjectId.new('1.3.6.1.2.1.4.22.1.2')
+        oid = IpNetToMediaPhysAddress
+
         @manager.walk(oid) do |r|
           r.each do |varbind|
             mac_addr = value_to_mac_address(varbind.value)
@@ -15,6 +19,30 @@ module Copian
           yield mac.dup, ips if block_given?
         end
       end
+      protected
+        def name_to_ip_address(name, oid)
+          if oid == IpNetToMediaPhysAddress
+            # Strip off the parent and IDX oid
+            # the rest is an IPv4 address
+            name.index(oid)[1..-1].to_s
+          elsif oid == IpNetToPhysicalPhysAddresss
+            # Strip off the parent and IDX oid
+            sub = name.index(oid)[1..-1]
+            family = sub.shift
+            addrlen = sub.shift
+
+            case family
+            when 1  # IPv4
+              sub[0..addrlen].to_s
+            when 2  # IPv6
+              sub[0..addrlen].map do |i|
+                "%02x" % i.to_i
+              end.join.split(/([a-f0-9]{4})/).reject do |i|
+                i == ""
+              end.join(":")
+            end
+          end
+        end
     end
   end
 end

data/lib/copian/collector/cisco/ports.rb

@@ -19,9 +19,9 @@ module Copian
       private
         def each_vlan
           @vlans_collector.collect do |vlan_id, vlan_index|
-            yield SNMP::Manager.new(:Host => @manager.host,
-              :Version => @manager.version,
-              :Community => "#{@manager.community}@#{vlan_id}")
+            yield SNMP::Manager.new(:host => @manager.host,
+              :version => @manager.version,
+              :community => "#{@manager.community}@#{vlan_id}")
           end
         end
         def gather_mac_bridge_ports(manager)

data/lib/copian/collector/generic.rb

@@ -5,8 +5,8 @@ module Copian
         "#<#{self.class} #{@manager.host}@#{@manager.community}>"
       end
       def initialize(ip_addr, community, version = :SNMPv2c)
-        @manager = SNMP::Manager.new(:Host => ip_addr,
-          :Community => community, :Version => version)
+        @manager = SNMP::Manager.new(:host => ip_addr,
+          :community => community, :version => version)
       end
       def port_stats # :yields: ifindex, name, mtu, speed, admin_status, oper_status
         load_ifnames
@@ -23,7 +23,7 @@ module Copian
       #
       # Valid Options
       #   +:b64+  :Set to true to enable b64 bandwidth collection. Default false.
-      def bandwidth(options = {}) # :yields: ifindex, inoctets, outoctets
+      def bandwidth(options = {}) # :yields: ifindex, ifname, inoctets, outoctets
         load_ifnames
 
         collect_method = options[:b64] == true ? :collect64 : :collect

data/lib/copian/version.rb

@@ -0,0 +1,3 @@
+module Copian
+  VERSION = "1.3.3"
+end

metadata

@@ -1,47 +1,44 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: copian
-version: !ruby/object:Gem::Version 
-  version: 1.3.2
+version: !ruby/object:Gem::Version
+  version: 1.3.3
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Geoff Garside
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2009-10-06 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: snmp
+  requirement: &70195160173080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.4
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.2
-    version: 
+  prerelease: false
+  version_requirements: *70195160173080
 description: Suite of SNMP collectors for different types of network devices
-email: geoff@geoffgarside.co.uk
+email:
+- geoff@geoffgarside.co.uk
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE
-- README
-files: 
+extra_rdoc_files: []
+files:
 - .gitignore
+- Gemfile
 - LICENSE
-- README
+- README.rdoc
 - Rakefile
-- VERSION.yml
+- copian.gemspec
 - lib/copian.rb
 - lib/copian/collector/abstract_collector.rb
 - lib/copian/collector/addresses_collector.rb
 - lib/copian/collector/bandwidth_collector.rb
-- lib/copian/collector/description_collector.rb
 - lib/copian/collector/cisco.rb
 - lib/copian/collector/cisco/addresses.rb
 - lib/copian/collector/cisco/ports.rb
@@ -49,42 +46,46 @@ files:
 - lib/copian/collector/dell.rb
 - lib/copian/collector/dell/ports.rb
 - lib/copian/collector/dell/vlans.rb
+- lib/copian/collector/description_collector.rb
 - lib/copian/collector/generic.rb
 - lib/copian/collector/hp.rb
 - lib/copian/collector/hp/ports.rb
 - lib/copian/collector/hp/vlans.rb
 - lib/copian/collector/port_stats_collector.rb
 - lib/copian/collector/ports_collector.rb
+- lib/copian/version.rb
 - test/copian_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://github.com/geoffgarside/copian
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: -1816480518592960478
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: -1816480518592960478
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: Suite of SNMP collectors for different types of network devices
-test_files: 
+summary: SNMP Information statistics
+test_files:
 - test/copian_test.rb
 - test/test_helper.rb

data/VERSION.yml

@@ -1,4 +0,0 @@
---- 
-:major: 1
-:minor: 3
-:patch: 2