corona 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: feaba7651c162b75ed4377d5a53dcc6f92dee768
-  data.tar.gz: 509307e0e7c99b34d5ca6f00355651209b6b58d1
+  metadata.gz: 13a0a34b2f4fb806e785aa8228e713831e2c0897
+  data.tar.gz: 46830aec3debd98c44442d422aaed5fe489aa99d
 SHA512:
-  metadata.gz: 9e9f8c5ecc6ef91cfdcb8f88ea7ad6a4b0ed2e5157c14401354d99db1be5f7aa860ed7cf4da75fc006b43a8e6cc958ee91c5ab54ba9114d8b4aa67b4860d3da4
-  data.tar.gz: 15957e33cf5288771f4f597b392805a61fd224b86e1c90a5791488a8d2dc9559bdfccaf1323da9a72efde2992c789f26ec08cc62d106b54f757a30ee7f6c6b6f
+  metadata.gz: ea8d5b6d6b1a48155eb4eab2381257c211e576caa78609db4816f12af22e942135a9db1c43cb026dc7307b3b6826a36de26336b066ab67dd5506f6dd3841734a
+  data.tar.gz: 11424afb5f63c87b3529470adec9d5e3edef6822ff6450f3c5a8c4d4c922ec38e8f65d82322420288c8429eafcd7e0f941f552fda29d8709a6d9499aefaee2d2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    corona (0.0.12)
+    corona (0.0.13)
       asetus
       sequel
       slop
@@ -13,10 +13,10 @@ GEM
   specs:
     asetus (0.0.7)
       slop
-    sequel (4.7.0)
-    slop (3.4.7)
+    sequel (4.9.0)
+    slop (3.5.0)
     snmp (1.1.1)
-    sqlite3 (1.3.8)
+    sqlite3 (1.3.9)
 
 PLATFORMS
   ruby

data/corona.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'corona'
-  s.version           = '0.0.12'
+  s.version           = '0.0.13'
   s.platform          = Gem::Platform::RUBY
   s.authors           = [ 'Saku Ytti' ]
   s.email             = %w( saku@ytti.fi )

data/lib/corona/cli.rb

@@ -7,13 +7,13 @@ module Corona
 
     def run
       if @opts[:poll]
-        Corona.new :cidr=>@opts[:poll]
+        Corona.new(:cidr=>@opts[:poll]).run
       elsif @opts[:remove]
         remove_records @opts[:remove]
       elsif @opts['purge-old']
         remove_old @opts['purge-old']
       else
-        Corona.new
+        Corona.new.run
       end
     end
 

data/lib/corona/core.rb

@@ -11,15 +11,21 @@ module Corona
     def new opts={}
       Core.new opts
     end
+
+    def poll opts={}
+      host = opts.delete :host
+      raise CoronaError, '\'host\' not given' unless host
+      corona = new opts
+      result = corona.poll Resolv.getaddress(host)
+      corona.mkrecord result if result
+    end
   end
 
   class Core
 
-    private
-
-    def initialize opts={}
-      cidr          = opts.delete :cidr
-      @output       = opts.delete :output
+    def run
+      cidr          = @opts.delete :cidr
+      @output       = @opts.delete :output
       if not @output
         @output = Logger.new $stdout
         @output.formatter = proc { |_ ,_ ,_ , msg| msg + "\n" }
@@ -36,19 +42,23 @@ module Corona
             threads.delete_if { |thread| not thread.alive? }
             sleep 0.01
           end
-          threads << Thread.new { poll ip }
+          threads << Thread.new do
+            result = poll ip
+            @mutex.synchronize { process result } if result
+          end
         end
       end
       threads.each { |thread| thread.join }
     end
 
     def poll ip
-      snmp = SNMP.new ip.to_s
+      result = nil
+      snmp = SNMP.new ip.to_s, @community
       oids = snmp.dbget
       if oids
         if index = snmp.ip2index(ip.to_s)
           if int = snmp.ifdescr(index)
-            @mutex.synchronize { process :oids=>oids, :int=>int.downcase, :ip=>ip }
+            result = {:oids=>oids, :int=>int.downcase, :ip=>ip}
           else
             Log.warn "no ifDescr for #{index} at #{ip}"
           end
@@ -57,6 +67,28 @@ module Corona
         end
       end
       snmp.close
+      result
+    end
+
+    def mkrecord opt
+      {
+        :ip              => opt[:ip].to_s,
+        :ptr             => ip2name(opt[:ip].to_s),
+        :model           => Model.map(opt[:oids][:sysDescr], opt[:oids][:sysObjectID]),
+        :oid_ifDescr     => opt[:int],
+        :oid_sysName     => opt[:oids][:sysName],
+        :oid_sysLocation => opt[:oids][:sysLocation],
+        :oid_sysDescr    => opt[:oids][:sysDescr],
+        :oid_sysObjectID => opt[:oids][:sysObjectID].join('.'),
+      }
+    end
+
+    private
+
+    def initialize opts={}
+      @opts = opts
+      @community   = opts.delete :community
+      @community ||= CFG.community
     end
 
     def process opt
@@ -110,7 +142,7 @@ 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 SNMP.new(old_by_sysname[:ip], @community).sysdescr
           # if old IP works, don't update
           Log.debug "#{record[:ip]} not updating, previously seen as #{old_by_sysname[:ip]}"
         else
@@ -127,19 +159,6 @@ module Corona
       end
     end
 
-    def mkrecord opt
-      {
-        :ip              => opt[:ip].to_s,
-        :ptr             => ip2name(opt[:ip].to_s),
-        :model           => Model.map(opt[:oids][:sysDescr], opt[:oids][:sysObjectID]),
-        :oid_ifDescr     => opt[:int],
-        :oid_sysName     => opt[:oids][:sysName],
-        :oid_sysLocation => opt[:oids][:sysLocation],
-        :oid_sysDescr    => opt[:oids][:sysDescr],
-        :oid_sysObjectID => opt[:oids][:sysObjectID].join('.'),
-      }
-    end
-
     def normalize_opt opt
       opt[:oids][:sysName].sub!(/-re[1-9]\./, '-re0.')
       opt

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: corona
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Saku Ytti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: corona
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: device discovery via snmp polls