win32-file-stat 1.2.7 → 1.2.8

data/CHANGES

@@ -1,3 +1,8 @@
+== 1.2.8 - 29-Jul-2008
+* Internally now always uses wide character functions.
+* A private alias was made private.
+* Now requires windows-pr 0.9.1 or later.
+
 == 1.2.7 - 1-Oct-2007
 * Changed an error type in a private method in order to maintain
   compatibility with the FileUtils module.
@@ -32,7 +37,7 @@
 
 == 1.2.0 - 23-Apr-2006
 * Removed the attribute setters.  From now on this class provides readonly
-  methods.  Use the win32-file package for attribute setters.
+  methods.  Use the win32-file library for attribute setters.
 * Added the content_indexed? alias for the indexed? method.
 * Corresponding test suite changes.
 * Fixed the pp issue by writing a custom pretty_print method.

data/MANIFEST

@@ -6,4 +6,4 @@
 * lib/win32/file/stat.rb
 * test/sometestfile.exe
 * test/sometestfile.txt
-* test/tc_file_stat.rb
+* test/test_file_stat.rb

data/README

@@ -2,8 +2,8 @@
 A redefinition of the File::Stat class for MS Windows.
 
 = Prerequisites
-* Ruby 1.8.0 or later.
-* windows-pr 0.6.0 or later.
+* Ruby 1.8.2 or later.
+* windows-pr 0.9.1 or later.
 
 = Installation
 rake install (non-gem) OR rake install_gem (gems)
@@ -37,32 +37,35 @@ rake install (non-gem) OR rake install_gem (gems)
   
 = 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
+win32-file library 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.
+methods have been redefined in the win32-file library to work in conjunction
+with the custom File::Stat objects created by this library.
 
 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.
+and that 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.
+None that I'm aware of beyond the Known Issues listed above. Please report any
+bugs you find on the project page at:
+
+http://www.rubyforge.org/projects/win32utils.
 
 = Miscellaneous
 I had to require 'pp' explicitly in order to deal with the fact that pp.rb
-has a builtin pretty_print method for File::Stat.  If I didn't do this
+has a builtin pretty_print method for File::Stat. If I didn't do this
 you would end up using the pretty_print in pp.rb, which would break.
 
 = License
 Ruby's
 
 = Warranty
-This package is provided "as is" and without any express or
+This library is provided "as is" and without any express or
 implied warranties, including, without limitation, the implied
 warranties of merchantability and fitness for a particular purpose.
 
-= Author
-Daniel J. Berger
+= Authors
+Daniel J. Berger
+Park Heesob

data/Rakefile

@@ -23,8 +23,6 @@ task :install_gem do
 end
 
 Rake::TestTask.new do |t|
-   t.libs << 'test'
    t.verbose = true
    t.warning = true
-   t.test_files = FileList['test/tc_file_stat.rb']
 end

data/lib/win32/file/stat.rb

@@ -21,7 +21,9 @@ class File::Stat
    include Windows::Volume
    include Comparable
    
-   VERSION = '1.2.7'
+   VERSION = '1.2.8'
+
+   private
 
    # Defined in Ruby's win32.h.  Not meant for public consumption.
    S_IWGRP = 0020
@@ -39,6 +41,8 @@ class File::Stat
    undef_method(:size, :size?, :socket?, :sticky?, :symlink?, :uid, :writable?)
    undef_method(:writable_real?, :zero?)
    undef_method(:pretty_print, :inspect, :<=>)
+   
+   public
 
    attr_reader :dev_major, :dev_minor, :rdev_major, :rdev_minor
    
@@ -48,12 +52,13 @@ class File::Stat
    # the file after that point will not be reflected.
    #
    def initialize(file)
-      @file = file
+      @file = file.tr('/', "\\")
+      @file = multi_to_wide(@file)
       
-      @file_type = get_file_type(file)
+      @file_type = get_file_type(@file)
       @chardev = @file_type == FILE_TYPE_CHAR
 
-      case GetDriveType(file)
+      case GetDriveTypeW(@file)
          when DRIVE_REMOVABLE, DRIVE_CDROM, DRIVE_RAMDISK
             @blockdev = true
          else
@@ -63,7 +68,7 @@ class File::Stat
       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
-      if stat64(file, stat_buf) != 0
+      if wstat64(@file, stat_buf) != 0
           raise ArgumentError, get_last_error unless @chardev
       end
 
@@ -91,17 +96,17 @@ class File::Stat
       
       @mode = 33188 if @chardev
 
