oxidized 0.21.0 → 0.22.0

data/lib/oxidized/version.rb

@@ -1,3 +1,19 @@
 module Oxidized
-  VERSION = '0.21.0'
+  VERSION = '0.22.0'
+  VERSION_FULL = '0.22.0'
+  def self.version_set
+    version_full = %x(git describe --tags).chop rescue ""
+    version      = %x(git describe --tags --abbrev=0).chop rescue ""
+
+    return false unless [version, version_full].none?(&:empty?)
+
+    Oxidized.send(:remove_const, :VERSION)
+    Oxidized.send(:remove_const, :VERSION_FULL)
+    const_set(:VERSION, version)
+    const_set(:VERSION_FULL, version_full)
+    file = File.readlines(__FILE__)
+    file[1] = "  VERSION = '%s'\n" % VERSION
+    file[2] = "  VERSION_FULL = '%s'\n" % VERSION_FULL
+    File.write(__FILE__, file.join)
+  end
 end

data/lib/oxidized/worker.rb

@@ -42,9 +42,9 @@ module Oxidized
       node.stats.add job
       @jobs.duration job.time
       node.running = false
-      @jobs_done += 1 # needed for worker_done event
 
       if job.status == :success
+        @jobs_done += 1 # needed for :nodes_done hook
         Oxidized.Hooks.handle :node_success, :node => node,
                                              :job => job
         msg = "update #{node.name}"
@@ -52,7 +52,7 @@ module Oxidized
         msg += " with message '#{node.msg}'" if node.msg
         output = node.output.new
         if output.store node.name, job.config,
-                              :msg => msg, :email => node.email, :user => node.user, :group => node.group
+                        :msg => msg, :email => node.email, :user => node.user, :group => node.group
           Oxidized.logger.info "Configuration updated for #{node.group}/#{node.name}"
           Oxidized.Hooks.handle :post_store, :node => node,
                                              :job => job,
@@ -66,6 +66,11 @@ module Oxidized
           msg += ", retry attempt #{node.retry}"
           @nodes.next node.name
         else
+          # Only increment the @jobs_done when we give up retries for a node (or success).
+          # As it would otherwise cause @jobs_done to be incremented with generic retries.
+          # This would cause :nodes_done hook to desync from running at the end of the nodelist and
+          # be fired when the @jobs_done > @nodes.count (could be mid-cycle on the next cycle).
+          @jobs_done += 1
           msg += ", retries exhausted, giving up"
           node.retry = 0
           Oxidized.Hooks.handle :node_fail, :node => node,
@@ -80,7 +85,11 @@ module Oxidized
     private
 
     def is_cycle_finished?
-      @jobs_done > 0 && @jobs_done % @nodes.count == 0
+      if @jobs_done > @nodes.count
+        true
+      else
+        @jobs_done > 0 && @jobs_done % @nodes.count == 0
+      end
     end
 
     def run_done_hook

data/oxidized.gemspec

@@ -1,37 +1,43 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'oxidized/version'
 
 Gem::Specification.new do |s|
   s.name              = 'oxidized'
   s.version           = Oxidized::VERSION
-  s.licenses          = %w( Apache-2.0 )
+  s.licenses          = %w[Apache-2.0]
   s.platform          = Gem::Platform::RUBY
-  s.authors           = [ 'Saku Ytti', 'Samer Abdel-Hafez', 'Anton Aksola' ]
-  s.email             = %w( saku@ytti.fi sam@arahant.net aakso@iki.fi)
+  s.authors           = ['Saku Ytti', 'Samer Abdel-Hafez', 'Anton Aksola']
+  s.email             = %w[saku@ytti.fi sam@arahant.net aakso@iki.fi]
   s.homepage          = 'http://github.com/ytti/oxidized'
   s.summary           = 'feeble attempt at rancid'
   s.description       = 'software to fetch configuration from network devices and store them'
   s.rubyforge_project = s.name
-  s.files             = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  s.executables       = %w( oxidized )
+  s.files             = %x(git ls-files -z).split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  s.executables       = %w[oxidized]
   s.require_path      = 'lib'
 
   s.required_ruby_version =           '>= 2.0.0'
   s.add_runtime_dependency 'asetus',  '~> 0.1'
-  s.add_runtime_dependency 'slop',    '~> 3.5'
   s.add_runtime_dependency 'net-ssh', '~> 4.1.0'
-  s.add_runtime_dependency 'rugged',  '~> 0.21',  '>= 0.21.4'
+  s.add_runtime_dependency 'rugged',  '~> 0.21', '>= 0.21.4'
+  s.add_runtime_dependency 'slop',    '~> 3.5'
 
   if defined?(RUBY_VERSION) && RUBY_VERSION > '2.3'
-      s.add_runtime_dependency 'net-telnet', '~> 0'
+    s.add_runtime_dependency 'net-telnet', '~> 0'
+  end
+
+  s.add_development_dependency 'simplecov'
+  if ENV['CI'] == 'true'
+    s.add_development_dependency 'codecov'
   end
 
-  s.add_development_dependency 'pry',      '~> 0'
   s.add_development_dependency 'bundler',  '~> 1.10'
-  s.add_development_dependency 'rake',     '~> 10.0'
+  s.add_development_dependency 'git',      '~> 1'
   s.add_development_dependency 'minitest', '~> 5.8'
   s.add_development_dependency 'mocha',    '~> 1.1'
-  s.add_development_dependency 'git',      '~> 1'
+  s.add_development_dependency 'pry',      '~> 0'
+  s.add_development_dependency 'rails_best_practices', '~> 1.19'
+  s.add_development_dependency 'rake',     '~> 10.0'
+  s.add_development_dependency 'rubocop',  '~> 0.55.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oxidized
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Saku Ytti
@@ -10,154 +10,210 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-01 00:00:00.000000000 Z
+date: 2018-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asetus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: slop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: rugged
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.21'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.21.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.21'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.21.4
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: slop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+- !ruby/object:Gem::Dependency
+  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
+  name: simplecov
+  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
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.8'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: git
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails_best_practices
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.19'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.19'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.55.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.55.0
 description: software to fetch configuration from network devices and store them
 email:
 - saku@ytti.fi
@@ -168,25 +224,36 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
-- .travis.yml
+- ".github/no-response.yml"
+- ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - Dockerfile
 - Gemfile
-- Gemfile.lock
+- LICENSE
 - README.md
 - Rakefile
 - TODO.md
 - bin/console
 - bin/oxidized
 - docs/Configuration.md
+- docs/Creating-Models.md
 - docs/Hooks.md
+- docs/Model-Notes/AireOS.md
+- docs/Model-Notes/ArbOS.md
+- docs/Model-Notes/Comware.md
+- docs/Model-Notes/EOS.md
+- docs/Model-Notes/JunOS.md
+- docs/Model-Notes/Netgear.md
+- docs/Model-Notes/README.md
+- docs/Model-Notes/VRP-Huawei.md
+- docs/Model-Notes/XGS4600-Zyxel.md
 - docs/Outputs.md
 - docs/Ruby-API.md
 - docs/Sources.md
 - docs/Supported-OS-Types.md
-- docs/VRP-Huawei.md
 - extra/auto-reload-config.runit
 - extra/nagios_check_failing_nodes.rb
 - extra/oxidized-report-git-commits
@@ -194,6 +261,7 @@ files:
 - extra/oxidized.apache2
 - extra/oxidized.init
 - extra/oxidized.init.d
+- extra/oxidized.logrotate
 - extra/oxidized.nginx
 - extra/oxidized.runit
 - extra/oxidized.service
@@ -210,12 +278,15 @@ files:
 - lib/oxidized/core.rb
 - lib/oxidized/hook.rb
 - lib/oxidized/hook/awssns.rb
+- lib/oxidized/hook/ciscosparkdiff.rb
 - lib/oxidized/hook/exec.rb
 - lib/oxidized/hook/githubrepo.rb
 - lib/oxidized/hook/noophook.rb
 - lib/oxidized/hook/slackdiff.rb
+- lib/oxidized/hook/xmppdiff.rb
 - lib/oxidized/input/cli.rb
 - lib/oxidized/input/ftp.rb
+- lib/oxidized/input/http.rb
 - lib/oxidized/input/input.rb
 - lib/oxidized/input/ssh.rb
 - lib/oxidized/input/telnet.rb
@@ -234,25 +305,32 @@ files:
 - lib/oxidized/model/aos7.rb
 - lib/oxidized/model/aosw.rb
 - lib/oxidized/model/apc_aos.rb
+- lib/oxidized/model/arbos.rb
+- lib/oxidized/model/aricentiss.rb
 - lib/oxidized/model/asa.rb
 - lib/oxidized/model/asyncos.rb
 - lib/oxidized/model/audiocodes.rb
+- lib/oxidized/model/awplus.rb
 - lib/oxidized/model/boss.rb
 - lib/oxidized/model/br6910.rb
 - lib/oxidized/model/c4cmts.rb
+- lib/oxidized/model/cambium.rb
 - lib/oxidized/model/casa.rb
 - lib/oxidized/model/catos.rb
 - lib/oxidized/model/cisconga.rb
 - lib/oxidized/model/ciscosma.rb
 - lib/oxidized/model/ciscosmb.rb
+- lib/oxidized/model/comnetms.rb
 - lib/oxidized/model/comware.rb
 - lib/oxidized/model/coriant8600.rb
 - lib/oxidized/model/coriantgroove.rb
 - lib/oxidized/model/corianttmos.rb
 - lib/oxidized/model/cumulus.rb
 - lib/oxidized/model/datacom.rb
+- lib/oxidized/model/dcnos.rb
 - lib/oxidized/model/dlink.rb
 - lib/oxidized/model/dnos.rb
+- lib/oxidized/model/edgecos.rb
 - lib/oxidized/model/edgeos.rb
 - lib/oxidized/model/edgeswitch.rb
 - lib/oxidized/model/enterasys.rb
@@ -264,11 +342,13 @@ files:
 - lib/oxidized/model/ftos.rb
 - lib/oxidized/model/fujitsupy.rb
 - lib/oxidized/model/gaiaos.rb
+- lib/oxidized/model/gcombnps.rb
 - lib/oxidized/model/hatteras.rb
 - lib/oxidized/model/hirschmann.rb
 - lib/oxidized/model/hpebladesystem.rb
 - lib/oxidized/model/hpemsa.rb
 - lib/oxidized/model/ios.rb
+- lib/oxidized/model/iosxe.rb
 - lib/oxidized/model/iosxr.rb
 - lib/oxidized/model/ipos.rb
 - lib/oxidized/model/ironware.rb
@@ -278,13 +358,17 @@ files:
 - lib/oxidized/model/mlnxos.rb
 - lib/oxidized/model/model.rb
 - lib/oxidized/model/mtrlrfs.rb
+- lib/oxidized/model/ndms.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/openbsd.rb
 - lib/oxidized/model/opengear.rb
+- lib/oxidized/model/openwrt.rb
+- lib/oxidized/model/opnsense.rb
 - lib/oxidized/model/outputs.rb
 - lib/oxidized/model/panos.rb
 - lib/oxidized/model/pfsense.rb
@@ -297,6 +381,9 @@ files:
 - lib/oxidized/model/screenos.rb
 - lib/oxidized/model/sgos.rb
 - lib/oxidized/model/siklu.rb
+- lib/oxidized/model/slxos.rb
+- lib/oxidized/model/sros.rb
+- lib/oxidized/model/stoneos.rb
 - lib/oxidized/model/supermicro.rb
 - lib/oxidized/model/timos.rb
 - lib/oxidized/model/tmos.rb
@@ -311,6 +398,7 @@ files:
 - lib/oxidized/model/xos.rb
 - lib/oxidized/model/zhoneolt.rb
 - lib/oxidized/model/zynos.rb
+- lib/oxidized/model/zynoscli.rb
 - lib/oxidized/node.rb
 - lib/oxidized/node/stats.rb
 - lib/oxidized/nodes.rb
@@ -337,17 +425,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: oxidized
-rubygems_version: 2.0.14.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: feeble attempt at rancid