win32-file-stat 1.3.1 → 1.3.2

data/CHANGES

@@ -1,3 +1,12 @@
+== 1.3.2 - 1-Oct-2008
+* Fixed an issue with the private get_blksize method.
+* Updated the test suite to use Test::Unit 2.x, which also makes it a
+  required dependency.
+* Removed the pre-generated .txt and .exe files that were used for testing.
+  These are now generated within the test suite itself.
+* Fixed two broken size tests, and now omits one blockdev test if there's no
+  media in the drive.
+
 == 1.3.1 - 9-Aug-2008
 * Fixed the stat buf to be the proper size (I had too many struct members).
 * Modified the tests slightly.

data/MANIFEST

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

data/lib/win32/file/stat.rb

@@ -21,7 +21,7 @@ class File::Stat
    include Windows::Volume
    include Comparable
    
-   VERSION = '1.3.1'
+   VERSION = '1.3.2'
 
    private
 
@@ -548,14 +548,15 @@ class File::Stat
       # The dup is necessary here because the function modifies the argument.
       file = file.dup
       
-      if PathStripToRootW(file)
-         file += "\\" unless file[-1].chr == "\\"
+      if PathStripToRootA(wide_to_multi(file))
+         file = file[/^[^\0]*/] << ':'
+         file << "\\" unless file[-1].chr == "\\"
       else
          file = nil # Default to the root drive on relative paths
       end
       
       # Don't check for an error here.  Just default to nil.
-      if GetDiskFreeSpaceW(file, sectors, bytes, free, total)
+      if GetDiskFreeSpaceA(file, sectors, bytes, free, total)
          size = sectors.unpack('L').first * bytes.unpack('L').first
       end
       

data/test/test_file_stat.rb

@@ -4,37 +4,46 @@
 # Test case for stat related methods of win32-file. You should use
 # the 'rake test' task to run these tests.
 #####################################################################
+require 'rubygems'
+gem 'test-unit'
 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
+
+   def self.startup
+      Dir.chdir('test') unless File.basename(Dir.pwd) == 'test'
+
+      'A'.upto('Z'){ |volume|
+         volume += ":\\"
+         case GetDriveType(volume)
+         when DRIVE_REMOVABLE, DRIVE_CDROM, DRIVE_RAMDISK
+            @@block_dev = volume
+            break
+         end
+      }
+
+      @@txt_file = 'test_file.txt'
+      @@exe_file = 'test_file.exe'
+
+      File.open(@@txt_file, "w"){ |fh| fh.print "This is a test\nHello" }
+      File.open(@@exe_file, "wb"){ |fh| fh.print "This is a test" }
+   end
      
    def setup
-      Dir.chdir('test') unless File.basename(Dir.pwd) == 'test'
-      @file   = 'sometestfile.txt'
-      @exe    = 'sometestfile.exe'
-      @dir    = Dir.pwd 
-      @stat   = File::Stat.new(@file)
-      @attr   = GetFileAttributes(@file)  
+      @dir  = Dir.pwd 
+      @stat = File::Stat.new(@@txt_file)
+      @attr = GetFileAttributes(@@txt_file)  
    end
    
    def test_version
-      assert_equal('1.3.1', File::Stat::VERSION)
+      assert_equal('1.3.2', File::Stat::VERSION)
    end
    
-   # One or more tests will fail if the archive attribute on @file is not set.
+   # One or more tests will fail if the archive attribute on @@text_file
+   # is not set.
    def test_archive
       assert_respond_to(@stat, :archive?)
       assert_nothing_raised{ @stat.archive? }
@@ -57,7 +66,12 @@ class TC_Win32_File_Stat < Test::Unit::TestCase
       assert_respond_to(@stat, :blockdev?)
       assert_equal(false, @stat.blockdev?)
       assert_equal(false, File::Stat.new('NUL').blockdev?)
-      assert_equal(true, File::Stat.new($block_dev).blockdev?)
+
+      begin
+         assert_equal(true, File::Stat.new(@@block_dev).blockdev?)
+      rescue SystemCallError      
+         omit("Skipping because drive is empty")
+      end
    end
    
    def test_blocks
@@ -74,7 +88,7 @@ class TC_Win32_File_Stat < Test::Unit::TestCase
    
    def test_comparison
       assert_respond_to(@stat, :<=>)
-      assert_nothing_raised{ @stat <=> File::Stat.new(@exe) }
+      assert_nothing_raised{ @stat <=> File::Stat.new(@@exe_file) }
    end
    
    def test_compressed
@@ -113,19 +127,19 @@ class TC_Win32_File_Stat < Test::Unit::TestCase
    def test_executable
       assert_respond_to(@stat, :executable?)
       assert_equal(false, @stat.executable?)
-      assert_equal(true, File::Stat.new(@exe).executable?)
+      assert_equal(true, File::Stat.new(@@exe_file).executable?)
    end
    
    def test_executable_real
       assert_respond_to(@stat, :executable_real?)
       assert_equal(false, @stat.executable_real?)
-      assert_equal(true, File::Stat.new(@exe).executable_real?)
+      assert_equal(true, File::Stat.new(@@exe_file).executable_real?)
    end
    
    def test_file
       assert_respond_to(@stat, :file?)
       assert_equal(true, @stat.file?)
-      assert_equal(true, File::Stat.new(@exe).file?)
+      assert_equal(true, File::Stat.new(@@exe_file).file?)
       assert_equal(true, File::Stat.new(Dir.pwd).file?)
       assert_equal(false, File::Stat.new('NUL').file?)
    end
@@ -175,12 +189,12 @@ class TC_Win32_File_Stat < Test::Unit::TestCase
    
    def test_mode
       assert_respond_to(@stat, :mode)
-      assert_equal(33188, File::Stat.new(@file).mode)
-      assert_equal(33261, File::Stat.new(@exe).mode)
+      assert_equal(33188, File::Stat.new(@@txt_file).mode)
+      assert_equal(33261, File::Stat.new(@@exe_file).mode)
       assert_equal(16877, File::Stat.new(@dir).mode)
       
-      SetFileAttributes(@file, 1) # Set to readonly.
-      assert_equal(33060, File::Stat.new(@file).mode)
+      SetFileAttributes(@@txt_file, 1) # Set to readonly.
+      assert_equal(33060, File::Stat.new(@@txt_file).mode)
    end
    
    def test_mtime
@@ -251,12 +265,12 @@ class TC_Win32_File_Stat < Test::Unit::TestCase
 
    def test_size
       assert_respond_to(@stat, :size)
-      assert_equal(20, @stat.size)
+      assert_equal(21, @stat.size)
    end
    
    def test_size_bool
       assert_respond_to(@stat, :size?)
-      assert_equal(20, @stat.size?)
+      assert_equal(21, @stat.size?)
    end
    
    def test_socket
@@ -313,10 +327,17 @@ class TC_Win32_File_Stat < Test::Unit::TestCase
    end
 
    def teardown
-      SetFileAttributes(@file, @attr) # Set file back to normal
-      @file = nil
-      @exe  = nil
+      SetFileAttributes(@@txt_file, @attr) # Set file back to normal
       @dir  = nil
       @stat = nil     
+      @attr = nil
+   end
+
+   def self.shutdown
+      File.delete(@@txt_file) if File.exists?(@@txt_file)
+      File.delete(@@exe_file) if File.exists?(@@exe_file)
+      @@block_dev = nil
+      @@txt_file  = nil
+      @@exe_file  = nil
    end
 end

data/test/test_file_stat.rb~

@@ -0,0 +1,343 @@
+#####################################################################
+# test_file_stat.rb
+#
+# Test case for stat related methods of win32-file. You should use
+# the 'rake test' task to run these tests.
+#####################################################################
+require 'rubygems'
+gem 'test-unit'
+require 'test/unit'
+require 'win32/file/stat'
+include Windows::Volume
+
+class TC_Win32_File_Stat < Test::Unit::TestCase
+   include Windows::File
+
+   def self.startup
+      Dir.chdir('test') unless File.basename(Dir.pwd) == 'test'
+
+      'A'.upto('Z'){ |volume|
+         volume += ":\\"
+         case GetDriveType(volume)
+         when DRIVE_REMOVABLE, DRIVE_CDROM, DRIVE_RAMDISK
+            @@block_dev = volume
+            break
+         end
+      }
+
+      @@txt_file = 'test_file.txt'
+      @@exe_file = 'test_file.exe'
+
+      File.open(@@txt_file, "w"){ |fh| fh.print "This is a test\nHello" }
+      File.open(@@exe_file, "wb"){ |fh| fh.print "This is a test" }
+   end
+     
+   def setup
+      @dir  = Dir.pwd 
+      @stat = File::Stat.new(@@txt_file)
+      @attr = GetFileAttributes(@@txt_file)  
+   end
+   
+   def test_version
+      assert_equal('1.3.3', File::Stat::VERSION)
+   end
+   
+   # One or more tests will fail if the archive attribute on @@text_file
+   # is not set.
+   def test_archive
+      assert_respond_to(@stat, :archive?)
+      assert_nothing_raised{ @stat.archive? }
+      assert(@stat.archive?, '=> May fail - ignore')
+   end
+   
+   def test_atime
+      assert_respond_to(@stat, :atime)
+      assert_kind_of(Time, @stat.atime)
+   end
+   
+   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?)
+      assert_equal(false, File::Stat.new('NUL').blockdev?)
+
+      begin
+         assert_equal(true, File::Stat.new(@@block_dev).blockdev?)
+      rescue SystemCallError      
+         omit("Skipping because drive is empty")
+      end
+   end
+   
+   def test_blocks
+      assert_respond_to(@stat, :blocks)
+      assert_equal(1, @stat.blocks)
+   end
+   
+   def test_chardev
+      assert_respond_to(@stat, :chardev?)
+      assert_nothing_raised{ File::Stat.new("NUL").chardev? }     
+      assert_equal(true, File::Stat.new("NUL").chardev?)
+      assert_equal(false, File::Stat.new("C:\\").chardev?)
+   end
+   
+   def test_comparison
+      assert_respond_to(@stat, :<=>)
+      assert_nothing_raised{ @stat <=> File::Stat.new(@@exe_file) }
+   end
+   
+   def test_compressed
+      assert_respond_to(@stat, :compressed?)
+      assert_nothing_raised{ @stat.compressed? }
+      assert_equal(false, @stat.compressed?)
+   end
+   
+   def test_ctime
+      assert_respond_to(@stat, :ctime)
+      assert_kind_of(Time, @stat.ctime)
+   end
+   
+   # Assumes you've installed on C: drive.
+   def test_dev
+      assert_respond_to(@stat, :dev)
+      assert_equal('C:', @stat.dev)
+   end
+   
+   def test_dev_major
+      assert_respond_to(@stat, :dev_major)
+      assert_nil(@stat.dev_major)
+   end
+   
+   def test_dev_minor
+      assert_respond_to(@stat, :dev_minor)
+      assert_nil(@stat.dev_minor)
+   end
+   
+   def test_directory
+      assert_respond_to(@stat, :directory?)
+      assert_equal(false, @stat.directory?)
+      assert_equal(true, File::Stat.new("C:\\").directory?)
+   end
+   
+   def test_executable
+      assert_respond_to(@stat, :executable?)
+      assert_equal(false, @stat.executable?)
+      assert_equal(true, File::Stat.new(@@exe_file).executable?)
+   end
+   
+   def test_executable_real
+      assert_respond_to(@stat, :executable_real?)
+      assert_equal(false, @stat.executable_real?)
+      assert_equal(true, File::Stat.new(@@exe_file).executable_real?)
+   end
+   
+   def test_file
+      assert_respond_to(@stat, :file?)
+      assert_equal(true, @stat.file?)
+      assert_equal(true, File::Stat.new(@@exe_file).file?)
+      assert_equal(true, File::Stat.new(Dir.pwd).file?)
+      assert_equal(false, File::Stat.new('NUL').file?)
+   end
+   
+   def test_ftype
+      assert_respond_to(@stat, :ftype)
+      assert_equal('file', @stat.ftype)
+      assert_equal('characterSpecial', File::Stat.new('NUL').ftype)
+      assert_equal('directory', File::Stat.new(Dir.pwd).ftype)
+   end
+   
+   def encrypted
+      assert_respond_to(@stat, :encrypted?)
+      assert_nothing_raised{ @stat.encrypted? }
+   end
+   
+   def test_gid
+      assert_respond_to(@stat, :gid)
+      assert_equal(0, @stat.gid)
+   end
+   
+   def test_grpowned
+      assert_respond_to(@stat, :grpowned?)
+   end
+   
+   def test_hidden
+      assert_respond_to(@stat, :hidden?)
+      assert_nothing_raised{ @stat.hidden? }
+      assert_equal(false, @stat.hidden?)
+   end
+   
+   def test_indexed
+      assert_respond_to(@stat, :indexed?)
+      assert_respond_to(@stat, :content_indexed?) # alias
+      assert_nothing_raised{ @stat.indexed? }
+      assert(@stat.indexed?)
+   end
+   
+   def test_ino
+      assert_respond_to(@stat, :ino)
+      assert_equal(0, @stat.ino)
+   end
+   
+   def test_inspect
+      assert_respond_to(@stat, :inspect)
+   end
+   
+   def test_mode
+      assert_respond_to(@stat, :mode)
+      assert_equal(33188, File::Stat.new(@@txt_file).mode)
+      assert_equal(33261, File::Stat.new(@@exe_file).mode)
+      assert_equal(16877, File::Stat.new(@dir).mode)
+      
+      SetFileAttributes(@@txt_file, 1) # Set to readonly.
+      assert_equal(33060, File::Stat.new(@@txt_file).mode)
+   end
+   
+   def test_mtime
+      assert_respond_to(@stat, :mtime)
+      assert_kind_of(Time, @stat.mtime)
+   end
+   
+   def test_nlink
+      assert_respond_to(@stat, :nlink)
+      assert_equal(1, @stat.nlink)
+   end
+   
+   def test_normal
+      assert_respond_to(@stat, :normal?)
+      assert_nothing_raised{ @stat.normal? }
+      assert_equal(false, @stat.normal?)
+   end
+   
+   def test_offline
+      assert_respond_to(@stat, :offline?)
+      assert_nothing_raised{ @stat.offline? }
+      assert_equal(false, @stat.offline?)
+   end
+   
+   def test_pipe
+      assert_respond_to(@stat, :pipe?)
+      assert_equal(false, @stat.pipe?)
+   end
+   
+   def test_readable
+      assert_respond_to(@stat, :readable?)
+      assert_equal(true, @stat.readable?)
+   end
+   
+   def test_readable_real
+      assert_respond_to(@stat, :readable_real?)
+      assert_equal(true, @stat.readable_real?)
+   end
+   
+   def test_readonly
+      assert_respond_to(@stat, :readonly?)
+      assert_nothing_raised{ @stat.readonly? }
+      assert_equal(false, @stat.readonly?)
+   end
+   
+   def test_reparse_point
+      assert_respond_to(@stat, :reparse_point?)
+      assert_nothing_raised{ @stat.reparse_point? }
+      assert_equal(false, @stat.reparse_point?)
+   end 
+   
+   # Assumes you've installed on C: drive.
+   def test_rdev
+      msg = "ignore failure if Ruby is not installed on C: drive"
+      assert_respond_to(@stat, :rdev)
+      assert_equal(2, @stat.rdev, msg)
+   end
+   
+   def test_setgid
+      assert_respond_to(@stat, :setgid?)
+      assert_equal(false, @stat.setgid?)
+   end
+   
+   def test_setuid
+      assert_respond_to(@stat, :setuid?)
+      assert_equal(false, @stat.setuid?)
+   end
+
+   def test_size
+      assert_respond_to(@stat, :size)
+      assert_equal(21, @stat.size)
+   end
+   
+   def test_size_bool
+      assert_respond_to(@stat, :size?)
+      assert_equal(21, @stat.size?)
+   end
+   
+   def test_socket
+      assert_respond_to(@stat, :socket?)
+      assert_equal(false, @stat.socket?)
+   end
+   
+   def test_sparse
+      assert_respond_to(@stat, :sparse?)
+      assert_nothing_raised{ @stat.sparse? }
+      assert_equal(false, @stat.sparse?)
+   end
+   
+   def test_sticky
+      assert_respond_to(@stat, :sticky?)
+      assert_equal(false, @stat.sticky?)
+   end
+   
+   def test_symlink
+      assert_respond_to(@stat, :symlink?)
+      assert_equal(false, @stat.symlink?)
+   end
+   
+   def test_system
+      assert_respond_to(@stat, :system?)
+      assert_nothing_raised{ @stat.system? }
+      assert_equal(false, @stat.system?)
+   end
+   
+   def test_temporary
+      assert_respond_to(@stat, :temporary?)
+      assert_nothing_raised{ @stat.temporary? }
+      assert_equal(false, @stat.temporary?)
+   end  
+   
+   def test_uid
+      assert_respond_to(@stat, :uid)
+      assert_equal(0, @stat.uid)
+   end
+   
+   def test_writable
+      assert_respond_to(@stat, :writable?)
+      assert_equal(true, @stat.writable?)
+   end
+   
+   def test_writable_real
+      assert_respond_to(@stat, :writable_real?)
+      assert_equal(true, @stat.writable_real?)
+   end
+   
+   def test_zero
+      assert_respond_to(@stat, :zero?)
+      assert_equal(false, @stat.zero?)
+   end
+
+   def teardown
+      SetFileAttributes(@@txt_file, @attr) # Set file back to normal
+      @dir  = nil
+      @stat = nil     
+      @attr = nil
+   end
+
+   def self.shutdown
+      File.delete(@@txt_file) if File.exists?(@@txt_file)
+      File.delete(@@exe_file) if File.exists?(@@exe_file)
+      @@block_dev = nil
+      @@txt_file  = nil
+      @@exe_file  = nil
+   end
+end

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.3.1"
+   gem.version     = "1.3.2"
    gem.authors     = ["Daniel J. Berger", "Park Heesob"]
    gem.email       = "djberg96@gmail.com"
    gem.homepage    = "http://www.rubyforge.org/projects/win32utils"
@@ -16,6 +16,7 @@ spec = Gem::Specification.new do |gem|
    gem.require_path = "lib"
    gem.extra_rdoc_files = ["README", "CHANGES"]
    gem.add_dependency("windows-pr", ">= 0.9.1")
+   gem.add_dependency("test-unit", ">= 2.0.0")
    gem.rubyforge_project = 'Win32Utils'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: win32-file-stat
 version: !ruby/object:Gem::Version 
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-09 00:00:00 -06:00
+date: 2008-10-01 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,6 +23,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.9.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: test-unit
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.0
+    version: 
 description: A File::Stat class tailored to MS Windows
 email: djberg96@gmail.com
 executables: []
@@ -41,9 +51,8 @@ files:
 - README
 - test
 - win32-file-stat.gemspec
-- test/sometestfile.exe
-- test/sometestfile.txt
 - test/test_file_stat.rb
+- test/test_file_stat.rb~
 has_rdoc: true
 homepage: http://www.rubyforge.org/projects/win32utils
 post_install_message: 
@@ -66,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: Win32Utils
-rubygems_version: 1.2.0
+rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
 summary: A File::Stat class tailored to MS Windows

data/test/sometestfile.exe

@@ -1 +0,0 @@
-This is a test

data/test/sometestfile.txt

@@ -1,2 +0,0 @@
-This is a test
-Hello