oxidized-script 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68cefc95e5aa80208cafc27a688c8be059491610
-  data.tar.gz: b494915c82884731ed23e7e0b840769f131e239d
+  metadata.gz: 0c16bc591c5474eb15e40fef64bcdbc48fd7091d
+  data.tar.gz: cd0e0ed8d118e8c1f913435b40647b2eb503d33e
 SHA512:
-  metadata.gz: b14fb72028484d26c864247868803ab5d559b868adbbebc1f5dff19be3efefea04df5ec7bf6cb493ad111d45b72fe2177ada490a75d1f457148e45a98ae7f4ca
-  data.tar.gz: 652cfd656ae8f34d6e867f8d7f4790955da500f02d9980a1a02d2b174640a35d2867125fbefc5f58b14191f89bb4771e08a49d3cca2887d72efbb020941fe936
+  metadata.gz: a062907057e209090eff6dc322344586138bbe07e5bb9f53b22f6397f9fd0c2102049cea90ca060e06f9dc8be83d3a380cd9f7a2f80ee844f6b66c5f066fbede
+  data.tar.gz: 983fd99551877eb0522005e35fad53721cae4f759a9f20023e75d271a691cef6ac1db89257224489819e4045deeca8306b96a17f72b65a36865b89ccbbbe5308

data/lib/oxidized/script/cli.rb

@@ -30,14 +30,15 @@ module Oxidized
       def opts_parse cmds
         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 'x=', '--commands', 'commands file to be sent'
-        slop.on 'u=', '--username', 'username to use'
-        slop.on 'p=', '--password', 'password to use'
-        slop.on 't=', '--timeout',  'timeout value to use'
-        slop.on 'e=', '--enable',   'enable password to use'
-        slop.on 'v',  '--verbose',  'verbose output, e.g. show commands sent'
-        slop.on 'd',  '--debug',    'turn on debugging'
+        slop.on 'm=', '--model',     'host model (ios, junos, etc), otherwise discovered from Oxidized source'
+        slop.on 'x=', '--commands',  'commands file to be sent'
+        slop.on 'u=', '--username',  'username to use'
+        slop.on 'p=', '--password',  'password to use'
+        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 'v',  '--verbose',   'verbose output, e.g. show commands sent'
+        slop.on 'd',  '--debug',     'turn on debugging'
         cmds.each do |cmd|
           slop.on cmd[:name], cmd[:description] do
             cmd[:class].run(:args=>@args, :opts=>@opts, :host=>@host, :cmd=>@cmd)
@@ -50,7 +51,7 @@ module Oxidized
       def connect
         opts = {}
         opts[:host]     = @host
-        [:model, :username, :passsword, :timeout, :enable, :verbose].each do |key|
+        [:model, :username, :password, :timeout, :enable, :verbose, :community].each do |key|
           opts[key] = @opts[key] if @opts[key]
         end
         @oxs = Script.new opts
@@ -60,6 +61,7 @@ module Oxidized
         out = ''
         file = file == '-' ? $stdin : File.read(file)
         file.each_line do |line|
+          line.chomp!
           line.sub!(/\\n/, "\n") # tread escaped newline as newline
           out += @oxs.cmd line
         end

data/lib/oxidized/script/script.rb

@@ -33,17 +33,19 @@ module Oxidized
     # @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]  :community community to use for discovery
     # @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
-      host     = opts.delete :host
-      model    = opts.delete :model
-      timeout  = opts.delete :timeout
-      username = opts.delete :username
-      password = opts.delete :password
-      enable   = opts.delete :enable
-      @verbose = opts.delete :verbose
+      host        = opts.delete :host
+      model       = opts.delete :model
+      timeout     = opts.delete :timeout
+      username    = opts.delete :username
+      password    = opts.delete :password
+      enable      = opts.delete :enable
+      community   = opts.delete :community
+      @verbose    = opts.delete :verbose
       raise InvalidOption, "#{opts} not recognized" unless opts.empty?
       Oxidized.mgr = Manager.new
       @node = if model
@@ -51,7 +53,17 @@ module Oxidized
       else
         Nodes.new(:node=>host).first
       end
-      raise NoNode, 'node not found' unless @node
+      if not @node
+        begin
+          require 'corona'
+          community ||= Corona::CFG.community
+        rescue LoadError
+          raise NoNode, 'node not found'
+        end
+        node = Corona.poll :host=>host, :community=>community
+        raise NoNode, 'node not found' unless node
+        @node = Node.new :name=>host, :model=>node[:model]
+      end
       @node.auth[:username] = username if username
       @node.auth[:password] = password if password
       CFG.vars.enable = enable if enable

data/oxidized-script.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'oxidized-script'
-  s.version           = '0.0.3'
+  s.version           = '0.0.4'
   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.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Saku Ytti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oxidized
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: oxidized-script
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: cli + library for scripting network devices