win32-dir 0.3.3 → 0.3.4

data/CHANGES

@@ -1,3 +1,8 @@
+== 0.3.4 - 5-May-2009
+* Redefined the Dir.getwd (and the Dir.pwd alias) to always return a
+  normalized path.
+* Some gemspec updates.
+
 == 0.3.3 - 30-Mar-2009
 * Virtual folders like Dir::CONTROL, which were previously almost always nil,
   are now set to their display name.

data/README

@@ -261,7 +261,7 @@ Dir::TEMPLATES
    Ruby's
     
 == Copyright
-   (C) 2003-2008 Daniel J. Berger, All Rights Reserved
+   (C) 2003-2009 Daniel J. Berger, All Rights Reserved
     
 == Warranty
    This package is provided "as is" and without any express or

data/lib/win32/dir.rb

@@ -29,7 +29,8 @@ class Dir
    extend Windows::Limits
    extend Windows::SystemInfo
    
-   VERSION = '0.3.3'
+   # The version of the win32-dir library.
+   VERSION = '0.3.4'
    
    # Dynamically set each of the CSIDL_ constants
    constants.grep(/CSIDL/).each{ |constant|
@@ -59,10 +60,42 @@ class Dir
 
    # Set Dir::MYDOCUMENTS to the same as Dir::PERSONAL if undefined
    unless defined? MYDOCUMENTS
+      # Same as Dir::PERSONAL
       MYDOCUMENTS = PERSONAL
    end
+   
+   class << self
+      remove_method :getwd
+   end
+   
+   # Returns the present working directory. Unlike MRI, this method always
+   # normalizes the path.
+   #
+   # Examples:
+   #
+   #    Dir.chdir("C:/Progra~1")
+   #    Dir.getwd # => C:\Program Files
+   #
+   #    Dir.chdir("C:/PROGRAM FILES")
+   #    Dir.getwd # => C:\Program Files
+   #
+   def self.getwd
+      path1 = 0.chr * MAXPATH
+      path2 = 0.chr * MAXPATH
+      path3 = 0.chr * MAXPATH
+
+      GetCurrentDirectory(MAXPATH, path1)
+      GetShortPathName(path1, path2, MAXPATH)
+      GetLongPathName(path2, path3, MAXPATH)
+
+      path3[/^[^\0]*/]
+   end
+   
+   class << self
+      alias :pwd :getwd
+   end
 
-   # Creates the symlink +to+, linked to the existing directory +from+.  If the
+   # Creates the symlink +to+, linked to the existing directory +from+. If the
 	# +to+ directory already exists, it must be empty or an error is raised.
 	# 
    def self.create_junction(to, from)

data/test/test_dir.rb

@@ -13,11 +13,13 @@ require 'fileutils'
 
 class TC_Win32_Dir < Test::Unit::TestCase
    def self.startup
-      Dir.chdir('test') unless File.basename(Dir.pwd) == 'test'
-      @@from = File.join(Dir.pwd, "test_from_directory")
+      @@test_home = File.dirname(File.expand_path(__FILE__))
    end
 
    def setup
+      Dir.chdir(@@test_home) unless File.basename(Dir.pwd) == 'test'
+      @@from = File.join(Dir.pwd, "test_from_directory")
+
       @ascii_to   = "test_to_directory"
       @unicode_to = "Ελλάσ" # Greek - the word is 'Hellas'
       @test_file  = File.join(@@from, "test.txt")
@@ -25,7 +27,7 @@ class TC_Win32_Dir < Test::Unit::TestCase
    end
    
    def test_version
-      assert_equal('0.3.3', Dir::VERSION)
+      assert_equal('0.3.4', Dir::VERSION)
    end
   
    def test_create_junction_basic
@@ -62,6 +64,36 @@ class TC_Win32_Dir < Test::Unit::TestCase
       assert_equal(true, Dir.empty?(@@from))
    end
 
+   def test_pwd_basic
+      assert_respond_to(Dir, :pwd)
+      assert_nothing_raised{ Dir.pwd }
+      assert_kind_of(String, Dir.pwd)
+   end
+
+   def test_pwd_short_path
+      Dir.chdir("C:\\Progra~1")
+      assert_equal("C:\\Program Files", Dir.pwd)
+   end
+
+   def test_pwd_long_path
+      Dir.chdir("C:\\Program Files")
+      assert_equal("C:\\Program Files", Dir.pwd)
+   end
+ 
+   def test_pwd_caps
+      Dir.chdir("C:\\PROGRAM FILES")
+      assert_equal("C:\\Program Files", Dir.pwd)
+   end
+   
+   def test_pwd_forward_slash
+      Dir.chdir("C:/Program Files")
+      assert_equal("C:\\Program Files", Dir.pwd)
+   end
+   
+   def test_pwd_is_proper_alias
+      assert_true(Dir.method(:getwd) == Dir.method(:pwd))
+   end
+
    def test_admintools
       assert_not_nil(Dir::ADMINTOOLS)
       assert_kind_of(String, Dir::ADMINTOOLS)

data/win32-dir.gemspec

@@ -1,25 +1,31 @@
 require "rubygems"
 
 spec = Gem::Specification.new do |gem|
-   gem.name        = "win32-dir"
-   gem.version     = "0.3.3"
-   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     = "Extra constants and methods for the Dir class on Windows."
-   gem.description = "Extra constants and methods for the Dir class on Windows."
-   gem.test_file   = "test/test_dir.rb"
-   gem.has_rdoc    = true
-   gem.files       = Dir["lib/win32/*.rb"] + Dir["test/*"] + Dir["[A-Z]*"]
-   gem.files.reject! { |fn| fn.include? "CVS" }
-   gem.require_path = "lib"
-   gem.extra_rdoc_files = ['README', 'CHANGES', 'MANIFEST']
-   gem.add_dependency("windows-pr", ">= 0.9.3")
-   gem.rubyforge_project = "win32utils"
+   gem.name      = 'win32-dir'
+   gem.version   = '0.3.4'
+   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   = 'Extra constants and methods for the Dir class on Windows.'
+   gem.test_file = 'test/test_dir.rb'
+   gem.files     = Dir["lib/win32/*.rb"] + Dir["test/*"] + Dir["[A-Z]*"]
+
+   gem.rubyforge_project = 'win32utils'
+   gem.extra_rdoc_files  = ['README', 'CHANGES', 'MANIFEST']
+
+   gem.add_dependency('windows-pr', '>= 0.9.3')
+
+   gem.files.reject!{ |fn| fn.include? "CVS" }
+
+   gem.description = "The win32-dir library provides extra methods and
+      constants for the builtin Dir class. The constants provide a convenient
+      way to identify certain directories across all versions of Windows. Some
+      methods have been added, such as the ability to create junctions. Others
+      have been modified to provide a more consistent result for MS Windows.".gsub(/\s+/, ' ')
 end
 
-if $0 == __FILE__
+if $0 == __FILE__ 
    Gem.manage_gems if Gem::RubyGemsVersion.to_f < 1.0
    Gem::Builder.new(spec).build
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: win32-dir
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-30 00:00:00 -06:00
+date: 2009-05-19 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,7 +23,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.9.3
     version: 
-description: Extra constants and methods for the Dir class on Windows.
+description: The win32-dir library provides extra methods and constants for the builtin Dir class. The constants provide a convenient way to identify certain directories across all versions of Windows. Some methods have been added, such as the ability to create junctions. Others have been modified to provide a more consistent result for MS Windows.
 email: djberg96@gmail.com
 executables: []
 
@@ -37,15 +37,14 @@ files:
 - lib/win32/dir.rb
 - test/test_dir.rb
 - CHANGES
-- examples
-- lib
 - MANIFEST
 - Rakefile
 - README
-- test
 - win32-dir.gemspec
 has_rdoc: true
 homepage: http://www.rubyforge.org/projects/win32utils
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -66,9 +65,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: win32utils
-rubygems_version: 1.3.1
+rubygems_version: 1.3.3
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Extra constants and methods for the Dir class on Windows.
 test_files: 
 - test/test_dir.rb