sys-filesystem 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34f3ac9a042ae4f81d584a6c32aec6bd0365c12c
-  data.tar.gz: a5fa1fd3b884a0e10249fd7583ed64536d4448cc
+  metadata.gz: c4f18d48f15b2e167689efcba3383011e4d8ee3f
+  data.tar.gz: 83007b80b704891feba089e82b7d2d46e1a63ff9
 SHA512:
-  metadata.gz: bf773f2a53550dfac708332522396932f9830d0721476d8d6abaee17ed11f70d919f4b0b9bdc058a1214678138b74a660712f59b982deb10dbf8f1f69d9de4be
-  data.tar.gz: 3defee7ad40391abe85802270fb353a036190df7ed8ed1828c357cb2804344f1d4c8e31bbf1e0b04d90bfc60106ba2a5d69ba9ba64924619569a0c738490683d
+  metadata.gz: b7fec893f3575ce639210de2089e8897236af7f84ac48fd8f9db39ed7649491b2792dcd5dc02f62bde79368ee6cfb3bb40f0bc01f52ae8b8c1c2a0cb31ae86f7
+  data.tar.gz: 28a988104582d8e4d1c61f3a4f7c3d46a6230ce45e88c2aecdb92aaf1cd05aeb9b5ae95a9f322354991e4f9b9c8c56f7627fa04816d8fcfcaf4598d30e26bb81

data/CHANGES

@@ -1,3 +1,9 @@
+== 1.1.3 - 1-Oct-2014
+* Now ignores EPERM errors when trying to find the mount point for a path.
+  Thanks go to petersen for the patch.
+* The Filesystem.stat method now defaults to using the root path on Windows
+  for volume information.
+
 == 1.1.2 - 9-May-2014
 * Added the percent_used, bytes_total, bytes_free and bytes_used methods
   to the Filesystem::Stat class. Thanks go to xanview for the suggestion.

data/lib/unix/sys/filesystem.rb

@@ -10,7 +10,7 @@ module Sys
     ffi_lib FFI::Library::LIBC
 
     # The version of the sys-filesystem library.
-    VERSION = '1.1.2'
+    VERSION = '1.1.3'
 
     private
 

data/lib/windows/sys/filesystem.rb

@@ -19,7 +19,7 @@ module Sys
     class Error < StandardError; end
 
     # The version of the sys-filesystem library.
-    VERSION = '1.1.2'
+    VERSION = '1.1.3'
 
     class Mount
       # The name of the volume. This is the device mapping.
@@ -255,20 +255,23 @@ module Sys
     end
 
     # Returns a Filesystem::Stat object that contains information about the
-    # +path+ file system.
+    # +path+ file system. On Windows this will default to using the root
+    # path for volume information.
     #
     # Examples:
     #
-    #    File.stat("C:\\")
-    #    File.stat("C:\\Documents and Settings\\some_user")
+    #    Sys::Filesystem.stat("C:\\")
+    #    Sys::Filesystem.stat("C:\\Documents and Settings\\some_user")
     #
     def self.stat(path)
       bytes_avail = FFI::MemoryPointer.new(:ulong_long)
       bytes_free  = FFI::MemoryPointer.new(:ulong_long)
       total_bytes = FFI::MemoryPointer.new(:ulong_long)
 
-      wpath = path.wincode
+      mpoint = mount_point(path)
+      wpath  = path.wincode
 
+      # We need this call for the 64 bit support
       unless GetDiskFreeSpaceExW(wpath, bytes_avail, total_bytes, bytes_free)
         raise SystemCallError.new('GetDiskFreeSpaceEx', FFI.errno)
       end
@@ -282,6 +285,7 @@ module Sys
       free    = FFI::MemoryPointer.new(:ulong_long)
       total   = 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)
         raise SystemCallError.new('GetDiskFreeSpace', FFI.errno)
       end
@@ -295,31 +299,37 @@ module Sys
       blocks_avail = total_bytes / block_size
       blocks_free  = bytes_free / block_size
 
-      vol_name   = FFI::MemoryPointer.new(:char, MAXPATH)
-      base_type  = FFI::MemoryPointer.new(:char, MAXPATH)
-      vol_serial = FFI::MemoryPointer.new(:ulong)
-      name_max   = FFI::MemoryPointer.new(:ulong)
-      flags      = FFI::MemoryPointer.new(:ulong)
+      vol_name_ptr   = FFI::MemoryPointer.new(:char, MAXPATH)
+      base_type_ptr  = FFI::MemoryPointer.new(:char, MAXPATH)
+      vol_serial_ptr = FFI::MemoryPointer.new(:ulong)
+      name_max_ptr   = FFI::MemoryPointer.new(:ulong)
+      flags_ptr      = FFI::MemoryPointer.new(:ulong)
 
       bool = GetVolumeInformationW(
-        wpath,
-        vol_name,
-        vol_name.size,
-        vol_serial,
-        name_max,
-        flags,
-        base_type,
-        base_type.size
+        mpoint.wincode,
+        vol_name_ptr,
+        vol_name_ptr.size,
+        vol_serial_ptr,
+        name_max_ptr,
+        flags_ptr,
+        base_type_ptr,
+        base_type_ptr.size
       )
 
       unless bool
         raise SystemCallError.new('GetVolumInformation', FFI.errno)
       end
 
-      vol_serial = vol_serial.read_ulong
-      name_max   = name_max.read_ulong
-      flags      = flags.read_ulong
-      base_type  = base_type.read_string(base_type.size).tr(0.chr, '')
+      vol_serial = vol_serial_ptr.read_ulong
+      name_max   = name_max_ptr.read_ulong
+      flags      = flags_ptr.read_ulong
+      base_type  = base_type_ptr.read_string(base_type_ptr.size).tr(0.chr, '')
+
+      vol_name_ptr.free
+      vol_serial_ptr.free
+      name_max_ptr.free
+      flags_ptr.free
+      base_type_ptr.free
 
       stat_obj = Stat.new
       stat_obj.instance_variable_set(:@path, path)
@@ -419,3 +429,7 @@ class Numeric
     self / 1099511627776
   end
 end
+
+if $0 == __FILE__
+  p Sys::Filesystem.stat("C:/Users/djberge")
+end

data/sys-filesystem.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name      = 'sys-filesystem'
-  spec.version   = '1.1.2'
+  spec.version   = '1.1.3'
   spec.author    = 'Daniel J. Berger'
   spec.email     = 'djberg96@gmail.com'
   spec.homepage  = 'https://github.com/djberg96/sys-filesystem'
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency('rake')
 
   spec.description = <<-EOF
-    The sys-filesystem library provides an interface for gathering filesystem
-    information, such as disk space and mount point data.
+    The sys-filesystem library provides a cross-platform interface for
+    gathering filesystem information, such as disk space and mount point data.
   EOF
 end

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.2', Filesystem::VERSION)
+    assert_equal('1.1.3', Filesystem::VERSION)
   end
 
   def test_stat_path

data/test/test_sys_filesystem_windows.rb

@@ -11,7 +11,7 @@ include Sys
 
 class TC_Sys_Filesystem_Windows < Test::Unit::TestCase
   def setup
-    @dir   = '/'
+    @dir   = 'C:/'
     @stat  = Filesystem.stat(@dir)
     @mount = Filesystem.mounts[0]
     @size  = 58720256
@@ -19,12 +19,12 @@ class TC_Sys_Filesystem_Windows < Test::Unit::TestCase
   end
 
   test "version number is set to the expected value" do
-    assert_equal('1.1.2', Filesystem::VERSION)
+    assert_equal('1.1.3', Filesystem::VERSION)
   end
 
   test "stat path works as expected" do
     assert_respond_to(@stat, :path)
-    assert_equal("/", @stat.path)
+    assert_equal("C:/", @stat.path)
   end
 
   test "stat block_size works as expected" do
@@ -147,11 +147,19 @@ class TC_Sys_Filesystem_Windows < Test::Unit::TestCase
     assert_not_nil(Filesystem::READ_ONLY_VOLUME)
   end
 
+  test "stat singleton method defaults to root path if proviced" do
+    assert_nothing_raised{ Filesystem.stat("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) }
   end
 
+  test "stat singleton method raises an error if path is not found" do
+    assert_raise(Errno::ESRCH){ Filesystem.stat("C://Bogus//Dir") }
+  end
+
    # Filesystem.mounts
 
   test "mounts singleton method basic functionality" do

metadata

@@ -1,60 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: sys-filesystem
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Daniel J. Berger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-09 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: |2
-      The sys-filesystem library provides an interface for gathering filesystem
-      information, such as disk space and mount point data.
+      The sys-filesystem library provides a cross-platform interface for
+      gathering filesystem information, such as disk space and mount point data.
 email: djberg96@gmail.com
 executables: []
 extensions: []
@@ -89,17 +89,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: sysutils
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: A Ruby interface for getting file system information.