oxidized-script 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a38be515ce13472269675c5686f022207c5f394
-  data.tar.gz: 8a08ffbdbe0aa0326d32aaa9c9b59435ca4af3a1
+  metadata.gz: f33b06421d3e4c2ab37dd2532a68215b98991d34
+  data.tar.gz: e9349537593bfbc2b4194827381ce8f3f400ab8c
 SHA512:
-  metadata.gz: 8e0d9f0226991efd74bfb9a4896ed7b896f8f2b5ad86736047aa780c041dae5f77d343506720e975cac80e455fd22a7adf3aa6d7376dd18e64e057f53146c481
-  data.tar.gz: dff10d69c6fc2e601f8c030465541dff60a086fcd354a7054ea3570981d893abc7b9c667ba4af43f14373ba0b1441d89b20ca3ca97ead77599c8163eaf2633ff
+  metadata.gz: 09dbc25da8a981abcadd591ffe630a037c4068c248ef7d5117c60d4272d40be424c5b4efc5e86df5a180541233ac1142237c57a8751ed95561a54b01e4a555b1
+  data.tar.gz: 39895ff7b8f342f1e7ff3470ee010b1ea0e9ada7200bee3ce2556ada7d743cc978672b894a652faeb762b3a8b383f929768689208fb814e1568c8eb9a9d8f7a1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.3.1
+- FEATURE on --dryrun to get a list of nodes without running a command (by @nertwork)
+- BUGFIX: errors with large config files running in ruby threads - forking instead (by @nertwork)
+
 # 0.3.0
 - FEATURE on --regex to run commands on hosts matching a regex (by @nertwork)
 - FEATURE on -g to run commands on entire group (by @nertwork)

data/README.md

@@ -46,7 +46,8 @@ Usage: oxs [options] hostname [command]
     -c, --community        snmp community to use for discovery
     -g, --group            group to run commands on (ios, junos, etc), specified in oxidized db
     -r, --threads          specify ammount of threads to use for running group (default: 1)
-        --regex    	   run on all hosts that match the regexp
+        --regex            run on all hosts that match the regexp
+        --dryrun           do a dry run on either groups or regexp to find matching hosts
         --protocols        protocols to use, default "ssh, telnet"
     -v, --verbose          verbose output, e.g. show commands sent
     -d, --debug            turn on debugging

data/Rakefile

@@ -1,10 +1,5 @@
-begin
-  require 'rake/testtask'
-  require 'bundler'
-  # Bundler.setup
-rescue LoadError
-  warn 'bunler missing'
-end
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 gemspec = eval(File.read(Dir['*.gemspec'].first))
 file    = [gemspec.name, gemspec.version].join('-') + '.gem'
@@ -17,19 +12,13 @@ end
 desc 'Run minitest'
 task :test do
   Rake::TestTask.new do |t|
-    t.libs.push "lib"
-    t.test_files = FileList['spec/*_spec.rb']
+    t.libs << 'spec'
+    t.test_files = FileList['spec/**/*_spec.rb']
+    t.warning = true
     t.verbose = true
   end
 end
 
-desc 'Build gem'
-task :build do
-  system "gem build #{gemspec.name}.gemspec"
-  FileUtils.mkdir_p 'gems'
-  FileUtils.mv file, 'gems'
-end
-
 desc 'Install gem'
 task :install => :build do
   system "sudo -Es sh -c \'umask 022; gem install gems/#{file}\'"
@@ -37,10 +26,17 @@ end
 
 desc 'Remove gems'
 task :clean do
-  FileUtils.rm_rf 'gems'
+  FileUtils.rm_rf 'pkg'
+end
+
+desc 'Tag the release'
+task :tag do
+  system "git tag #{gemspec.version}"
 end
 
 desc 'Push to rubygems'
-task :push do
-  system "gem push gems/#{file}"
+task :push => :tag do
+  system "gem push pkg/#{file}"
 end
+
+task default: :test

data/lib/oxidized/script/cli.rb

@@ -1,7 +1,6 @@
 module Oxidized
   require_relative 'script'
   require 'slop'
-  require 'thread'
 
   class Script
     class CLI
@@ -12,29 +11,26 @@ module Oxidized
       def run
         if @group or @regex
           nodes = get_hosts
-          work_q = Queue.new
-          nodes.each{|node| work_q.push node}
-          workers = (0...@threads.to_i).map do
-            Thread.new do
+          counter = @threads.to_i
+          Signal.trap("CLD")  { counter += 1 }
+          nodes.each do |node| 
+            Process.wait if counter <= 0
+            puts "Forking " + node if @verbose
+            counter -= 1
+            fork {
               begin
-                while node = work_q.pop(true)
-                  begin
-                    @host = node
-                    connect
-                    if @opts[:commands]
-                      puts run_file @opts[:commands]
-                    elsif @cmd
-                      puts @oxs.cmd @cmd
-                    end
-                  rescue
-                    puts "Couldn't connect to: " + node
-                  end
+                @host = node
+                connect
+                if @opts[:commands]
+                  puts "Running commands on #{node}:\n#{run_file @opts[:commands]}"
+                elsif @cmd
+                  puts "Running commands on #{node}:\n#{@oxs.cmd @cmd}"
                 end
-              rescue ThreadError
+              rescue => error
+                puts "We had the following error on node #{node}:\n#{error}"
               end
-            end
+            }
           end
-          workers.map(&:join)
         else
           connect
           if @opts[:commands]
@@ -69,6 +65,10 @@ module Oxidized
           end
           @oxs  = nil
           raise NothingToDo, 'no host given' if not @host and not @group and not @regex
+          if @dryrun
+            puts get_hosts
+            exit
+          end
           raise NothingToDo, 'nothing to do, give command or -x' if not @cmd and not @opts[:commands]
         end
       end
@@ -86,6 +86,7 @@ module Oxidized
         slop.on 'g=', '--group',     'group to run commands on (ios, junos, etc), specified in oxidized db'
         slop.on 'r=', '--threads',   'specify ammount of threads to use for running group', default: '1'
         slop.on       '--regex=',    'run on all hosts that match the regexp'
+        slop.on       '--dryrun',    'do a dry run on either groups or regexp to find matching hosts'
         slop.on       '--protocols=','protocols to use, default "ssh, telnet"'
         slop.on 'v',  '--verbose',   'verbose output, e.g. show commands sent'
         slop.on 'd',  '--debug',     'turn on debugging'
@@ -103,6 +104,7 @@ module Oxidized
         @group = slop[:group]
         @threads = slop[:threads]
         @verbose = slop[:verbose]
+        @dryrun= slop[:dryrun]
         @regex = slop[:regex]
         [slop.parse!, slop]
       end
@@ -144,18 +146,18 @@ module Oxidized
       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 @regex
-            puts 'running list for hosts matching: ' + @regex if @verbose
-            return run_regex @regex
-          else
-            puts 'running list for hosts in group: ' + @group if @verbose
-            return run_group @group
-          end
+        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 @regex
+          puts 'running list for hosts matching: ' + @regex if @verbose
+          return run_regex @regex
+        else
+          puts 'running list for hosts in group: ' + @group if @verbose
+          return run_group @group
+        end
       end
 
       def run_group group

data/oxidized-script.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'oxidized-script'
-  s.version           = '0.3.0'
+  s.version           = '0.3.1'
   s.licenses          = %w( Apache-2.0 )
   s.platform          = Gem::Platform::RUBY
   s.authors           = [ 'Saku Ytti' ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oxidized-script
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Saku Ytti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-23 00:00:00.000000000 Z
+date: 2016-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oxidized