win32-file 0.6.6 → 0.6.7

data/CHANGES

@@ -1,3 +1,9 @@
+== 0.6.7 - 23-Nov-2011
+* Fixed an encoding problem with File.set_permissions for Ruby 1.9.x.
+* Fixed a bug in File.basename where an error could be caused by trailing
+  slashes. Thanks go to paz for the spot and patch.
+* Updated the clean task in the Rakefile.
+
 == 0.6.6 - 3-Sep-2010
 * Fixed a bug in the custom File.dirname where trailing slashes were
   affecting the result. Trailing slashes are now ignored.

data/Rakefile

@@ -1,14 +1,10 @@
 require 'rake'
 require 'rake/testtask'
+require 'rake/clean'
 require 'rbconfig'
 include Config
 
-desc 'Clean any text files that may have been left over from tests'
-task :clean do 
-  Dir['test/*'].each{ |file|
-    rm file if File.extname(file) == '.txt'
-  }
-end
+CLEAN.include("**/*.txt", "**/*.gem", "**/*.rbc")
 
 namespace 'gem' do
   desc 'Create the win32-file gem'

data/lib/win32/file.rb

@@ -19,7 +19,7 @@ class File
   extend Windows::Handle
    
   # The version of the win32-file library
-  WIN32_FILE_VERSION = '0.6.6'
+  WIN32_FILE_VERSION = '0.6.7'
 
   # Abbreviated attribute constants for convenience
 
@@ -176,8 +176,9 @@ class File
       all_ace = 0.chr * ALLOW_ACE_LENGTH
       all_ace_ptr = memset(all_ace, 0, 0) # address of all_ace
 
+
       # all_ace_ptr->Header.AceType = ACCESS_ALLOWED_ACE_TYPE
