sys-filesystem 1.1.7 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9095d7fbf62ef5ff5cca1f6c4b43439a72e1f7b
-  data.tar.gz: e93c09ed0f9f0e14abdbb22ba617d418214b8252
+  metadata.gz: 3ab3e7d37b096548a4fab240e6416776c8068c43
+  data.tar.gz: 1f515589a8a40d73754f2b50b29d12f9a4015b51
 SHA512:
-  metadata.gz: 513de924e461b85b1c2acc623e90c58bd917bf15320f787ea56d65fa5008705a4dca2ca8227ab68d0861892a19e92e47a7a961c3aba102c69a3e71512f298c33
-  data.tar.gz: c3f334218d63293a9bff63cf31bc630a3492572ee57745d8c501b62f9526fc7cd816e12ae2d997c901eab96813702eb00d0d1f07561806061f18f0c9b3a5a901
+  metadata.gz: 9471253e1d27b50b98902cb384c8261e4907ca8315fe0cb8a1c297c7b759d9b5606b4249c78eec27423eab2e78de7579e2fa55f3a7505c80777ccdc2e98d1d97
+  data.tar.gz: 749d521d6a4780e32e093191ac12b8d7379d26f86072d28479b1dd5409df2372d0c4c8fc6f96d3a134630116d33af1cc6e7f79e9458265bc661a15ce6002a840

data/CHANGES

@@ -1,3 +1,9 @@
+== 1.1.8 - 2-Sep-2017
+* The stat and mount_point methods now call to_s on the string argument
+  explicitly so that Pathname objects will now work with String#wincode.
+* Updated some tests to avoid Fixnum warnings for Ruby 2.4.
+* Updated the cert.
+
 == 1.1.7 - 1-Aug-2016
 * Fixed an issue in the stat method for MS Windows where the blocks_avail
   value was not correct. Thanks go to Maxime Lapointe for the spot.

data/certs/djberg96_pub.pem

@@ -1,21 +1,21 @@
 -----BEGIN CERTIFICATE-----
 MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MREwDwYDVQQDDAhkamJl
 cmc5NjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYDY29t
-MB4XDTE1MDkwMjIwNDkxOFoXDTE2MDkwMTIwNDkxOFowPzERMA8GA1UEAwwIZGpi
+MB4XDTE2MDkxOTAzNDY0NVoXDTE3MDkxOTAzNDY0NVowPzERMA8GA1UEAwwIZGpi
 ZXJnOTYxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2Nv
-bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMyTkvXqRp6hLs9eoJOS
-Hmi8kRYbq9Vkf15/hMxJpotYMgJVHHWrmDcC5Dye2PbnXjTkKf266Zw0PtT9h+lI
-S3ts9HO+vaCFSMwFFZmnWJSpQ3CNw2RcHxjWkk9yF7imEM8Kz9ojhiDXzBetdV6M
-gr0lV/alUr7TNVBDngbXEfTWscyXh1qd7xZ4EcOdsDktCe5G45N/o3662tPQvJsi
-FOF0CM/KuBsa/HL1/eoEmF4B3EKIRfTHrQ3hu20Kv3RJ88QM4ec2+0dd97uX693O
-zv6981fyEg+aXLkxrkViM/tz2qR2ZE0jPhHTREPYeMEgptRkTmWSKAuLVWrJEfgl
-DtkCAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFEwe
-nn6bfJADmuIDiMSOzedOrL+xMB0GA1UdEQQWMBSBEmRqYmVyZzk2QGdtYWlsLmNv
+bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM0eOHOQRpLOeqkyeK7O
+DGHYLkO0Wq7gStVVVyHXahgyCopLN6JVBwGy5aCpKFcy5sFz2DdnISj+hQ7FctDa
+yz6Lq9TvAF8Jkis8dDFLQKeHilB/AM4ssQAsGQyoQnoE4v5tCOSW4e3YHFDp/dMZ
+s7Hkoim6PeEdkh4hB5LCa90OrHSPe8nlMFsVhRIGj86xNTRazEiWPZCOKmN9rZgW
+ziheP/6hC2c7vNRevv5iE/K+NqaL/WOdMquOSZoF2mdBcoMIPDDBNzh/oHinPQ3N
+1oOvoET0+Tj+O5tXX/L1TAsUrwZXlyrYGaZ5aYyoo/7r9pmvmbfgBqaU6JywT0EE
+5x0CAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFO+k
+C/3R+t2aIyIpwU5wPrAfYVL6MB0GA1UdEQQWMBSBEmRqYmVyZzk2QGdtYWlsLmNv
 bTAdBgNVHRIEFjAUgRJkamJlcmc5NkBnbWFpbC5jb20wDQYJKoZIhvcNAQEFBQAD
-ggEBAHmNOCWoDVD75zHFueY0viwGDVP1BNGFC+yXcb7u2GlK+nEMCORqzURbYPf7
-tL+/hzmePIRz7i30UM//64GI1NLv9jl7nIwjhPpXpf7/lu2I9hOTsvwSumb5UiKC
-/sqBxI3sfj9pr79Wpv4MuikX1XPik7Ncb7NPsJPw06Lvyc3Hkg5X2XpPtLtS+Gr2
-wKJnmzb5rIPS1cmsqv0M9LPWflzfwoZ/SpnmhagP+g05p8bRNKjZSA2iImM/GyYZ
-EJYzxdPOrx2n6NYR3Hk+vHP0U7UBSveI6+qx+ndQYaeyCn+GRX2PKS9h66YF/Q1V
-tGSHgAmcLlkdGgan182qsE/4kKM=
+ggEBAIJWpqQOUMoYhpm0wJ4kfiYv9rZVbpZ3L2cFYt4O6+wgbpdWP8DBBgZfCSQW
+1J9miChMKdxZ8eOoeId79IMXN3IAcnalTFvD0Rp9ltaFZTXBfXMFqxQN3fHsIVwz
+as/JSbwXo/PE8rULhjU+Utwcmji38cKEDWLAW4vsCBmwvBTwmAmcuHHKjnNvd8aR
+YMrq9v505w8IjSysIO3KKysxCFuzoIPIYMdYswquvmtuTA+lpB9btWHr8n2FFsDp
+A943I/wqE6xbYQpHxkndWo5uLDUbZh+XxG+fhZKpeqLIqHaFuU6wdO5odt32kB/B
+nCjVswaVYlu1U2iLPCqE+MrjmTA=
 -----END CERTIFICATE-----

data/lib/sys/filesystem.rb

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

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

@@ -42,6 +42,8 @@ module Sys
       MOUNT_FILE = '/etc/mtab'
     elsif File.exist?('/etc/mnttab')
       MOUNT_FILE = '/etc/mnttab'
+    elsif File.exist?('/proc/mounts')
+      MOUNT_FILE = '/proc/mounts'
     else
       MOUNT_FILE = 'getmntinfo'
     end

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

@@ -5,6 +5,15 @@ module Sys
   class Filesystem
     module Structs
       class Statfs < FFI::Struct
+
+        # FreeBSD 12.0 MNAMELEN from 88 => 1024.
+        MNAMELEN =
+          if RbConfig::CONFIG['host_os'] =~ /freebsd(.*)/i
+            $1.to_f < 12.0 ? 88 : 1024
+          else
+            88
+          end
+
         if RbConfig::CONFIG['host_os'] =~ /bsd/i
           layout(
             :f_version, :uint32,
@@ -27,8 +36,8 @@ module Sys
             :f_fsid,  [:int32, 2],
             :f_charspare, [:char, 80],
             :f_fstypename, [:char, 16],
-            :f_mntfromname, [:char, 88],
-            :f_mntonname, [:char, 88]
+            :f_mntfromname, [:char, MNAMELEN],
+            :f_mntonname, [:char, MNAMELEN]
           )
         else
           layout(

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

@@ -241,7 +241,7 @@ module Sys
     #    File.mount_point("C:\\Documents and Settings") # => "C:\\'
     #
     def self.mount_point(file)
-      wfile = FFI::MemoryPointer.from_string(file.wincode)
+      wfile = FFI::MemoryPointer.from_string(file.to_s.wincode)
 
       if PathStripToRootW(wfile)
         wfile.read_string(wfile.size).split("\000\000").first.tr(0.chr, '')
@@ -265,7 +265,7 @@ module Sys
       total_bytes = FFI::MemoryPointer.new(:ulong_long)
 
       mpoint = mount_point(path)
-      wpath  = path.wincode
+      wpath  = path.to_s.wincode
 
       # We need this call for the 64 bit support
       unless GetDiskFreeSpaceExW(wpath, bytes_avail, total_bytes, bytes_free)
@@ -304,7 +304,7 @@ module Sys
       flags_ptr      = FFI::MemoryPointer.new(:ulong)
 
       bool = GetVolumeInformationW(
-        mpoint.wincode,
+        mpoint.to_s.wincode,
         vol_name_ptr,
         vol_name_ptr.size,
         vol_serial_ptr,
@@ -315,7 +315,7 @@ module Sys
       )
 
       unless bool
-        raise SystemCallError.new('GetVolumInformation', FFI.errno)
+        raise SystemCallError.new('GetVolumeInformation', FFI.errno)
       end
 
       vol_serial = vol_serial_ptr.read_ulong

data/sys-filesystem.gemspec

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

data/test/test_sys_filesystem_unix.rb

@@ -25,7 +25,7 @@ class TC_Sys_Filesystem_Unix < Test::Unit::TestCase
   end
 
   def test_version
-    assert_equal('1.1.7', Filesystem::VERSION)
+    assert_equal('1.1.8', Filesystem::VERSION)
   end
 
   def test_stat_path
@@ -35,7 +35,7 @@ class TC_Sys_Filesystem_Unix < Test::Unit::TestCase
 
   def test_stat_block_size
     assert_respond_to(@stat, :block_size)
-    assert_kind_of(Fixnum, @stat.block_size)
+    assert_kind_of(Numeric, @stat.block_size)
   end
 
   def test_block_size_is_a_plausible_value
@@ -45,27 +45,27 @@ class TC_Sys_Filesystem_Unix < Test::Unit::TestCase
 
   def test_stat_fragment_size
     assert_respond_to(@stat, :fragment_size)
-    assert_kind_of(Fixnum, @stat.fragment_size)
+    assert_kind_of(Numeric, @stat.fragment_size)
   end
 
   def test_stat_blocks
     assert_respond_to(@stat, :blocks)
-    assert_kind_of(Fixnum, @stat.blocks)
+    assert_kind_of(Numeric, @stat.blocks)
   end
 
   def test_stat_blocks_free
     assert_respond_to(@stat, :blocks_free)
-    assert_kind_of(Fixnum, @stat.blocks_free)
+    assert_kind_of(Numeric, @stat.blocks_free)
   end
 
   def test_stat_blocks_available
     assert_respond_to(@stat, :blocks_available)
-    assert_kind_of(Fixnum, @stat.blocks_available)
+    assert_kind_of(Numeric, @stat.blocks_available)
   end
 
   def test_stat_files
     assert_respond_to(@stat, :files)
-    assert_kind_of(Fixnum, @stat.files)
+    assert_kind_of(Numeric, @stat.files)
   end
 
   def test_inodes_alias
@@ -75,7 +75,7 @@ class TC_Sys_Filesystem_Unix < Test::Unit::TestCase
 
   def test_stat_files_free
     assert_respond_to(@stat, :files_free)
-    assert_kind_of(Fixnum, @stat.files_free)
+    assert_kind_of(Numeric, @stat.files_free)
   end
 
   def test_stat_inodes_free_alias
@@ -85,7 +85,7 @@ class TC_Sys_Filesystem_Unix < Test::Unit::TestCase
 
   def test_stat_files_available
     assert_respond_to(@stat, :files_available)
-    assert_kind_of(Fixnum, @stat.files_available)
+    assert_kind_of(Numeric, @stat.files_available)
   end
 
   def test_stat_inodes_available_alias
@@ -100,12 +100,12 @@ class TC_Sys_Filesystem_Unix < Test::Unit::TestCase
 
   def test_stat_flags
     assert_respond_to(@stat, :flags)
-    assert_kind_of(Fixnum, @stat.flags)
+    assert_kind_of(Numeric, @stat.flags)
   end
 
   def test_stat_name_max
     assert_respond_to(@stat, :name_max)
-    assert_kind_of(Fixnum, @stat.name_max)
+    assert_kind_of(Numeric, @stat.name_max)
   end
 
   def test_stat_base_type
@@ -232,7 +232,7 @@ class TC_Sys_Filesystem_Unix < Test::Unit::TestCase
     msg = 'dump_frequency test skipped on this platform'
     omit_if(@@solaris || @@freebsd || @@darwin, msg)
     assert_respond_to(@mnt, :dump_frequency)
-    assert_kind_of(Fixnum, @mnt.dump_frequency)
+    assert_kind_of(Numeric, @mnt.dump_frequency)
   end
 
   def test_freq_alias
@@ -244,7 +244,7 @@ class TC_Sys_Filesystem_Unix < Test::Unit::TestCase
     msg = 'pass_number test skipped on this platform'
     omit_if(@@solaris || @@freebsd || @@darwin, msg)
     assert_respond_to(@mnt, :pass_number)
-    assert_kind_of(Fixnum, @mnt.pass_number)
+    assert_kind_of(Numeric, @mnt.pass_number)
   end
 
   def test_passno_alias

data/test/test_sys_filesystem_windows.rb

@@ -7,6 +7,7 @@
 require 'test-unit'
 require 'sys/filesystem'
 require 'rbconfig'
+require 'pathname'
 include Sys
 
 class TC_Sys_Filesystem_Windows < Test::Unit::TestCase
@@ -19,7 +20,7 @@ class TC_Sys_Filesystem_Windows < Test::Unit::TestCase
   end
 
   test "version number is set to the expected value" do
-    assert_equal('1.1.7', Filesystem::VERSION)
+    assert_equal('1.1.8', Filesystem::VERSION)
   end
 
   test "stat path works as expected" do
@@ -135,6 +136,12 @@ class TC_Sys_Filesystem_Windows < Test::Unit::TestCase
     assert_equal("\\\\foo\\bar", Filesystem.mount_point("//foo/bar/baz"))
   end
 
+  test "mount_point works with Pathname object" do
+    assert_nothing_raised{ Filesystem.mount_point(Pathname.new("C:/Users/foo")) }
+    assert_equal("C:\\", Filesystem.mount_point("C:\\Users\\foo"))
+    assert_equal("\\\\foo\\bar", Filesystem.mount_point("//foo/bar/baz"))
+  end
+
   test "filesystem constants are defined" do
     assert_not_nil(Filesystem::CASE_SENSITIVE_SEARCH)
     assert_not_nil(Filesystem::CASE_PRESERVED_NAMES)
@@ -156,6 +163,10 @@ class TC_Sys_Filesystem_Windows < Test::Unit::TestCase
     assert_nothing_raised{ Filesystem.stat("C://Program Files") }
   end
 
+  test "stat singleton method accepts a Pathname object" do
+    assert_nothing_raised{ Filesystem.stat(Pathname.new("C://Program Files")) }
+  end
+
   test "stat singleton method requires a single argument" do
     assert_raise(ArgumentError){ Filesystem.stat }
     assert_raise(ArgumentError){ Filesystem.stat(Dir.pwd, Dir.pwd) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sys-filesystem
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -12,25 +12,25 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MREwDwYDVQQDDAhkamJl
   cmc5NjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYDY29t
-  MB4XDTE1MDkwMjIwNDkxOFoXDTE2MDkwMTIwNDkxOFowPzERMA8GA1UEAwwIZGpi
+  MB4XDTE2MDkxOTAzNDY0NVoXDTE3MDkxOTAzNDY0NVowPzERMA8GA1UEAwwIZGpi
   ZXJnOTYxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2Nv
-  bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMyTkvXqRp6hLs9eoJOS
-  Hmi8kRYbq9Vkf15/hMxJpotYMgJVHHWrmDcC5Dye2PbnXjTkKf266Zw0PtT9h+lI
-  S3ts9HO+vaCFSMwFFZmnWJSpQ3CNw2RcHxjWkk9yF7imEM8Kz9ojhiDXzBetdV6M
-  gr0lV/alUr7TNVBDngbXEfTWscyXh1qd7xZ4EcOdsDktCe5G45N/o3662tPQvJsi
-  FOF0CM/KuBsa/HL1/eoEmF4B3EKIRfTHrQ3hu20Kv3RJ88QM4ec2+0dd97uX693O
-  zv6981fyEg+aXLkxrkViM/tz2qR2ZE0jPhHTREPYeMEgptRkTmWSKAuLVWrJEfgl
-  DtkCAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFEwe
-  nn6bfJADmuIDiMSOzedOrL+xMB0GA1UdEQQWMBSBEmRqYmVyZzk2QGdtYWlsLmNv
+  bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM0eOHOQRpLOeqkyeK7O
+  DGHYLkO0Wq7gStVVVyHXahgyCopLN6JVBwGy5aCpKFcy5sFz2DdnISj+hQ7FctDa
+  yz6Lq9TvAF8Jkis8dDFLQKeHilB/AM4ssQAsGQyoQnoE4v5tCOSW4e3YHFDp/dMZ
+  s7Hkoim6PeEdkh4hB5LCa90OrHSPe8nlMFsVhRIGj86xNTRazEiWPZCOKmN9rZgW
+  ziheP/6hC2c7vNRevv5iE/K+NqaL/WOdMquOSZoF2mdBcoMIPDDBNzh/oHinPQ3N
+  1oOvoET0+Tj+O5tXX/L1TAsUrwZXlyrYGaZ5aYyoo/7r9pmvmbfgBqaU6JywT0EE
+  5x0CAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFO+k
+  C/3R+t2aIyIpwU5wPrAfYVL6MB0GA1UdEQQWMBSBEmRqYmVyZzk2QGdtYWlsLmNv
   bTAdBgNVHRIEFjAUgRJkamJlcmc5NkBnbWFpbC5jb20wDQYJKoZIhvcNAQEFBQAD
-  ggEBAHmNOCWoDVD75zHFueY0viwGDVP1BNGFC+yXcb7u2GlK+nEMCORqzURbYPf7
-  tL+/hzmePIRz7i30UM//64GI1NLv9jl7nIwjhPpXpf7/lu2I9hOTsvwSumb5UiKC
-  /sqBxI3sfj9pr79Wpv4MuikX1XPik7Ncb7NPsJPw06Lvyc3Hkg5X2XpPtLtS+Gr2
-  wKJnmzb5rIPS1cmsqv0M9LPWflzfwoZ/SpnmhagP+g05p8bRNKjZSA2iImM/GyYZ
-  EJYzxdPOrx2n6NYR3Hk+vHP0U7UBSveI6+qx+ndQYaeyCn+GRX2PKS9h66YF/Q1V
-  tGSHgAmcLlkdGgan182qsE/4kKM=
+  ggEBAIJWpqQOUMoYhpm0wJ4kfiYv9rZVbpZ3L2cFYt4O6+wgbpdWP8DBBgZfCSQW
+  1J9miChMKdxZ8eOoeId79IMXN3IAcnalTFvD0Rp9ltaFZTXBfXMFqxQN3fHsIVwz
+  as/JSbwXo/PE8rULhjU+Utwcmji38cKEDWLAW4vsCBmwvBTwmAmcuHHKjnNvd8aR
+  YMrq9v505w8IjSysIO3KKysxCFuzoIPIYMdYswquvmtuTA+lpB9btWHr8n2FFsDp
+  A943I/wqE6xbYQpHxkndWo5uLDUbZh+XxG+fhZKpeqLIqHaFuU6wdO5odt32kB/B
+  nCjVswaVYlu1U2iLPCqE+MrjmTA=
   -----END CERTIFICATE-----
-date: 2016-08-01 00:00:00.000000000 Z
+date: 2017-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A Ruby interface for getting file system information.

metadata.gz.sig

@@ -1,3 +1,2 @@
-���q{�&d[��;�=N2�ա��SJl��K,_�
6��3
-�M������Cm��{���z�k��x:�n�
/�{t[ATC��
��{RD�:����؎e�N$j*7��C��n�kv�Do�)
-P2߻�}�����Jcv����{�*��%7�f��*�P��P���6?�yZPfR��Ơ�HL'0Z]��'y���~�����Ja"ז���E�6Y[lE,�˱0�������,
+�C!�^Š@Й�m�2�l
+�Z�p���&�[��a���$���,����˛�	�A:�9[�}qd�w���`�Aΰo�T
B�@0Z���UT
��+���/1���!lVw�O���"*�b�dN����hٗڳ}�������]