net-proto 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1bb0410a112bffe12fb31973dae5747d6b7fee011b0c6004bb3b70a113705d5
-  data.tar.gz: 1520a184788ead801920378b3900924d20f34181b5aa3ffb26cc1863b3cafe7d
+  metadata.gz: 82de82e11a8d4cca74f1b807925b90c89a9dccf50907c5f29edfecf60e43d00d
+  data.tar.gz: 0f9f4da5409f7e6e6c1ba1b1ca6bb396964283edf1d01917fd168ccf666ec30c
 SHA512:
-  metadata.gz: 0022bcec3b3fcd9e6070b04fe0a619bab1508b7a939865ffd26f068ac57ddbc69ff89ec35a1b040075ff4f88eac0d7aba69369244fea8426eea9240963e0aae0
-  data.tar.gz: e31b0e71126f44869040fb630968aaaea482a83aef4599f2389198f90ec26b57db0e2e82b9b526323f4135799f77e8d76054bf628e2860df7dacb471ac47a392
+  metadata.gz: f31941974311642c93785c9885524cd724822cffc7d3e7a3954f033c6787125b6d50405a7edc2b41f9685114be2ec82c1dd758570fb0806cc769fa28fcafc777
+  data.tar.gz: 887a80b0657627809196abcbb4ae6966ab4d3147d79f9780bea662f3d5a1eb71e3180cb5c1af57746a61cc9ac57bb5d4c4e49fbf8ae4651aadcded2c67145040

data/CHANGES.md

@@ -1,3 +1,8 @@
+## 1.4.2 - 3-Aug-2021
+* Properly set the p_proto type (short, not int) for Windows.
+* Minor updates suggested by rubocop.
+* Added a Gemfile.
+
 ## 1.4.1 - 18-Feb-2021
 * Switch rdoc format to markdown where appropriate.
 

data/Gemfile

@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gemspec

data/Rakefile

@@ -3,15 +3,15 @@ require 'rake/testtask'
 require 'rake/clean'
 require 'rspec/core/rake_task'
 
-CLEAN.include('**/*.gem', '**/*.rbx', '**/*.rbc')
+CLEAN.include('**/*.gem', '**/*.rbx', '**/*.rbc', '**/*.lock')
 
 namespace 'gem' do
   desc 'Create the net-proto gem'
   task :create => :clean do
     require 'rubygems/package'
-    spec = eval(IO.read('net-proto.gemspec'))
+    spec = Gem::Specification.load('net-proto.gemspec')
     spec.signing_key = File.join(Dir.home, '.ssh', 'gem-private_key.pem')
-    Gem::Package.build(spec, true)
+    Gem::Package.build(spec)
   end
 
   desc 'Install the net-proto gem'

data/lib/generic/net/proto.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'net/proto/common'
 
 # The Net module serves as a namespace only.
@@ -92,7 +94,7 @@ module Net
         endprotoent() if respond_to?(:endprotoent, true)
       end
 
-      ptr.null? ? nil: struct[:p_name]
+      ptr.null? ? nil : struct[:p_name]
     end
 
     # In block form, yields each entry from /etc/protocols as a struct of type

data/lib/linux/net/proto.rb

@@ -1,17 +1,18 @@
+# frozen_string_literal: true
+
 require 'net/proto/common'
 
 # The Net module serves as a namespace only.
 module Net
-
   # The Proto class serves as the base class for the various protocol methods.
   class Proto
     ffi_lib FFI::Library::LIBC
 
     attach_function :setprotoent, [:int], :void
     attach_function :endprotoent, [], :void
-    attach_function :getprotobyname_r, [:string, :pointer, :pointer, :long, :pointer], :int
-    attach_function :getprotobynumber_r, [:int, :pointer, :pointer, :long, :pointer], :int
-    attach_function :getprotoent_r, [:pointer, :pointer, :long, :pointer], :int
+    attach_function :getprotobyname_r, %i[string pointer pointer long pointer], :int
+    attach_function :getprotobynumber_r, %i[int pointer pointer long pointer], :int
+    attach_function :getprotoent_r, %i[pointer pointer long pointer], :int
 
     private_class_method :setprotoent, :endprotoent, :getprotobyname_r
     private_class_method :getprotobynumber_r, :getprotoent_r

data/lib/net-proto.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require_relative 'net/proto'

data/lib/net/proto.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rbconfig'
 
 case RbConfig::CONFIG['host_os']

data/lib/net/proto/common.rb

@@ -1,29 +1,45 @@
+# frozen_string_literal: true
+
 require 'ffi'
 
+# The Net module serves as a namespace only.
 module Net
+  # The Proto class serves as the base class for the various protocol methods.
   class Proto
     extend FFI::Library
 
     # The version of the net-proto library
-    VERSION = '1.4.1'.freeze
+    VERSION = '1.4.2'
 
     private_class_method :new
 
+    # Struct used internally by C functions
     class ProtocolStruct < FFI::Struct
-      layout(
-        :p_name,    :string,
-        :p_aliases, :pointer,
-        :p_proto,   :int
-      )
+      if File::ALT_SEPARATOR
+        layout(
+          :p_name,    :string,
+          :p_aliases, :pointer,
+          :p_proto,   :short
+        )
+      else
+        layout(
+          :p_name,    :string,
+          :p_aliases, :pointer,
+          :p_proto,   :int
+        )
+      end
     end
 
+    private_constant :ProtocolStruct
+
+    # Reopen the FFI::Pointer class and add our own method.
     class FFI::Pointer
       def read_array_of_string
         elements = []
 
         loc = self
 
-        until ((element = loc.read_pointer).null?)
+        until (element = loc.read_pointer).null?
           elements << element.read_string
           loc += FFI::Type::POINTER.size
         end

data/lib/sunos/net/proto.rb

@@ -1,17 +1,18 @@
+# frozen_string_literal: true
+
 require 'net/proto/common'
 
 # The Net module serves as a namespace only.
 module Net
-
   # The Proto class serves as the base class for the various protocol methods.
   class Proto
     ffi_lib 'socket'
 
     attach_function :setprotoent, [:int], :void
     attach_function :endprotoent, [], :void
-    attach_function :getprotobyname_r, [:string, :pointer, :pointer, :int], :pointer
-    attach_function :getprotobynumber_r, [:int, :pointer, :pointer, :int], :pointer
-    attach_function :getprotoent_r, [:pointer, :pointer, :int], :pointer
+    attach_function :getprotobyname_r, %i[string pointer pointer int], :pointer
+    attach_function :getprotobynumber_r, %i[int pointer pointer int], :pointer
+    attach_function :getprotoent_r, %i[pointer pointer int], :pointer
 
     private_class_method :setprotoent, :endprotoent, :getprotobyname_r
     private_class_method :getprotobynumber_r, :getprotoent_r

data/lib/windows/net/proto.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'net/proto/common'
 
 # The Net module serves as a namespace only.
@@ -13,8 +15,8 @@ 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 :WSAAsyncGetProtoByName, %i[uintptr_t uint string pointer pointer], :uintptr_t
+    attach_function :WSAAsyncGetProtoByNumber, %i[uintptr_t uint int pointer pointer], :uintptr_t
     attach_function :WSAGetLastError, [], :int
 
     private_class_method :getprotobyname_c
@@ -67,9 +69,7 @@ module Net
 
         handle = WSAAsyncGetProtoByName(hwnd, msg, protocol, struct, size_ptr)
 
-        if handle == 0
-          raise SystemCallError.new('WSAAsyncGetProtoByName', WSAGetLastError())
-        end
+        raise SystemCallError.new('WSAAsyncGetProtoByName', WSAGetLastError()) if handle == 0
 
         yield struct[:p_proto], handle
       else
@@ -109,9 +109,7 @@ module Net
 
         handle = WSAAsyncGetProtoByNumber(hwnd, msg, protocol, struct, size_ptr)
 
-        if handle == 0
-          raise SystemCallError.new('WSAAsyncGetProtoByNumber', WSAGetLastError())
-        end
+        raise SystemCallError.new('WSAAsyncGetProtoByNumber', WSAGetLastError()) if handle == 0
 
         yield struct[:p_name], handle
       else
@@ -146,11 +144,11 @@ module Net
     #
     def self.getprotoent
       structs = block_given? ? nil : []
-      file = ENV['SystemRoot'] + '/system32/drivers/etc/protocol'
+      file = File.join(ENV['SystemRoot'], '/system32/drivers/etc/protocol')
 
       IO.foreach(file) do |line|
         next if line.lstrip[0] == '#' # Skip comments
-        next if line.lstrip.size == 0 # Skip blank lines
+        next if line.lstrip.empty? # Skip blank lines
         line = line.split
 
         ruby_struct = ProtoStruct.new(line[0], line[2].split(','), line[1].to_i).freeze

data/net-proto.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'net-proto'
-  spec.version    = '1.4.1'
+  spec.version    = '1.4.2'
   spec.author     = 'Daniel J. Berger'
   spec.license    = 'Apache-2.0'
   spec.email      = 'djberg96@gmail.com'
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   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',
+    'changelog_uri'     => 'https://github.com/djberg96/net-proto/blob/main/CHANGES.md',
     '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'

data/spec/net_proto_spec.rb

@@ -19,7 +19,7 @@ RSpec.describe Net::Proto do
   end
 
   example "version number is set to expected value" do
-    expect(Net::Proto::VERSION).to eq('1.4.1')
+    expect(Net::Proto::VERSION).to eq('1.4.2')
     expect(Net::Proto::VERSION).to be_frozen
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-proto
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -35,7 +35,7 @@ cert_chain:
   ORVCZpRuCPpmC8qmqxUnARDArzucjaclkxjLWvCVHeFa9UP7K3Nl9oTjJNv+7/jM
   WZs4eecIcUc4tKdHxcAJ0MO/Dkqq7hGaiHpwKY76wQ1+8xAh
   -----END CERTIFICATE-----
-date:
+date: 2021-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -89,45 +89,31 @@ extensions: []
 extra_rdoc_files:
 - doc/netproto.rdoc
 files:
+- CHANGES.md
+- Gemfile
 - LICENSE
-- spec
-- spec/net_proto_spec.rb
+- MANIFEST.md
 - README.md
 - Rakefile
-- MANIFEST.md
-- certs
 - certs/djberg96_pub.pem
-- examples
+- doc/netproto.rdoc
 - examples/example_net_proto.rb
-- lib
-- lib/net
+- lib/generic/net/proto.rb
+- lib/linux/net/proto.rb
+- lib/net-proto.rb
 - 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
-- CHANGES.md
-- doc
-- doc/netproto.rdoc
 - net-proto.gemspec
+- spec/net_proto_spec.rb
 homepage: https://github.com/djberg96/net-proto
 licenses:
 - 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
+  changelog_uri: https://github.com/djberg96/net-proto/blob/main/CHANGES.md
   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
@@ -146,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: A Ruby interface for determining protocol information