sys-filesystem 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 819b6d21deb2c0e958a38ec3ba23f511e343286b
-  data.tar.gz: d180ac914f02bde52231efe4cb903f00ca1f3173
+  metadata.gz: f9095d7fbf62ef5ff5cca1f6c4b43439a72e1f7b
+  data.tar.gz: e93c09ed0f9f0e14abdbb22ba617d418214b8252
 SHA512:
-  metadata.gz: 85d89bbe808f6ec1259f686a5b762044b9e07a03db5cac98ba269dd1034b97d30d905fb5c709ddad3eb9b0c2122de7553404acc781522726bcfa78acf8c7ed2b
-  data.tar.gz: 81adece28fb90a500819200c82d1a871f0fa238f1a020394db7defa35e1d8c73bced46da7bc98bc7b979ade3b85dea9960c2e12b03c5dc7ecd7512acd07cbbba
+  metadata.gz: 513de924e461b85b1c2acc623e90c58bd917bf15320f787ea56d65fa5008705a4dca2ca8227ab68d0861892a19e92e47a7a961c3aba102c69a3e71512f298c33
+  data.tar.gz: c3f334218d63293a9bff63cf31bc630a3492572ee57745d8c501b62f9526fc7cd816e12ae2d997c901eab96813702eb00d0d1f07561806061f18f0c9b3a5a901

data/CHANGES

@@ -1,3 +1,7 @@
+== 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.
+
 == 1.1.6 - 17-May-2016
 * On versions that use setmntent or fopen, explicitly raise an error if
   either of those calls return a null value.

data/lib/sys/filesystem.rb

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

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

@@ -65,8 +65,7 @@ module Sys
       # The total number of unused blocks.
       attr_reader :blocks_free
 
-      # The total number of unused blocks available to unprivileged
-      # processes. Identical to +blocks+ at the moment.
+      # The total number of unused blocks available to unprivileged processes.
       attr_reader :blocks_available
 
       # Total number of files/inodes that can be created on the file system.
@@ -277,24 +276,26 @@ module Sys
       bytes_free  = bytes_free.read_ulong_long
       total_bytes = total_bytes.read_ulong_long
 
-      sectors = FFI::MemoryPointer.new(:ulong_long)
-      bytes   = FFI::MemoryPointer.new(:ulong_long)
-      free    = FFI::MemoryPointer.new(:ulong_long)
-      total   = FFI::MemoryPointer.new(:ulong_long)
+      sectors_ptr = FFI::MemoryPointer.new(:ulong_long)
+      bytes_ptr   = FFI::MemoryPointer.new(:ulong_long)
+      free_ptr    = FFI::MemoryPointer.new(:ulong_long)
+      total_ptr   = FFI::MemoryPointer.new(:ulong_long)
 
       # We need this call for the total/cluster info, which is not in the Ex call.
-      unless GetDiskFreeSpaceW(wpath, sectors, bytes, free, total)
+      unless GetDiskFreeSpaceW(wpath, sectors_ptr, bytes_ptr, free_ptr, total_ptr)
         raise SystemCallError.new('GetDiskFreeSpace', FFI.errno)
       end
 
-      sectors = sectors.read_ulong_long
-      bytes   = bytes.read_ulong_long
-      free    = free.read_ulong_long
-      total   = total.read_ulong_long
+      sectors_per_cluster = sectors_ptr.read_ulong_long
+      bytes_per_sector    = bytes_ptr.read_ulong_long
 
-      block_size   = sectors * bytes
-      blocks_avail = total_bytes / block_size
+      free_ptr.free
+      total_ptr.free
+
+      block_size   = sectors_per_cluster * bytes_per_sector
+      blocks_avail = bytes_avail / block_size
       blocks_free  = bytes_free / block_size
+      total_blocks = total_bytes / block_size
 
       vol_name_ptr   = FFI::MemoryPointer.new(:char, MAXPATH)
       base_type_ptr  = FFI::MemoryPointer.new(:char, MAXPATH)
@@ -322,16 +323,19 @@ module Sys
       flags      = flags_ptr.read_ulong
       base_type  = base_type_ptr.read_string(base_type_ptr.size).tr(0.chr, '')
 
+      # Lets explicitly free our pointers
       vol_name_ptr.free
       vol_serial_ptr.free
       name_max_ptr.free
       flags_ptr.free
       base_type_ptr.free
+      sectors_ptr.free
+      bytes_ptr.free
 
       stat_obj = Stat.new
       stat_obj.instance_variable_set(:@path, path)
       stat_obj.instance_variable_set(:@block_size, block_size)
-      stat_obj.instance_variable_set(:@blocks, blocks_avail)
+      stat_obj.instance_variable_set(:@blocks, total_blocks)
       stat_obj.instance_variable_set(:@blocks_available, blocks_avail)
       stat_obj.instance_variable_set(:@blocks_free, blocks_free)
       stat_obj.instance_variable_set(:@name_max, name_max)

data/sys-filesystem.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'sys-filesystem'
-  spec.version    = '1.1.6'
+  spec.version    = '1.1.7'
   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.6', Filesystem::VERSION)
+    assert_equal('1.1.7', Filesystem::VERSION)
   end
 
   def test_stat_path

data/test/test_sys_filesystem_windows.rb

@@ -19,7 +19,7 @@ class TC_Sys_Filesystem_Windows < Test::Unit::TestCase
   end
 
   test "version number is set to the expected value" do
-    assert_equal('1.1.6', Filesystem::VERSION)
+    assert_equal('1.1.7', Filesystem::VERSION)
   end
 
   test "stat path works as expected" do
@@ -52,6 +52,11 @@ class TC_Sys_Filesystem_Windows < Test::Unit::TestCase
     assert_kind_of(Fixnum, @stat.blocks_available)
   end
 
+  test "block stats return expected relative values" do
+    assert_true(@stat.blocks >= @stat.blocks_free)
+    assert_true(@stat.blocks_free >= @stat.blocks_available)
+  end
+
   test "stat files works as expected" do
     assert_respond_to(@stat, :files)
     assert_nil(@stat.files)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sys-filesystem
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -30,7 +30,7 @@ cert_chain:
   EJYzxdPOrx2n6NYR3Hk+vHP0U7UBSveI6+qx+ndQYaeyCn+GRX2PKS9h66YF/Q1V
   tGSHgAmcLlkdGgan182qsE/4kKM=
   -----END CERTIFICATE-----
-date: 2016-05-17 00:00:00.000000000 Z
+date: 2016-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi