sys-filesystem 1.5.2 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70493df8ed3722f3da6776ef9c1c287f992e9fcec64852e11b6fe04e64a7e73e
-  data.tar.gz: 0c924d1aca503181261bdbd1b73ed2e20eecc55293cdff2a9c8b54465859e652
+  metadata.gz: 43744bef5f8edef84a4b282c900460fd5aefb7f2d9650e5259d5b0f8a8fae97a
+  data.tar.gz: 6eddc2f29fb509209addc117e4a9ad4ff80e64f11cb71b9db54672dfefeba4eb
 SHA512:
-  metadata.gz: 827b599edce400ecb52221ab8d279269811f03beb9cc4440182334e5231426b75ca8b98addc10bfbdc2d1a45cc3a39ebb3d21a1f71e5f014d1053439845dd5a1
-  data.tar.gz: d66206e8a76a5be307c71e01a57158a49381e7699dfda4e84364dd0a44e40f8345d7a8e9e33318a6fb20f864cfbb8d86d85972d7433398cdfd510aac3e23b443
+  metadata.gz: 59800ffa5e85934f3cc4f360c6cde04168deb1d9b5790750f8584332d2fba5bdf2c8019d1e05261bd3ac71858c3488c8d80a65c2cf4fc4fb2c6db6e032cf2461
+  data.tar.gz: 001fb9676236d2916836e4690cfdaa8bfb838328c43e1c31fa07669f3da4bba3e814a35cc55122ca825fd7c22c90e24d8ea385bc3d9c70548363b8cfa4594def

data/CHANGES.md

@@ -1,3 +1,15 @@
+## 1.5.4 - 7-Sep-2025
+* Added a fallback check for 64-bit Linux in case the config info doesn't
+  include "64" anywhere in it. Thanks go to Chris Hofstaedtler for the
+  report.
+
+## 1.5.3 - 3-Oct-2024
+* Decided to unroll the changes in 1.5.2 because doing runtime compiler
+  checks was making more people unhappy than happy, and I already had
+  some misgivings about it.
+* Updated the README.md to note the issues with running 32-bit Ruby with
+  64-bit offsets. At the moment I think this mainly only affects arch Linux.
+
 ## 1.5.2 - 30-Sep-2024
 * Forgot to switch mkmf-lite from a dev dependency to a runtime dependency.
   Thanks go to Thomas Langé for the spot and patch.

data/README.md

@@ -55,16 +55,19 @@ with JRuby, too.
 Run 'rake example' if you want to see a basic sample run. The actual code
 is 'example_stat.rb' in the 'examples' directory. Modify it as you see fit.
 
-## Known Bugs
+## Known Issues
 
-None that I'm aware of. Please report bugs on the project page at:
+Currently this may not work if you're running a 32-bit system with 64-bit offsets:
+
+  https://github.com/djberg96/sys-filesystem/issues/71
+
+Please report any other issues on the project home page at:
 
   https://github.com/djberg96/sys-filesystem
 
 ## Future Plans
 
-* Add better 64-bit support for Linux and BSD.
-* Other suggestions welcome.
+* Suggestions welcome.
 
 ## Acknowledgements
 
@@ -78,7 +81,7 @@ Apache-2.0
 
 ## Copyright
 
-(C) 2003-2024 Daniel J. Berger
+(C) 2003-2025 Daniel J. Berger
 All Rights Reserved
 
 ## Warranty

data/Rakefile

@@ -39,7 +39,10 @@ namespace :rubocop do
 end
 
 desc "Run the test suite"
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.verbose = false
+  t.rspec_opts = '-f documentation'
+end
 
 # Clean up afterwards
 Rake::Task[:spec].enhance do

data/lib/sys/filesystem.rb

@@ -16,7 +16,7 @@ module Sys
   # return objects of other types. Do not instantiate.
   class Filesystem
     # The version of the sys-filesystem library
