sloe 0.3.1 → 0.3.2

data/README.md

@@ -18,19 +18,16 @@ Or install it yourself as:
 
 ## Usage
 
-This gem augments the functionality of Netconf::SSH and SNMP gems. Please refer to those gem's documentation or detailed instruction on how to use this gem.
+This gem augments the functionality of Netconf::SSH, Net::SCP and SNMP gems. Please refer to those gem's documentation or detailed instruction on how to use this gem.
 
-All SNMP methods are accessed via the snmp() method. 
+All Netconf methods are accessed via the rpc() method. All Net::SCP methods are access via the scp() method. All SNMP methods are accessed via the snmp() method. For example:
 
     require 'sloe'
 
     # create options hash
-
     options = {:target => 'remotehost', :username => 'foo', :password => 'bar'}
 
     Sloe::Device.new(options) { |device|
-      # establish connection to device
-      device.open
 
       # call a Netconf RPC and display some of output
       inventory = device.rpc.get_chassis_inventory
@@ -40,7 +37,24 @@ All SNMP methods are accessed via the snmp() method.
       puts device.snmp.get_value('sysDescr.0')
     } 
 
-All options supported by Netconf and SNMP are supported in this gem too. The :target option is aliased to the SNMP :host option so there is no need to duplicate that option key.
+An alternate way to use this module is:
+
+    require 'sloe'
+
+    # create options hash
+    options = {:target => 'remotehost', :username => 'foo', :password => 'bar'}
+
+    device = Sloe::Device.new(options)
+
+    # call a Netconf RPC and display some of output
+    inventory = device.rpc.get_chassis_inventory
+    puts "Chassis: " + inventory.xpath('chassis/description').text
+
+    # display SNMP data
+    puts device.snmp.get_value('sysDescr.0')
+    
+
+All options supported by Netconf, Net::SCP and SNMP are supported in this gem too. The :target option is aliased to the SNMP :host option so there is no need to duplicate that option key.
 
 ## SUPPORT
 

data/lib/sloe/version.rb

@@ -1,3 +1,3 @@
 module Sloe
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/sloe.rb

@@ -9,14 +9,18 @@ module Sloe
 
 		attr_reader :snmp
 
-	  def initialize(args)
-	    super(args)
-	    self.open
-
-	    @snmp_args = {:host => args[:target], :mib_dir => args[:mib_dir], :mib_modules => args[:mib_modules]}
+	  def initialize(args, &block)
+	  	@snmp_args = {:host => args[:target], :mib_dir => args[:mib_dir], :mib_modules => args[:mib_modules]}
       @snmp = SNMP::Manager.new(@snmp_args)
-	    
-      self
+			
+	  	if block_given?
+	  		super( args, &block )
+	  		return
+	  	else
+		  	super(args)
+		    self.open
+		    self
+	  	end
 	  end
 	end
 end

data/spec/blocks_spec.rb

@@ -0,0 +1,30 @@
+require 'sloe'
+require 'ruby-debug'
+
+describe Sloe do
+  context "invoked with block" do
+    before(:all) do
+      @login = {
+        :target => 'capella',
+        :username => 'dgethings',
+        :password => 'mcisamilf'
+      }
+      @hostname = ''
+    end
+
+    it "calls Netconf RPC" do
+      Sloe::Device.new( @login ) { |dut| 
+        sw_info = dut.rpc.get_system_information
+        @hostname = sw_info.xpath('//host-name').text
+      }
+      @hostname.should include @login[:target]
+    end
+
+    it "calls SNMP RPC" do
+      Sloe::Device.new ( @login ) { |dut| 
+        @hostname = dut.snmp.get_value( 'sysName.0' ).to_s
+      }
+      @hostname.should include @login[:target]
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sloe
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-16 00:00:00.000000000 Z
+date: 2013-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: snmp
@@ -460,7 +460,8 @@ files:
 - mibs/VRRP-MIB.yaml
 - mibs/WWW-MIB.yaml
 - sloe.gemspec
-- spec/sloe_spec.rb
+- spec/blocks_spec.rb
+- spec/methods_spec.rb
 - spec_helper.rb
 homepage: https://github.com/dgjnpr/Sloe
 licenses: []
@@ -488,5 +489,6 @@ specification_version: 3
 summary: A one stop shop for collecting data from a network device using NETCONF or
   SNMP
 test_files:
-- spec/sloe_spec.rb
+- spec/blocks_spec.rb
+- spec/methods_spec.rb
 has_rdoc: