sloe 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42fe5c84de5b299199ac4cbdc8410907fa92f966
-  data.tar.gz: 244610b987c788afdac45093de958878dc77ac44
+  metadata.gz: 70dbc4a381ed8fdeedc2880478b1505fd52ca7c7
+  data.tar.gz: b0569e9879ac1c7009b040334a382d659fe0a589
 SHA512:
-  metadata.gz: 80417d5d6395447689ded0445a4d1ddb6fd20530d1db131dd1f5248273217aed333556199d0237de98ea7ed773c6659d2c0ac15d26a92144767626a0b691a75f
-  data.tar.gz: 0a3ec219af1ab3429796eb3a612ba81d13ffc9cb710e1784405b26ff60af2421f4aa2cbb06cd32f92735a26cbd12bb7b991e08c3ef91a32e2fbf8b3284da1349
+  metadata.gz: 3213a4ef90102fca971c467eba65efbb3c51f1c39955eaf95cd708fafed5f1d4195a6147d1ac75baf10a63a58b8d3bdbad15100cc4eb3a270d1ded306a77b9aa
+  data.tar.gz: 2cbba263c6c19e5b3b97cc46f21a8fafe7ea0bc781f273001a7ef72826dc853663b98035efcc8b1b25f2fd363fcd51dc25376b12ab1c32337156de4c8ebabf57

data/lib/sloe/version.rb

@@ -1,4 +1,4 @@
 module Sloe
   # Current version
-  VERSION = "0.8.5"
+  VERSION = "0.8.6"
 end

data/sloe.gemspec

@@ -12,15 +12,16 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{A one stop shop for collecting data from a network device using NETCONF or SNMP}
   gem.homepage      = "https://github.com/dgjnpr/Sloe"
 
-  gem.add_dependency('snmp', '~> 1.1')
-  gem.add_dependency('netconf', '~> 0.3')
-  gem.add_dependency('net-scp', '~> 1.0')
-  gem.add_development_dependency('rspec', '~> 2.12')
-  gem.add_development_dependency('yard')
-  # gem.add_development_dependency('pry-debugger')
-  gem.add_development_dependency('simplecov')
-  gem.add_development_dependency('ci_reporter')
-  gem.add_development_dependency('rake')
+  gem.add_dependency('snmp', '~> 1.2')
+  gem.add_dependency('net-netconf', '~> 0.3')
+  gem.add_dependency('net-scp', '~> 1.2')
+  gem.add_development_dependency('rspec', '~> 3.4')
+  gem.add_development_dependency('yard', '~> 0.8')
+  gem.add_development_dependency('simplecov', '~> 0.11')
+  gem.add_development_dependency('ci_reporter', '~> 2.0')
+  gem.add_development_dependency('ci_reporter_rspec')
+  gem.add_development_dependency('rake', '>= 10')
+  gem.add_development_dependency('pry-byebug', '~> 3.3')
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/spec/blocks_spec.rb

@@ -1,52 +1,31 @@
 require 'spec_helper'
 
 describe Sloe do
+  let(:login) { {target: 'crtj-0dc1-0001', username: 'netadmin', password: 'pass123'} }
   context "invoked with block" do
-    before(:all) do
-      @login = {
-        :target => 'capella',
-        :username => 'netconf',
-        :password => 'netconf'
-      }
-      @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 = ''
+      Sloe::Device.new(login) { |dut| 
+        hostname = dut.rpc.get_system_information.xpath('//host-name').text
       }
-      @hostname.should include @login[:target]
+      expect(hostname).to include login[:target]
     end
 
     it "calls SNMP RPC" do
-      Sloe::Device.new ( @login ) { |dut| 
-        @hostname = dut.snmp.get_value( 'sysName.0' ).to_s
+      hostname = ''
+      Sloe::Device.new (login) { |dut| 
+        hostname = dut.snmp.get_value( 'sysName.0' ).to_s
       }
-      @hostname.should include @login[:target]
+      expect(hostname).to include login[:target]
     end
-
   end
 
   context "Junos extensions" do
-    before(:all) do
-      @login = {
-        :target => 'capella',
-        :username => 'netconf',
-        :password => 'netconf'
-      }
-    end
-
     it "Sloe::Junos responds to Junos specific RPCs" do
-      Sloe::Junos.new ( @login ) { |dut|
-        dut.rpc.respond_to?(:lock_configuration).should be true
-      }
+      expect( Sloe::Junos.new(login).rpc ).to respond_to(:lock_configuration)
     end
     it "Sloe::Device does not respond to Junos specific RPCs" do
-      Sloe::Device.new ( @login ) { |dut|
-        dut.rpc.respond_to?(:lock_configuration).should be false
-      }
+      expect( Sloe::Device.new(login).rpc ).to_not respond_to(:lock_configuration)
     end
-
   end
 end

data/spec/methods_spec.rb

@@ -1,107 +1,74 @@
 require 'sloe/junos'
 
 describe Sloe do
-
-  before(:all) do
-    @jnx_mibs = Dir.glob("./mibs/JUNIPER-*.yaml").map { |f| File.basename(f, '.yaml') }
-    @args = {
-      :target => 'capella',
-      :username => 'netconf',
-      :password => 'netconf',
-      :mib_dir => './mibs',
-      :mib_modules => ["SNMPv2-SMI", "SNMPv2-MIB", "IF-MIB", "IP-MIB", "TCP-MIB", "UDP-MIB"].concat(@jnx_mibs)
-    }
-
-    @dut = Sloe::Junos.new(@args)
-  end
+  let(:jnx_mibs) { Dir.glob("./mibs/JUNIPER-*.yaml").map { |f| File.basename(f, '.yaml') } }
+  let(:login) { {
+    target: 'crtj-0dc1-0001',
+    username: 'netadmin',
+    password: 'pass123',
+    mib_dir: './mibs',
+    mib_modules: ["SNMPv2-SMI", "SNMPv2-MIB", "IF-MIB", "IP-MIB", "TCP-MIB", "UDP-MIB"].concat(jnx_mibs) }
+  }
+  subject(:dut) { Sloe::Junos.new(login) }
 
   context "SNMP API" do
     it "snmp.get_value() returns valid value" do
-      @dut.snmp.get_value('sysDescr.0').should =~ /^Juniper Networks,/
+      expect( dut.snmp.get_value('sysDescr.0') ).to =~ /^Juniper Networks,/
     end
     it "snmp.get() returns one PDU" do
-      @pdu = @dut.snmp.get('sysDescr.0')
-      @pdu.varbind_list.should have(1).item
+      expect( dut.snmp.get('sysDescr.0').varbind_list.size ).to eq(1)
     end
     it "snmp.get_bulk() returns a list of PDUs" do
-      @pdu = @dut.snmp.get_bulk(0, 5, 'system')
-      @pdu.varbind_list.should have(5).items
+      expect( dut.snmp.get_bulk(0, 5, 'system').varbind_list.size ).to eq(5)
     end
     it "snmp.get_next() returns one PDU" do
-      @pdu = @dut.snmp.get_next('system')
-      @pdu.varbind_list.should have(1).item
+      expect( dut.snmp.get_next('system').varbind_list.size ).to eq(1)
     end
     it "snmp.walk() returns a list of PDUs none of which are nil" do
-      @dut.snmp.walk('system') { |vb| vb.should_not be_nil }
+      expect { dut.snmp.walk('system') }.not_to eq(nil)
     end
   end
 
   context "JNX Enterprise MIBs" do
     it "jnxBoxDescr.0 has a valid value" do
-      @dut.snmp.get_value('jnxBoxDescr.0').should =~ /^Juniper/
+      expect( dut.snmp.get_value('jnxBoxDescr.0') ).to =~ /^Juniper/
     end
   end
 
   context "NETCONF API" do
     it "rpc.get_interface_information() functions without error" do
-      lambda { @dut.rpc.get_interface_information() }.should_not raise_error
+      expect { dut.rpc.get_interface_information() }.not_to raise_error
     end
     it "rpc.get_ospf_neighbor_information() functions without error" do
-      lambda { @dut.rpc.get_ospf_neighbor_information() }.should_not raise_error
+      expect { dut.rpc.get_ospf_neighbor_information() }.not_to raise_error
     end
   end
 
   context "SCP API" do
     it "scp.download() functions without error" do
-      lambda { @dut.scp.download!('/config/juniper.conf.gz', '/var/tmp/juniper.conf.gz') }.should_not raise_error
+      expect { dut.scp.download!('/config/juniper.conf.gz', '/var/tmp/juniper.conf.gz') }.not_to raise_error
       File.delete('/var/tmp/juniper.conf.gz')
     end
     it "scp.upload() functions without error" do
       File.new('/var/tmp/test', 'w+')
-      lambda { @dut.scp.upload!('/var/tmp/test', 'test') }.should_not raise_error
-      @dut.rpc.file_delete(:path => 'test')
+      expect { dut.scp.upload!('/var/tmp/test', 'test') }.not_to raise_error
+      dut.rpc.file_delete(:path => 'test')
       File.delete('/var/tmp/test')
     end
   end
 
   context "CLI API" do
     it "cli('show version') functions without error" do
-      lambda { @dut.cli("show version") }.should_not raise_error
+      expect { dut.cli("show version") }.not_to raise_error
     end
     it "cli('show version') contains OS information" do
-      @dut.cli("show version").should be_a(String)      
-      @dut.cli("show version").should =~ /JUNOS Base OS/
+      expect( dut.cli("show version") ).to =~ /JUNOS Base OS/
     end
     it "cli('show version', :foo => 'bar') still contains OS information" do
-      @dut.cli("show version", :foo => 'bar').should be_a(String)
-      @dut.cli("show version", :foo => 'bar').should =~ /JUNOS Base OS/
+      expect( dut.cli("show version", :foo => 'bar') ).to =~ /JUNOS Base OS/
     end
     it "cli('clear interface statistics') empty reply does not cause an error" do
-      lambda { @dut.cli('clear interface statistics fxp0') }.should_not raise_error
-    end
-  end
-
-  context "Helper methods" do
-    before( :all ) do
-      Dir.mkdir( 'configs' )
-      @apply = File.open( "configs/capella-apply.set", "w" )
-      @apply.write( 'set system location building "In a galaxy far, far, away"' )
-      @apply.close
-
-      @delete = File.open( "configs/capella-delete.set", "w" )
-      @delete.write( 'delete system location')
-      @delete.close
-    end
-
-    it "setup() with default args updates the router config" do
-      lambda { @dut.setup() }.should_not raise_error
-    end
-    it "clearup() with default args updates the router config" do
-      lambda { @dut.clearup() }.should_not raise_error
-    end
-
-    after(:all) do
-      FileUtils.rm_rf( 'configs' )
+      expect { dut.cli('clear interface statistics fxp0') }.not_to raise_error
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 require 'sloe'
 require 'sloe/junos'
-# require 'pry-debugger'
+require 'pry-byebug'
 require 'simplecov'
 
 SimpleCov.start

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sloe
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - David Gethings
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-09 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: snmp
@@ -16,16 +16,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: netconf
+  name: net-netconf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -44,58 +44,72 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: ci_reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: ci_reporter_rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -114,14 +128,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
 description: Sloe uses NETCONF and/or SNMP to gather data regarding a network device.
   Designed to help with automated testing this gem can also be used with things like
   Ruby on Rails
@@ -501,7 +529,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A one stop shop for collecting data from a network device using NETCONF or