-    VERSION = '1.5.2'
+    VERSION = '1.5.4'
 
     # Stat objects are returned by the Sys::Filesystem.stat method. Here
     # we're adding universal methods.

data/lib/sys/unix/sys/filesystem/functions.rb

@@ -16,7 +16,7 @@ module Sys
             ENV_JAVA['sun.arch.data.model'].to_i == 64
         else
           RbConfig::CONFIG['host_os'] =~ /linux/i &&
-            (RbConfig::CONFIG['arch'] =~ /64/ || RbConfig::CONFIG['DEFS'] =~ /64/)
+            (RbConfig::CONFIG['arch'] =~ /64/ || RbConfig::CONFIG['DEFS'] =~ /64/ || [nil].pack('P').size == 8)
         end
       end
 

data/lib/sys/unix/sys/filesystem/structs.rb

@@ -28,7 +28,7 @@ module Sys
             ENV_JAVA['sun.arch.data.model'].to_i == 64
           else
             RbConfig::CONFIG['host_os'] =~ /linux/i &&
-              (RbConfig::CONFIG['arch'] =~ /64/ || RbConfig::CONFIG['DEFS'] =~ /64/)
+              (RbConfig::CONFIG['arch'] =~ /64/ || RbConfig::CONFIG['DEFS'] =~ /64/ || [nil].pack('P').size == 8)
           end
         end
 
@@ -155,7 +155,7 @@ module Sys
             ENV_JAVA['sun.arch.data.model'].to_i == 64
           else
             RbConfig::CONFIG['host_os'] =~ /linux/i &&
-              (RbConfig::CONFIG['arch'] =~ /64/ || RbConfig::CONFIG['DEFS'] =~ /64/)
+              (RbConfig::CONFIG['arch'] =~ /64/ || RbConfig::CONFIG['DEFS'] =~ /64/ || [nil].pack('P').size == 8)
           end
         end
 
@@ -227,9 +227,7 @@ module Sys
             :f_spare, [:int, 5]
           )
         else
-          require 'mkmf-lite'
-          extend Mkmf::Lite
-          layout_array = [
+          layout(
             :f_bsize, :ulong,
             :f_frsize, :ulong,
             :f_blocks, :uint64,
@@ -243,16 +241,7 @@ module Sys
             :f_namemax, :ulong,
             :f_type, :uint,
             :f_spare, [:int, 5]
-          ]
-
-          # Check if we need to add __f_unused
-          f_unused_bytes = 2 * check_sizeof('int') - check_sizeof('long')
-          if f_unused_bytes > 0
-            # For Big Endian, this should be inserted at -9
-            layout_array.insert(-7, :__f_unused, [:char, f_unused_bytes])
-          end
-
-          layout(*layout_array)
+          )
         end
       end
 

data/spec/sys_filesystem_shared.rb

@@ -4,7 +4,7 @@ require 'sys-filesystem'
 
 RSpec.shared_examples Sys::Filesystem do
   example 'version number is set to the expected value' do
-    expect(Sys::Filesystem::VERSION).to eq('1.5.2')
+    expect(Sys::Filesystem::VERSION).to eq('1.5.4')
     expect(Sys::Filesystem::VERSION).to be_frozen
   end
 

data/spec/sys_filesystem_unix_spec.rb

@@ -524,4 +524,218 @@ RSpec.describe Sys::Filesystem, :unix do
       expect(Sys::Filesystem::Functions.attached_functions[:statvfs64]).to be_nil
     end
   end
+
+  describe 'linux64? method' do
+    let(:functions_class) { Sys::Filesystem::Functions }
+
+    # Helper method to test linux64? with mocked config
+    def test_linux64_with_config(host_os, pointer_size, ruby_platform = nil, java_arch = nil)
+      # Mock RbConfig::CONFIG
+      allow(RbConfig::CONFIG).to receive(:[]).and_call_original
+      allow(RbConfig::CONFIG).to receive(:[]).with('host_os').and_return(host_os)
+
+      # When running under JRuby, we need to handle it differently
+      if RUBY_PLATFORM == 'java'
+        # Under JRuby, always mock ENV_JAVA since that's the path the code will take
+        if java_arch
+          # This is a JRuby-specific test
+          allow(ENV_JAVA).to receive(:[]).with('sun.arch.data.model').and_return(java_arch.to_s)
+        else
+          # This is meant to test regular Ruby logic, but under JRuby we need to mock ENV_JAVA
+          # to make it take the "regular Ruby" path by returning nil/empty
+          expected_arch = pointer_size == 8 ? '64' : '32'
+          allow(ENV_JAVA).to receive(:[]).with('sun.arch.data.model').and_return(expected_arch)
+        end
+      else
+        # Running under regular Ruby
+        # Determine arch and DEFS based on host_os for the new multi-check approach
+        if pointer_size == 8
+          # For 64-bit systems, make arch contain "64"
+          arch_value = host_os.include?('64') ? host_os : host_os + '64'
+          defs_value = '-DSOMETHING=1'
+        else
+          # For 32-bit systems, ensure neither arch nor DEFS contain "64"
+          arch_value = host_os.gsub(/64/, '32')
+          defs_value = '-DSOMETHING=1'
+        end
+
+        allow(RbConfig::CONFIG).to receive(:[]).with('arch').and_return(arch_value)
+        allow(RbConfig::CONFIG).to receive(:[]).with('DEFS').and_return(defs_value)
+
+        if ruby_platform == 'java'
+          # Mock RUBY_PLATFORM for JRuby tests
+          stub_const('RUBY_PLATFORM', 'java')
+
+          # Mock ENV_JAVA for JRuby
+          env_java_mock = double('ENV_JAVA')
+          allow(env_java_mock).to receive(:[]).with('sun.arch.data.model').and_return(java_arch.to_s)
+          stub_const('ENV_JAVA', env_java_mock)
+        else
+          # Mock the pack method for regular Ruby (last resort check)
+          packed_data = 'x' * pointer_size
+          allow_any_instance_of(Array).to receive(:pack).with('P').and_return(packed_data)
+        end
+      end
+
+      functions_class.send(:linux64?)
+    end
+
+    context 'with different Linux distributions on 64-bit architectures' do
+      let(:linux_distros) do
+        {
+          'x86_64-linux-gnu' => 'Ubuntu/Debian x86_64',
+          'x86_64-pc-linux-gnu' => 'Generic x86_64 Linux',
+          'aarch64-linux-gnu' => 'ARM64 (Raspberry Pi 4, AWS Graviton)',
+          's390x-linux-gnu' => 'IBM Z mainframe',
+          'powerpc64le-linux-gnu' => 'POWER8/9 little-endian',
+          'powerpc64-linux-gnu' => 'POWER8/9 big-endian',
+          'mips64el-linux-gnuabi64' => 'MIPS64 little-endian',
+          'alpha-linux-gnu' => 'DEC Alpha',
+          'sparc64-linux-gnu' => 'SPARC64',
+          'riscv64-linux-gnu' => 'RISC-V 64-bit'
+        }
+      end
+
+      it 'returns true for 64-bit Linux systems' do
+        linux_distros.each do |host_os, description|
+          result = test_linux64_with_config(host_os, 8)
+          expect(result).to be_truthy, "Expected linux64? to return true for #{host_os} (#{description})"
+        end
+      end
+    end
+
+    context 'with different Linux distributions on 32-bit architectures' do
+      let(:linux_32bit_distros) do
+        {
+          'i386-linux-gnu' => '32-bit x86',
+          'i486-linux-gnu' => '32-bit x86',
+          'i586-linux-gnu' => '32-bit x86',
+          'i686-linux-gnu' => '32-bit x86',
+          'arm-linux-gnueabihf' => 'ARM 32-bit hard-float',
+          'armv7l-linux-gnueabihf' => 'ARMv7 32-bit',
+          'mips-linux-gnu' => 'MIPS 32-bit',
+          'mipsel-linux-gnu' => 'MIPS 32-bit little-endian',
+          'powerpc-linux-gnu' => 'PowerPC 32-bit',
+          's390-linux-gnu' => 'IBM S/390 32-bit'
+        }
+      end
+
+      it 'returns false for 32-bit Linux systems' do
+        linux_32bit_distros.each do |host_os, description|
+          result = test_linux64_with_config(host_os, 4)
+          expect(result).to be_falsey, "Expected linux64? to return false for #{host_os} (#{description})"
+        end
+      end
+    end
+
+    context 'with non-Linux operating systems' do
+      let(:non_linux_os) do
+        {
+          'darwin21.6.0' => 'macOS',
+          'freebsd13.1' => 'FreeBSD',
+          'openbsd7.2' => 'OpenBSD',
+          'netbsd9.3' => 'NetBSD',
+          'dragonfly6.4' => 'DragonFlyBSD',
+          'solaris2.11' => 'Solaris',
+          'aix7.2.0.0' => 'AIX',
+          'mingw32' => 'Windows MSYS2',
+          'cygwin' => 'Cygwin'
+        }
+      end
+
+      it 'returns false for non-Linux systems regardless of architecture' do
+        non_linux_os.each do |host_os, description|
+          # Test both 32-bit and 64-bit scenarios
+          [4, 8].each do |pointer_size|
+            result = test_linux64_with_config(host_os, pointer_size)
+            expect(result).to be_falsey,
+              "Expected linux64? to return false for #{host_os} (#{description}) with #{pointer_size * 8}-bit pointers"
+          end
+        end
+      end
+    end
+
+    context 'with JRuby on different platforms' do
+      it 'returns true for 64-bit Linux on JRuby' do
+        result = test_linux64_with_config('x86_64-linux-gnu', nil, 'java', 64)
+        expect(result).to be_truthy
+      end
+
+      it 'returns false for 32-bit Linux on JRuby' do
+        result = test_linux64_with_config('i386-linux-gnu', nil, 'java', 32)
+        expect(result).to be_falsey
+      end
+
+      it 'returns false for non-Linux systems on JRuby' do
+        result = test_linux64_with_config('darwin21.6.0', nil, 'java', 64)
+        expect(result).to be_falsey
+      end
+    end
+
+    context 'edge cases' do
+      it 'handles case-insensitive Linux detection' do
+        ['LINUX-gnu', 'Linux-gnu', 'linux-GNU'].each do |host_os|
+          result = test_linux64_with_config(host_os, 8)
+          expect(result).to be_truthy, "Expected linux64? to handle case-insensitive matching for #{host_os}"
+        end
+      end
+
+      it 'handles partial Linux matches in host_os string' do
+        ['some-linux-variant', 'embedded-linux-system', 'custom-linux-build'].each do |host_os|
+          result = test_linux64_with_config(host_os, 8)
+          expect(result).to be_truthy, "Expected linux64? to match partial Linux strings for #{host_os}"
+        end
+      end
+    end
+
+    context 'multi-check priority order', unless: RUBY_PLATFORM == 'java' do
+      it 'uses arch check first when arch contains 64' do
+        allow(RbConfig::CONFIG).to receive(:[]).and_call_original
+        allow(RbConfig::CONFIG).to receive(:[]).with('host_os').and_return('x86_64-linux-gnu')
+        allow(RbConfig::CONFIG).to receive(:[]).with('arch').and_return('x86_64-linux')
+        allow(RbConfig::CONFIG).to receive(:[]).with('DEFS').and_return('')
+
+        # Should not need to call pack method since arch check succeeds
+        expect_any_instance_of(Array).not_to receive(:pack)
+
+        expect(functions_class.send(:linux64?)).to be_truthy
+      end
+
+      it 'uses DEFS check when arch does not contain 64 but DEFS does' do
+        allow(RbConfig::CONFIG).to receive(:[]).and_call_original
+        allow(RbConfig::CONFIG).to receive(:[]).with('host_os').and_return('special-linux-gnu')
+        allow(RbConfig::CONFIG).to receive(:[]).with('arch').and_return('special-linux')
+        allow(RbConfig::CONFIG).to receive(:[]).with('DEFS').and_return('-D__LP64__=1')
+
+        # Should not need to call pack method since DEFS check succeeds
+        expect_any_instance_of(Array).not_to receive(:pack)
+
+        expect(functions_class.send(:linux64?)).to be_truthy
+      end
+
+      it 'falls back to pack method when neither arch nor DEFS contain 64' do
+        allow(RbConfig::CONFIG).to receive(:[]).and_call_original
+        allow(RbConfig::CONFIG).to receive(:[]).with('host_os').and_return('custom-linux-gnu')
+        allow(RbConfig::CONFIG).to receive(:[]).with('arch').and_return('custom-linux')
+        allow(RbConfig::CONFIG).to receive(:[]).with('DEFS').and_return('-DSOMETHING=1')
+
+        # Should call pack method as last resort
+        allow_any_instance_of(Array).to receive(:pack).with('P').and_return('12345678')
+
+        expect(functions_class.send(:linux64?)).to be_truthy
+      end
+
+      it 'returns false when all checks fail on 32-bit' do
+        allow(RbConfig::CONFIG).to receive(:[]).and_call_original
+        allow(RbConfig::CONFIG).to receive(:[]).with('host_os').and_return('custom-linux-gnu')
+        allow(RbConfig::CONFIG).to receive(:[]).with('arch').and_return('custom-linux')
+        allow(RbConfig::CONFIG).to receive(:[]).with('DEFS').and_return('-DSOMETHING=1')
+
+        # Pack method returns 4 bytes (32-bit)
+        allow_any_instance_of(Array).to receive(:pack).with('P').and_return('1234')
+
+        expect(functions_class.send(:linux64?)).to be_falsey
+      end
+    end
+  end
 end

data/sys-filesystem.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'sys-filesystem'
-  spec.version    = '1.5.2'
+  spec.version    = '1.5.4'
   spec.author     = 'Daniel J. Berger'
   spec.email      = 'djberg96@gmail.com'
   spec.homepage   = 'https://github.com/djberg96/sys-filesystem'
@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.cert_chain = Dir['certs/*']
    
   spec.add_dependency('ffi', '~> 1.1')
-  spec.add_dependency('mkmf-lite', '~> 0.7') unless Gem.win_platform?
+  spec.add_development_dependency('mkmf-lite', '~> 0.7') unless Gem.win_platform?
   spec.add_development_dependency('rake')
   spec.add_development_dependency('rspec', '~> 3.9')
   spec.add_development_dependency('rubocop')
@@ -31,7 +31,8 @@ Gem::Specification.new do |spec|
     'source_code_uri'       => 'https://github.com/djberg96/sys-filesystem',
     'wiki_uri'              => 'https://github.com/djberg96/sys-filesystem/wiki',
     'rubygems_mfa_required' => 'true',
-    'github_repo'           => 'https://github.com/djberg96/sys-filesystem' 
+    'github_repo'           => 'https://github.com/djberg96/sys-filesystem',
+    'funding_uri'           => 'https://github.com/sponsors/djberg96'
   }
 
   spec.description = <<-EOF

metadata

@@ -1,11 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: sys-filesystem
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.4
 platform: ruby
 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-09-30 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -58,7 +57,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -165,7 +164,7 @@ metadata:
   wiki_uri: https://github.com/djberg96/sys-filesystem/wiki
   rubygems_mfa_required: 'true'
   github_repo: https://github.com/djberg96/sys-filesystem
-post_install_message:
+  funding_uri: https://github.com/sponsors/djberg96
 rdoc_options: []
 require_paths:
 - lib
@@ -180,8 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A Ruby interface for getting file system information.
 test_files: