sys-filesystem 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef992a58a28ea604cbcce569c09abaee7212b04dbe7f7d0fd6b69d7ce4d62835
-  data.tar.gz: f51965f0faec2fb982893f002c01d4499424d4838d7550cf44ff99c1ca859ea4
+  metadata.gz: 3b00e624e22bd699630d63b34f90be7758f82630a069f7db2a61e2139cb55888
+  data.tar.gz: 59add440f0203bade0430b2acd410e785b4ab0de416f272755a72db9276aa767
 SHA512:
-  metadata.gz: 41001e2db9ba3048671910f0f4ebb264b781ef509d682353a02116434308386ad6c363a6409c311696729a28ea7fafa5edaf042f7f118485f0e31b0f5633c9e2
-  data.tar.gz: 53e972089622fae12ad436e6634988d60fab6f271c391fc122d670c53cbc8d91312a4ba659d0e5f3e709bbaaf1969e4a9cb61ca2dd9b7e9152be478d0ae5347c
+  metadata.gz: eb24f3c965a15d090fd7fff5800cc4c1829a7ddc7f2cbc4e943bb7e57ae92749a6abfccfecd94e8522287e9700916fc22f57af164afa413459321fa9460ba9a3
+  data.tar.gz: d5d30e84e01f370ac62b77251f2c80c07964a99bebfa0cc30252237bc33830198d3a065c28a546c230327b1b951d45d95bc309f75276d17d7e1e8968ade216f2

data/CHANGES.md

@@ -1,3 +1,11 @@
+## 1.4.3 - 20-Oct-2021
+* Another fix for 32-bit vs 64-bit Linux since it was realized we cannot always
+  rely on the host architecture information. Handling for JRuby was improved
+  as well. Thanks go to Scott Bradnick for the spot. 
+* The constructor is now explicitly private. This class was never meant to
+  actually be instantiated.
+* Updated the MANIFEST.md file.
+
 ## 1.4.2 - 22-Jul-2021
 * Fixed support for 32-bit Linux. Thanks go to ciprianbadescu for the spot.
 

data/Gemfile

@@ -1,3 +1,2 @@
-source 'https://rubygems.org' do
-  gemspec
-end
+source 'https://rubygems.org'
+gemspec

data/MANIFEST.md

@@ -1,11 +1,12 @@
-* CHANGES.rdoc
+* CHANGES.md
 * Gemfile
 * LICENSE
-* MANIFEST.rdoc
+* MANIFEST.md
 * Rakefile
-* README.rdoc
+* README.md
 * sys-fileystem.gemspec
 * certs/djberg96_pub.pem
+* examples/example_mount.rb
 * examples/example_stat.rb
 * lib/sys-filesystem.rb
 * lib/sys/filesystem.rb
@@ -17,6 +18,6 @@
 * lib/sys/windows/sys/filesystem/constants.rb
 * lib/sys/windows/sys/filesystem/functions.rb
 * lib/sys/windows/sys/filesystem/helper.rb
-* test/test_sys_filesystem.rb
-* test/test_sys_filesystem_unix
-* test/test_sys_filesystem_windows
+* spec/spec_helper.rb
+* spec/sys_filesystem_unix_spec.rb
+* spec/sys_filesystem_windows_spec.rb

data/README.md

@@ -8,6 +8,9 @@ A cross platform Ruby interface for getting file system information.
 
 `gem install sys-filesystem`
 
+## Adding the trusted cert
+`gem cert --add <(curl -Ls https://raw.githubusercontent.com/djberg96/sys-filesystem/main/certs/djberg96_pub.pem)`
+
 ## Synopsis
 
 ```ruby

data/lib/sys/filesystem.rb

@@ -1,7 +1,7 @@
 module Sys
   class Filesystem
     # The version of the sys-filesystem library
-    VERSION = '1.4.2'.freeze
+    VERSION = '1.4.3'.freeze
   end
 end
 

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

@@ -7,9 +7,20 @@ module Sys
 
       ffi_lib FFI::Library::LIBC
 
+      def self.linux64?
+        if RUBY_PLATFORM == 'java'
+          ENV_JAVA['sun.arch.data.model'].to_i == 64
+        else
+          RbConfig::CONFIG['host_os'] =~ /linux/i &&
+            (RbConfig::CONFIG['arch'] =~ /64/ || RbConfig::CONFIG['DEFS'] =~ /64/)
+        end
+      end
+
+      private_class_method :linux64?
+
       if RbConfig::CONFIG['host_os'] =~ /sunos|solaris/i
         attach_function(:statvfs, :statvfs64, %i[string pointer], :int)
-      elsif RbConfig::CONFIG['host_os'] =~ /linux/i && RbConfig::CONFIG['arch'] =~ /64/
+      elsif linux64?
         attach_function(:statvfs, :statvfs64, %i[string pointer], :int)
       else
         attach_function(:statvfs, %i[string pointer], :int)

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

@@ -6,6 +6,17 @@ module Sys
     module Structs
       class Statfs < FFI::Struct
 
+        def self.linux64?
+          if RUBY_PLATFORM == 'java'
+            ENV_JAVA['sun.arch.data.model'].to_i == 64
+          else
+            RbConfig::CONFIG['host_os'] =~ /linux/i &&
+              (RbConfig::CONFIG['arch'] =~ /64/ || RbConfig::CONFIG['DEFS'] =~ /64/)
+          end
+        end
+
+        private_class_method :linux64?
+
         # FreeBSD 12.0 MNAMELEN from 88 => 1024.
         MNAMELEN =
           if RbConfig::CONFIG['host_os'] =~ /freebsd(.*)/i
@@ -40,7 +51,7 @@ module Sys
             :f_mntonname, [:char, MNAMELEN]
           )
         elsif RbConfig::CONFIG['host_os'] =~ /linux/i
-          if RbConfig::CONFIG['arch'] =~ /64/
+          if linux64?
             layout(
               :f_type, :ulong,
               :f_bsize, :ulong,

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

@@ -11,6 +11,8 @@ module Sys
     include Sys::Filesystem::Structs
     extend Sys::Filesystem::Functions
 
+    private_class_method :new
+
     # Readable versions of constant names
     OPT_NAMES = {
       MNT_RDONLY => 'read-only',

data/lib/sys/windows/sys/filesystem.rb

@@ -18,6 +18,8 @@ module Sys
     # Error typically raised if any of the Sys::Filesystem methods fail.
     class Error < StandardError; end
 
+    private_class_method :new
+
     class Mount
       # The name of the volume. This is the device mapping.
       attr_reader :name

data/spec/sys_filesystem_unix_spec.rb

@@ -21,10 +21,14 @@ RSpec.describe Sys::Filesystem, :unix => true do
   end
 
   example "version number is set to the expected value" do
-    expect(Sys::Filesystem::VERSION).to eq('1.4.2')
+    expect(Sys::Filesystem::VERSION).to eq('1.4.3')
     expect(Sys::Filesystem::VERSION).to be_frozen
   end
 
+  example "you cannot instantiate an instance" do
+    expect{ described_class.new }.to raise_error(NoMethodError)
+  end
+
   example "stat path works as expected" do
     expect(@stat).to respond_to(:path)
     expect(@stat.path).to eq(root)

data/spec/sys_filesystem_windows_spec.rb

@@ -17,10 +17,14 @@ RSpec.describe Sys::Filesystem, :windows => true do
   end
 
   example "version number is set to the expected value" do
-    expect(Sys::Filesystem::VERSION).to eq('1.4.2')
+    expect(Sys::Filesystem::VERSION).to eq('1.4.3')
     expect(Sys::Filesystem::VERSION).to be_frozen
   end
 
+  example "you cannot instantiate an instance" do
+    expect{ described_class.new }.to raise_error(NoMethodError)
+  end
+
   example "stat path works as expected" do
     expect(@stat).to respond_to(:path)
     expect(@stat.path).to eq(root)

data/sys-filesystem.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'sys-filesystem'
-  spec.version    = '1.4.2'
+  spec.version    = '1.4.3'
   spec.author     = 'Daniel J. Berger'
   spec.email      = 'djberg96@gmail.com'
   spec.homepage   = 'https://github.com/djberg96/sys-filesystem'

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: sys-filesystem
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Daniel J. Berger
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
@@ -35,7 +35,7 @@ cert_chain:
   ORVCZpRuCPpmC8qmqxUnARDArzucjaclkxjLWvCVHeFa9UP7K3Nl9oTjJNv+7/jM
   WZs4eecIcUc4tKdHxcAJ0MO/Dkqq7hGaiHpwKY76wQ1+8xAh
   -----END CERTIFICATE-----
-date: 2021-07-22 00:00:00.000000000 Z
+date: 2021-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -134,7 +134,7 @@ metadata:
   documentation_uri: https://github.com/djberg96/sys-filesystem/wiki
   source_code_uri: https://github.com/djberg96/sys-filesystem
   wiki_uri: https://github.com/djberg96/sys-filesystem/wiki
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -149,8 +149,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.2.29
+signing_key:
 specification_version: 4
 summary: A Ruby interface for getting file system information.
 test_files:

metadata.gz.sig

@@ -1,3 +1 @@
-�~)g`؆�'��iI��uԂS)�
-L��"5�ފ�rȥ�5�/����E9������,;}̡������h�'Sp|q�IlB2Z�p�L��k�XzyV����\�Ҩnx������b��*r������))`�!��rr_����{hkB=8���
-���]�L��a��yc�pkS�L�oGO�b��qR�?1;O�
J&�����&���M�@BU�{>��[����p��i"S}
-�����٤��a�,Q'3"�%�|,YU���j��B�J���RȎ�-��E>�A=i��e�%���b9d\�C~� !%���;�:F��,�u�\��=΁2.�4ݿ]�@�O�Ϭs,Yi���i��wUt��T=�������
+�)Q�ge�����
�@������F`FT"��1�O&���j$�<�O/>�D�n�3�`s��8�,���,�$"p%���sG
��?�F�~i�K0�Ю#�b��^�>�0�",Y�v "L��P�lW��l�2�]О+Kɦ��M"�o���ݞ�>��D�M��*��*ݷu����4�:Z��tv&GiɊD�?Ệε\���QI�8��]Do89��l/���7��Q���q�$��l@�ᗆ��x��[H[�y�HWя���-�;������)1}��+�PpxMwM���Y2�#�����'y;��μ���>��`�k�����c[��Zo�}+�\
V_�X�=�R���~�O���K������gN�c�Z��O