-      all_ace[0] = 0
+      all_ace[0] = 0.chr
 
       perms.each{ |account, mask|
         next if mask.nil?
@@ -225,7 +226,10 @@ class File
         end
 
         # all_ace_ptr->Header.AceFlags = INHERIT_ONLY_ACE|OBJECT_INHERIT_ACE
-        all_ace[1] = INHERIT_ONLY_ACE | OBJECT_INHERIT_ACE
+        all_ace[1] = (INHERIT_ONLY_ACE | OBJECT_INHERIT_ACE).chr
+
+        # WHY DO I NEED THIS RUBY CORE TEAM? WHY?!?!?!?!?!?
+        all_ace.force_encoding('ASCII-8BIT') if RUBY_VERSION.to_f >= 1.9
 
         2.times{
           if account_rights != 0
@@ -245,10 +249,10 @@ class File
             end
 
             # all_ace_ptr->Header.AceFlags = CONTAINER_INHERIT_ACE
-            all_ace[1] = CONTAINER_INHERIT_ACE
+            all_ace[1] = CONTAINER_INHERIT_ACE.chr
           else
             # all_ace_ptr->Header.AceFlags = 0
-            all_ace[1] = 0
+            all_ace[1] = 0.chr
           end
 
           account_rights = REST_RIGHTS_MASK & mask
@@ -483,7 +487,7 @@ class File
       end
 
       file = wide_to_multi(file)
-      file.chop! while file[-1].chr == "\\" # Trim trailing slashes
+      file.sub!(/\\+\z/, '') # Trim trailing slashes
 
       file
     end

data/test/test_win32_file_attributes.rb

@@ -26,7 +26,7 @@ class TC_Win32_File_Attributes < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal('0.6.6', File::WIN32_FILE_VERSION)
+      assert_equal('0.6.7', File::WIN32_FILE_VERSION)
    end
    
    def test_is_directory

data/test/test_win32_file_path.rb

@@ -1,246 +1,256 @@
-#############################################################################
-# test_win32_file_path.rb
-#
-# Test case for the path related methods of win32-file. You should run this
-# test via the 'rake test' or 'rake test_path' task.
-#############################################################################
-require 'rubygems'
-gem 'test-unit'
-
-require 'test/unit'
-require 'win32/file'
-
-class TC_Win32_File_Path < Test::Unit::TestCase
-  def self.startup
-    Dir.chdir(File.dirname(File.expand_path(File.basename(__FILE__))))
-    @@file = File.join(Dir.pwd, 'path_test.txt')
-    File.open(@@file, 'w'){ |fh| fh.puts "This is a path test." }
-  end
-
-  def setup
-    @long_file  = File.join(Dir.pwd, 'path_test.txt')      
-    @short_file = File.join(Dir.pwd, 'PATH_T~1.TXT')
-  end
-   
-  test "basename method basic functionality" do
-    assert_respond_to(File, :basename)
-    assert_nothing_raised{ File.basename("C:\\foo") }
-    assert_kind_of(String, File.basename("C:\\foo"))
-  end
-      
-  test "basename method handles standard paths" do
-    assert_equal("baz.txt", File.basename("C:\\foo\\bar\\baz.txt"))
-    assert_equal("baz", File.basename("C:\\foo\\bar\\baz.txt", ".txt"))
-    assert_equal("baz.txt", File.basename("C:\\foo\\bar\\baz.txt", ".zip"))
-    assert_equal("bar", File.basename("C:\\foo\\bar"))
-    assert_equal("bar", File.basename("C:\\foo\\bar\\"))
-    assert_equal("foo", File.basename("C:\\foo"))
-    assert_equal("C:\\", File.basename("C:\\"))
-  end
-      
-  test "basename method handles unc paths" do
-    assert_equal("baz.txt", File.basename("\\\\foo\\bar\\baz.txt"))
-    assert_equal("baz", File.basename("\\\\foo\\bar\\baz"))
-    assert_equal("\\\\foo", File.basename("\\\\foo"))
-    assert_equal("\\\\foo\\bar", File.basename("\\\\foo\\bar"))
-  end
- 
-  test "basename method handles forward slashes in standard unix paths" do
-    assert_equal("bar", File.basename("/foo/bar"))
-    assert_equal("bar.txt", File.basename("/foo/bar.txt"))
-    assert_equal("bar.txt", File.basename("bar.txt"))
-    assert_equal("bar", File.basename("/bar"))
-    assert_equal("bar", File.basename("/bar/"))
-    assert_equal("baz", File.basename("//foo/bar/baz"))
-  end
-
-  test "basename method handles forward slashes in unc unix paths" do
-    assert_equal("\\\\foo", File.basename("//foo"))
-    assert_equal("\\\\foo\\bar", File.basename("//foo/bar"))
-  end
-      
-  test "basename method handles forward slashes in windows paths" do
-    assert_equal("bar", File.basename("C:/foo/bar"))
-    assert_equal("bar", File.basename("C:/foo/bar/"))
-    assert_equal("foo", File.basename("C:/foo"))
-    assert_equal("C:\\", File.basename("C:/"))
-    assert_equal("bar", File.basename("C:/foo/bar//"))
-  end
-         
-  test "basename handles edge cases as expected" do
-    assert_equal("", File.basename(""))
-    assert_equal(".", File.basename("."))
-    assert_equal("..", File.basename(".."))
-    assert_equal("foo", File.basename("//foo/"))
-  end
- 
-  test "basename handles path names with suffixes" do
-    assert_equal("bar", File.basename("bar.txt", ".txt"))
-    assert_equal("bar", File.basename("/foo/bar.txt", ".txt"))
-    assert_equal("bar.txt", File.basename("bar.txt", ".exe"))
-    assert_equal("bar.txt", File.basename("bar.txt.exe", ".exe"))
-    assert_equal("bar.txt.exe", File.basename("bar.txt.exe", ".txt"))
-    assert_equal("bar", File.basename("bar.txt", ".*"))
-    assert_equal("bar.txt", File.basename("bar.txt.exe", ".*"))
-  end
-      
-  test "basename method does not modify its argument" do
-    path = "C:\\foo\\bar"
-    assert_nothing_raised{ File.basename(path) }
-    assert_equal("C:\\foo\\bar", path)    
-  end
-   
-  test "dirname basic functionality" do
-    assert_respond_to(File, :dirname)
-    assert_nothing_raised{ File.dirname("C:\\foo") }
-    assert_kind_of(String, File.dirname("C:\\foo"))
-  end
-     
-  test "dirname handles standard windows paths as expected" do
-    assert_equal("C:\\foo", File.dirname("C:\\foo\\bar.txt"))
-    assert_equal("C:\\foo", File.dirname("C:\\foo\\bar"))
-    assert_equal("C:\\", File.dirname("C:\\foo"))
-    assert_equal("C:\\", File.dirname("C:\\"))
-    assert_equal(".", File.dirname("foo"))
-  end
-      
-  test "dirname handles unc windows paths as expected" do
-    assert_equal("\\\\foo\\bar", File.dirname("\\\\foo\\bar\\baz"))
-    assert_equal("\\\\foo\\bar", File.dirname("\\\\foo\\bar"))
-    assert_equal("\\\\foo", File.dirname("\\\\foo"))
-    assert_equal("\\\\", File.dirname("\\\\"))
-  end
-    
-  test "dirname handles forward slashes in standard windows path names" do
-    assert_equal("C:\\foo", File.dirname("C:/foo/bar.txt"))
-    assert_equal("C:\\foo", File.dirname("C:/foo/bar"))
-    assert_equal("C:\\", File.dirname("C:/foo"))
-    assert_equal("C:\\", File.dirname("C:/"))
-  end
-
-  test "dirname handles forward slashes in unc windows path names" do
-    assert_equal("\\\\foo\\bar", File.dirname("//foo/bar/baz"))
-    assert_equal("\\\\foo\\bar", File.dirname("//foo/bar"))
-    assert_equal("\\\\foo", File.dirname("//foo"))
-    assert_equal("\\\\", File.dirname("//"))
-  end
-
-  test "dirname handles forward slashes in relative path names" do
-    assert_equal(".", File.dirname("./foo"))
-    assert_equal(".\\foo", File.dirname("./foo/bar"))
-  end
-    
-  test "dirname handles various edge cases as expected" do
-    assert_equal(".", File.dirname(""))
-    assert_equal(".", File.dirname("."))
-    assert_equal(".", File.dirname(".."))
-    assert_equal(".", File.dirname("./"))
-  end
-      
-  test "dirname method does not modify its argument" do
-    path = "C:\\foo\\bar"
-    assert_nothing_raised{ File.dirname(path) }
-    assert_equal("C:\\foo\\bar", path)
-  end
-
-  test "dirname method ignores trailing slashes" do
-    assert_equal("C:\\foo\\bar", File.dirname("C:/foo/bar/baz/"))
-    assert_equal("C:\\foo\\bar", File.dirname("C:/foo/bar/baz//"))
-    assert_equal("C:\\foo\\bar", File.dirname("C:/foo/bar/baz///"))
-    assert_equal("C:\\foo\\bar", File.dirname("C:\\foo\\bar\\baz\\"))
-    assert_equal("\\\\foo\\bar", File.dirname("\\\\foo\\bar\\baz\\"))
-  end
-
-  test "argument to dirname must be a string" do
-    assert_raises(TypeError){ File.dirname(nil) }
-    assert_raises(TypeError){ File.dirname(['foo', 'bar']) }
-  end
-
-  test "split method basic functionality" do
-    assert_respond_to(File, :split)
-    assert_nothing_raised{ File.split("C:\\foo\\bar") }
-    assert_kind_of(Array, File.split("C:\\foo\\bar"))
-  end
-      
-  test "split method handles standard windows path names" do
-    assert_equal(["C:\\foo", "bar"], File.split("C:\\foo\\bar"))     
-    assert_equal([".", "foo"], File.split("foo"))
-  end
-
-  test "split method handles windows paths with forward slashes" do
-    assert_equal(["C:\\foo", "bar"], File.split("C:/foo/bar"))
-    assert_equal([".", "foo"], File.split("foo"))
-  end
-      
-  test "split method handles standard unix paths as expected" do
-    assert_equal(["\\foo","bar"], File.split("/foo/bar"))
-    assert_equal(["\\", "foo"], File.split("/foo"))
-    assert_equal([".", "foo"], File.split("foo"))
-  end
-      
-  test "split method handles unc paths as expected" do
-    assert_equal(["\\\\foo\\bar", "baz"], File.split("\\\\foo\\bar\\baz"))
-    assert_equal(["\\\\foo\\bar", ""], File.split("\\\\foo\\bar"))
-    assert_equal(["\\\\foo", ""], File.split("\\\\foo"))
-    assert_equal(["\\\\", ""], File.split("\\\\"))
-  end
-
-  test "split method handles various edge cases as expected" do
-    assert_equal(["C:\\", ""], File.split("C:\\"))
-    assert_equal(["", ""], File.split(""))
-  end
-      
-  test "split method does not modify its arguments" do
-    path = "C:\\foo\\bar"
-    assert_nothing_raised{ File.split(path) }
-    assert_equal("C:\\foo\\bar", path)
-  end
-   
-  test "long_path method works as expected" do
-    assert_respond_to(File, :long_path)
-    assert_equal(@long_file, File.long_path(@short_file))
-    assert_equal('PATH_T~1.TXT', File.basename(@short_file))
-  end
-   
-  test "short_path method works as expected" do
-    assert_respond_to(File, :short_path)
-    assert_equal('path_test.txt', File.basename(@long_file))
-  end
-
-  test "join method works as expected" do
-    assert_respond_to(File, :join)
-  end
-
-  test "join handles multiple arguments as expected" do
-    assert_equal("C:\\foo\\bar", File.join("C:", "foo", "bar"))
-    assert_equal("foo\\bar", File.join("foo", "bar"))
-  end
-
-  test "join handles multiple arguments as expected with unc paths" do
-    assert_equal("\\\\foo", File.join("\\\\foo"))
-    assert_equal("\\\\foo\\bar", File.join("\\\\foo", "bar"))
-  end
-
-  test "join does not normalize paths" do
-    assert_equal("C:\\.\\foo\\..", File.join("C:", ".", "foo", ".."))
-  end
-
-  test "join with no arguments returns an empty string" do
-    assert_equal('', File.join)
-  end
-
-  test "join with one argument returns the argument" do
-    assert_equal('foo', File.join('foo'))
-    assert_equal('c:', File.join('c:'))
-  end
-   
-  def teardown
-    @short_file = nil
-    @long_file  = nil
-  end
-
-  def self.shutdown
-    File.delete(@@file) if File.exists?(@@file)
-    @@file = nil
-  end
-end
+#############################################################################
+# test_win32_file_path.rb
+#
+# Test case for the path related methods of win32-file. You should run this
+# test via the 'rake test' or 'rake test_path' task.
+#############################################################################
+require 'rubygems'
+gem 'test-unit'
+
+require 'test/unit'
+require 'win32/file'
+
+class TC_Win32_File_Path < Test::Unit::TestCase
+  def self.startup
+    Dir.chdir(File.dirname(File.expand_path(File.basename(__FILE__))))
+    @@file = File.join(Dir.pwd, 'path_test.txt')
+    File.open(@@file, 'w'){ |fh| fh.puts "This is a path test." }
+  end
+
+  def setup
+    @long_file  = File.join(Dir.pwd, 'path_test.txt')      
+    @short_file = File.join(Dir.pwd, 'PATH_T~1.TXT')
+  end
+   
+  test "basename method basic functionality" do
+    assert_respond_to(File, :basename)
+    assert_nothing_raised{ File.basename("C:\\foo") }
+    assert_kind_of(String, File.basename("C:\\foo"))
+  end
+      
+  test "basename method handles standard paths" do
+    assert_equal("baz.txt", File.basename("C:\\foo\\bar\\baz.txt"))
+    assert_equal("baz", File.basename("C:\\foo\\bar\\baz.txt", ".txt"))
+    assert_equal("baz.txt", File.basename("C:\\foo\\bar\\baz.txt", ".zip"))
+    assert_equal("bar", File.basename("C:\\foo\\bar"))
+    assert_equal("bar", File.basename("C:\\foo\\bar\\"))
+    assert_equal("foo", File.basename("C:\\foo"))
+    assert_equal("C:\\", File.basename("C:\\"))
+  end
+      
+  test "basename method handles unc paths" do
+    assert_equal("baz.txt", File.basename("\\\\foo\\bar\\baz.txt"))
+    assert_equal("baz", File.basename("\\\\foo\\bar\\baz"))
+    assert_equal("\\\\foo", File.basename("\\\\foo"))
+    assert_equal("\\\\foo\\bar", File.basename("\\\\foo\\bar"))
+  end
+ 
+  test "basename method handles forward slashes in standard unix paths" do
+    assert_equal("bar", File.basename("/foo/bar"))
+    assert_equal("bar.txt", File.basename("/foo/bar.txt"))
+    assert_equal("bar.txt", File.basename("bar.txt"))
+    assert_equal("bar", File.basename("/bar"))
+    assert_equal("bar", File.basename("/bar/"))
+    assert_equal("baz", File.basename("//foo/bar/baz"))
+  end
+
+  test "basename method handles forward slashes in unc unix paths" do
+    assert_equal("\\\\foo", File.basename("//foo"))
+    assert_equal("\\\\foo\\bar", File.basename("//foo/bar"))
+  end
+      
+  test "basename method handles forward slashes in windows paths" do
+    assert_equal("bar", File.basename("C:/foo/bar"))
+    assert_equal("bar", File.basename("C:/foo/bar/"))
+    assert_equal("foo", File.basename("C:/foo"))
+    assert_equal("C:\\", File.basename("C:/"))
+    assert_equal("bar", File.basename("C:/foo/bar//"))
+  end
+         
+  test "basename handles edge cases as expected" do
+    assert_equal("", File.basename(""))
+    assert_equal(".", File.basename("."))
+    assert_equal("..", File.basename(".."))
+    assert_equal("foo", File.basename("//foo/"))
+  end
+ 
+  test "basename handles path names with suffixes" do
+    assert_equal("bar", File.basename("bar.txt", ".txt"))
+    assert_equal("bar", File.basename("/foo/bar.txt", ".txt"))
+    assert_equal("bar.txt", File.basename("bar.txt", ".exe"))
+    assert_equal("bar.txt", File.basename("bar.txt.exe", ".exe"))
+    assert_equal("bar.txt.exe", File.basename("bar.txt.exe", ".txt"))
+    assert_equal("bar", File.basename("bar.txt", ".*"))
+    assert_equal("bar.txt", File.basename("bar.txt.exe", ".*"))
+  end
+      
+  test "basename method does not modify its argument" do
+    path = "C:\\foo\\bar"
+    assert_nothing_raised{ File.basename(path) }
+    assert_equal("C:\\foo\\bar", path)    
+  end
+
+  test "basename removes all trailing slashes" do
+    assert_equal("foo.txt", File.basename("C:/foo.txt/"))
+    assert_equal("foo.txt", File.basename("C:/foo.txt//"))
+    assert_equal("foo.txt", File.basename("C:/foo.txt///"))
+    assert_equal("foo.txt", File.basename("C:\\foo.txt\\"))
+    assert_equal("foo.txt", File.basename("C:\\foo.txt\\\\"))
+    assert_equal("foo.txt", File.basename("C:\\foo.txt\\\\\\"))
+    assert_equal("foo.txt", File.basename("foo.txt\\\\\\"))
+  end
+   
+  test "dirname basic functionality" do
+    assert_respond_to(File, :dirname)
+    assert_nothing_raised{ File.dirname("C:\\foo") }
+    assert_kind_of(String, File.dirname("C:\\foo"))
+  end
+     
+  test "dirname handles standard windows paths as expected" do
+    assert_equal("C:\\foo", File.dirname("C:\\foo\\bar.txt"))
+    assert_equal("C:\\foo", File.dirname("C:\\foo\\bar"))
+    assert_equal("C:\\", File.dirname("C:\\foo"))
+    assert_equal("C:\\", File.dirname("C:\\"))
+    assert_equal(".", File.dirname("foo"))
+  end
+      
+  test "dirname handles unc windows paths as expected" do
+    assert_equal("\\\\foo\\bar", File.dirname("\\\\foo\\bar\\baz"))
+    assert_equal("\\\\foo\\bar", File.dirname("\\\\foo\\bar"))
+    assert_equal("\\\\foo", File.dirname("\\\\foo"))
+    assert_equal("\\\\", File.dirname("\\\\"))
+  end
+    
+  test "dirname handles forward slashes in standard windows path names" do
+    assert_equal("C:\\foo", File.dirname("C:/foo/bar.txt"))
+    assert_equal("C:\\foo", File.dirname("C:/foo/bar"))
+    assert_equal("C:\\", File.dirname("C:/foo"))
+    assert_equal("C:\\", File.dirname("C:/"))
+  end
+
+  test "dirname handles forward slashes in unc windows path names" do
+    assert_equal("\\\\foo\\bar", File.dirname("//foo/bar/baz"))
+    assert_equal("\\\\foo\\bar", File.dirname("//foo/bar"))
+    assert_equal("\\\\foo", File.dirname("//foo"))
+    assert_equal("\\\\", File.dirname("//"))
+  end
+
+  test "dirname handles forward slashes in relative path names" do
+    assert_equal(".", File.dirname("./foo"))
+    assert_equal(".\\foo", File.dirname("./foo/bar"))
+  end
+    
+  test "dirname handles various edge cases as expected" do
+    assert_equal(".", File.dirname(""))
+    assert_equal(".", File.dirname("."))
+    assert_equal(".", File.dirname(".."))
+    assert_equal(".", File.dirname("./"))
+  end
+      
+  test "dirname method does not modify its argument" do
+    path = "C:\\foo\\bar"
+    assert_nothing_raised{ File.dirname(path) }
+    assert_equal("C:\\foo\\bar", path)
+  end
+
+  test "dirname method ignores trailing slashes" do
+    assert_equal("C:\\foo\\bar", File.dirname("C:/foo/bar/baz/"))
+    assert_equal("C:\\foo\\bar", File.dirname("C:/foo/bar/baz//"))
+    assert_equal("C:\\foo\\bar", File.dirname("C:/foo/bar/baz///"))
+    assert_equal("C:\\foo\\bar", File.dirname("C:\\foo\\bar\\baz\\"))
+    assert_equal("\\\\foo\\bar", File.dirname("\\\\foo\\bar\\baz\\"))
+  end
+
+  test "argument to dirname must be a string" do
+    assert_raises(TypeError){ File.dirname(nil) }
+    assert_raises(TypeError){ File.dirname(['foo', 'bar']) }
+  end
+
+  test "split method basic functionality" do
+    assert_respond_to(File, :split)
+    assert_nothing_raised{ File.split("C:\\foo\\bar") }
+    assert_kind_of(Array, File.split("C:\\foo\\bar"))
+  end
+      
+  test "split method handles standard windows path names" do
+    assert_equal(["C:\\foo", "bar"], File.split("C:\\foo\\bar"))     
+    assert_equal([".", "foo"], File.split("foo"))
+  end
+
+  test "split method handles windows paths with forward slashes" do
+    assert_equal(["C:\\foo", "bar"], File.split("C:/foo/bar"))
+    assert_equal([".", "foo"], File.split("foo"))
+  end
+      
+  test "split method handles standard unix paths as expected" do
+    assert_equal(["\\foo","bar"], File.split("/foo/bar"))
+    assert_equal(["\\", "foo"], File.split("/foo"))
+    assert_equal([".", "foo"], File.split("foo"))
+  end
+      
+  test "split method handles unc paths as expected" do
+    assert_equal(["\\\\foo\\bar", "baz"], File.split("\\\\foo\\bar\\baz"))
+    assert_equal(["\\\\foo\\bar", ""], File.split("\\\\foo\\bar"))
+    assert_equal(["\\\\foo", ""], File.split("\\\\foo"))
+    assert_equal(["\\\\", ""], File.split("\\\\"))
+  end
+
+  test "split method handles various edge cases as expected" do
+    assert_equal(["C:\\", ""], File.split("C:\\"))
+    assert_equal(["", ""], File.split(""))
+  end
+      
+  test "split method does not modify its arguments" do
+    path = "C:\\foo\\bar"
+    assert_nothing_raised{ File.split(path) }
+    assert_equal("C:\\foo\\bar", path)
+  end
+   
+  test "long_path method works as expected" do
+    assert_respond_to(File, :long_path)
+    assert_equal(@long_file, File.long_path(@short_file))
+    assert_equal('PATH_T~1.TXT', File.basename(@short_file))
+  end
+   
+  test "short_path method works as expected" do
+    assert_respond_to(File, :short_path)
+    assert_equal('path_test.txt', File.basename(@long_file))
+  end
+
+  test "join method works as expected" do
+    assert_respond_to(File, :join)
+  end
+
+  test "join handles multiple arguments as expected" do
+    assert_equal("C:\\foo\\bar", File.join("C:", "foo", "bar"))
+    assert_equal("foo\\bar", File.join("foo", "bar"))
+  end
+
+  test "join handles multiple arguments as expected with unc paths" do
+    assert_equal("\\\\foo", File.join("\\\\foo"))
+    assert_equal("\\\\foo\\bar", File.join("\\\\foo", "bar"))
+  end
+
+  test "join does not normalize paths" do
+    assert_equal("C:\\.\\foo\\..", File.join("C:", ".", "foo", ".."))
+  end
+
+  test "join with no arguments returns an empty string" do
+    assert_equal('', File.join)
+  end
+
+  test "join with one argument returns the argument" do
+    assert_equal('foo', File.join('foo'))
+    assert_equal('c:', File.join('c:'))
+  end
+   
+  def teardown
+    @short_file = nil
+    @long_file  = nil
+  end
+
+  def self.shutdown
+    File.delete(@@file) if File.exists?(@@file)
+    @@file = nil
+  end
+end

data/test/test_win32_file_security.rb

@@ -15,52 +15,52 @@ require 'win32/file'
 require 'socket'
 
 class TC_Win32_File_Security < Test::Unit::TestCase
-   def self.startup
-      Dir.chdir(File.dirname(File.expand_path(File.basename(__FILE__))))
-      @@host = Socket.gethostname
-      @@file = File.join(Dir.pwd, 'security_test.txt')
-      File.open(@@file, 'w'){ |fh| fh.puts "This is a security test." }
-   end
+  def self.startup
+    Dir.chdir(File.dirname(File.expand_path(File.basename(__FILE__))))
+    @@host = Socket.gethostname
+    @@file = File.join(Dir.pwd, 'security_test.txt')
+    File.open(@@file, 'w'){ |fh| fh.puts "This is a security test." }
+  end
 
-   def setup
-      @perms = nil
-   end
+  def setup
+    @perms = nil
+  end
 
-   # This will fail if there is no "Users" builtin.  Not to worry.
-   def test_get_permissions
-      assert_respond_to(File, :get_permissions)
-      assert_nothing_raised{ File.get_permissions(@@file) }
-      assert_kind_of(Hash, File.get_permissions(@@file))
-   end
+  # This will fail if there is no "Users" builtin.  Not to worry.
+  def test_get_permissions
+    assert_respond_to(File, :get_permissions)
+    assert_nothing_raised{ File.get_permissions(@@file) }
+    assert_kind_of(Hash, File.get_permissions(@@file))
+  end
 
-   def test_get_permissions_with_host
-      assert_nothing_raised{ File.get_permissions(@@file, @@host) }
-      assert_kind_of(Hash, File.get_permissions(@@file))
-   end
+  def test_get_permissions_with_host
+    assert_nothing_raised{ File.get_permissions(@@file, @@host) }
+    assert_kind_of(Hash, File.get_permissions(@@file))
+  end
 
-   def test_set_permissions
-      assert_respond_to(File, :set_permissions)
-      assert_nothing_raised{ @perms = File.get_permissions(@@file) }
-      assert_nothing_raised{ File.set_permissions(@@file, @perms) }
-   end
+  def test_set_permissions
+    assert_respond_to(File, :set_permissions)
+    assert_nothing_raised{ @perms = File.get_permissions(@@file) }
+    assert_nothing_raised{ File.set_permissions(@@file, @perms) }
+  end
 
-   def test_securities
-      assert_respond_to(File, :securities)
-      assert_nothing_raised{ @perms = File.get_permissions(@@file) }
+  def test_securities
+    assert_respond_to(File, :securities)
+    assert_nothing_raised{ @perms = File.get_permissions(@@file) }
 
-      @perms.each{ |acct, mask|
-         assert_nothing_raised{ File.securities(mask) }
-         assert_kind_of(Array, File.securities(mask))
-      }
-   end
+    @perms.each{ |acct, mask|
+      assert_nothing_raised{ File.securities(mask) }
+      assert_kind_of(Array, File.securities(mask))
+    }
+  end
 
-   def teardown
-      @perms = nil
-   end
+  def teardown
+    @perms = nil
+  end
 
-   def self.shutdown
-      File.delete(@@file) if File.exists?(@@file)
-      @@file  = nil
-      @@host  = nil
-   end
+  def self.shutdown
+    File.delete(@@file) if File.exists?(@@file)
+    @@file  = nil
+    @@host  = nil
+  end
 end

data/win32-file.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'win32-file'
-  spec.version    = '0.6.6'
+  spec.version    = '0.6.7'
   spec.authors    = ['Daniel J. Berger', 'Park Heesob']
   spec.license    = 'Artistic 2.0'
   spec.email      = 'djberg96@gmail.com'
@@ -10,7 +10,6 @@ Gem::Specification.new do |spec|
   spec.platform   = Gem::Platform::RUBY
   spec.summary    = 'Extra or redefined methods for the File class on Windows.'
   spec.test_files = Dir['test/test*']
-  spec.has_rdoc   = true
   spec.files      = Dir['**/*'].reject{ |f| f.include?('git') }
 
   spec.rubyforge_project = 'win32utils'
@@ -20,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency('win32-file-stat', '>= 1.3.2')
   spec.add_dependency('windows-pr', '>= 1.0.8')
 
-  spec.add_development_dependency('test-unit', '>= 2.0.7')
+  spec.add_development_dependency('test-unit')
 
   spec.description = <<-EOF
     The win32-file library adds several methods to the core File class which

metadata

@@ -1,90 +1,74 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: win32-file
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 6
-  - 6
-  version: 0.6.6
+version: !ruby/object:Gem::Version
+  version: 0.6.7
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Daniel J. Berger
 - Park Heesob
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-09-03 00:00:00 -06:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-23 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: win32-api
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 1
+  requirement: &19820904 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: win32-file-stat
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 2
+  version_requirements: *19820904
+- !ruby/object:Gem::Dependency
+  name: win32-file-stat
+  requirement: &19460016 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.3.2
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: windows-pr
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 8
+  version_requirements: *19460016
+- !ruby/object:Gem::Dependency
+  name: windows-pr
+  requirement: &19454796 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.8
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: test-unit
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 7
-        version: 2.0.7
+  version_requirements: *19454796
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: &19452456 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-description: "    The win32-file library adds several methods to the core File class which\n    are specific to MS Windows, such as the ability to set and retrieve file\n    attributes. In addition, several core methods have been redefined in\n    order to work properly on MS Windows, such as File.blksize. See the\n    README file for more details.\n"
+  prerelease: false
+  version_requirements: *19452456
+description: ! "    The win32-file library adds several methods to the core File class
+  which\n    are specific to MS Windows, such as the ability to set and retrieve file\n
+  \   attributes. In addition, several core methods have been redefined in\n    order
+  to work properly on MS Windows, such as File.blksize. See the\n    README file for
+  more details.\n"
 email: djberg96@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
 - CHANGES
 - MANIFEST
-files: 
+files:
 - CHANGES
 - lib/win32/file.rb
 - MANIFEST
@@ -97,37 +81,32 @@ files:
 - test/test_win32_file_security.rb
 - test/test_win32_file_stat.rb
 - win32-file.gemspec
-has_rdoc: true
 homepage: http://www.rubyforge.org/projects/win32utils
-licenses: 
+licenses:
 - Artistic 2.0
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: win32utils
-rubygems_version: 1.3.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Extra or redefined methods for the File class on Windows.
-test_files: 
+test_files:
 - test/test_win32_file_attributes.rb
 - test/test_win32_file_constants.rb
 - test/test_win32_file_encryption.rb