oxidized 0.19.0 → 0.20.0

data/lib/oxidized/source/csv.rb

@@ -11,14 +11,23 @@ class CSV < Source
       Oxidized.asetus.user.source.csv.delimiter = /:/
       Oxidized.asetus.user.source.csv.map.name  = 0
       Oxidized.asetus.user.source.csv.map.model = 1
+      Oxidized.asetus.user.source.csv.gpg       = false
       Oxidized.asetus.save :user
       raise NoConfig, 'no source csv config, edit ~/.config/oxidized/config'
     end
+    require 'gpgme' if @cfg.gpg?
   end
 
   def load
     nodes = []
-    open(File.expand_path @cfg.file).each_line do |line|
+    file = File.expand_path(@cfg.file)
+    file = if @cfg.gpg?
+      crypto = GPGME::Crypto.new password: @cfg.gpg_password
+      crypto.decrypt(file).to_s
+    else
+      open(file)
+    end  
+    file.each_line do |line|
       next if line.match(/^\s*#/)
       data  = line.chomp.split(@cfg.delimiter, -1)
       next if data.empty?

data/lib/oxidized/source/http.rb

@@ -29,25 +29,27 @@ class HTTP < Source
     end
 
     request = Net::HTTP::Get.new(uri.request_uri, headers)
-    if (@cfg.user && @cfg.pass)
+    if (@cfg.user? && @cfg.pass?)
         request.basic_auth(@cfg.user,@cfg.pass)
     end
 
     response = http.request(request)
     data = JSON.parse(response.body)
-    data.each do |line|
-      next if line.empty?
+    data.each do |node|
+      next if node.empty?
       # map node parameters
       keys = {}
-      @cfg.map.each do |key, position|
-        keys[key.to_sym] = node_var_interpolate line[position]
+      @cfg.map.each do |key, want_position|
+        want_positions = want_position.split('.')
+        keys[key.to_sym] = node_var_interpolate node.dig(*want_positions)
       end
       keys[:model] = map_model keys[:model] if keys.key? :model
 
       # map node specific vars
       vars = {}
-      @cfg.vars_map.each do |key, position|
-        vars[key.to_sym] = node_var_interpolate line[position]
+      @cfg.vars_map.each do |key, want_position|
+        want_positions = want_position.split('.')
+        vars[key.to_sym] = node_var_interpolate node.dig(*want_positions)
       end
       keys[:vars] = vars unless vars.empty?
 
@@ -58,3 +60,18 @@ class HTTP < Source
 
 end
 end
+
+if RUBY_VERSION < '2.3'
+  class Hash
+    def dig(key, *rest)
+      value = self[key]
+      if value.nil? || rest.empty?
+        value
+      elsif value.respond_to?(:dig)
+        value.dig(*rest)
+      else # foo.bar.baz (bar exist but is not hash)
+        return nil
+      end
+    end
+  end
+end

data/lib/oxidized/version.rb

@@ -1,3 +1,3 @@
 module Oxidized
-  VERSION = '0.19.0'
+  VERSION = '0.20.0'
 end

data/lib/oxidized/worker.rb

@@ -3,8 +3,9 @@ module Oxidized
   require 'oxidized/jobs'
   class Worker
     def initialize nodes
-      @nodes   = nodes
-      @jobs    = Jobs.new(Oxidized.config.threads, Oxidized.config.interval, @nodes)
+      @nodes      = nodes
+      @jobs       = Jobs.new(Oxidized.config.threads, Oxidized.config.interval, @nodes)
+      @nodes.jobs = @jobs
       Thread.abort_on_exception = true
     end
 

data/oxidized.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'rugged',  '~> 0.21',  '>= 0.21.4'
 
   if defined?(RUBY_VERSION) && RUBY_VERSION > '2.3'
-      s.add_runtime_dependency 'net-telnet'
+      s.add_runtime_dependency 'net-telnet', '~> 0'
   end
 
   s.add_development_dependency 'pry',      '~> 0'
@@ -33,4 +33,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake',     '~> 10.0'
   s.add_development_dependency 'minitest', '~> 5.8'
   s.add_development_dependency 'mocha',    '~> 1.1'
+  s.add_development_dependency 'git',      '~> 1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oxidized
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Saku Ytti
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-12 00:00:00.000000000 Z
+date: 2017-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asetus
@@ -78,14 +78,14 @@ dependencies:
   name: net-telnet
   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'
 - !ruby/object:Gem::Dependency
@@ -158,6 +158,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 description: software to fetch configuration from network devices and store them
 email:
 - saku@ytti.fi
@@ -194,6 +208,7 @@ files:
 - extra/rest_client.rb
 - extra/rvm.oxidized.upstart
 - extra/syslog.rb
+- extra/update-ca-certificates.runit
 - lib/oxidized.rb
 - lib/oxidized/cli.rb
 - lib/oxidized/config.rb
@@ -204,6 +219,7 @@ files:
 - lib/oxidized/hook/exec.rb
 - lib/oxidized/hook/githubrepo.rb
 - lib/oxidized/hook/noophook.rb
+- lib/oxidized/hook/slackdiff.rb
 - lib/oxidized/input/cli.rb
 - lib/oxidized/input/ftp.rb
 - lib/oxidized/input/input.rb
@@ -226,6 +242,7 @@ files:
 - lib/oxidized/model/c4cmts.rb
 - lib/oxidized/model/casa.rb
 - lib/oxidized/model/catos.rb
+- lib/oxidized/model/cisconga.rb
 - lib/oxidized/model/ciscosmb.rb
 - lib/oxidized/model/comware.rb
 - lib/oxidized/model/coriant8600.rb
@@ -256,10 +273,12 @@ files:
 - lib/oxidized/model/mlnxos.rb
 - lib/oxidized/model/model.rb
 - lib/oxidized/model/mtrlrfs.rb
+- lib/oxidized/model/netgear.rb
 - lib/oxidized/model/netonix.rb
 - lib/oxidized/model/netscaler.rb
 - lib/oxidized/model/nos.rb
 - lib/oxidized/model/nxos.rb
+- lib/oxidized/model/oneos.rb
 - lib/oxidized/model/opengear.rb
 - lib/oxidized/model/outputs.rb
 - lib/oxidized/model/panos.rb
@@ -271,19 +290,25 @@ files:
 - lib/oxidized/model/routeros.rb
 - lib/oxidized/model/saos.rb
 - lib/oxidized/model/screenos.rb
+- lib/oxidized/model/siklu.rb
 - lib/oxidized/model/supermicro.rb
 - lib/oxidized/model/timos.rb
 - lib/oxidized/model/tmos.rb
+- lib/oxidized/model/tplink.rb
 - lib/oxidized/model/trango.rb
+- lib/oxidized/model/voltaire.rb
+- lib/oxidized/model/voss.rb
 - lib/oxidized/model/vrp.rb
 - lib/oxidized/model/vyatta.rb
 - lib/oxidized/model/xos.rb
+- lib/oxidized/model/zhoneolt.rb
 - lib/oxidized/model/zynos.rb
 - lib/oxidized/node.rb
 - lib/oxidized/node/stats.rb
 - lib/oxidized/nodes.rb
 - lib/oxidized/output/file.rb
 - lib/oxidized/output/git.rb
+- lib/oxidized/output/gitcrypt.rb
 - lib/oxidized/output/http.rb
 - lib/oxidized/output/output.rb
 - lib/oxidized/source/csv.rb