sys-filesystem 1.5.0 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e69ef4806a64a956dfd3b1eb629a17654d7b14a5a8ed8468113f8ee045287682
-  data.tar.gz: 54182b67d58e77fc0c4b0dc8c96aa7ab64f5c7759943e966abd77d1ba212bfb8
+  metadata.gz: 70493df8ed3722f3da6776ef9c1c287f992e9fcec64852e11b6fe04e64a7e73e
+  data.tar.gz: 0c924d1aca503181261bdbd1b73ed2e20eecc55293cdff2a9c8b54465859e652
 SHA512:
-  metadata.gz: 496090ea1ac8ef0b3d3fe55489b3e3f7eeb39f0406135ebdc3dfc650c0ea16c2e010a8eafb8ffb47e837b4be79217311c1d0e7cd71bb0c3ee81d189a8b7e54ca
-  data.tar.gz: fa6242583cf58ea04fa2fc2581030fcc53e62c7871852ffd3105caa8e363685b1521a056ee0a292327a75c497720dd934c23bd7d58d9687157c8265eeac64833
+  metadata.gz: 827b599edce400ecb52221ab8d279269811f03beb9cc4440182334e5231426b75ca8b98addc10bfbdc2d1a45cc3a39ebb3d21a1f71e5f014d1053439845dd5a1
+  data.tar.gz: d66206e8a76a5be307c71e01a57158a49381e7699dfda4e84364dd0a44e40f8345d7a8e9e33318a6fb20f864cfbb8d86d85972d7433398cdfd510aac3e23b443

data/CHANGES.md

@@ -1,3 +1,15 @@
+## 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.
+
+## 1.5.1 - 29-Sep-2024
+* Add the f_type struct member to the Statvfs struct for Linux. This was added
+  at some point in the Linux lifecycle, though may still be blank depending on
+  your platform. Thanks go to Tasos Sahanidis for the patch.
+* Added padding on 32-bit Statvfs struct with 64-bit offsets for Linux. Thanks
+  go Tasos Sahanidis again for this update.
+* Bumped mkmf-lite dependency since the changes were needed to support the above.
+
 ## 1.5.0 - 8-Jun-2024
 * Add support for DragonFlyBSD.
 * Remove Solaris support. It's dead, Jim.

data/Rakefile

@@ -41,4 +41,9 @@ end
 desc "Run the test suite"
 RSpec::Core::RakeTask.new(:spec)
 
+# Clean up afterwards
+Rake::Task[:spec].enhance do
+  Rake::Task[:clean].invoke
+end
+
 task :default => :spec

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.0'
+    VERSION = '1.5.2'
 
     # Stat objects are returned by the Sys::Filesystem.stat method. Here
     # we're adding universal methods.

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

@@ -123,7 +123,7 @@ module Sys
               :f_spares1, :short,
               :f_mntfromname, [:char, 80],
               :f_spares2, :short,
-              :f_spare, [:long,2]
+              :f_spare, [:long, 2]
             )
           else
             layout(
@@ -223,10 +223,13 @@ module Sys
             :f_unused, :int,
             :f_flag, :ulong,
             :f_namemax, :ulong,
-            :f_spare, [:int, 6]
+            :f_type, :uint,
+            :f_spare, [:int, 5]
           )
         else
-          layout(
+          require 'mkmf-lite'
+          extend Mkmf::Lite
+          layout_array = [
             :f_bsize, :ulong,
             :f_frsize, :ulong,
             :f_blocks, :uint64,
@@ -238,8 +241,18 @@ module Sys
             :f_fsid, :ulong,
             :f_flag, :ulong,
             :f_namemax, :ulong,
-            :f_spare, [:int, 6]
-          )
+            :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/lib/sys/unix/sys/filesystem.rb

@@ -105,9 +105,6 @@ module Sys
       # The filesystem type, e.g. UFS.
       attr_accessor :base_type
 
-      # The filesystem ID
-      attr_accessor :filesystem_id
-
       # The filesystem type
       attr_accessor :filesystem_type
 
@@ -275,8 +272,8 @@ module Sys
       if RbConfig::CONFIG['host_os'] =~ /dragonfly/i
         obj.owner = fs[:f_owner]
         obj.filesystem_type = fs[:f_type]
-        obj.sync_reads= fs[:f_syncreads]
-        obj.async_reads= fs[:f_asyncreads]
+        obj.sync_reads = fs[:f_syncreads]
+        obj.async_reads = fs[:f_asyncreads]
         obj.sync_writes = fs[:f_syncwrites]
         obj.async_writes = fs[:f_asyncwrites]
       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.0')
+    expect(Sys::Filesystem::VERSION).to eq('1.5.2')
     expect(Sys::Filesystem::VERSION).to be_frozen
   end
 

data/spec/sys_filesystem_unix_spec.rb

@@ -10,7 +10,7 @@ require 'spec_helper'
 require 'sys-filesystem'
 require 'pathname'
 
-RSpec.describe Sys::Filesystem, :unix => true do
+RSpec.describe Sys::Filesystem, :unix do
   let(:linux)   { RbConfig::CONFIG['host_os'] =~ /linux/i }
   let(:bsd)     { RbConfig::CONFIG['host_os'] =~ /bsd|dragonfly/i }
   let(:darwin)  { RbConfig::CONFIG['host_os'] =~ /mac|darwin/i }

data/spec/sys_filesystem_windows_spec.rb

@@ -10,7 +10,7 @@ require 'spec_helper'
 require 'sys/filesystem'
 require 'pathname'
 
-RSpec.describe Sys::Filesystem, :windows => true do
+RSpec.describe Sys::Filesystem, :windows do
   let(:root) { 'C:/' }
 
   before do

data/sys-filesystem.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'sys-filesystem'
-  spec.version    = '1.5.0'
+  spec.version    = '1.5.2'
   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_development_dependency('mkmf-lite', '~> 0.5') unless Gem.win_platform?
+  spec.add_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')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sys-filesystem
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.2
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -35,7 +35,7 @@ cert_chain:
   ORVCZpRuCPpmC8qmqxUnARDArzucjaclkxjLWvCVHeFa9UP7K3Nl9oTjJNv+7/jM
   WZs4eecIcUc4tKdHxcAJ0MO/Dkqq7hGaiHpwKY76wQ1+8xAh
   -----END CERTIFICATE-----
-date: 2024-06-09 00:00:00.000000000 Z
+date: 2024-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -57,14 +57,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :development
+        version: '0.7'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -180,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: A Ruby interface for getting file system information.