oxidized 0.25.1 → 0.26.0

data/lib/oxidized/string.rb

@@ -4,33 +4,33 @@ module Oxidized
     attr_accessor :type, :cmd, :name
 
     # @return [Oxidized::String] copy of self with last line removed
-    def cut_tail lines = 1
+    def cut_tail(lines = 1)
       Oxidized::String.new each_line.to_a[0..-1 - lines].join
     end
 
     # @return [Oxidized::String] copy of self with first line removed
-    def cut_head lines = 1
+    def cut_head(lines = 1)
       Oxidized::String.new each_line.to_a[lines..-1].join
     end
 
     # @return [Oxidized::String] copy of self with first and last lines removed
-    def cut_both head = 1, tail = 1
+    def cut_both(head = 1, tail = 1)
       Oxidized::String.new each_line.to_a[head..-1 - tail].join
     end
 
     # sets @cmd and @name unless @name is already set
-    def set_cmd command
+    def set_cmd(command)
       @cmd = command
       @name ||= @cmd.to_s.strip.gsub(/\s+/, '_') # what to do when command is proc? #to_s seems ghetto
     end
 
-    def initialize str = ''
+    def initialize(str = '')
       super
-      if str.class == Oxidized::String
-        @cmd  = str.cmd
-        @name = str.name
-        @type = str.type
-      end
+      return unless str.class == Oxidized::String
+
+      @cmd  = str.cmd
+      @name = str.name
+      @type = str.type
     end
   end
 end

data/lib/oxidized/version.rb

@@ -1,6 +1,6 @@
 module Oxidized
-  VERSION = '0.25.1'
-  VERSION_FULL = '0.25.1'
+  VERSION = '0.26.0'.freeze
+  VERSION_FULL = '0.26.0'.freeze
   def self.version_set
     version_full = %x(git describe --tags).chop rescue ""
     version      = %x(git describe --tags --abbrev=0).chop rescue ""
@@ -12,8 +12,8 @@ module Oxidized
     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[1] = "  VERSION = '%s'.freeze\n" % VERSION
+    file[2] = "  VERSION_FULL = '%s'.freeze\n" % VERSION_FULL
     File.write(__FILE__, file.join)
   end
 end

data/lib/oxidized/worker.rb

@@ -2,7 +2,7 @@ module Oxidized
   require 'oxidized/job'
   require 'oxidized/jobs'
   class Worker
-    def initialize nodes
+    def initialize(nodes)
       @jobs_done  = 0
       @nodes      = nodes
       @jobs       = Jobs.new(Oxidized.config.threads, Oxidized.config.interval, @nodes)
@@ -12,7 +12,7 @@ module Oxidized
 
     def work
       ended = []
-      @jobs.delete_if { |job| ended << job if not job.alive? }
+      @jobs.delete_if { |job| ended << job unless job.alive? }
       ended.each      { |job| process job }
       @jobs.work
 
@@ -22,7 +22,7 @@ module Oxidized
         nextnode = @nodes.first
         unless nextnode.last.nil?
           # Set unobtainable value for 'last' if interval checking is disabled
-          last = Oxidized.config.interval == 0 ? Time.now.utc + 10 : nextnode.last.end
+          last = Oxidized.config.interval.zero? ? Time.now.utc + 10 : nextnode.last.end
           break if last + Oxidized.config.interval > Time.now.utc
         end
         # shift nodes and get the next node
@@ -33,11 +33,11 @@ module Oxidized
         Oxidized.logger.debug "lib/oxidized/worker.rb: Added #{node.group}/#{node.name} to the job queue"
       end
 
-      run_done_hook if is_cycle_finished?
+      run_done_hook if cycle_finished?
       Oxidized.logger.debug("lib/oxidized/worker.rb: #{@jobs.size} jobs running in parallel") unless @jobs.empty?
     end
 
-    def process job
+    def process(job)
       node = job.node
       node.last = job
       node.stats.add job
@@ -54,10 +54,10 @@ module Oxidized
 
     private
 
-    def process_success node, job
+    def process_success(node, job)
       @jobs_done += 1 # needed for :nodes_done hook
       Oxidized.Hooks.handle :node_success, node: node,
-                                           job: job
+                                           job:  job
       msg = "update #{node.group}/#{node.name}"
       msg += " from #{node.from}" if node.from
       msg += " with message '#{node.msg}'" if node.msg
@@ -66,14 +66,14 @@ module Oxidized
                       msg: msg, email: node.email, user: node.user, group: node.group
         node.modified
         Oxidized.logger.info "Configuration updated for #{node.group}/#{node.name}"
-        Oxidized.Hooks.handle :post_store, node: node,
-                                           job: job,
+        Oxidized.Hooks.handle :post_store, node:      node,
+                                           job:       job,
                                            commitref: output.commitref
       end
       node.reset
     end
 
-    def process_failure node, job
+    def process_failure(node, job)
       msg = "#{node.group}/#{node.name} status #{job.status}"
       if node.retry < Oxidized.config.retries
         node.retry += 1
@@ -87,24 +87,24 @@ module Oxidized
         @jobs_done += 1
         msg += ", retries exhausted, giving up"
         node.retry = 0
-        Oxidized.Hooks.handle :node_fail, :node => node,
-                                          :job => job
+        Oxidized.Hooks.handle :node_fail, node: node,
+                                          job:  job
       end
       Oxidized.logger.warn msg
     end
 
-    def is_cycle_finished?
+    def cycle_finished?
       if @jobs_done > @nodes.count
         true
       else
-        @jobs_done > 0 && @jobs_done % @nodes.count == 0
+        @jobs_done.positive? && (@jobs_done % @nodes.count).zero?
       end
     end
 
     def run_done_hook
       Oxidized.logger.debug "lib/oxidized/worker.rb: Running :nodes_done hook"
       Oxidized.Hooks.handle :nodes_done
-    rescue => e
+    rescue StandardError => e
       # swallow the hook erros and continue as normal
       Oxidized.logger.error "lib/oxidized/worker.rb: #{e.message}"
     ensure

data/oxidized.gemspec

@@ -17,23 +17,20 @@ Gem::Specification.new do |s|
   s.executables       = %w[oxidized]
   s.require_path      = 'lib'
 
-  s.required_ruby_version =           '>= 2.0.0'
+  s.required_ruby_version =           '>= 2.3'
   s.add_runtime_dependency 'asetus',  '~> 0.1'
-  s.add_runtime_dependency 'net-ssh', '~> 4.1.0'
+  s.add_runtime_dependency 'net-ssh', '~> 5'
   s.add_runtime_dependency 'net-telnet', '~> 0.1.1'
   s.add_runtime_dependency 'rugged',  '~> 0.21', '>= 0.21.4'
   s.add_runtime_dependency 'slop',    '~> 3.5'
 
-  s.add_development_dependency 'simplecov'
-  if ENV['CI'] == 'true'
-    s.add_development_dependency 'codecov'
-  end
-
-  s.add_development_dependency 'bundler',  '~> 1.10'
+  s.add_development_dependency 'bundler', '~> 2.0'
+  s.add_development_dependency 'codecov' if ENV['CI'] == 'true'
   s.add_development_dependency 'git',      '~> 1'
   s.add_development_dependency 'minitest', '~> 5.8'
   s.add_development_dependency 'mocha',    '~> 1.1'
   s.add_development_dependency 'pry',      '~> 0'
   s.add_development_dependency 'rake',     '~> 10.0'
-  s.add_development_dependency 'rubocop',  '~> 0.57.1'
+  s.add_development_dependency 'rubocop',  '~> 0.65.0'
+  s.add_development_dependency 'simplecov'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oxidized
 version: !ruby/object:Gem::Version
-  version: 0.25.1
+  version: 0.26.0
 platform: ruby
 authors:
 - Saku Ytti
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-18 00:00:00.000000000 Z
+date: 2019-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asetus
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: net-telnet
   requirement: !ruby/object:Gem::Requirement
@@ -88,34 +88,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
-- !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'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -192,14 +178,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.57.1
+        version: 0.65.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.57.1
+        version: 0.65.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'
 description: software to fetch configuration from network devices and store them
 email:
 - saku@ytti.fi
@@ -238,6 +238,7 @@ files:
 - docs/Model-Notes/Netgear.md
 - docs/Model-Notes/Nokia.md
 - docs/Model-Notes/README.md
+- docs/Model-Notes/SmartAX-Huawei.md
 - docs/Model-Notes/VRP-Huawei.md
 - docs/Model-Notes/Viptela.md
 - docs/Model-Notes/XGS4600-Zyxel.md
@@ -302,6 +303,7 @@ files:
 - lib/oxidized/model/asa.rb
 - lib/oxidized/model/asyncos.rb
 - lib/oxidized/model/audiocodes.rb
+- lib/oxidized/model/audiocodesmp.rb
 - lib/oxidized/model/awplus.rb
 - lib/oxidized/model/axos.rb
 - lib/oxidized/model/boss.rb
@@ -313,6 +315,7 @@ files:
 - lib/oxidized/model/cisconga.rb
 - lib/oxidized/model/ciscosma.rb
 - lib/oxidized/model/ciscosmb.rb
+- lib/oxidized/model/ciscovpn3k.rb
 - lib/oxidized/model/comnetms.rb
 - lib/oxidized/model/comtrol.rb
 - lib/oxidized/model/comware.rb
@@ -340,6 +343,7 @@ files:
 - lib/oxidized/model/fujitsupy.rb
 - lib/oxidized/model/gaiaos.rb
 - lib/oxidized/model/gcombnps.rb
+- lib/oxidized/model/grandstream.rb
 - lib/oxidized/model/hatteras.rb
 - lib/oxidized/model/hirschmann.rb
 - lib/oxidized/model/hpebladesystem.rb
@@ -357,6 +361,7 @@ files:
 - lib/oxidized/model/mtrlrfs.rb
 - lib/oxidized/model/ndms.rb
 - lib/oxidized/model/netgear.rb
+- lib/oxidized/model/netgearxs716.rb
 - lib/oxidized/model/netonix.rb
 - lib/oxidized/model/netscaler.rb
 - lib/oxidized/model/nos.rb
@@ -373,15 +378,18 @@ files:
 - lib/oxidized/model/powerconnect.rb
 - lib/oxidized/model/procurve.rb
 - lib/oxidized/model/quantaos.rb
+- lib/oxidized/model/raisecom.rb
 - lib/oxidized/model/routeros.rb
 - lib/oxidized/model/saos.rb
 - lib/oxidized/model/screenos.rb
 - lib/oxidized/model/sgos.rb
 - lib/oxidized/model/siklu.rb
 - lib/oxidized/model/slxos.rb
+- lib/oxidized/model/smartax.rb
 - lib/oxidized/model/sros.rb
 - lib/oxidized/model/stoneos.rb
 - lib/oxidized/model/supermicro.rb
+- lib/oxidized/model/tdre.rb
 - lib/oxidized/model/timos.rb
 - lib/oxidized/model/tmos.rb
 - lib/oxidized/model/tplink.rb
@@ -425,15 +433,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: oxidized
-rubygems_version: 2.7.6
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: feeble attempt at rancid