oxidized-script 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea2afb0bc4bb68667bc29704bde3f1a70cb591f4
-  data.tar.gz: 0121bfb120faa8af163da27cb0e302324df8811d
+  metadata.gz: ea9be3c8d9c8f52605aa70e968d1402b067bd9c5
+  data.tar.gz: 92dd4aeba5806eda79f706be7b77813f9a05cf6f
 SHA512:
-  metadata.gz: d850980e48c31ba44f5618906219ab8b5618e4002aa6d8bf1e240b02f1c8aee4d6bd41c7247e1fb1659d26133d32acf71e3a6d37e628d0adc7be75a7089701c1
-  data.tar.gz: ea183301f772e8035bbbe49b38473ccc5a2a4b80994a50273f8c0fa9df0b924cad986b07a289d0b1868069514d2de3bee8660c4361c99817a3aff4db93db8d7c
+  metadata.gz: bd23cfcd6376dd20c7676ecf183a635b3e3953ecf9a1dc61f1c3760b2821518bb6e0ee10a4bc86bcb54a3d47581d1184b0f091ff96d44d0d14146f6504fb59bf
+  data.tar.gz: 0a8d27f8bec9dbda18078b914088285f65df78dc780d965f19ed9e98492328aebac13012b4370b8679e2e8073502694f1a03dd30a2db35160dccb7f448c8cf0c

data/lib/oxidized/script/cli.rb

@@ -36,6 +36,7 @@ module Oxidized
           on 'p=', '--password', 'password to use'
           on 't=', '--timeout',  'timeout value to use'
           on 'e=', '--enable',   'enable password to use'
+          on 'v',  '--verbose',  'verbose output, e.g. show commands sent'
           on 'd',  '--debug',    'turn on debugging'
         end
         [slop.parse!, slop]
@@ -44,11 +45,9 @@ module Oxidized
       def connect
         opts = {}
         opts[:host]     = @host
-        opts[:model]    = @opts[:model] if @opts[:model]
-        opts[:username] = @opts[:username] if @opts[:username]
-        opts[:password] = @opts[:password] if @opts[:password]
-        opts[:timeout]  = @opts[:timeout].to_i if @opts[:timeout]
-        opts[:enable]   = @opts[:enable] if @opts[:enable]
+        [:model, :username, :passsword, :timeout, :enable, :verbose].each do |key|
+          opts[key] = @opts[key] if @opts[key]
+        end
         @oxs = Script.new opts
       end
 

data/lib/oxidized/script/script.rb

@@ -11,7 +11,10 @@ module Oxidized
     # @param [String] command command to be sent
     # @return [String] output for command
     def cmd command
-      @model.cmd command
+      out = ''
+      out += "## OXS - #{command}\n" if @verbose
+      out += @model.cmd command
+      out
     end
 
     # disconnects from ssh/telnet session
@@ -24,12 +27,13 @@ module Oxidized
     private
 
     # @param [Hash] opts options for Oxidized::Script
-    # @option opts [String] :host      hostname or ip address for Oxidized::Node
-    # @option opts [String] :model     node model (ios, junos etc) if defined, nodes are not loaded from source
-    # @option opts [Fixnum] :timeout   oxidized timeout
-    # @option opts [String  :username  username for login
-    # @option opts [String  :passsword password for login
-    # @option opts [String  :enable    enable password to use
+    # @option opts [String]  :host      hostname or ip address for Oxidized::Node
+    # @option opts [String]  :model     node model (ios, junos etc) if defined, nodes are not loaded from source
+    # @option opts [Fixnum]  :timeout   oxidized timeout
+    # @option opts [String]  :username  username for login
+    # @option opts [String]  :passsword password for login
+    # @option opts [String]  :enable    enable password to use
+    # @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]
     def initialize opts, &block
@@ -38,7 +42,8 @@ module Oxidized
       timeout  = opts.delete :timeout
       username = opts.delete :username
       password = opts.delete :password
-      enable  =  opts.delete :enable
+      enable   = opts.delete :enable
+      @verbose = opts.delete :verbose
       raise InvalidOption, "#{opts} not recognized" unless opts.empty?
       Oxidized.mgr = Manager.new
       @node = if model
@@ -49,7 +54,7 @@ module Oxidized
       raise NoNode, 'node not found' unless @node
       @node.auth[:username] = username if username
       @node.auth[:password] = password if password
-      CFG.vars[:enable] = enable if enable
+      CFG.vars.enable = enable if enable
       CFG.timeout = timeout if timeout
       @model = @node.model
       @input = nil

data/oxidized-script.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'oxidized-script'
-  s.version           = '0.0.1'
+  s.version           = '0.0.2'
   s.platform          = Gem::Platform::RUBY
   s.authors           = [ 'Saku Ytti' ]
   s.email             = %w( saku@ytti.fi )
@@ -12,6 +12,6 @@ Gem::Specification.new do |s|
   s.executables       = %w( oxs )
   s.require_path      = 'lib'
 
-  #s.add_dependency 'oxidized'
+  s.add_dependency 'oxidized'
   s.add_dependency 'slop'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: oxidized-script
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Saku Ytti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-13 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: oxidized
+  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: slop
   requirement: !ruby/object:Gem::Requirement