-      attr = GetFileAttributes(file)
-      error_num = GetLastError()
+      attributes = GetFileAttributesW(@file)
+      error_num  = GetLastError()
       
       # Ignore errors caused by empty/open/used block devices.
-      if attr == INVALID_FILE_ATTRIBUTES
+      if attributes == INVALID_FILE_ATTRIBUTES
          unless error_num == ERROR_NOT_READY
             raise ArgumentError, get_last_error(error_num)
          end
       end
       
-      @blksize = get_blksize(file)
+      @blksize = get_blksize(@file)
       
       # This is a reasonable guess
       case @blksize
@@ -113,21 +118,21 @@ class File::Stat
             @blocks  = (@size.to_f / @blksize.to_f).ceil
       end
       
-      @readonly      = attr & FILE_ATTRIBUTE_READONLY > 0
-      @hidden        = attr & FILE_ATTRIBUTE_HIDDEN > 0
-      @system        = attr & FILE_ATTRIBUTE_SYSTEM > 0
-      @archive       = attr & FILE_ATTRIBUTE_ARCHIVE > 0
-      @directory     = attr & FILE_ATTRIBUTE_DIRECTORY > 0
-      @encrypted     = attr & FILE_ATTRIBUTE_ENCRYPTED > 0
-      @normal        = attr & FILE_ATTRIBUTE_NORMAL > 0
-      @temporary     = attr & FILE_ATTRIBUTE_TEMPORARY > 0
-      @sparse        = attr & FILE_ATTRIBUTE_SPARSE_FILE > 0
-      @reparse_point = attr & FILE_ATTRIBUTE_REPARSE_POINT > 0
-      @compressed    = attr & FILE_ATTRIBUTE_COMPRESSED > 0
-      @offline       = attr & FILE_ATTRIBUTE_OFFLINE > 0
-      @indexed       = attr & ~FILE_ATTRIBUTE_NOT_CONTENT_INDEXED > 0
+      @readonly      = attributes & FILE_ATTRIBUTE_READONLY > 0
+      @hidden        = attributes & FILE_ATTRIBUTE_HIDDEN > 0
+      @system        = attributes & FILE_ATTRIBUTE_SYSTEM > 0
+      @archive       = attributes & FILE_ATTRIBUTE_ARCHIVE > 0
+      @directory     = attributes & FILE_ATTRIBUTE_DIRECTORY > 0
+      @encrypted     = attributes & FILE_ATTRIBUTE_ENCRYPTED > 0
+      @normal        = attributes & FILE_ATTRIBUTE_NORMAL > 0
+      @temporary     = attributes & FILE_ATTRIBUTE_TEMPORARY > 0
+      @sparse        = attributes & FILE_ATTRIBUTE_SPARSE_FILE > 0
+      @reparse_point = attributes & FILE_ATTRIBUTE_REPARSE_POINT > 0
+      @compressed    = attributes & FILE_ATTRIBUTE_COMPRESSED > 0
+      @offline       = attributes & FILE_ATTRIBUTE_OFFLINE > 0
+      @indexed       = attributes & ~FILE_ATTRIBUTE_NOT_CONTENT_INDEXED > 0
       
-      @executable = GetBinaryType(file, '')
+      @executable = GetBinaryTypeW(@file, '')
       @regular    = @file_type == FILE_TYPE_DISK
       @pipe       = @file_type == FILE_TYPE_PIPE
       
@@ -539,7 +544,7 @@ class File::Stat
       # 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 PathStripToRoot(file.dup)
+      if PathStripToRootW(file.dup)
          file += "\\" unless file[-1].chr == "\\"
       else
          file = 0 # Default to root drive
@@ -556,34 +561,42 @@ class File::Stat
    # Returns the file's type (as a numeric).
    #
    def get_file_type(file)
-      handle = CreateFile(
-         file,
-         0,
-         0,
-         0,
-         OPEN_EXISTING,
-         FILE_FLAG_BACKUP_SEMANTICS, # Need this for directories
-         0
-      )
+      begin
+         handle = CreateFileW(
+            file,
+            GENERIC_READ,
+            FILE_SHARE_READ,
+            nil,
+            OPEN_EXISTING,
+            FILE_FLAG_BACKUP_SEMANTICS, # Need this for directories
+            nil
+         )
       
-      error_num = GetLastError()
+         error_num = GetLastError()
       
