corona 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05542efc8878a1c42874c4a0fb32badca922a9b5
-  data.tar.gz: 0758f35f168258f9c9db2f98eb5855517fbfbbbc
+  metadata.gz: 05d90e5d39580853fa3d8de2d8bb23ab5e71c059
+  data.tar.gz: af308eb023c66b5c1c7148ccc2fdd3168de87f87
 SHA512:
-  metadata.gz: f47ae73a9939219ea5cb37314d64b5a9c826d6822eef1246f9061a0e97150c8f2ed266aeb2981b87991b30972fcfd1b9241412f2755e78794f4f29900bdfec8c
-  data.tar.gz: 37e81fa4f1bf58cb8867945409b13f498540169a5899a96c94d59af26e3e77143ed9b58dd314bab8d21442bd258993f403804ab9771cc6b27f3e49cbeb4e9bd3
+  metadata.gz: 953a40c47c411c1666a4f0731b6f865dd6db15e44fd01cf2c65c9534120d0f04c5716df983831b6be116aeee73f53d426d5b95a5f9d5e3e64e60541aeae038bb
+  data.tar.gz: d76d38b3c9af8a87606645e60c09fbefba2da67ee5c56ac2e9731a52186aff3f28ea06be8f5803e4855d315641f9409c1367062883b7f4de7ed93a5bcb764736

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    corona (0.0.10)
+    corona (0.0.11)
+      asetus
       sequel
       slop
       snmp
@@ -10,6 +11,8 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    asetus (0.0.6)
+      slop
     sequel (4.7.0)
     slop (3.4.7)
     snmp (1.1.1)

data/README.md

@@ -15,3 +15,20 @@
   * You need to configure SNMP community
   * You need to define CIDR to poll and CIDRs to ignore (subset of those you poll)
   * CIDR in example config is list, but can be replaced with 'string' which points to file, where CIDRs are listed
+
+# Use
+```
+[fisakytt@lan-login1 ~/projects/corona]% corona --help
+Usage: corona [options] [argument]
+    -d, --debug           Debugging on
+    -p, --poll            Poll CIDR [argument]
+    -r, --remove          Remove [argument] from DB
+    -m, --max-delete      Maximum number to delete, default 1
+    -o, --purge-old       Remove records order than [argument] days
+    -s, --simulate        Simulate, do not change DB
+    -h, --help            Display this help message.
+
+% corona -p 192.0.2.0/28   # poll specific CIDR
+% corona -r core-sw1       # remove specific record
+% corona -o 7              # remore records older than 7 days
+```

data/corona.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'corona'
-  s.version           = '0.0.10'
+  s.version           = '0.0.11'
   s.platform          = Gem::Platform::RUBY
   s.authors           = [ 'Saku Ytti' ]
   s.email             = %w( saku@ytti.fi )
@@ -16,4 +16,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'sqlite3'
   s.add_dependency 'snmp'
   s.add_dependency 'slop'
+  s.add_dependency 'asetus'
 end

data/lib/corona/cli.rb

@@ -3,6 +3,7 @@ module Corona
     MAX_DELETE = 1
     require 'corona'
     require 'slop'
+    class NoConfig < CoronaError; end
 
     def run
       if @opts[:poll]
@@ -22,6 +23,11 @@ module Corona
       args, @opts = opts_parse
       @arg = args.shift
       CFG.debug = true if @opts[:debug]
+      if CFGS.system.empty? and CFGS.user.empty?
+        CFGS.user = CFGS.default
+        CFGS.save :user
+        raise NoConfig, 'edit ~/.config/corona/config'
+      end
     end
 
     def opts_parse

data/lib/corona/config.rb

@@ -0,0 +1,29 @@
+module Corona
+  require 'asetus'
+  require 'fileutils'
+
+  class Config
+    Root  = File.join ENV['HOME'], '.config', 'corona'
+    Crash = File.join Root, 'crash'
+  end
+
+  FileUtils.mkdir_p Config::Root
+  CFGS = Asetus.new :name=>'corona', :load=>'false', :key_to_s=>true
+
+  CFGS.default.community = 'public'
+  CFGS.default.db        = File.join Config::Root, 'corona.db'
+  CFGS.default.poll      = %w( 10.10.10.0/24 10.10.20.0/24 )
+  CFGS.default.ignore    = %w( 10.10.10.42/32 10.10.20.42/32 )
+  CFGS.default.mgmt      = %w( lo0.0 loopback0 vlan2 )
+  CFGS.default.threads   = 50
+  CFGS.default.timeout   = 0.25
+  CFGS.default.retries   = 2
+  CFGS.default.log       = File.join Config::Root, 'log'
+  CFGS.default.debug     = false
+
+  CFGS.load
+  CFG = CFGS.cfg
+
+  Log.file  = CFG.log if CFG.log
+  Log.level = Logger::INFO unless CFG.debug
+end

data/lib/corona/core.rb

@@ -1,5 +1,5 @@
 require 'corona/log'
-require 'corona/config/core'
+require 'corona/config'
 require 'corona/snmp'
 require 'corona/db/db'
 require 'corona/model'

data/lib/corona/model.rb

@@ -39,7 +39,9 @@ module Corona
       else
         case sysObjectID
         when Regexp.new('^' + Regexp.quote('1.3.6.1.4.1.12356.'))
-          'fortios'  # 1.3.6.1.4.1.12356.101.1.10004
+          'fortios' # 1.3.6.1.4.1.12356.101.1.10004
+        when Regexp.new('^' + Regexp.quote('1.3.6.1.4.1.6486.'))
+          'aos'     # 1.3.6.1.4.1.6486.800.1.1.2.1.11.2.2
         else
           'unsupported'
         end

data/lib/corona.rb

@@ -1,3 +1,4 @@
 module Corona
+  class CoronaError < StandardError; end
   require 'corona/core'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: corona
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Saku Ytti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-13 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -66,6 +66,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: asetus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Threaded SNMP poll based network discovery. Devices are stored in SQL
 email:
 - saku@ytti.fi
@@ -84,8 +98,7 @@ files:
 - corona.gemspec
 - lib/corona.rb
 - lib/corona/cli.rb
-- lib/corona/config/bootstrap.rb
-- lib/corona/config/core.rb
+- lib/corona/config.rb
 - lib/corona/core.rb
 - lib/corona/db/db.rb
 - lib/corona/db/model.rb

data/lib/corona/config/bootstrap.rb

@@ -1,15 +0,0 @@
-module Corona
-  require 'fileutils'
-  FileUtils.mkdir_p Config::Root
-  CFG.community = 'public'
-  CFG.db        = File.join Config::Root, 'corona.db'
-  CFG.poll      = %w( 10.10.10.0/24 10.10.20.0/24 )
-  CFG.ignore    = %w( 10.10.10.42/32 10.10.20.42/32 )
-  CFG.mgmt      = %w( lo0.0 loopback0 vlan2 )
-  CFG.threads   = 50
-  CFG.timeout   = 0.25
-  CFG.retries   = 2
-  CFG.log       = File.join Config::Root, 'log'
-  CFG.debug     = false
-  CFG.save
-end

data/lib/corona/config/core.rb

@@ -1,26 +0,0 @@
-module Corona
-  require 'ostruct'
-  require 'yaml'
-  class Config < OpenStruct
-    Root      = File.join ENV['HOME'], '.config', 'corona'
-    Crash     = File.join Root, 'crash'
-    def initialize file=File.join(Config::Root, 'config')
-      super()
-      @file = file.to_s
-    end
-    def load
-      if File.exists? @file
-        marshal_load YAML.load_file @file 
-      else
-        require 'corona/config/bootstrap'
-      end
-    end
-    def save
-      File.write @file, YAML.dump(marshal_dump)
-    end
-  end
-  CFG = Config.new
-  CFG.load
-  Log.file = CFG.log if CFG.log
-  Log.level = Logger::INFO unless CFG.debug
-end