corona 0.0.2 → 0.0.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8dbac544706aa6c8804d989307768c20ed0e5149
+  data.tar.gz: efe2c5e74b075d7fa8206c2ce0413221aaf6e345
+SHA512:
+  metadata.gz: d00f70284e1d0049d153d83b9c24ae3a49191235fc714fd80f049ba4ab4e2689d2c54aeca1a6e7182d238a064035ea92ff048f6a6f574a36f25bd94e96b4648f
+  data.tar.gz: 8426a763a70f6d6529b4dff2d8b9e0ba77be47893454fba3d9e91be55408bf1992e281622002457a4a5e4b2751b5fada89bd6dad0c7b516a17f4ed6be785e8cd

data/Gemfile

@@ -1,14 +1,3 @@
 source 'https://rubygems.org'
-#ruby '2.0.0'
 
-gem 'sequel'
-gem 'sqlite3'
-gem 'snmp'
-
-group :development do
-  gem 'pry'
-end
-
-group :test do
-  gem 'rspec'
-end
+gemspec

data/Gemfile.lock

@@ -1,32 +1,22 @@
+PATH
+  remote: .
+  specs:
+    corona (0.0.5)
+      sequel
+      snmp
+      sqlite3
+
 GEM
   remote: https://rubygems.org/
   specs:
