win32-file-stat 1.2.8 → 1.3.0

data/CHANGES

@@ -1,3 +1,12 @@
+== 1.3.0 - 1-Aug-2008
+* Fixed a couple of function calls where I had forgotten to call an
+  explicitly wide version.
+* No longer ignores failures on empty block devices, e.g. CD-ROM drives
+  without any media in them. A SystemCallError is raised instead.
+* Added blockdev boolean to the inspect/pp output.
+* Fixed a potential issue with an internal helper function and the new 'S'
+  prototype from win32-api 1.2.0 or later.
+
 == 1.2.8 - 29-Jul-2008
 * Internally now always uses wide character functions.
 * A private alias was made private.

data/README

@@ -33,7 +33,7 @@ rake install (non-gem) OR rake install_gem (gems)
 * The File::Stat#socket method works more accurately.
 * Allows you to get file attributes specific to MS Windows, e.g. archive,
   hidden, etc.
-* The pp (pretty print) output has been customized.
+* The inspect and pretty print output has been customized.
   
 = Known issues
 You should not require 'win32/file/stat' directly.  Instead, require the

data/lib/win32/file/stat.rb

@@ -21,7 +21,7 @@ class File::Stat
    include Windows::Volume
    include Comparable
    
-   VERSION = '1.2.8'
+   VERSION = '1.3.0'
 
    private
 
@@ -414,7 +414,7 @@ class File::Stat
    # UNC path then the drive number (probably -1) is returned instead.
    #
    def dev
-      if PathIsUNC(@file)
+      if PathIsUNCW(@file)
          @dev
       else
          (@dev + ?A).chr + ':'
@@ -477,9 +477,10 @@ class File::Stat
    #
    def inspect    
       members = %w/
-         archive? atime blksize blocks compressed? ctime dev encrypted? gid
-         hidden? indexed? ino mode mtime rdev nlink normal? offline? readonly?
-         reparse_point? size sparse? system? temporary? uid
+         archive? atime blksize blockdev? blocks compressed? ctime dev
+         encrypted? gid hidden? indexed? ino mode mtime rdev nlink normal?
+         offline? readonly? reparse_point? size sparse? system? temporary?
+         uid
       /
       str = "#<#{self.class}"
       members.sort.each{ |mem|
@@ -500,9 +501,10 @@ class File::Stat
    #
    def pretty_print(q)
       members = %w/
-         archive? atime blksize blocks compressed? ctime dev encrypted? gid
-         hidden? indexed? ino mode mtime rdev nlink normal? offline? readonly?
-         reparse_point? size sparse? system? temporary? uid
+         archive? atime blksize blockdev? blocks compressed? ctime dev
+         encrypted? gid hidden? indexed? ino mode mtime rdev nlink normal?
+         offline? readonly? reparse_point? size sparse? system? temporary?
+         uid
       /
 
       q.object_group(self){
@@ -542,16 +544,17 @@ class File::Stat
       total   = [0].pack('L')
       
       # If there's a drive letter it must contain a trailing backslash.
-      # The dup is necessary here because, for some odd reason, the function
-      # appears to modify the argument passed in.
-      if PathStripToRootW(file.dup)
+      # The dup is necessary here because the function modifies the argument.
+      file = file.dup
+      
+      if PathStripToRootW(file)
          file += "\\" unless file[-1].chr == "\\"
       else
-         file = 0 # Default to root drive
+         file = nil # Default to the root drive on relative paths
       end
       
       # Don't check for an error here.  Just default to nil.
-      if GetDiskFreeSpace(file, sectors, bytes, free, total)
+      if GetDiskFreeSpaceW(file, sectors, bytes, free, total)
          size = sectors.unpack('L').first * bytes.unpack('L').first
       end
       
@@ -564,8 +567,8 @@ class File::Stat
       begin
          handle = CreateFileW(
             file,
-            GENERIC_READ,
-            FILE_SHARE_READ,
+            0,
+            0,
             nil,
             OPEN_EXISTING,
             FILE_FLAG_BACKUP_SEMANTICS, # Need this for directories
@@ -578,9 +581,7 @@ class File::Stat
          # SystemCallError explicitly here in order to maintain compatibility
          # with the FileUtils module.
          if handle == INVALID_HANDLE_VALUE
-            unless error_num == ERROR_NOT_READY
-               raise SystemCallError, get_last_error(error_num)
-            end
+            raise SystemCallError, get_last_error(error_num)
          end
       
          file_type = GetFileType(handle)
@@ -602,4 +603,4 @@ class File::Stat
    def check_bool(val)
       raise TypeError unless val == true || val == false
    end
-end
+end

data/test/test_file_stat.rb

@@ -30,7 +30,7 @@ class TC_Win32_File_Stat < Test::Unit::TestCase
    end
    
    def test_version
-      assert_equal('1.2.8', File::Stat::VERSION)
+      assert_equal('1.3.0', File::Stat::VERSION)
    end
    
    # One or more tests will fail if the archive attribute on @file is not set.
@@ -48,8 +48,10 @@ class TC_Win32_File_Stat < Test::Unit::TestCase
    def test_blksize
       assert_respond_to(@stat, :blksize)
       assert_equal(4096, @stat.blksize)
+      assert_equal(4096, File::Stat.new("C:\\").blksize)
    end
    
+   # The block dev test error out if there's no media in it.
    def test_blockdev
       assert_respond_to(@stat, :blockdev?)
       assert_equal(false, @stat.blockdev?)

data/win32-file-stat.gemspec

@@ -2,7 +2,7 @@ require "rubygems"
 
 spec = Gem::Specification.new do |gem|
    gem.name        = "win32-file-stat"
-   gem.version     = "1.2.8"
+   gem.version     = "1.3.0"
    gem.authors     = ["Daniel J. Berger", "Park Heesob"]
    gem.email       = "djberg96@gmail.com"
    gem.homepage    = "http://www.rubyforge.org/projects/win32utils"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: win32-file-stat
 version: !ruby/object:Gem::Version 
-  version: 1.2.8
+  version: 1.3.0
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-29 00:00:00 -06:00
+date: 2008-08-01 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency