net-proto 1.1.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 83b848fce79a24c404a269ecfaf838c8999e000a
-  data.tar.gz: 33fada4059a1ac04b305e0d04b621d777cc4e5e9
+SHA256:
+  metadata.gz: 22fc633cd0a57112a8a74a3725ef8cf228a0e4d7234d092b154bd075fb6467e3
+  data.tar.gz: d1b70a57d424a8a9f8088c38f3551fd339ed9ba35b701de4d53354358555cee7
 SHA512:
-  metadata.gz: fd37187da1d51e62cf87fb54dab95ab6a5dc718aa397f25b9fb7e2e7898926d00ef38445bfa71619606ddee887610bbb89fb103b7f39fcc989fddb3ef8e5b270
-  data.tar.gz: d36e65afe0656f492d34ada92d6833aa18da0c36ec3846b26bb1cef8172c64a82dadda712d6c282d86c811013e597bb7745e9cb5a1ecc500ec23f06dab869968
+  metadata.gz: 7bb84b41f65803a273e6343d3a2e6d7126a2589831529120bbd255b6fcae57e642ea76d1976bd4f44287be0ededc5941f9393136d2b3429558e1b63174101934
+  data.tar.gz: 0a9abc6743751706c141314275595f2162f69924ee4b8a63dd14a6fff9caa2f0a66edfa855031e9e563b62408b351e81afb012889355564e79bc807134eac2b0

checksums.yaml.gz.sig

@@ -0,0 +1 @@
+N�

data/CHANGES

@@ -1,3 +1,25 @@
+== 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.
+
+== 1.3.0 - 10-Jan-2019
+* Changed license to Apache-2.0.
+* The VERSION constant is now frozen.
+* Added metadata to the gemspec.
+* Updated cert, should be good for about 10 years now.
+
+== 1.2.1 - 4-Jan-2016
+* This gem is now signed.
+* The gem related tasks in the Rakefile now assume Rubygems 2.x.
+* Added a net-proto.rb file for convenience.
+
+== 1.2.0 - 3-Nov-2014
+* The getprotobynumber and getprotobyname methods on MS Windows now accept
+  optional window and message arguments. If used, the method becomes
+  asynchronous and yields a block instead.
+
 == 1.1.1 - 9-Oct-2014
 * Implemented getprotoent on Windows using pure Ruby.
 * Miscellaneous minor updates to the Rakefile, gemspec and docs.

data/LICENSE

@@ -0,0 +1,177 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS

data/MANIFEST

@@ -1,13 +1,16 @@
 * CHANGES
+* LICENSE
 * MANIFEST
 * README
 * Rakefile
 * doc/netproto.txt
 * net-proto.gemspec
+* certs/djberg96_pub.pem
+* lib/net-proto.rb
 * lib/net/proto.rb
 * lib/net/proto/common.rb
 * lib/generic/net/proto.rb
 * 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,19 +1,17 @@
 require 'rake'
 require 'rake/testtask'
 require 'rake/clean'
+require 'rspec/core/rake_task'
 
 CLEAN.include('**/*.gem', '**/*.rbx', '**/*.rbc')
 
 namespace 'gem' do
   desc 'Create the net-proto gem'
   task :create => :clean do
+    require 'rubygems/package'
     spec = eval(IO.read('net-proto.gemspec'))
-    if Gem::VERSION.to_f < 2.0
-      Gem::Builder.new(spec).build
-    else
-      require 'rubygems/package'
-      Gem::Package.build(spec)
-    end
+    spec.signing_key = File.join(Dir.home, '.ssh', 'gem-private_key.pem')
+    Gem::Package.build(spec, true)
   end
 
   desc 'Install the net-proto gem'
@@ -28,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/certs/djberg96_pub.pem

@@ -0,0 +1,26 @@
+-----BEGIN CERTIFICATE-----
+MIIEcDCCAtigAwIBAgIBATANBgkqhkiG9w0BAQsFADA/MREwDwYDVQQDDAhkamJl
+cmc5NjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYDY29t
+MB4XDTE4MDMxODE1MjIwN1oXDTI4MDMxNTE1MjIwN1owPzERMA8GA1UEAwwIZGpi
+ZXJnOTYxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2Nv
+bTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALgfaroVM6CI06cxr0/h
+A+j+pc8fgpRgBVmHFaFunq28GPC3IvW7Nvc3Y8SnAW7pP1EQIbhlwRIaQzJ93/yj
+u95KpkP7tA9erypnV7dpzBkzNlX14ACaFD/6pHoXoe2ltBxk3CCyyzx70mTqJpph
+75IB03ni9a8yqn8pmse+s83bFJOAqddSj009sGPcQO+QOWiNxqYv1n5EHcvj2ebO
+6hN7YTmhx7aSia4qL/quc4DlIaGMWoAhvML7u1fmo53CYxkKskfN8MOecq2vfEmL
+iLu+SsVVEAufMDDFMXMJlvDsviolUSGMSNRTujkyCcJoXKYYxZSNtIiyd9etI0X3
+ctu0uhrFyrMZXCedutvXNjUolD5r9KGBFSWH1R9u2I3n3SAyFF2yzv/7idQHLJJq
+74BMnx0FIq6fCpu5slAipvxZ3ZkZpEXZFr3cIBtO1gFvQWW7E/Y3ijliWJS1GQFq
+058qERadHGu1yu1dojmFRo6W2KZvY9al2yIlbkpDrD5MYQIDAQABo3cwdTAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUFZsMapgzJimzsbaBG2Tm8j5e
+AzgwHQYDVR0RBBYwFIESZGpiZXJnOTZAZ21haWwuY29tMB0GA1UdEgQWMBSBEmRq
+YmVyZzk2QGdtYWlsLmNvbTANBgkqhkiG9w0BAQsFAAOCAYEAW2tnYixXQtKxgGXq
+/3iSWG2bLwvxS4go3srO+aRXZHrFUMlJ5W0mCxl03aazxxKTsVVpZD8QZxvK91OQ
+h9zr9JBYqCLcCVbr8SkmYCi/laxIZxsNE5YI8cC8vvlLI7AMgSfPSnn/Epq1GjGY
+6L1iRcEDtanGCIvjqlCXO9+BmsnCfEVehqZkQHeYczA03tpOWb6pon2wzvMKSsKH
+ks0ApVdstSLz1kzzAqem/uHdG9FyXdbTAwH1G4ZPv69sQAFAOCgAqYmdnzedsQtE
+1LQfaQrx0twO+CZJPcRLEESjq8ScQxWRRkfuh2VeR7cEU7L7KqT10mtUwrvw7APf
+DYoeCY9KyjIBjQXfbj2ke5u1hZj94Fsq9FfbEQg8ygCgwThnmkTrrKEiMSs3alYR
+ORVCZpRuCPpmC8qmqxUnARDArzucjaclkxjLWvCVHeFa9UP7K3Nl9oTjJNv+7/jM
+WZs4eecIcUc4tKdHxcAJ0MO/Dkqq7hGaiHpwKY76wQ1+8xAh
+-----END CERTIFICATE-----

data/doc/netproto.txt

@@ -58,12 +58,8 @@ Proto.getprotoent{ |struct| ... }
   None that I'm aware of. Please log any bug reports on the project page
   at https://github.com/djberg96/net-proto.
 	
-== Future Plans
-  Use the asynchronous calls (WSAAsyncGetProtoByName and
-  WSAAsyncGetProtoByNumber) on MS Windows systems.
-	
 == Copyright
-  (C) 2003-2014 Daniel J. Berger
+  (C) 2003-2020 Daniel J. Berger
   All rights reserved.
 	
 == Warranty
@@ -72,7 +68,7 @@ Proto.getprotoent{ |struct| ... }
   warranties of merchantability and fitness for a particular purpose.
 	
 == License
-  Artistic 2.0
+  Apache-2.0
 	
 == Author
   Daniel J. Berger

data/lib/net-proto.rb

@@ -0,0 +1 @@
+require_relative 'net/proto'

data/lib/net/proto/common.rb

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

data/lib/windows/net/proto.rb

@@ -15,9 +15,15 @@ module Net
     # These should exist on every platform.
     attach_function :getprotobyname_c, :getprotobyname, [:string], :pointer
     attach_function :getprotobynumber_c, :getprotobynumber, [:int], :pointer
+    attach_function :WSAAsyncGetProtoByName, [:uintptr_t, :uint, :string, :pointer, :pointer], :uintptr_t
+    attach_function :WSAAsyncGetProtoByNumber, [:uintptr_t, :uint, :int, :pointer, :pointer], :uintptr_t
+    attach_function :WSAGetLastError, [], :int
 
     private_class_method :getprotobyname_c
     private_class_method :getprotobynumber_c
+    private_class_method :WSAAsyncGetProtoByName
+    private_class_method :WSAAsyncGetProtoByNumber
+    private_class_method :WSAGetLastError
 
     public
 
@@ -47,17 +53,38 @@ module Net
     #    Net::Proto.getprotobyname('tcp')   # => 6
     #    Net::Proto.getprotobyname('bogus') # => nil
     #
-    def self.getprotobyname(protocol)
+    # On MS Windows, you may also pass a window handle and a message (int)
+    # that window will receive. If present, this method becomes asynchronous
+    # and yields a block instead, with the protocol and handle.
+    #
+    # Example:
+    #
+    #   Net::Proto.getprotobyname('tcp', SOME_WINDOW, SOME_MSG){ |num, handle| ... }
+    #
+    def self.getprotobyname(protocol, hwnd = 0, msg = 0)
       raise TypeError unless protocol.is_a?(String)
 
-      begin
-        ptr = getprotobyname_c(protocol)
-        struct = ProtocolStruct.new(ptr) unless ptr.null?
-      ensure
-        endprotoent() if respond_to?(:endprotoent, true)
-      end
+      if hwnd && hwnd > 0
+        struct = ProtocolStruct.new
+        size_ptr = FFI::MemoryPointer.new(:int)
+        size_ptr.write_int(struct.size)
+
+        handle = WSAAsyncGetProtoByName(hwnd, msg, protocol, struct, size_ptr)
 
-      ptr.null? ? nil : struct[:p_proto]
+        if handle == 0
+          raise SystemCallError.new('WSAAsyncGetProtoByName', WSAGetLastError())
+        end
+
+        yield struct[:p_proto], handle
+      else
+        begin
+          ptr = getprotobyname_c(protocol)
+          struct = ProtocolStruct.new(ptr) unless ptr.null?
+        ensure
+          endprotoent() if respond_to?(:endprotoent, true)
+        end
+        ptr.null? ? nil : struct[:p_proto]
+      end
     end
 
     # Given a protocol number, returns the corresponding string, or nil if
@@ -68,17 +95,39 @@ module Net
     #   Net::Proto.getprotobynumber(6)   # => 'tcp'
     #   Net::Proto.getprotobynumber(999) # => nil
     #
-    def self.getprotobynumber(protocol)
+    # On MS Windows, you may also pass a window handle and a message (int)
+    # that window will receive. If present, this method becomes asynchronous
+    # and yields a block instead, with the protocol and handle.
+    #
+    # Example:
+    #
+    #   Net::Proto.getprotobynumber(6, SOME_WINDOW, SOME_MSG){ |name, handle| ... }
+    #
+    def self.getprotobynumber(protocol, hwnd = 0, msg = 0)
       raise TypeError unless protocol.is_a?(Integer)
 
-      begin
-        ptr = getprotobynumber_c(protocol)
-        struct = ProtocolStruct.new(ptr) unless ptr.null?
-      ensure
-        endprotoent() if respond_to?(:endprotoent, true)
-      end
+      if hwnd && hwnd > 0
+        struct = ProtocolStruct.new
+        size_ptr = FFI::MemoryPointer.new(:int)
+        size_ptr.write_int(struct.size)
+
+        handle = WSAAsyncGetProtoByNumber(hwnd, msg, protocol, struct, size_ptr)
 
-      ptr.null? ? nil: struct[:p_name]
+        if handle == 0
+          raise SystemCallError.new('WSAAsyncGetProtoByNumber', WSAGetLastError())
+        end
+
+        yield struct[:p_name], handle
+      else
+        begin
+          ptr = getprotobynumber_c(protocol)
+          struct = ProtocolStruct.new(ptr) unless ptr.null?
+        ensure
+          endprotoent() if respond_to?(:endprotoent, true)
+        end
+
+        ptr.null? ? nil : struct[:p_name]
+      end
     end
 
     # In block form, yields each entry from /etc/protocol as a struct of type

data/net-proto.gemspec

@@ -1,23 +1,33 @@
 require 'rubygems'
 
-Gem::Specification.new do |gem|
-  gem.name       = 'net-proto'
-  gem.version    = '1.1.1'
-  gem.author     = 'Daniel J. Berger'
-  gem.license    = 'Artistic 2.0'
-  gem.email      = 'djberg96@gmail.com'
-  gem.homepage   = 'https://github.com/djberg96/net-proto'
-  gem.summary    = 'A Ruby interface for determining protocol information'
-  gem.test_file  = 'test/test_net_proto.rb'
-  gem.files      = Dir['**/*'].reject{ |f| f.include?('git') }
+Gem::Specification.new do |spec|
+  spec.name       = 'net-proto'
+  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  = 'spec/net_proto_spec.rb'
+  spec.files      = Dir['**/*'].reject{ |f| f.include?('git') }
+  spec.cert_chain = Dir['certs/*']
 
-  gem.extra_rdoc_files  = ['CHANGES', 'README', 'MANIFEST', 'doc/netproto.txt']
+  spec.extra_rdoc_files  = ['CHANGES', 'README', 'MANIFEST', 'doc/netproto.txt']
 
-  gem.add_dependency('ffi', '>= 1.0.0')
-  gem.add_development_dependency('test-unit', '>= 2.2.0')
-  gem.add_development_dependency('rake')
+  spec.add_dependency('ffi', '~> 1.0')
+  spec.add_development_dependency('rspec', '~> 3.9')
+  spec.add_development_dependency('rake')
 
-  gem.description = <<-EOF
+  spec.metadata = {
+    'homepage_uri'      => 'https://github.com/djberg96/net-proto',
+    'bug_tracker_uri'   => 'https://github.com/djberg96/net-proto/issues',
+    'changelog_uri'     => 'https://github.com/djberg96/net-proto/blob/ffi/CHANGES',
+    'documentation_uri' => 'https://github.com/djberg96/net-proto/wiki',
+    'source_code_uri'   => 'https://github.com/djberg96/net-proto',
+    'wiki_uri'          => 'https://github.com/djberg96/net-proto/wiki'
+  }
+
+  spec.description = <<-EOF
     The net-proto library provides an interface for get protocol information
     by name or by number. It can also iterate over the list of protocol
     entries defined on your system.

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,43 +1,70 @@
 --- !ruby/object:Gem::Specification
 name: net-proto
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Daniel J. Berger
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIEcDCCAtigAwIBAgIBATANBgkqhkiG9w0BAQsFADA/MREwDwYDVQQDDAhkamJl
+  cmc5NjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYDY29t
+  MB4XDTE4MDMxODE1MjIwN1oXDTI4MDMxNTE1MjIwN1owPzERMA8GA1UEAwwIZGpi
+  ZXJnOTYxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2Nv
+  bTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALgfaroVM6CI06cxr0/h
+  A+j+pc8fgpRgBVmHFaFunq28GPC3IvW7Nvc3Y8SnAW7pP1EQIbhlwRIaQzJ93/yj
+  u95KpkP7tA9erypnV7dpzBkzNlX14ACaFD/6pHoXoe2ltBxk3CCyyzx70mTqJpph
+  75IB03ni9a8yqn8pmse+s83bFJOAqddSj009sGPcQO+QOWiNxqYv1n5EHcvj2ebO
+  6hN7YTmhx7aSia4qL/quc4DlIaGMWoAhvML7u1fmo53CYxkKskfN8MOecq2vfEmL
+  iLu+SsVVEAufMDDFMXMJlvDsviolUSGMSNRTujkyCcJoXKYYxZSNtIiyd9etI0X3
+  ctu0uhrFyrMZXCedutvXNjUolD5r9KGBFSWH1R9u2I3n3SAyFF2yzv/7idQHLJJq
+  74BMnx0FIq6fCpu5slAipvxZ3ZkZpEXZFr3cIBtO1gFvQWW7E/Y3ijliWJS1GQFq
+  058qERadHGu1yu1dojmFRo6W2KZvY9al2yIlbkpDrD5MYQIDAQABo3cwdTAJBgNV
+  HRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUFZsMapgzJimzsbaBG2Tm8j5e
+  AzgwHQYDVR0RBBYwFIESZGpiZXJnOTZAZ21haWwuY29tMB0GA1UdEgQWMBSBEmRq
+  YmVyZzk2QGdtYWlsLmNvbTANBgkqhkiG9w0BAQsFAAOCAYEAW2tnYixXQtKxgGXq
+  /3iSWG2bLwvxS4go3srO+aRXZHrFUMlJ5W0mCxl03aazxxKTsVVpZD8QZxvK91OQ
+  h9zr9JBYqCLcCVbr8SkmYCi/laxIZxsNE5YI8cC8vvlLI7AMgSfPSnn/Epq1GjGY
+  6L1iRcEDtanGCIvjqlCXO9+BmsnCfEVehqZkQHeYczA03tpOWb6pon2wzvMKSsKH
+  ks0ApVdstSLz1kzzAqem/uHdG9FyXdbTAwH1G4ZPv69sQAFAOCgAqYmdnzedsQtE
+  1LQfaQrx0twO+CZJPcRLEESjq8ScQxWRRkfuh2VeR7cEU7L7KqT10mtUwrvw7APf
+  DYoeCY9KyjIBjQXfbj2ke5u1hZj94Fsq9FfbEQg8ygCgwThnmkTrrKEiMSs3alYR
+  ORVCZpRuCPpmC8qmqxUnARDArzucjaclkxjLWvCVHeFa9UP7K3Nl9oTjJNv+7/jM
+  WZs4eecIcUc4tKdHxcAJ0MO/Dkqq7hGaiHpwKY76wQ1+8xAh
+  -----END CERTIFICATE-----
+date: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        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.0
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -65,24 +92,48 @@ extra_rdoc_files:
 - MANIFEST
 - doc/netproto.txt
 files:
+- LICENSE
 - CHANGES
 - MANIFEST
+- spec
+- spec/net_proto_spec.rb
 - README
 - Rakefile
-- doc/netproto.txt
+- certs
+- certs/djberg96_pub.pem
+- examples
 - examples/example_net_proto.rb
-- lib/generic/net/proto.rb
-- lib/linux/net/proto.rb
+- lib
+- lib/net
 - lib/net/proto.rb
+- lib/net/proto
 - lib/net/proto/common.rb
+- lib/sunos
+- lib/sunos/net
 - lib/sunos/net/proto.rb
+- lib/net-proto.rb
+- lib/linux
+- lib/linux/net
+- lib/linux/net/proto.rb
+- lib/generic
+- lib/generic/net
+- lib/generic/net/proto.rb
+- lib/windows
+- lib/windows/net
 - lib/windows/net/proto.rb
+- doc
+- doc/netproto.txt
 - net-proto.gemspec
-- test/test_net_proto.rb
 homepage: https://github.com/djberg96/net-proto
 licenses:
-- Artistic 2.0
-metadata: {}
+- Apache-2.0
+metadata:
+  homepage_uri: https://github.com/djberg96/net-proto
+  bug_tracker_uri: https://github.com/djberg96/net-proto/issues
+  changelog_uri: https://github.com/djberg96/net-proto/blob/ffi/CHANGES
+  documentation_uri: https://github.com/djberg96/net-proto/wiki
+  source_code_uri: https://github.com/djberg96/net-proto
+  wiki_uri: https://github.com/djberg96/net-proto/wiki
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -98,10 +149,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.1
+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,135 +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.1.1', Net::Proto::VERSION)
-  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