oxidized-script 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c16bc591c5474eb15e40fef64bcdbc48fd7091d
-  data.tar.gz: cd0e0ed8d118e8c1f913435b40647b2eb503d33e
+  metadata.gz: 1013bd79d71871bee9cd63c675ddef578746c19e
+  data.tar.gz: 6b3f703fcbe41564e85e1aa7f9853446a554b0c5
 SHA512:
-  metadata.gz: a062907057e209090eff6dc322344586138bbe07e5bb9f53b22f6397f9fd0c2102049cea90ca060e06f9dc8be83d3a380cd9f7a2f80ee844f6b66c5f066fbede
-  data.tar.gz: 983fd99551877eb0522005e35fad53721cae4f759a9f20023e75d271a691cef6ac1db89257224489819e4045deeca8306b96a17f72b65a36865b89ccbbbe5308
+  metadata.gz: bde082a7305a4d44be46aa36097456da566282eaa6aeaa74b57d51be825f823be5d74f288eedba3626038e8514c23733853ae4b5b50f949febfef8f4ca4c3dbf
+  data.tar.gz: 01de2421170611dc2cd285f46879ef244a7949044eb1aaa4c9dc09f018bd9e32ed6f3f048826b9d204d7d5ee627ccf62b5f872ba88da66f193f3899593be5c5c

data/Rakefile

@@ -1,10 +1,9 @@
 begin
   require 'rake/testtask'
   require 'bundler'
-  Bundler.setup
+  # Bundler.setup
 rescue LoadError
   warn 'bunler missing'
-  exit 42
 end
 
 gemspec = eval(File.read(Dir['*.gemspec'].first))
@@ -33,7 +32,7 @@ end
 
 desc 'Install gem'
 task :install => :build do
-  system "sudo -E sh -c \'umask 022; gem install gems/#{file}\'"
+  system "sudo -Es sh -c \'umask 022; gem install gems/#{file}\'"
 end
 
 desc 'Remove gems'

data/lib/oxidized/script/cli.rb

@@ -3,6 +3,7 @@ module Oxidized
   require 'slop'
   class Script
     class CLI
+      attr_accessor :cmd_class
       class CLIError < ScriptError; end
       class NothingToDo < ScriptError; end
 
@@ -20,11 +21,16 @@ module Oxidized
       def initialize
         @args, @opts = opts_parse load_dynamic
         CFG.debug = true if @opts[:debug]
-        @host = @args.shift
-        @cmd  = @args.shift if @args
-        @oxs  = nil
-        raise NothingToDo, 'no host given' if not @host
-        raise NothingToDo, 'nothing to do, give command or -x' if not @cmd and not @opts[:commands]
+        if @cmd_class
+          @cmd_class.run :args=>@args, :opts=>@opts, :host=>@host, :cmd=>@cmd
+          exit 0
+        else
+          @host = @args.shift
+          @cmd  = @args.shift if @args
+          @oxs  = nil
+          raise NothingToDo, 'no host given' if not @host
+          raise NothingToDo, 'nothing to do, give command or -x' if not @cmd and not @opts[:commands]
+        end
       end
 
       def opts_parse cmds
@@ -37,11 +43,17 @@ module Oxidized
         slop.on 't=', '--timeout',   'timeout value to use'
         slop.on 'e=', '--enable',    'enable password to use'
         slop.on 'c=', '--community', 'snmp community to use for discovery'
+        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'
+        slop.on :terse, 'display clean output'
         cmds.each do |cmd|
-          slop.on cmd[:name], cmd[:description] do
-            cmd[:class].run(:args=>@args, :opts=>@opts, :host=>@host, :cmd=>@cmd)
+          if cmd[:class].respond_to? :cmdline
+            cmd[:class].cmdline slop, self
+          else
+            slop.on cmd[:name], cmd[:description] do
+              @cmd_class = cmd[:class]
+            end
           end
         end
         slop.parse
@@ -51,7 +63,7 @@ module Oxidized
       def connect
         opts = {}
         opts[:host]     = @host
-        [:model, :username, :password, :timeout, :enable, :verbose, :community].each do |key|
+        [:model, :username, :password, :timeout, :enable, :verbose, :community, :protocols].each do |key|
           opts[key] = @opts[key] if @opts[key]
         end
         @oxs = Script.new opts
@@ -75,6 +87,7 @@ module Oxidized
         files = Dir.glob files
         files.each { |file| require_relative file }
         Script::Command.constants.each do |cmd|
+          next if cmd == :Base
           cmd = Script::Command.const_get cmd
           name = cmd.const_get :Name
           desc = cmd.const_get :Description

data/lib/oxidized/script/command.rb

@@ -0,0 +1,8 @@
+module Oxidized
+  class Script
+    module Command
+      class Base
+      end
+    end
+  end
+end

data/lib/oxidized/script/commands/list-models.rb

@@ -1,13 +1,12 @@
 module Oxidized
   class Script
     module Command
-      class ListModels
+      class ListModels < Base
         Name        = 'list-models'
         Description = 'list supported models'
 
         def self.run opts={}
           puts new(opts).models
-          exit
         end
 
         def models

data/lib/oxidized/script/commands/list-nodes.rb

@@ -1,13 +1,26 @@
 module Oxidized
   class Script
     module Command
-      class ListNodes
+      class ListNodes < Base
         Name        = 'list-nodes'
         Description = 'list nodes in oxidized source'
 
+        # this is not needed this this command, just shown how todo more
+        # complex commands, this could use slop sub-commands etc. As long as it
+        # sets cli.cmd_class when you want to run it, it gets ran after parsing
+        # commandline
+        def self.cmdline slop, cli
+          slop.on "--#{Name}", Description do
+            cli.cmd_class = self
+          end
+        end
+
         def self.run opts={}
-          puts new(opts).nodes
-          exit
+          if opts[:opts][:terse] # find if 'terse' global option is set
+            puts new(opts).nodes_terse
+          else
+            puts new(opts).nodes
+          end
         end
 
         def nodes
@@ -25,6 +38,15 @@ module Oxidized
           out
         end
 
+        def nodes_terse
+          out = ''
+          i = 0
+          Nodes.new.each do |node|
+            out += "#{i += 1} - #{node.name}\n"
+          end
+          out
+        end
+
         private
 
         def initialize opts={}

data/lib/oxidized/script/script.rb

@@ -2,11 +2,15 @@
 
 module Oxidized
   require 'oxidized'
+  require_relative 'command'
   class Script
     class ScriptError   < OxidizedError; end
-    class NoConnection  < ScriptError;   end
     class NoNode        < ScriptError;   end
     class InvalidOption < ScriptError;   end
+    class NoConnection  < ScriptError
+      attr_accessor :node_error
+    end
+
 
     # @param [String] command command to be sent
     # @return [String] output for command
@@ -34,6 +38,7 @@ module Oxidized
     # @option opts [String]  :passsword password for login
     # @option opts [String]  :enable    enable password to use
     # @option opts [String]  :community community to use for discovery
+    # @option opts [String]  :protocols protocols to use to connect, default "ssh ,telnet"
     # @option opts [boolean] :verbose   extra output, e.g. show command given in output
     # @yieldreturn [self] if called in block, returns self and disconnnects session after exiting block
     # @return [void]
@@ -46,6 +51,7 @@ module Oxidized
       enable      = opts.delete :enable
       community   = opts.delete :community
       @verbose    = opts.delete :verbose
+      CFG.input.default = opts.delete :protocols if opts[:protocols]
       raise InvalidOption, "#{opts} not recognized" unless opts.empty?
       Oxidized.mgr = Manager.new
       @node = if model
@@ -78,16 +84,20 @@ module Oxidized
     end
 
     def connect
+      node_error = {}
       @node.input.each do |input|
         begin
           @node.model.input = input.new
           @node.model.input.connect @node
           break
-        rescue
+        rescue => error
+          node_error[input] = error
         end
       end
       @input = @node.model.input
-      raise NoConnection, 'unable to connect' unless @input.connected?
+      err = NoConnection.new
+      err.node_error = node_error
+      raise err, 'unable to connect' unless @input.connected?
       @input.connect_cli
     end
   end

data/oxidized-script.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'oxidized-script'
-  s.version           = '0.0.4'
+  s.version           = '0.0.6'
   s.platform          = Gem::Platform::RUBY
   s.authors           = [ 'Saku Ytti' ]
   s.email             = %w( saku@ytti.fi )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oxidized-script
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Saku Ytti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-16 00:00:00.000000000 Z
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oxidized
@@ -54,6 +54,7 @@ files:
 - bin/oxs
 - lib/oxidized/script.rb
 - lib/oxidized/script/cli.rb
+- lib/oxidized/script/command.rb
 - lib/oxidized/script/commands/list-models.rb
 - lib/oxidized/script/commands/list-nodes.rb
 - lib/oxidized/script/script.rb