sys-admin 1.8.2-universal-mingw32 → 1.8.3-universal-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0a5f8abb2d51fd89dfaba1749f6ebedc824e53c16f5d19c7a09d8e5964643f6
-  data.tar.gz: b15cbcbdcb14f3c8067f0d445acad1eb4a106a9a0670640b03d04fd45d49ff03
+  metadata.gz: c3a9114756676fa5db9d9b64c90faf8a95210ce70963da3e497c6911c6d4476d
+  data.tar.gz: 499b4f25b5412aec43fddb603d0d55de967ed7873ff55f332a67854041037d71
 SHA512:
-  metadata.gz: 5344588bd21a2d4cbff3e845cf3dd1bff33f1e5e1996f499e874b100d40861c01f5646212bd0e860b48c6e67c458a4664092efd136beea30deef467476289b4e
-  data.tar.gz: 7b8852c72276c2480320f3fe680baf1a1339b8b51f87a4558eb96610288ffebef45a53f247bf6ed129c2de838c32db37ce883d0d59d6a449287b9e26313830a9
+  metadata.gz: f65bb12071960dd2fa940a379965bdad5cc5552e67db4c79a61be77394078cf867367b1c17152e67b470ea6b3da6d93e26b4a179f059b22bc8db2b1b509cfe2b
+  data.tar.gz: 1e8a54333ab37374d4f6f6bbd675d5fe5bb91b15d5600d980e4a74e7215e78cf7b2658e4f0232e52128fe6082a1b1ffbeb1a03ff6598746aa6555fb48259560c

data/CHANGES.md

@@ -1,3 +1,10 @@
+## 1.8.3 - 20-Apr-2024
+* Fixed up the get_group method on most platforms. Previously it was allocating
+  slightly more memory than it needed (wrong struct, oops). In addition, the
+  error handling wasn't consistent because I can't read a man page properly.
+* More specs were added to properly test the get_group updates.
+* The github actions test matrix was updated.
+
 ## 1.8.2 - 9-Apr-2023
 * Lots of rubocop related updates.
 * Refactored specs to use shared specs.

data/README.md

@@ -162,7 +162,7 @@ None that I'm aware of. If you find any, please log them on the project page at:
 Apache-2.0
 
 ## Copyright
-(C) 2005-2020, Daniel J. Berger
+(C) 2005-2024, Daniel J. Berger
 All Rights Reserved
 
 ## Author

data/lib/bsd/sys/admin.rb

@@ -131,7 +131,7 @@ module Sys
     def self.get_group(gid)
       size = 1024
       buf  = FFI::MemoryPointer.new(:char, size)
-      pbuf = FFI::MemoryPointer.new(PasswdStruct)
+      pbuf = FFI::MemoryPointer.new(GroupStruct)
       temp = GroupStruct.new
 
       begin
@@ -142,7 +142,14 @@ module Sys
           val = getgrgid_r(gid, temp, buf, buf.size, pbuf)
           fun = 'getgrgid_r'
         end
-        raise SystemCallError.new(fun, val) if val != 0
+
+        if pbuf.null?
+          if val != 0
+            raise SystemCallError.new(fun, val)
+          else
+            raise Error, "group '#{gid}' not found"
+          end
+        end
       rescue Errno::ERANGE
         size += 1024
         raise if size > BUF_MAX

data/lib/darwin/sys/admin.rb

@@ -125,7 +125,7 @@ module Sys
     def self.get_group(gid)
       size = 1024
       buf  = FFI::MemoryPointer.new(:char, size)
-      pbuf = FFI::MemoryPointer.new(PasswdStruct)
+      pbuf = FFI::MemoryPointer.new(GroupStruct)
       temp = GroupStruct.new
 
       begin
@@ -136,7 +136,14 @@ module Sys
           val = getgrgid_r(gid, temp, buf, buf.size, pbuf)
           fun = 'getgrgid_r'
         end
-        raise SystemCallError.new(fun, val) if val != 0
+
+        if pbuf.null?
+          if val != 0
+            raise SystemCallError.new(fun, val)
+          else
+            raise Error, "group '#{gid}' not found"
+          end
+        end
       rescue Errno::ERANGE
         size += 1024
         raise if size > BUF_MAX

data/lib/linux/sys/admin.rb

@@ -120,7 +120,7 @@ module Sys
     def self.get_group(gid)
       size = 1024
       buf  = FFI::MemoryPointer.new(:char, size)
-      pbuf = FFI::MemoryPointer.new(PasswdStruct)
+      pbuf = FFI::MemoryPointer.new(GroupStruct)
       temp = GroupStruct.new
 
       begin
@@ -131,7 +131,14 @@ module Sys
           val = getgrgid_r(gid, temp, buf, buf.size, pbuf)
           fun = 'getgrgid_r'
         end
-        raise SystemCallError.new(fun, val) if val != 0
+
+        if pbuf.null?
+          if val != 0
+            raise SystemCallError.new(fun, val)
+          else
+            raise Error, "group '#{gid}' not found"
+          end
+        end
       rescue Errno::ERANGE # Large groups
         size += 1024
         raise if size > BUF_MAX

data/lib/sys/admin.rb

@@ -5,7 +5,7 @@ module Sys
   # The Admin class provides a unified, cross platform replacement for the Etc module.
   class Admin
     # The version of the sys-admin library.
-    VERSION = '1.8.2'
+    VERSION = '1.8.3'
 
     private_class_method :new
   end

data/spec/sys_admin_shared.rb

@@ -2,7 +2,7 @@
 
 RSpec.shared_examples Sys::Admin do
   example 'version is set to expected value' do
-    expect(described_class::VERSION).to eq('1.8.2')
+    expect(described_class::VERSION).to eq('1.8.3')
   end
 
   example 'version constant is frozen' do

data/spec/sys_admin_unix_spec.rb

@@ -76,6 +76,12 @@ RSpec.describe Sys::Admin, :unix do
     end
 
     describe 'get_group' do
+      before do
+        described_class.class_eval do
+          public :getgrgid_r
+        end
+      end
+
       example 'get_group basic functionality' do
         expect(described_class).to respond_to(:get_group)
         expect{ described_class.get_group(group) }.not_to raise_error
@@ -100,8 +106,31 @@ RSpec.describe Sys::Admin, :unix do
       end
 
       example 'get_group raises an Error if the group cannot be found' do
+        expect{ described_class.get_group(123456789) }.to raise_error(Sys::Admin::Error)
         expect{ described_class.get_group('foofoofoo') }.to raise_error(Sys::Admin::Error)
       end
+
+      example 'get_group handles large groups and will retry an ERANGE' do
+        allow(Sys::Admin).to receive(:getgrgid_r).with(any_args).and_return(34)
+        allow(Sys::Admin).to receive(:getgrgid_r).with(any_args).and_call_original
+        expect{ described_class.get_group(group_id) }.not_to raise_error
+      end
+
+      example 'get_group will raise the expected error for an ENOENT' do
+        allow(Sys::Admin).to receive(:getgrgid_r).with(any_args).and_return(2)
+        expect{ described_class.get_group(group_id) }.to raise_error(Sys::Admin::Error)
+      end
+
+      example 'get_group will raise the expected error for a failed getgrxxx function call' do
+        allow(Sys::Admin).to receive(:getgrgid_r).with(any_args).and_return(22)
+        allow_any_instance_of(FFI::MemoryPointer).to receive(:null?).and_return(true)
+        expect{ described_class.get_group(group_id) }.to raise_error(Errno::EINVAL)
+      end
+
+      example 'get_group will not retry failures other than an ERANGE' do
+        allow(Sys::Admin).to receive(:getgrgid_r).with(any_args).and_return(35)
+        expect{ described_class.get_group(group_id) }.to raise_error(Sys::Admin::Error)
+      end
     end
 
     describe 'groups' do

data/sys-admin.gemspec

@@ -3,7 +3,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'sys-admin'
-  spec.version    = '1.8.2'
+  spec.version    = '1.8.3'
   spec.author     = 'Daniel J. Berger'
   spec.license    = 'Apache-2.0'
   spec.email      = 'djberg96@gmail.com'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sys-admin
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.8.3
 platform: universal-mingw32
 authors:
 - Daniel J. Berger
@@ -35,7 +35,7 @@ cert_chain:
   ORVCZpRuCPpmC8qmqxUnARDArzucjaclkxjLWvCVHeFa9UP7K3Nl9oTjJNv+7/jM
   WZs4eecIcUc4tKdHxcAJ0MO/Dkqq7hGaiHpwKY76wQ1+8xAh
   -----END CERTIFICATE-----
-date: 2023-04-09 00:00:00.000000000 Z
+date: 2024-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -185,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.19
+rubygems_version: 3.5.7
 signing_key:
 specification_version: 4
 summary: A unified, cross platform replacement for the "etc" library.