-    coderay (1.0.9)
-    diff-lcs (1.2.3)
-    method_source (0.8.2)
-    pry (0.9.10)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.3.1)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.5)
-    rspec-expectations (2.14.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.3)
-    sequel (3.42.0)
-    slop (3.3.2)
-    snmp (1.1.0)
-    sqlite3 (1.3.7)
+    rspec-core (2.14.7)
+    sequel (4.7.0)
+    snmp (1.1.1)
+    sqlite3 (1.3.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  pry
-  rspec
-  sequel
-  snmp
-  sqlite3
+  corona!
+  rspec-core

data/Rakefile

@@ -1,35 +1,47 @@
 begin
+  require 'rake/testtask'
   require 'bundler'
-  require 'rspec/core/rake_task'
   Bundler.setup
 rescue LoadError
-  warn 'missing dependencies'
-  raise
+  warn 'bunler missing'
   exit 42
 end
 
 gemspec = eval(File.read(Dir['*.gemspec'].first))
+file    = [gemspec.name, gemspec.version].join('-') + '.gem'
 
-desc 'Validate the gemspec'
+desc 'Validate gemspec'
 task :gemspec do
   gemspec.validate
 end
 
-RSpec::Core::RakeTask.new(:spec)
+desc 'Run minitest'
+task :test do
+  Rake::TestTask.new do |t|
+    t.libs.push "lib"
+    t.test_files = FileList['spec/*_spec.rb']
+    t.verbose = true
+  end
+end
 
-desc "Build gem locally"
-task :build => [:spec, :gemspec] do
+desc 'Build gem'
+task :build do
   system "gem build #{gemspec.name}.gemspec"
-  FileUtils.mkdir_p "gems"
-  FileUtils.mv "#{gemspec.name}-#{gemspec.version}.gem", "gems"
+  FileUtils.mkdir_p 'gems'
+  FileUtils.mv file, 'gems'
 end
 
-desc "Install gem locally"
+desc 'Install gem'
 task :install => :build do
-  system "sudo sh -c \'umask 022; gem install gems/#{gemspec.name}-#{gemspec.version}\'"
+  system "sudo -E sh -c \'umask 022; gem install gems/#{file}\'"
 end
 
-desc "Clean automatically generated files"
+desc 'Remove gems'
 task :clean do
-  FileUtils.rm_rf "gems"
+  FileUtils.rm_rf 'gems'
+end
+
+desc 'Push to rubygems'
+task :push do
+  system "gem push gems/#{file}"
 end

data/corona.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'corona'
-  s.version           = '0.0.2'
+  s.version           = '0.0.5'
   s.platform          = Gem::Platform::RUBY
   s.authors           = [ 'Saku Ytti' ]
   s.email             = %w( saku@ytti.fi )
@@ -15,4 +15,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'sequel'
   s.add_dependency 'sqlite3'
   s.add_dependency 'snmp'
+  s.add_development_dependency 'rspec-core'
 end

data/lib/corona/core.rb

@@ -1,7 +1,8 @@
 require 'corona/log'
 require 'corona/config/core'
 require 'corona/snmp'
-require 'corona/db'
+require 'corona/db/db'
+require 'corona/model'
 require 'ipaddr'
 require 'resolv'
 
@@ -55,8 +56,8 @@ module Corona
     def process opt
       opt = normalize_opt opt
       record = mkrecord opt
-      old_by_ip, old_by_sysname = @db.old record[:id], record[:oid_sysName]
-     
+      old_by_ip, old_by_sysname = @db.old record[:ip], record[:oid_sysName]
+
       # unique box having non-unique sysname
       # old_by_sysname = false if record[:oid_sysDescr].match 'Application Control Engine'
 
@@ -104,14 +105,14 @@ module Corona
       elsif new_int_pref == 100 and old_int_pref == 99
         # neither old or new interface is known good MGMT interface
         if SNMP.new(old_by_sysname[:ip]).sysdescr
-          # if old IP works, don't update 
+          # if old IP works, don't update
           Log.debug "#{record[:ip]} not updating, previously seen as #{old_by_sysname[:ip]}"
         else
           Log.info "#{record[:ip]} updating, old #{old_by_sysname[:ip]} is dead"
           @db.update record, [:oid_sysName, old_by_sysname[:oid_sysName]]
         end
 
-      elsif new_int_pref >= old_int_pref 
+      elsif new_int_pref >= old_int_pref
         # nothing to do, we have better entry
         Log.debug "#{record[:ip]} already seen as superior via #{old_by_sysname[:ip]}"
 
@@ -122,10 +123,9 @@ module Corona
 
     def mkrecord opt
       {
-        :id              => opt[:ip].to_i,
         :ip              => opt[:ip].to_s,
         :ptr             => ip2name(opt[:ip].to_s),
-        :model           => model(opt),
+        :model           => Model.map(opt[:oids][:sysDescr]),
         :oid_ifDescr     => opt[:int],
         :oid_sysName     => opt[:oids][:sysName],
         :oid_sysLocation => opt[:oids][:sysLocation],
@@ -142,25 +142,6 @@ module Corona
       Resolv.getname ip rescue ip
     end
 
-    def model opt
-      case opt[:oids][:sysDescr]
-      when /Cisco Catalyst operating System/
-        'catos'
-      when /cisco/i, /Application Control Engine/i
-        'ios'
-      when /JUNOS/
-        'junos'
-      when /^NetScreen/, /^SSG-\d+/
-        'screenos'
-      when /IronWare/
-        'ironware'
-      when /^Summit/
-        'xos'
-      when /^\d+[A-Z]\sEthernet Switch$/
-        'powerconnect'
-      end
-    end
-
     def resolve_networks
       [CFG.poll, CFG.ignore].map do |nets|
         if nets.respond_to? :each

data/lib/corona/db/db.rb

@@ -0,0 +1,31 @@
+module Corona
+  class DB
+    require 'sequel'
+    require 'sqlite3'
+    def initialize
+      Sequel::Model.plugin :schema
+      @db = Sequel.sqlite(CFG.db, :max_connections => 1, :pool_timeout => 60)
+      require_relative 'model'
+    end
+
+    def add record
+      record[:first_seen] = record[:last_seen] = Time.now.utc
+      record[:active] = true
+      Log.debug "adding: #{record}"
+      Device.new(record).save
+    end
+
+    def update record, where
+      record[:last_seen] = Time.now.utc
+      record[:active] = true
+      Log.debug "updating (where: #{where}): #{record}"
+      Device[where.first.to_sym => where.last].update record
+    end
+
+    def old ip, oid_sysName
+      ip       = Device[:ip => ip]
+      sysName  = Device[:oid_sysName => oid_sysName]
+      [ip, sysName]
+    end
+  end
+end

data/lib/corona/db/model.rb

@@ -0,0 +1,20 @@
+module Corona
+  class DB
+    class Device < Sequel::Model
+      set_schema do
+        primary_key :id
+        String      :ip
+        String      :ptr
+        String      :model
+        String      :oid_ifDescr
+        Boolean     :active
+        Time        :first_seen
+        Time        :last_seen
+        String      :oid_sysName
+        String      :oid_sysLocation
+        String      :oid_sysDescr
+      end
+      create_table unless table_exists?
+    end
+  end
+end

data/lib/corona/model.rb

@@ -0,0 +1,34 @@
+module Corona
+  class Model
+    def self.map sysDescr
+      case sysDescr
+      when /Cisco Catalyst Operating System/i
+        'catos'
+      when /Cisco Controller/
+        'aireos'
+      when /IOS XR/
+        'iosxr'
+      when /NX-OS/
+        'nxos'
+      when /cisco/i, /Application Control Engine/i
+        'ios'
+      when /JUNOS/
+        'junos'
+      when /^NetScreen/, /^SSG-\d+/
+        'screenos'
+      when /Arista Networks EOS/
+        'eos'
+      when /IronWare/
+        'ironware'
+      when /^Summit/
+        'xos'
+      when /^Alcatel-Lucent/
+        'aos'
+      when /ProCurve/  # ProCurve OS does not seem to have name?
+        'procurve'
+      when /^\d+[A-Z]\sEthernet Switch$/
+        'powerconnect'
+      end
+    end
+  end
+end

data/lib/corona/snmp.rb

@@ -27,7 +27,7 @@ module Corona
       oid = [oid].flatten.join('.')
       begin
         @snmp.get(oid).each_varbind { |vb| return vb }
-      rescue ::SNMP::RequestTimeout
+      rescue ::SNMP::RequestTimeout, Errno::EACCES
         return false
       end
     end
@@ -42,7 +42,7 @@ module Corona
             end
           end
         end
-      rescue ::SNMP::RequestTimeout
+      rescue ::SNMP::RequestTimeout, Errno::EACCES
         return false
       end
       result

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: corona
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors:
 - Saku Ytti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-10 00:00:00.000000000 Z
+date: 2014-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: snmp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,20 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -79,34 +86,32 @@ files:
 - lib/corona/config/bootstrap.rb
 - lib/corona/config/core.rb
 - lib/corona/core.rb
-- lib/corona/db.rb
+- lib/corona/db/db.rb
+- lib/corona/db/model.rb
 - lib/corona/log.rb
+- lib/corona/model.rb
 - lib/corona/snmp.rb
 homepage: http://github.com/ytti/corona
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1830848294566328575
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: corona
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: device discovery via snmp polls
 test_files: []

data/lib/corona/db.rb

@@ -1,50 +0,0 @@
-module Corona
-  class DB
-    require 'sequel'
-    require 'sqlite3'
-    def initialize 
-      @db = Sequel.sqlite(CFG.db, :max_connections => 1, :pool_timeout => 60)
-
-      @db.create_table :device do
-        primary_key :id
-        String      :ip
-        String      :ptr
-        String      :model
-        String      :oid_ifDescr
-        Boolean     :active
-        Time        :first_seen
-        Time        :last_seen
-        String      :oid_sysName
-        String      :oid_sysLocation
-        String      :oid_sysDescr
-      end unless @db.table_exists? :device
-    end
-
-    # http://sequel.rubyforge.org/rdoc/files/doc/cheat_sheet_rdoc.html
-    #
-
-    def add record
-      record[:first_seen] = record[:last_seen] = Time.now.utc
-      record[:active] = true
-      #Log.debug "adding: #{record}"
-      @db[:device].insert record
-    end
-
-    def update record, where
-      record[:last_seen] = Time.now.utc
-      record[:active] = true
-      #Log.debug "updating (where: #{where}): #{record}"
-      @db[:device].where('? == ?', where.first, where.last).update record
-    end
-
-    def [] primary_key
-      @db[:device].where('id == ?', primary_key).first
-    end
-
-    def old primary_key, oid_sysName
-      ip       = self[primary_key]
-      sysName  = @db[:device].where('oid_sysName == ?', oid_sysName).first
-      [ip, sysName]
-    end
-  end
-end