net-proto 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43aeb8ae73964b0d03c6897ecf87b6e41cc1b5728976c9d40765d0965ce3038b
-  data.tar.gz: b819851e28b890bb5545017e6da3706eec374116f94a0b9abf90334cd94c1562
+  metadata.gz: 22fc633cd0a57112a8a74a3725ef8cf228a0e4d7234d092b154bd075fb6467e3
+  data.tar.gz: d1b70a57d424a8a9f8088c38f3551fd339ed9ba35b701de4d53354358555cee7
 SHA512:
-  metadata.gz: 6120909386e31c152f93c7905549a7b10332f731f9d99677d1908c96322c6f864002aab62e4f89e02f00d0a5a556d0949dfe30b1fb708d28c4b752cd7db50724
-  data.tar.gz: 5b77d5ea65999cb40b588d1f1a0f0d59de71d18db4baf5379523fb419affe8ddecec332928a83ee17b89ba207a0bc9f8f4a5d94616fa0cffa2efbd3377214b38
+  metadata.gz: 7bb84b41f65803a273e6343d3a2e6d7126a2589831529120bbd255b6fcae57e642ea76d1976bd4f44287be0ededc5941f9393136d2b3429558e1b63174101934
+  data.tar.gz: 0a9abc6743751706c141314275595f2162f69924ee4b8a63dd14a6fff9caa2f0a66edfa855031e9e563b62408b351e81afb012889355564e79bc807134eac2b0

data/CHANGES

@@ -1,3 +1,6 @@
+== 1.4.0 - 17-Aug-2020
+* Switched from test-unit to rspec.
+
 == 1.3.1 - 30-Jul-2020
 * Add a LICENSE file as required by the Apache-2.0 license.
 

data/MANIFEST

@@ -13,4 +13,4 @@
 * lib/linux/net/proto.rb
 * lib/sunos/net/proto.rb
 * examples/example_net_proto.rb
-* test/test_net_proto.rb
+* spec/net_proto_spec.rb

data/Rakefile

@@ -1,6 +1,7 @@
 require 'rake'
 require 'rake/testtask'
 require 'rake/clean'
+require 'rspec/core/rake_task'
 
 CLEAN.include('**/*.gem', '**/*.rbx', '**/*.rbc')
 
@@ -25,9 +26,8 @@ task :example do
   ruby '-Ilib examples/example_net_proto.rb'
 end
 
-Rake::TestTask.new do |t|
-  t.warning = true
-  t.verbose = true
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = ['spec/net_proto_spec.rb']
 end
 
-task :default => :test
+task :default => :spec

data/lib/net/proto/common.rb

@@ -5,7 +5,7 @@ module Net
     extend FFI::Library
 
     # The version of the net-proto library
-    VERSION = '1.3.1'.freeze
+    VERSION = '1.4.0'.freeze
 
     private_class_method :new
 

data/net-proto.gemspec

@@ -2,20 +2,20 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'net-proto'
-  spec.version    = '1.3.1'
+  spec.version    = '1.4.0'
   spec.author     = 'Daniel J. Berger'
   spec.license    = 'Apache-2.0'
   spec.email      = 'djberg96@gmail.com'
   spec.homepage   = 'https://github.com/djberg96/net-proto'
   spec.summary    = 'A Ruby interface for determining protocol information'
-  spec.test_file  = 'test/test_net_proto.rb'
+  spec.test_file  = 'spec/net_proto_spec.rb'
   spec.files      = Dir['**/*'].reject{ |f| f.include?('git') }
   spec.cert_chain = Dir['certs/*']
 
   spec.extra_rdoc_files  = ['CHANGES', 'README', 'MANIFEST', 'doc/netproto.txt']
 
-  spec.add_dependency('ffi', '>= 1.0')
-  spec.add_development_dependency('test-unit', '>= 2.2')
+  spec.add_dependency('ffi', '~> 1.0')
+  spec.add_development_dependency('rspec', '~> 3.9')
   spec.add_development_dependency('rake')
 
   spec.metadata = {

data/spec/net_proto_spec.rb

@@ -0,0 +1,123 @@
+###########################################################################
+# net_netproto_spec.rb
+#
+# Test suite for net-proto  all platforms. This test suite should be run
+# via the 'rake spec' task.
+###########################################################################
+require 'net/proto'
+require 'rspec'
+
+RSpec.describe Net::Proto do
+  # These were the protocols listed in my own /etc/protocols file on Solaris 9
+  let(:protocols) do
+    %w[
+      ip icmp igmp ggp ipip tcp cbt egp igp pup udp mux hmp
+      xns-idp rdp idpr idpr-cmtp sdrp idrp rsvp gre
+      mobile ospf pim ipcomp vrrp sctp hopopt ipv6
+      ipv6-route ipv6-frag esp ah ipv6-icmp ipv6-nonxt ipv6-opts
+    ]
+  end
+
+  example "version number is set to expected value" do
+    expect(Net::Proto::VERSION).to eq('1.4.0')
+    expect(Net::Proto::VERSION.frozen?).to eq(true)
+  end
+
+  example "get_protocol method basic functionality" do
+    expect(Net::Proto).to respond_to(:get_protocol)
+  end
+
+  example "get_protocol method accepts a string or a number" do
+    expect{ Net::Proto.get_protocol(1) }.not_to raise_error
+    expect{ Net::Proto.get_protocol('tcp') }.not_to raise_error
+  end
+
+  example "get_protocol returns nil if protocol not found" do
+    expect(Net::Proto.get_protocol(9999999)).to be_nil
+  end
+
+  example "get_protocol fails if an invalid type is passed" do
+    expect{ Net::Proto.get_protocol([]) }.to raise_error(TypeError)
+  end
+
+  example "getprotobynumber basic functionality" do
+    expect(Net::Proto).to respond_to(:getprotobynumber)
+    expect{ 0.upto(132){ |n| Net::Proto.getprotobynumber(n) } }.not_to raise_error
+    expect(Net::Proto.getprotobynumber(1)).to be_kind_of(String)
+  end
+
+  example "getprotobynumber returns the expected result" do
+    expect(Net::Proto.getprotobynumber(1)).to eq('icmp')
+    expect(Net::Proto.getprotobynumber(6)).to eq('tcp')
+  end
+
+  example "getprotobynumber returns nil if not found" do
+    expect(Net::Proto.getprotobynumber(9999999)).to eq(nil)
+    expect(Net::Proto.getprotobynumber(-1)).to eq(nil)
+  end
+
+  example "getprotobynumber raises a TypeError if a non-numeric arg is used" do
+    expect{ Net::Proto.getprotobynumber('foo') }.to raise_error(TypeError)
+    expect{ Net::Proto.getprotobynumber(nil) }.to raise_error(TypeError)
+  end
+
+  example "getprotobyname method basic functionality" do
+    expect(Net::Proto).to respond_to(:getprotobyname)
+    protocols.each{ |n| expect{ Net::Proto.getprotobyname(n) }.not_to raise_error }
+  end
+
+  example "getprotobyname returns the expected result" do
+    expect(Net::Proto.getprotobyname('icmp')).to eq(1)
+    expect(Net::Proto.getprotobyname('tcp')).to eq(6)
+  end
+
+  example "getprotobyname returns nil if the protocol is not found" do
+    expect(Net::Proto.getprotobyname('foo')).to be_nil
+    expect(Net::Proto.getprotobyname('tcpx')).to be_nil
+    expect(Net::Proto.getprotobyname('')).to be_nil
+  end
+
+  example "getprotobyname raises a TypeError if an invalid arg is passed" do
+    expect{ Net::Proto.getprotobyname(1) }.to raise_error(TypeError)
+    expect{ Net::Proto.getprotobyname(nil) }.to raise_error(TypeError)
+  end
+
+  example "getprotoent basic functionality" do
+    expect(Net::Proto).to respond_to(:getprotoent)
+    expect{ Net::Proto.getprotoent }.not_to raise_error
+    expect(Net::Proto.getprotoent).to be_kind_of(Array)
+  end
+
+  example "getprotoent method returns the expected results" do
+    expect(Net::Proto.getprotoent.first).to be_kind_of(Struct::ProtoStruct)
+    expect(Net::Proto.getprotoent{}).to be_nil
+  end
+
+  example "struct returned by getprotoent method contains the expected data" do
+    protoent = Net::Proto.getprotoent.first
+    expect( protoent.members).to eq([:name, :aliases, :proto])
+    expect( protoent.name).to be_kind_of(String)
+    expect( protoent.aliases).to be_kind_of(Array)
+    expect( protoent.proto).to be_kind_of(Integer)
+  end
+
+  example "all members of the aliases struct member are strings" do
+    protoent = Net::Proto.getprotoent.first
+    expect(protoent.aliases.all?{ |e| e.is_a?(String) }).to eq(true)
+  end
+
+  example "struct returned by getprotoent method is frozen" do
+    protoent = Net::Proto.getprotoent.first
+    expect(protoent.frozen?).to eq(true)
+  end
+
+  example "there is no constructor" do
+    expect{ Net::Proto.new }.to raise_error(NoMethodError)
+  end
+
+  example "ffi functions are private" do
+    methods = Net::Proto.methods(false)
+    expect(methods.include?(:setprotoent)).to eq(false)
+    expect(methods.include?(:endprotoent)).to eq(false)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-proto
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -41,30 +41,30 @@ dependencies:
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -93,10 +93,10 @@ extra_rdoc_files:
 - doc/netproto.txt
 files:
 - LICENSE
-- test
-- test/test_net_proto.rb
 - CHANGES
 - MANIFEST
+- spec
+- spec/net_proto_spec.rb
 - README
 - Rakefile
 - certs
@@ -149,9 +149,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A Ruby interface for determining protocol information
 test_files:
-- test/test_net_proto.rb
+- spec/net_proto_spec.rb

data/test/test_net_proto.rb

@@ -1,136 +0,0 @@
-###########################################################################
-# test_net_netproto.rb
-#
-# Test suite for net-proto - all platforms. This test suite should be run
-# via the 'rake test' task.
-###########################################################################
-require 'net/proto'
-require 'test-unit'
-
-class TC_Net_Proto < Test::Unit::TestCase
-
-  # These were the protocols listed in my own /etc/protocols file on Solaris 9
-  def self.startup
-    @@protocols = %w/
-      ip icmp igmp ggp ipip tcp cbt egp igp pup udp mux hmp
-      xns-idp rdp idpr idpr-cmtp sdrp idrp rsvp gre
-      mobile ospf pim ipcomp vrrp sctp hopopt ipv6
-      ipv6-route ipv6-frag esp ah ipv6-icmp ipv6-nonxt ipv6-opts
-    /
-  end
-
-  def setup
-    @protoent = nil
-  end
-
-  test "version number is set to expected value" do
-    assert_equal('1.3.1', Net::Proto::VERSION)
-    assert_true(Net::Proto::VERSION.frozen?)
-  end
-
-  test "get_protocol method basic functionality" do
-    assert_respond_to(Net::Proto, :get_protocol)
-  end
-
-  test "get_protocol method accepts a string or a number" do
-    assert_nothing_raised{ Net::Proto.get_protocol(1) }
-    assert_nothing_raised{ Net::Proto.get_protocol('tcp') }
-  end
-
-  test "get_protocol returns nil if protocol not found" do
-    assert_nil(Net::Proto.get_protocol(9999999))
-  end
-
-  test "get_protocol fails if an invalid type is passed" do
-    assert_raise(TypeError){ Net::Proto.get_protocol([]) }
-  end
-
-  test "getprotobynumber basic functionality" do
-    assert_respond_to(Net::Proto, :getprotobynumber)
-    assert_nothing_raised{ 0.upto(132){ |n| Net::Proto.getprotobynumber(n) } }
-    assert_kind_of(String, Net::Proto.getprotobynumber(1))
-  end
-
-  test "getprotobynumber returns the expected result" do
-    assert_equal('icmp', Net::Proto.getprotobynumber(1))
-    assert_equal('tcp', Net::Proto.getprotobynumber(6))
-  end
-
-  test "getprotobynumber returns nil if not found" do
-    assert_equal(nil, Net::Proto.getprotobynumber(9999999))
-    assert_equal(nil, Net::Proto.getprotobynumber(-1))
-  end
-
-  test "getprotobynumber raises a TypeError if a non-numeric arg is used" do
-    assert_raise(TypeError){ Net::Proto.getprotobynumber('foo') }
-    assert_raise(TypeError){ Net::Proto.getprotobynumber(nil) }
-  end
-
-  test "getprotobyname method basic functionality" do
-    assert_respond_to(Net::Proto, :getprotobyname)
-    @@protocols.each{ |n| assert_nothing_raised{ Net::Proto.getprotobyname(n) } }
-  end
-
-  test "getprotobyname returns the expected result" do
-    assert_equal(1, Net::Proto.getprotobyname('icmp'))
-    assert_equal(6, Net::Proto.getprotobyname('tcp'))
-  end
-
-  test "getprotobyname returns nil if the protocol is not found" do
-    assert_nil(Net::Proto.getprotobyname('foo'))
-    assert_nil(Net::Proto.getprotobyname('tcpx'))
-    assert_nil(Net::Proto.getprotobyname(''))
-  end
-
-  test "getprotobyname raises a TypeError if an invalid arg is passed" do
-    assert_raises(TypeError){ Net::Proto.getprotobyname(1) }
-    assert_raises(TypeError){ Net::Proto.getprotobyname(nil) }
-  end
-
-  test "getprotoent basic functionality" do
-    assert_respond_to(Net::Proto, :getprotoent)
-    assert_nothing_raised{ Net::Proto.getprotoent }
-    assert_kind_of(Array, Net::Proto.getprotoent)
-  end
-
-  test "getprotoent method returns the expected results" do
-    assert_kind_of(Struct::ProtoStruct, Net::Proto.getprotoent.first)
-    assert_nil(Net::Proto.getprotoent{})
-  end
-
-  test "struct returned by getprotoent method contains the expected data" do
-    @protoent = Net::Proto.getprotoent.first
-    assert_equal([:name, :aliases, :proto], @protoent.members)
-    assert_kind_of(String, @protoent.name)
-    assert_kind_of(Array, @protoent.aliases)
-    assert_kind_of(Integer, @protoent.proto)
-  end
-
-  test "all members of the aliases struct member are strings" do
-    @protoent = Net::Proto.getprotoent.first
-    assert_true(@protoent.aliases.all?{ |e| e.is_a?(String) })
-  end
-
-  test "struct returned by getprotoent method is frozen" do
-    @protoent = Net::Proto.getprotoent.first
-    assert_true(@protoent.frozen?)
-  end
-
-  test "there is no constructor" do
-    assert_raise(NoMethodError){ Net::Proto.new }
-  end
-
-  test "ffi functions are private" do
-    methods = Net::Proto.methods(false).map{ |m| m.to_sym }
-    assert_false(methods.include?(:setprotoent))
-    assert_false(methods.include?(:endprotoent))
-  end
-
-  def teardown
-    @protoent = nil
-  end
-
-  def self.shutdown
-    @@protocols = nil
-  end
-end