-      # Ignore errors caused by open/empty/used block devices. We raise a
-      # 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)
+         # Ignore errors caused by open/empty/used block devices. We raise a
+         # 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
          end
-      end
       
-      file_type = GetFileType(handle)
-      error = GetLastError()
-           
-      CloseHandle(handle)
+         file_type = GetFileType(handle)
+         error_num = GetLastError()
+      ensure     
+         CloseHandle(handle)
+      end
+
+      if file_type == FILE_TYPE_UNKNOWN && error_num != NO_ERROR
+         raise SystemCallError, get_last_error(error_num)
+      end
       
       file_type
    end
+
+   private
    
    # Verifies that a value is either true or false
    def check_bool(val)

data/test/{tc_file_stat.rb → test_file_stat.rb}

@@ -1,5 +1,5 @@
 #####################################################################
-# tc_file_stat.rb
+# test_file_stat.rb
 #
 # Test case for stat related methods of win32-file. You should use
 # the 'rake test' task to run these tests.
@@ -30,14 +30,14 @@ class TC_Win32_File_Stat < Test::Unit::TestCase
    end
    
    def test_version
-      assert_equal('1.2.7', File::Stat::VERSION)
+      assert_equal('1.2.8', File::Stat::VERSION)
    end
    
    # One or more tests will fail if the archive attribute on @file is not set.
    def test_archive
       assert_respond_to(@stat, :archive?)
       assert_nothing_raised{ @stat.archive? }
-      assert(@stat.archive?, '- May fail: ignore -')
+      assert(@stat.archive?, '=> May fail - ignore')
    end
    
    def test_atime

data/win32-file-stat.gemspec

@@ -2,20 +2,21 @@ require "rubygems"
 
 spec = Gem::Specification.new do |gem|
    gem.name        = "win32-file-stat"
-   gem.version     = "1.2.7"
-   gem.author      = "Daniel J. Berger"
+   gem.version     = "1.2.8"
+   gem.authors     = ["Daniel J. Berger", "Park Heesob"]
    gem.email       = "djberg96@gmail.com"
    gem.homepage    = "http://www.rubyforge.org/projects/win32utils"
    gem.platform    = Gem::Platform::RUBY
    gem.summary     = "A File::Stat class tailored to MS Windows"
    gem.description = "A File::Stat class tailored to MS Windows"
-   gem.test_file   = "test/tc_file_stat.rb"
+   gem.test_file   = "test/test_file_stat.rb"
    gem.has_rdoc    = true
    gem.files = Dir['lib/win32/file/*.rb'] + Dir['[A-Z]*']  + Dir['test/*']
    gem.files.reject! { |fn| fn.include? "CVS" }
    gem.require_path = "lib"
    gem.extra_rdoc_files = ["README", "CHANGES"]
-   gem.add_dependency("windows-pr", ">= 0.6.0")
+   gem.add_dependency("windows-pr", ">= 0.9.1")
+   gem.rubyforge_project = 'Win32Utils'
 end
 
 if $0 == __FILE__

metadata

@@ -1,67 +1,74 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: win32-file-stat
 version: !ruby/object:Gem::Version 
-  version: 1.2.7
-date: 2007-10-01 00:00:00 -06:00
-summary: A File::Stat class tailored to MS Windows
-require_paths: 
-- lib
-email: djberg96@gmail.com
-homepage: http://www.rubyforge.org/projects/win32utils
-rubyforge_project: 
-description: A File::Stat class tailored to MS Windows
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 1.2.8
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Daniel J. Berger
+- Park Heesob
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-07-29 00:00:00 -06:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: windows-pr
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.1
+    version: 
+description: A File::Stat class tailored to MS Windows
+email: djberg96@gmail.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
+- CHANGES
 files: 
 - lib/win32/file/stat.rb
 - CHANGES
-- CVS
 - lib
 - MANIFEST
 - Rakefile
 - README
 - test
 - win32-file-stat.gemspec
-- test/CVS
 - test/sometestfile.exe
 - test/sometestfile.txt
-- test/tc_file_stat.rb
-test_files: 
-- test/tc_file_stat.rb
+- test/test_file_stat.rb
+has_rdoc: true
+homepage: http://www.rubyforge.org/projects/win32utils
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: 
-- README
-- CHANGES
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: windows-pr
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.6.0
-    version: 
+rubyforge_project: Win32Utils
+rubygems_version: 1.2.0
+signing_key: 
+specification_version: 2
+summary: A File::Stat class tailored to MS Windows
+test_files: 
+- test/test_file_stat.rb