win32-file 0.6.3 → 0.6.4

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.2', File::WIN32_FILE_VERSION)
+      assert_equal('0.6.4', File::WIN32_FILE_VERSION)
    end
    
    def test_is_directory

data/test/test_win32_file_path.rb

@@ -11,188 +11,224 @@ 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 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
+  def setup
+    @long_file  = File.join(Dir.pwd, 'path_test.txt')      
+    @short_file = File.join(Dir.pwd, 'PATH_T~1.TXT')
+  end
    
-   def test_basename_basic
-      assert_respond_to(File, :basename)
-      assert_nothing_raised{ File.basename("C:\\foo") }
-      assert_kind_of(String, File.basename("C:\\foo"))
-   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
       
-   def test_basename_standard_paths
-      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 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
       
-   def test_basename_unc_paths
-      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
-      
-   def test_basename_unix_style_paths
-      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"))
-      assert_equal("\\\\foo", File.basename("//foo"))
-      assert_equal("\\\\foo\\bar", File.basename("//foo/bar"))
-   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
       
-   def test_basename_with_forward_slashes
-      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 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
          
-   def test_basename_edge_cases
-      assert_equal("", File.basename(""))
-      assert_equal(".", File.basename("."))
-      assert_equal("..", File.basename(".."))
-      assert_equal("foo", File.basename("//foo/"))
-   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
       
-   def test_basename_with_suffixes
-      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
-      
-   def test_basename_does_not_modify_argument
-      path = "C:\\foo\\bar"
-      assert_nothing_raised{ File.basename(path) }
-      assert_equal("C:\\foo\\bar", path)    
-   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
    
-   def test_dirname_basic
-      assert_respond_to(File, :dirname)
-      assert_nothing_raised{ File.dirname("C:\\foo") }
-      assert_kind_of(String, File.dirname("C:\\foo"))
-   end
-      
-   def test_dirname_standard_paths
-      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 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
       
-   def test_dirname_unc_paths
-      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 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
     
-   def test_dirname_forward_slashes
-      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("\\\\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("//"))
-      assert_equal(".", File.dirname("./foo"))
-      assert_equal(".\\foo", File.dirname("./foo/bar"))
-   end
-      
-   def test_dirname_edge_cases
-      assert_equal(".", File.dirname(""))
-      assert_equal(".", File.dirname("."))
-      assert_equal(".", File.dirname("."))
-      assert_equal(".", File.dirname("./"))
-      assert_raises(TypeError){ File.dirname(nil) }
-   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("./"))
+    assert_raises(TypeError){ File.dirname(nil) }
+  end
       
-   def test_dirname_does_not_modify_argument
-      path = "C:\\foo\\bar"
-      assert_nothing_raised{ File.dirname(path) }
-      assert_equal("C:\\foo\\bar", path)
-   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
    
-   def test_split_basic
-      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 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
       
-   def test_split_standard_paths
-      assert_equal(["C:\\foo", "bar"], File.split("C:\\foo\\bar"))     
-      assert_equal([".", "foo"], File.split("foo"))
-   end
-      
-   def test_split_forward_slashes
-      assert_equal(["C:\\foo", "bar"], File.split("C:/foo/bar"))
-      assert_equal([".", "foo"], File.split("foo"))
-   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
       
-   def test_split_unix_paths
-      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 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
       
-   def test_split_unc_paths
-      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 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
 
-   def test_split_edge_cases
-      assert_equal(["C:\\", ""], File.split("C:\\"))
-      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
       
-   def test_split_does_not_modify_arguments
-      path = "C:\\foo\\bar"
-      assert_nothing_raised{ File.split(path) }
-      assert_equal("C:\\foo\\bar", path)
-   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
    
-   def test_long_path
-      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 "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
    
-   def test_short_path
-      assert_respond_to(File, :short_path)
-      assert_equal('path_test.txt', File.basename(@long_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 teardown
+    @short_file = nil
+    @long_file  = nil
+  end
 
-   def self.shutdown
-      File.delete(@@file) if File.exists?(@@file)
-      @@file = nil
-   end
+  def self.shutdown
+    File.delete(@@file) if File.exists?(@@file)
+    @@file = nil
+  end
 end

data/win32-file.gemspec

@@ -1,34 +1,32 @@
 require 'rubygems'
 
-spec = Gem::Specification.new do |gem|
-   gem.name       = 'win32-file'
-   gem.version    = '0.6.3'
-   gem.authors    = ['Daniel J. Berger', 'Park Heesob']
-   gem.license    = 'Artistic 2.0'
-   gem.email      = 'djberg96@gmail.com'
-   gem.homepage   = 'http://www.rubyforge.org/projects/win32utils'
-   gem.platform   = Gem::Platform::RUBY
-   gem.summary    = 'Extra or redefined methods for the File class on Windows.'
-   gem.test_files = Dir['test/test*']
-   gem.has_rdoc   = true
-   gem.files      = Dir['**/*'].reject{ |f| f.include?('CVS') }
+Gem::Specification.new do |spec|
+  spec.name       = 'win32-file'
+  spec.version    = '0.6.4'
+  spec.authors    = ['Daniel J. Berger', 'Park Heesob']
+  spec.license    = 'Artistic 2.0'
+  spec.email      = 'djberg96@gmail.com'
+  spec.homepage   = 'http://www.rubyforge.org/projects/win32utils'
+  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') }
 
-   gem.rubyforge_project = 'win32utils'
-   gem.extra_rdoc_files  = ['README', 'CHANGES', 'MANIFEST']
+  spec.rubyforge_project = 'win32utils'
+  spec.extra_rdoc_files  = ['README', 'CHANGES', 'MANIFEST']
 
-   gem.add_dependency('win32-api', '>= 1.4.5')
-   gem.add_dependency('win32-file-stat', '>= 1.3.2')
-   gem.add_dependency('windows-pr', '>= 1.0.8')
+  spec.add_dependency('win32-api', '>= 1.2.1')
+  spec.add_dependency('win32-file-stat', '>= 1.3.2')
+  spec.add_dependency('windows-pr', '>= 1.0.8')
 
-   gem.add_development_dependency('test-unit', '>= 2.0.3')
+  spec.add_development_dependency('test-unit', '>= 2.0.7')
 
-   gem.description = <<-EOF
-      The win32-file library adds several methods to the core File class which
-      are specific to MS Windows, such as the ability to set and retrieve file
-      attributes. In addition, several core methods have been redefined in
-      order to work properly on MS Windows, such as File.blksize. See the
-      README file for more details.
-   EOF
+  spec.description = <<-EOF
+    The win32-file library adds several methods to the core File class which
+    are specific to MS Windows, such as the ability to set and retrieve file
+    attributes. In addition, several core methods have been redefined in
+    order to work properly on MS Windows, such as File.blksize. See the
+    README file for more details.
+  EOF
 end
-
-Gem::Builder.new(spec).build