oxidized-script 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dce59c5895c068fc023aa8a323a7c6f055c218f67189ed1b9401863ab695a445
-  data.tar.gz: 50d648a5c1a6e3a9f97740c74d7499f378fc62326ab031f424887ac1be0840bb
+  metadata.gz: 0cb4b95b188a46565abcb9b42201b07bb988fd8672e2b5d55e3f5906378155eb
+  data.tar.gz: fb7d1798857327b428289fdca4307aa745728bf21726140f2617fef81ce5857c
 SHA512:
-  metadata.gz: bcb2fd0a06e5e6e6e5763425af6cf4c89f3f29161f6f2838795086c24e185dbbaf717a7c1a04976f311c5c93a08216f4e115d532fdba69be2695b7e604b6e740
-  data.tar.gz: 94a1b517081d8dbb511d9b2618bc009855f6494274ff9624a3e8bbc08ab0c6e65bbea09acddfb2f7bfe9989bf62c01e440fcd15a9051ead2412f86cb9c9c812f
+  metadata.gz: 0c9c0468da66871a5d82de1f116897191a4ec78b6673ab97afdf8b092115c9d10f88bce3f790ca63318ad08c70edf150a887ec789f47aad08065db44d2684b91
+  data.tar.gz: c631fe4bbc7d70ba5ea450926dacbb7d8d2d88528ffaf29e6af3b9c3f76baa58502bbdd400cc05e86a0ad66b8b6c10c9320c512dacfd1903c647e5c87b5b95b7

data/lib/oxidized/script/cli.rb

@@ -13,8 +13,8 @@ module Oxidized
           $stdout.sync = true
           nodes = get_hosts
           counter = @threads.to_i
-          Signal.trap("CLD")  { counter += 1 }
-          nodes.each do |node| 
+          Signal.trap("CLD") { counter += 1 }
+          nodes.each do |node|
             Process.wait if counter <= 0
             puts "Forking " + node if @verbose
             counter -= 1
@@ -76,7 +76,7 @@ module Oxidized
       end
 
       def opts_parse cmds
-        slop = Slop.new(:help=>true)
+        slop = Slop.new(help: true)
         slop.banner 'Usage: oxs [options] hostname [command]'
         slop.on 'm=', '--model',     'host model (ios, junos, etc), otherwise discovered from Oxidized source'
         slop.on 'o=', '--ostype',    'OS Type (ios, junos, etc)'
@@ -108,7 +108,7 @@ module Oxidized
         @ostype = slop[:ostype]
         @threads = slop[:threads]
         @verbose = slop[:verbose]
-        @dryrun= slop[:dryrun]
+        @dryrun = slop[:dryrun]
         @regex = slop[:regex]
         [slop.parse!, slop]
       end
@@ -144,61 +144,38 @@ module Oxidized
           cmd = Script::Command.const_get cmd
           name = cmd.const_get :Name
           desc = cmd.const_get :Description
-          cmds << {:class=>cmd, :name=>name, :description=>desc}
+          cmds << { class: cmd, name: name, description: desc }
         end
         cmds
       end
 
       def get_hosts
-        if @group and @regex
-          puts "running list for hosts in group: #{@group} and matching: #{@regex}" if @verbose
-          nodes_group = run_group @group
-          nodes_regex = run_regex @regex
-          return nodes_group & nodes_regex
-        elsif @group and @ostype
-          puts "running list for hosts in group: #{@group} and matching: #{@ostype}" if @verbose
-          nodes_group = run_group @group
-          nodes_ostype = run_ostype @ostype
-          return nodes_group & nodes_ostype
-        elsif @regex
-          puts 'running list for hosts matching: ' + @regex if @verbose
-          return run_regex @regex
-        elsif @ostype
-          puts 'running list for hosts matching ostype: ' + @ostype if @verbose
-          return run_ostype @ostype
-        else
-          puts 'running list for hosts in group: ' + @group if @verbose
-          return run_group @group
+        puts "running list for hosts" if @verbose
+        if @group
+          puts " - in group: #{@group}" if @verbose
         end
-      end
-
-      def run_group group
-        Oxidized.mgr = Manager.new
-        out = []
-        Nodes.new.each do |node|
-          next unless group == node.group
-          out << node.name
+        if @ostype
+          puts " - (and) matching ostype: #{@ostype}" if @verbose
         end
-        out
-      end
-
-      def run_ostype ostype
-        Oxidized.mgr = Manager.new
-        out = []
-        Nodes.new.each do |node|
-          ostype.downcase # need to make sure they are both in lowercase
-          nodemodel = node.model.to_s.downcase # need to make sure they are both in lowercase
-          next unless nodemodel =~ /#{ostype}/ 
-          out << node.name
+        if @regex
+          puts " - (and) matching: #{@regex}" if @verbose
         end
-        out
-      end
-
-      def run_regex regex
         Oxidized.mgr = Manager.new
         out = []
+        loop_verbose = false # turn on/off verbose output for the following loop
         Nodes.new.each do |node|
-          next unless node.name =~ /#{regex}/
+          if @group
+            puts " ... checking if #{node.name} in group: #{@group}, node group is: #{node.group}" if loop_verbose
+            next unless @group == node.group
+          end
+          if @ostype
+            puts " ... checking if #{node.name} matching ostype: #{@ostype}, node ostype is: #{node.model.to_s}" if loop_verbose
+            next unless node.model.to_s.match(/#{@ostype}/i)
+          end
+          if @regex
+            puts " ... checking if if #{node.name} matching: #{@regex}" if loop_verbose
+            next unless node.name.match(/#{@regex}/)
+          end
           out << node.name
         end
         out

data/oxidized-script.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'oxidized-script'
-  s.version           = '0.5.1'
+  s.version           = '0.6.0'
   s.licenses          = %w( Apache-2.0 )
   s.platform          = Gem::Platform::RUBY
   s.authors           = [ 'Saku Ytti' ]
@@ -13,6 +13,6 @@ Gem::Specification.new do |s|
   s.executables       = %w( oxs )
   s.require_path      = 'lib'
 
-  s.add_runtime_dependency 'oxidized', '~> 0.22'
+  s.add_runtime_dependency 'oxidized', '~> 0.25'
   s.add_runtime_dependency 'slop',     '~> 3.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oxidized-script
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Saku Ytti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-03 00:00:00.000000000 Z
+date: 2018-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oxidized
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: '0.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: '0.25'
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement