win32-file-stat 1.2.3 → 1.2.4

data/CHANGES

@@ -1,3 +1,6 @@
+== 1.2.4 - 22-Jan-2007
+* Improved block device handling.
+
 == 1.2.3 - 4-Nov-2006
 * Bug fix for file sizes over 4gb.
 

data/README

@@ -18,7 +18,7 @@ gem install win32-file-stat-<version>.gem
 gem install win32-file-stat
 
 = Synopsis
-require 'win32/file/stat'
+require 'win32/file/stat' # Don't do this in practice - see below
 
 stat = File::Stat.new('file.txt')
 stat.size
@@ -43,8 +43,20 @@ stat.hidden?
   hidden, etc.
 * The pp (pretty print) output has been customized.
   
-= Known issues or bugs
-None that I'm aware of. Please report any bugs you find on the project page
+= Known issues
+You should not require 'win32/file/stat' directly.  Instead, require the
+win32-file package which will, in turn, require win32-file-stat.  This is
+the preferred approach because some modules (i.e. 'find') use the pass-through
+methods of the File class, such as File.lstat.  Many of the pass through
+methods have been redefined in the win32-file package to work in conjunction
+with the custom File::Stat objects created by this package.
+
+Failure to follow these instructions could lead to cases where the core Ruby
+File class attempts to use the custom File::Stat object defined in this class,
+which will likely cause problems.
+
+= Known bugs
+None that I'm aware of.  Please report any bugs you find on the project page
 at http://www.rubyforge.org/projects/win32utils.
 
 = Miscellaneous

data/lib/win32/file/stat.rb

@@ -6,6 +6,7 @@ require 'windows/path'
 require 'windows/file'
 require 'windows/error'
 require 'windows/handle'
+require 'windows/volume'
 require 'pp'
 
 class File::Stat
@@ -17,9 +18,10 @@ class File::Stat
    include Windows::File
    include Windows::Error
    include Windows::Handle
+   include Windows::Volume
    include Comparable
    
-   VERSION = '1.2.3'
+   VERSION = '1.2.4'
 
    # Defined in Ruby's win32.h.  Not meant for public consumption.
    S_IWGRP = 0020
@@ -35,11 +37,16 @@ class File::Stat
    def initialize(file)
       @file = file
       
-      @blockdev  = false
-      @file_type = get_file_type(file) # May update @blockdev
-      
+      @file_type = get_file_type(file)
       @chardev = @file_type == FILE_TYPE_CHAR
 
+      case GetDriveType(file)
+         when DRIVE_REMOVABLE, DRIVE_CDROM, DRIVE_RAMDISK
+            @blockdev = true
+         else
+            @blockdev = false
+      end
+
       stat_buf = [0,0,0,0,0,0,0,0,0,0,0,0,0].pack('ISSssssIIQQQQ')
       
       # The stat64 function doesn't seem to like character devices
@@ -63,9 +70,13 @@ class File::Stat
       @mode = 33188 if @chardev
 
       attr = GetFileAttributes(file)
+      error_num = GetLastError()
       
+      # Ignore errors caused by empty/open/used block devices.
       if attr == INVALID_FILE_ATTRIBUTES
-         raise ArgumentError, get_last_error
+         unless error_num == ERROR_NOT_READY
+            raise ArgumentError, get_last_error(error_num)
+         end
       end
       
       @blksize = get_blksize(file)
@@ -527,8 +538,13 @@ class File::Stat
          0
       )
       
+      error_num = GetLastError()
+      
+      # Ignore errors caused by open/empty/used block devices.
       if handle == INVALID_HANDLE_VALUE
-         raise ArgumentError, get_last_error
+         unless error_num == ERROR_NOT_READY
+            raise ArgumentError, get_last_error(error_num)
+         end
       end
       
       file_type = GetFileType(handle)
@@ -536,12 +552,6 @@ class File::Stat
            
       CloseHandle(handle)
       
-      if error == 0
-         if file_type == FILE_TYPE_DISK || file_type == FILE_TYPE_UNKNOWN
-            @blockdev = true
-         end
-      end
-      
       file_type
    end
    

data/test/tc_file_stat.rb

@@ -13,18 +13,30 @@ end
 
 require 'test/unit'
 require 'win32/file/stat'
+include Windows::Volume
+
+# Find a block device
+'A'.upto('Z'){ |volume|
+   volume += ":\\"
+   case GetDriveType(volume)
+      when DRIVE_REMOVABLE, DRIVE_CDROM, DRIVE_RAMDISK
+         $block_dev = volume
+         break
+   end
+}
 
 class TC_Win32_File_Stat < Test::Unit::TestCase
-   include Windows::File  
+   include Windows::File
+     
    def setup
       @file   = 'sometestfile.txt'
       @exe    = 'sometestfile.exe'
       @dir    = Dir.pwd 
-      @stat   = File::Stat.new(@file)
+      @stat   = File::Stat.new(@file)  
    end
    
    def test_version
-      assert_equal('1.2.3', File::Stat::VERSION)
+      assert_equal('1.2.4', File::Stat::VERSION)
    end
    
    # One or more tests will fail if the archive attribute on @file is not set.
@@ -46,8 +58,9 @@ class TC_Win32_File_Stat < Test::Unit::TestCase
    
    def test_blockdev
       assert_respond_to(@stat, :blockdev?)
-      assert_equal(true, @stat.blockdev?)
+      assert_equal(false, @stat.blockdev?)
       assert_equal(false, File::Stat.new('NUL').blockdev?)
+      assert_equal(true, File::Stat.new($block_dev).blockdev?)
    end
    
    def test_blocks

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.3"
+   gem.version     = "1.2.4"
    gem.author      = "Daniel J. Berger"
    gem.email       = "djberg96@gmail.com"
    gem.homepage    = "http://www.rubyforge.org/projects/win32utils"
@@ -15,7 +15,7 @@ spec = Gem::Specification.new do |gem|
    gem.files.reject! { |fn| fn.include? "CVS" }
    gem.require_path = "lib"
    gem.extra_rdoc_files = ["README", "CHANGES"]
-   gem.add_dependency("windows-pr", ">= 0.4.0")
+   gem.add_dependency("windows-pr", ">= 0.6.0")
 end
 
 if $0 == __FILE__

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.0.8
 specification_version: 1
 name: win32-file-stat
 version: !ruby/object:Gem::Version 
-  version: 1.2.3
-date: 2006-11-04 00:00:00 -07:00
+  version: 1.2.4
+date: 2007-01-22 00:00:00 -07:00
 summary: A File::Stat class tailored to MS Windows
 require_paths: 
 - lib
@@ -31,12 +31,14 @@ authors:
 files: 
 - lib/win32/file/stat.rb
 - CHANGES
+- CVS
 - install.rb
 - lib
 - MANIFEST
 - README
 - test
 - win32-file-stat.gemspec
+- test/CVS
 - test/sometestfile.exe
 - test/sometestfile.txt
 - test/tc_file_stat.rb
@@ -61,5 +63,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.4.0
+        version: 0.6.0
     version: