sys-admin 1.8.3-universal-mingw32 → 1.8.4-universal-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3a9114756676fa5db9d9b64c90faf8a95210ce70963da3e497c6911c6d4476d
-  data.tar.gz: 499b4f25b5412aec43fddb603d0d55de967ed7873ff55f332a67854041037d71
+  metadata.gz: 30ad7b45ca84c45f1f2983b29100ae03b0334d72de8704a7d6c172a9fef38908
+  data.tar.gz: 1eceedd197d86d60ad7eda136873dbf2e3c1140d44b9dfd80ba68b6357cc3cd8
 SHA512:
-  metadata.gz: f65bb12071960dd2fa940a379965bdad5cc5552e67db4c79a61be77394078cf867367b1c17152e67b470ea6b3da6d93e26b4a179f059b22bc8db2b1b509cfe2b
-  data.tar.gz: 1e8a54333ab37374d4f6f6bbd675d5fe5bb91b15d5600d980e4a74e7215e78cf7b2658e4f0232e52128fe6082a1b1ffbeb1a03ff6598746aa6555fb48259560c
+  metadata.gz: 676de3cf5b83c9fff2c7afa9334b53ca4c4ef0b07f867272b78ce8c329834e1a02d6df01e9dffe08ef4080c98dd0c5847f799b77ebaaef0239b4d70e8cc66191
+  data.tar.gz: 129cea70f8a2fb1da9bb25586e055d3ac700adada8ade4733605fb284e1d848a932f542dd7933ca361f5c1b96fd2af5ba316efbef69d81cbfdb8f1137bfd6f40

data/CHANGES.md

@@ -1,3 +1,6 @@
+## 1.8.4 - 12-Jun-2024
+* Fixes for DragonFly BSD support.
+
 ## 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

data/Rakefile

@@ -31,7 +31,7 @@ RSpec::Core::RakeTask.new(:spec) do |t|
     t.rspec_opts = '-Ilib/linux'
   when /sunos|solaris/i
     t.rspec_opts = '-Ilib/sunos'
-  when /bsd/i
+  when /bsd|dragonfly/i
     t.rspec_opts = '-Ilib/bsd'
   when /windows|win32|mingw|cygwin|dos/i
     t.rspec_opts = '-Ilib/windows'
@@ -42,4 +42,9 @@ end
 
 RuboCop::RakeTask.new
 
+# Clean up afterwards
+Rake::Task[:spec].enhance do
+  Rake::Task[:clean].invoke
+end
+
 task :default => :spec

data/lib/bsd/sys/admin.rb

@@ -43,7 +43,7 @@ module Sys
         pw_expire time_t
       ]
 
-      if RbConfig::CONFIG['host_os'] =~ /freebsd/i
+      if RbConfig::CONFIG['host_os'] =~ /freebsd|dragonfly/i
         fields.push(:pw_fields, :int)
       end
 
@@ -144,11 +144,8 @@ module Sys
         end
 
         if pbuf.null?
-          if val != 0
-            raise SystemCallError.new(fun, val)
-          else
-            raise Error, "group '#{gid}' not found"
-          end
+          raise SystemCallError.new(fun, val) if val != 0
+          raise Error, "group '#{gid}' not found"
         end
       rescue Errno::ERANGE
         size += 1024

data/lib/darwin/sys/admin.rb

@@ -138,11 +138,8 @@ module Sys
         end
 
         if pbuf.null?
-          if val != 0
-            raise SystemCallError.new(fun, val)
-          else
-            raise Error, "group '#{gid}' not found"
-          end
+          raise SystemCallError.new(fun, val) if val != 0
+          raise Error, "group '#{gid}' not found"
         end
       rescue Errno::ERANGE
         size += 1024

data/lib/linux/sys/admin.rb

@@ -133,11 +133,8 @@ module Sys
         end
 
         if pbuf.null?
-          if val != 0
-            raise SystemCallError.new(fun, val)
-          else
-            raise Error, "group '#{gid}' not found"
-          end
+          raise SystemCallError.new(fun, val) if val != 0
+          raise Error, "group '#{gid}' not found"
         end
       rescue Errno::ERANGE # Large groups
         size += 1024

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.3'
+    VERSION = '1.8.4'
 
     private_class_method :new
   end
@@ -23,7 +23,7 @@ case RbConfig::CONFIG['host_os']
     require 'windows/sys/admin'
   when /darwin|mach/i
     require 'darwin/sys/admin'
-  when /bsd/i
+  when /bsd|dragonfly/i
     require 'bsd/sys/admin'
   else
     require 'unix/sys/admin'

data/lib/unix/sys/admin.rb

@@ -9,6 +9,7 @@ require 'sys/admin/common'
 module Sys
   # The Admin class provides a unified, cross platform replacement for the Etc module.
   class Admin
+    # Private wrapper class for a struct passwd.
     class PasswdStruct < FFI::Struct
       layout(
         :pw_name,   :string,
@@ -23,6 +24,7 @@ module Sys
 
     private_constant :PasswdStruct
 
+    # Private wrapper class for a struct group.
     class GroupStruct < FFI::Struct
       layout(
         :gr_name,   :string,

data/spec/spec_helper.rb

@@ -15,7 +15,7 @@ RSpec.configure do |config|
 
     config.filter_run_excluding(:unix)
 
-    config.before(:each, :requires_elevated => true) do
+    config.before(:each, :requires_elevated) do
       skip 'skipped unless administrator privileges' unless Win32::Security.elevated_security?
     end
   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.3')
+    expect(described_class::VERSION).to eq('1.8.4')
   end
 
   example 'version constant is frozen' do

data/spec/sys_admin_unix_spec.rb

@@ -22,7 +22,7 @@ RSpec.describe Sys::Admin, :unix do
       end
 
       example 'get_login returns a string' do
-        expect(described_class.get_login).to be_kind_of(String)
+        expect(described_class.get_login).to be_a(String)
         expect(described_class.get_login.length).to be > 0
       end
     end
@@ -35,11 +35,11 @@ RSpec.describe Sys::Admin, :unix do
       end
 
       example 'get_user with a string argument works as expected' do
-        expect(described_class.get_user(user)).to be_kind_of(Sys::Admin::User)
+        expect(described_class.get_user(user)).to be_a(Sys::Admin::User)
       end
 
       example 'get_user with an integer argument works as expected' do
-        expect(described_class.get_user(user_id)).to be_kind_of(Sys::Admin::User)
+        expect(described_class.get_user(user_id)).to be_a(Sys::Admin::User)
       end
 
       example 'get_user requires at least one argument' do
@@ -63,14 +63,14 @@ RSpec.describe Sys::Admin, :unix do
 
       example 'users returns an array of User objects' do
         users = described_class.users
-        expect(users).to be_kind_of(Array)
-        expect(users).to all(be_kind_of(Sys::Admin::User))
+        expect(users).to be_a(Array)
+        expect(users).to all(be_a(Sys::Admin::User))
       end
 
-      example 'users accepts an optional lastlog argument on darwin', :darwin => true do
+      example 'users accepts an optional lastlog argument on darwin', :darwin do
         users = described_class.users(:lastlog => false)
-        expect(users).to be_kind_of(Array)
-        expect(users).to all(be_kind_of(Sys::Admin::User))
+        expect(users).to be_a(Array)
+        expect(users).to all(be_a(Sys::Admin::User))
         expect(users.first.login_time).to be_nil
       end
     end
@@ -89,11 +89,11 @@ RSpec.describe Sys::Admin, :unix do
       end
 
       example 'get_group accepts a string argument' do
-        expect(described_class.get_group(group)).to be_kind_of(Sys::Admin::Group)
+        expect(described_class.get_group(group)).to be_a(Sys::Admin::Group)
       end
 
       example 'get_group accepts an integer argument' do
-        expect(described_class.get_group(group_id)).to be_kind_of(Sys::Admin::Group)
+        expect(described_class.get_group(group_id)).to be_a(Sys::Admin::Group)
       end
 
       example 'get_group requires one argument only' do
@@ -111,24 +111,24 @@ RSpec.describe Sys::Admin, :unix do
       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
+        allow(described_class).to receive(:getgrgid_r).with(any_args).and_return(34)
+        allow(described_class).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)
+        allow(described_class).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(described_class).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)
+        allow(described_class).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
@@ -141,8 +141,8 @@ RSpec.describe Sys::Admin, :unix do
 
       example 'groups returns an array of Group objects' do
         groups = described_class.groups
-        expect(groups).to be_kind_of(Array)
-        expect(groups).to all(be_kind_of(Sys::Admin::Group))
+        expect(groups).to be_a(Array)
+        expect(groups).to all(be_a(Sys::Admin::Group))
       end
 
       example 'groups method does not accept any arguments' do
@@ -156,103 +156,103 @@ RSpec.describe Sys::Admin, :unix do
       example 'user.name behaves as expected' do
         user = described_class.get_user(user_id)
         expect(user).to respond_to(:name)
-        expect(user.name).to be_kind_of(String)
+        expect(user.name).to be_a(String)
       end
 
       example 'user.passwd behaves as expected' do
         user = described_class.get_user(user_id)
         expect(user).to respond_to(:passwd)
-        expect(user.passwd).to be_kind_of(String)
+        expect(user.passwd).to be_a(String)
       end
 
       example 'user.uid behaves as expected' do
         user = described_class.get_user(user_id)
         expect(user).to respond_to(:uid)
-        expect(user.uid).to be_kind_of(Integer)
+        expect(user.uid).to be_a(Integer)
       end
 
       example 'user.gid behaves as expected' do
         user = described_class.get_user(user_id)
         expect(user).to respond_to(:gid)
-        expect(user.gid).to be_kind_of(Integer)
+        expect(user.gid).to be_a(Integer)
       end
 
       example 'user.dir behaves as expected' do
         user = described_class.get_user(user_id)
         expect(user).to respond_to(:dir)
-        expect(user.dir).to be_kind_of(String)
+        expect(user.dir).to be_a(String)
       end
 
       example 'user.shell behaves as expected' do
         user = described_class.get_user(user_id)
         expect(user).to respond_to(:shell)
-        expect(user.shell).to be_kind_of(String)
+        expect(user.shell).to be_a(String)
       end
 
       example 'user.gecos behaves as expected' do
         user = described_class.get_user(user_id)
         expect(user).to respond_to(:gecos)
-        expect(user.gecos).to be_kind_of(String).or be_nil
+        expect(user.gecos).to be_a(String).or be_nil
       end
 
       example 'user.quota behaves as expected' do
         user = described_class.get_user(user_id)
         expect(user).to respond_to(:quota)
-        expect(user.quota).to be_kind_of(Integer).or be_nil
+        expect(user.quota).to be_a(Integer).or be_nil
       end
 
       example 'user.age behaves as expected' do
         user = described_class.get_user(user_id)
         expect(user).to respond_to(:age)
-        expect(user.age).to be_kind_of(Integer).or be_nil
+        expect(user.age).to be_a(Integer).or be_nil
       end
 
       example 'user.access behaves as expected' do
         user = described_class.get_user(user_id)
         expect(user).to respond_to(:access_class)
-        expect(user.access_class).to be_kind_of(String).or be_nil
+        expect(user.access_class).to be_a(String).or be_nil
       end
 
       example 'user.comment behaves as expected' do
         user = described_class.get_user(user_id)
         expect(user).to respond_to(:comment)
-        expect(user.comment).to be_kind_of(String).or be_nil
+        expect(user.comment).to be_a(String).or be_nil
       end
 
       example 'user.expire behaves as expected' do
         user = described_class.get_user(user_id)
         expect(user).to respond_to(:expire)
-        expect(user.expire).to be_kind_of(Time).or be_nil
+        expect(user.expire).to be_a(Time).or be_nil
       end
 
       example 'user.change behaves as expected' do
         user = described_class.get_user(user_id)
         expect(user).to respond_to(:change)
-        expect(user.change).to be_kind_of(Time).or be_nil
+        expect(user.change).to be_a(Time).or be_nil
       end
 
       example 'user.login_time behaves as expected' do
         user = described_class.get_user(user_id)
         expect(user).to respond_to(:login_time)
-        expect(user.login_time).to be_kind_of(Time).or be_nil
+        expect(user.login_time).to be_a(Time).or be_nil
       end
 
       example 'user.login_device behaves as expected' do
         user = described_class.get_user(user_id)
         expect(user).to respond_to(:login_device)
-        expect(user.login_device).to be_kind_of(String).or be_nil
+        expect(user.login_device).to be_a(String).or be_nil
       end
 
       example 'user.login_host behaves as expected' do
         user = described_class.get_user(user_id)
         expect(user).to respond_to(:login_host)
-        expect(user.login_host).to be_kind_of(String).or be_nil
+        expect(user.login_host).to be_a(String).or be_nil
       end
 
       example 'user.groups behaves as expected' do
         user = described_class.get_user(user_id)
         expect(user).to respond_to(:groups)
-        expect(user.groups).to be_kind_of(Array)
+        expect(user.groups).to be_a(Array)
       end
     end
 
@@ -260,25 +260,25 @@ RSpec.describe Sys::Admin, :unix do
       example 'group.name behaves as expected' do
         group = described_class.get_group(group_id)
         expect(group).to respond_to(:name)
-        expect(group.name).to be_kind_of(String)
+        expect(group.name).to be_a(String)
       end
 
       example 'group.gid behaves as expected' do
         group = described_class.get_group(group_id)
         expect(group).to respond_to(:gid)
-        expect(group.gid).to be_kind_of(Integer)
+        expect(group.gid).to be_a(Integer)
       end
 
       example 'group.members behaves as expected' do
         group = described_class.get_group(group_id)
         expect(group).to respond_to(:members)
-        expect(group.members).to be_kind_of(Array)
+        expect(group.members).to be_a(Array)
       end
 
       example 'group.passwd behaves as expected' do
         group = described_class.get_group(group_id)
         expect(group).to respond_to(:passwd)
-        expect(group.passwd).to be_kind_of(String)
+        expect(group.passwd).to be_a(String)
       end
     end
   end

data/spec/sys_admin_windows_spec.rb

@@ -23,7 +23,7 @@ RSpec.describe Sys::Admin, :windows do
     @group_id   = 546        # best guess, may fail
   end
 
-  describe 'add, configure and delete user', :order => :defined, :requires_elevated => true do
+  describe 'add, configure and delete user', :requires_elevated, :order => :defined do
     before(:all) do
       @local_user = 'foo'
     end
@@ -54,7 +54,7 @@ RSpec.describe Sys::Admin, :windows do
     end
   end
 
-  describe 'add, configure and delete group', :order => :defined, :requires_elevated => true do
+  describe 'add, configure and delete group', :requires_elevated, :order => :defined do
     before(:all) do
       @local_user = 'foo'
       @local_group = 'bar'
@@ -100,7 +100,7 @@ RSpec.describe Sys::Admin, :windows do
       end
 
       example 'get_login returns a string' do
-        expect(described_class.get_login).to be_kind_of(String)
+        expect(described_class.get_login).to be_a(String)
         expect(described_class.get_login.size).to be > 0
       end
 
@@ -116,24 +116,24 @@ RSpec.describe Sys::Admin, :windows do
 
       example 'get_user with string argument works as expected' do
         expect{ described_class.get_user(@user_name, :localaccount => true) }.not_to raise_error
-        expect(described_class.get_user(@user_name, :localaccount => true)).to be_kind_of(Sys::Admin::User)
+        expect(described_class.get_user(@user_name, :localaccount => true)).to be_a(Sys::Admin::User)
       end
 
       example 'get user with integer argument works as expected' do
         expect{ described_class.get_user(@user_id, :localaccount => true) }.not_to raise_error
-        expect(described_class.get_user(@user_id, :localaccount => true)).to be_kind_of(Sys::Admin::User)
+        expect(described_class.get_user(@user_id, :localaccount => true)).to be_a(Sys::Admin::User)
       end
 
       example 'get_user method by string accepts a hash of options' do
         options = {:host => host, :localaccount => true}
         expect{ described_class.get_user(@user_name, options) }.not_to raise_error
-        expect(described_class.get_user(@user_name, options)).to be_kind_of(Sys::Admin::User)
+        expect(described_class.get_user(@user_name, options)).to be_a(Sys::Admin::User)
       end
 
       example 'get_user method by uid accepts a hash of options' do
         options = {:host => host, :localaccount => true}
         expect{ described_class.get_user(@user_id, options) }.not_to raise_error
-        expect(described_class.get_user(@user_id, options)).to be_kind_of(Sys::Admin::User)
+        expect(described_class.get_user(@user_id, options)).to be_a(Sys::Admin::User)
       end
 
       example 'get_user method requires an argument' do
@@ -149,8 +149,8 @@ RSpec.describe Sys::Admin, :windows do
 
       example 'users method returns an array of User objects' do
         users = described_class.users(:localaccount => true)
-        expect(users).to be_kind_of(Array)
-        expect(users).to all(be_kind_of(Sys::Admin::User))
+        expect(users).to be_a(Array)
+        expect(users).to all(be_a(Sys::Admin::User))
       end
     end
 
@@ -161,18 +161,18 @@ RSpec.describe Sys::Admin, :windows do
 
       example 'get_group method returns expected results with a string argument' do
         expect{ described_class.get_group(@group_name, :localaccount => true) }.not_to raise_error
-        expect(described_class.get_group(@group_name, :localaccount => true)).to be_kind_of(Sys::Admin::Group)
+        expect(described_class.get_group(@group_name, :localaccount => true)).to be_a(Sys::Admin::Group)
       end
 
       example 'get_group method returns expected results with an integer argument' do
         expect{ described_class.get_group(@group_id, :localaccount => true) }.not_to raise_error
-        expect(described_class.get_group(@group_id, :localaccount => true)).to be_kind_of(Sys::Admin::Group)
+        expect(described_class.get_group(@group_id, :localaccount => true)).to be_a(Sys::Admin::Group)
       end
 
       example 'get_group method accepts a hash of options' do
         options = {:host => host, :localaccount => true}
         expect{ described_class.get_group(@group_name, options) }.not_to raise_error
-        expect(described_class.get_group(@group_name, options)).to be_kind_of(Sys::Admin::Group)
+        expect(described_class.get_group(@group_name, options)).to be_a(Sys::Admin::Group)
       end
 
       example 'get_group method requires an argument' do
@@ -188,8 +188,8 @@ RSpec.describe Sys::Admin, :windows do
 
       example 'groups method returns an array of Group objects' do
         groups = described_class.groups(:localaccount => true)
-        expect(groups).to be_kind_of(Array)
-        expect(groups).to all(be_kind_of(Sys::Admin::Group))
+        expect(groups).to be_a(Array)
+        expect(groups).to all(be_a(Sys::Admin::Group))
       end
     end
   end
@@ -282,7 +282,7 @@ RSpec.describe Sys::Admin, :windows do
 
     example 'dir method returns either a string or nil' do
       expect{ @user = described_class.get_user(@user_name, :localaccount => true) }.not_to raise_error
-      expect(@user.dir).to be_kind_of(String).or be_kind_of(NilClass)
+      expect(@user.dir).to be_a(String).or be_a(NilClass)
     end
   end
 

data/sys-admin.gemspec

@@ -3,7 +3,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'sys-admin'
-  spec.version    = '1.8.3'
+  spec.version    = '1.8.4'
   spec.author     = 'Daniel J. Berger'
   spec.license    = 'Apache-2.0'
   spec.email      = 'djberg96@gmail.com'
@@ -35,7 +35,8 @@ Gem::Specification.new do |spec|
     'source_code_uri'       => 'https://github.com/djberg96/sys-admin',
     'wiki_uri'              => 'https://github.com/djberg96/sys-admin/wiki',
     'rubygems_mfa_required' => 'true',
-    'github_repo'           => 'https://github.com/djberg96/sys-admin'
+    'github_repo'           => 'https://github.com/djberg96/sys-admin',
+    'funding_uri'           => 'https://github.com/sponsors/djberg96'
   }
 
   spec.description = <<-EOF

metadata

@@ -1,11 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: sys-admin
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.4
 platform: universal-mingw32
 authors:
 - Daniel J. Berger
-autorequire:
 bindir: bin
 cert_chain:
 - |
@@ -35,7 +34,7 @@ cert_chain:
   ORVCZpRuCPpmC8qmqxUnARDArzucjaclkxjLWvCVHeFa9UP7K3Nl9oTjJNv+7/jM
   WZs4eecIcUc4tKdHxcAJ0MO/Dkqq7hGaiHpwKY76wQ1+8xAh
   -----END CERTIFICATE-----
-date: 2024-04-20 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -170,7 +169,7 @@ metadata:
   wiki_uri: https://github.com/djberg96/sys-admin/wiki
   rubygems_mfa_required: 'true'
   github_repo: https://github.com/djberg96/sys-admin
-post_install_message:
+  funding_uri: https://github.com/sponsors/djberg96
 rdoc_options: []
 require_paths:
 - lib
@@ -185,8 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.7
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: A unified, cross platform replacement for the "etc" library.
 test_files: