win32-dir 0.3.2 → 0.3.3

data/CHANGES

@@ -1,3 +1,11 @@
+== 0.3.3 - 30-Mar-2009
+* Virtual folders like Dir::CONTROL, which were previously almost always nil,
+  are now set to their display name.
+* Fixed a bug in the create_junction method.
+* Added an 'example' rake task to run the example code.
+* Renamed the example program from dir_test.rb to dir_example.rb to prevent
+  any potential confusion that it's a genuine test file.
+
 == 0.3.2 - 25-Jul-2007
 * Added a Rakefile with tasks for testing and installation.
 * Removed the install.rb file (the Rakefile handles installation).

data/MANIFEST

@@ -3,6 +3,6 @@
 * CHANGES
 * Rakefile
 * win32-dir.gemspec
-* examples/dir_test.rb
+* examples/dir_example.rb
 * lib/win32/dir.rb
-* test/tc_dir.rb
+* test/test_dir.rb

data/README

@@ -1,16 +1,12 @@
 = Description
    A series of extra constants for the Dir class that define special folders
-   on Win32 systems, as well as methods for creating and detecting junctions
-   (i.e. symlinks for directories).
+   on MS Windows systems, as well as methods for creating and detecting
+   junctions, i.e. symlinks for directories.
 
 = Installation
    rake test (optional)
    rake install (non-gem) or rake install_gem (gem).
 
-= Notes
-   Some tests may fail. That is expected, because not all constants are
-   necessarily defined on your system.
-
 = Synopsis
    require "win32/dir"
 	
@@ -41,9 +37,9 @@ Dir::COMMON_ADMINTOOLS
 Dir::APPDATA
    The file system directory that serves as a common repository for
    application-specific data. A typical path is
-   C:\Documents and Settings\username\Application Data.
+   C:\Documents and Settings\<user>\Application Data.
    
-   This CSIDL is supported by the redistributable Shfolder.dll for
+   This CSIDL is supported by the redistributable shfolder.dll for
    systems that do not have the Microsoft Internet Explorer 4.0
    integrated Shell installed.
 	
@@ -57,7 +53,7 @@ Dir::COMMON_DOCUMENTS
 	
 Dir::COOKIES
    The file system directory that serves as a common repository for Internet
-   cookies. A typical path is C:\Documents and Settings\username\Cookies.
+   cookies. A typical path is C:\Documents and Settings\<user>\Cookies.
 
 Dir::HISTORY
    The file system directory that serves as a common repository for Internet
@@ -66,17 +62,17 @@ Dir::HISTORY
 Dir::INTERNET_CACHE
    The file system directory that serves as a common repository for temporary
    Internet files. A typical path is
-   C:\Documents and Settings\username\Local Settings\Temporary Internet Files.
+   C:\Documents and Settings\<user>\Local Settings\Temporary Internet Files.
 
 Dir::LOCAL_APPDATA
    The file system directory that serves as a data repository for local
    (nonroaming) applications. A typical path is
-   C:\Documents and Settings\username\Local Settings\Application Data.
+   C:\Documents and Settings\<user>\Local Settings\Application Data.
 
 Dir::MYPICTURES
    The file system directory that serves as a common repository for image
    files. A typical path is
-   C:\Documents and Settings\username\My Documents\My Pictures.
+   C:\Documents and Settings\<user>\My Documents\My Pictures.
 	
 Dir::PERSONAL
    The virtual folder representing the My Documents desktop item. This is
@@ -97,7 +93,7 @@ Dir::WINDOWS
    %SYSTEMROOT% environment variables. A typical path is C:\Windows.
 	 
 == The following constants may or may not be defined:
-   Dir::ALTSTARTUP
+Dir::ALTSTARTUP
    The file system directory that corresponds to the user's nonlocalized
    Startup program group.
 	
@@ -234,8 +230,10 @@ Dir::TEMPLATES
 == Developer's Notes
    The SHGetFolderPath() documentation on MSDN is somewhat vague about which
    CSIDL constants are guaranteed to be defined.  However, there are 15 which
-   *should* be defined (see docs above). The rest I cannot vouch for. On
-   my own Windows XP SP 2 system, all but 7 were defined.
+   *should* be defined (see docs above). The rest I cannot vouch for.
+   
+   Some of these folders are virtual, and the value will be the display name
+   only instead of an actual path.
 	
 == Known Bugs
    The Unicode support is not quite there for Dir.create_junction. It creates
@@ -263,7 +261,7 @@ Dir::TEMPLATES
    Ruby's
     
 == Copyright
-   (C) 2003-2007 Daniel J. Berger, All Rights Reserved
+   (C) 2003-2008 Daniel J. Berger, All Rights Reserved
     
 == Warranty
    This package is provided "as is" and without any express or

data/Rakefile

@@ -15,8 +15,11 @@ task :install_gem do
    sh "gem install #{file}"
 end
 
+desc "Run the example program"
+task :example do
+   sh "ruby -Ilib examples/dir_example.rb"
+
 Rake::TestTask.new do |t|
-   t.libs << 'lib'
    t.warning = true
-   t.test_files = FileList['test/tc*']
+   t.verbose = true
 end

data/lib/win32/dir.rb

@@ -7,6 +7,8 @@ require 'windows/unicode'
 require 'windows/directory'
 require 'windows/handle'
 require 'windows/path'
+require 'windows/limits'
+require 'windows/system_info'
 
 class Dir
    include Windows::Directory
@@ -14,6 +16,8 @@ class Dir
    include Windows::Error
    include Windows::File
    include Windows::DeviceIO
+   include Windows::Limits
+
    extend Windows::Directory
    extend Windows::Shell
    extend Windows::File
@@ -22,12 +26,14 @@ class Dir
    extend Windows::Unicode
    extend Windows::Handle
    extend Windows::Path
+   extend Windows::Limits
+   extend Windows::SystemInfo
    
-   VERSION = '0.3.2'
+   VERSION = '0.3.3'
    
    # Dynamically set each of the CSIDL_ constants
    constants.grep(/CSIDL/).each{ |constant|
-      path   = 0.chr * 260
+      path   = 0.chr * MAXPATH
       nconst = constant.split('CSIDL_').last
       
       if SHGetFolderPath(0, const_get(constant), 0, 1, path) != 0
@@ -35,21 +41,37 @@ class Dir
       else 
          path.strip!
       end
-      
-      Dir.const_set(nconst, path)    
+
+      # Try another approach for virtual folders
+      if path.nil?
+         ppidl = 0.chr * 4 # PIDLIST_ABSOLUTE
+
+         if SHGetFolderLocation(0, const_get(constant), 0, 0, ppidl) == S_OK
+            info = 0.chr * 692 # sizeof(SHFILEINFO)
+            flags = SHGFI_DISPLAYNAME | SHGFI_PIDL
+            SHGetFileInfo(ppidl.unpack('L')[0], 0, info, 692, flags)
+            path = info[12..-1].strip
+         end
+      end
+
+      Dir.const_set(nconst, path) if path
    }
-   
+
+   # Set Dir::MYDOCUMENTS to the same as Dir::PERSONAL if undefined
+   unless defined? MYDOCUMENTS
+      MYDOCUMENTS = PERSONAL
+   end
+
    # 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)
-      # Normalize the paths
-      to.tr!('/', "\\")
-      from.tr!('/', "\\")
+      to   = to.tr(File::SEPARATOR, File::ALT_SEPARATOR)   # Normalize path
+      from = from.tr(File::SEPARATOR, File::ALT_SEPARATOR) # Normalize path
       
-      to_path    = 0.chr * 260
-      from_path  = 0.chr * 260
-      buf_target = 0.chr * 260
+      to_path    = 0.chr * MAXPATH
+      from_path  = 0.chr * MAXPATH
+      buf_target = 0.chr * MAXPATH
       
       if GetFullPathName(from, from_path.size, from_path, 0) == 0
          raise StandardError, 'GetFullPathName() failed: ' + get_last_error
@@ -65,6 +87,7 @@ class Dir
       # You can create a junction to a directory that already exists, so
       # long as it's empty.
       rv = CreateDirectory(to_path, 0)
+
       if rv == 0 && rv != ERROR_ALREADY_EXISTS
          raise StandardError, 'CreateDirectory() failed: ' + get_last_error
       end
@@ -84,9 +107,8 @@ class Dir
       end 
       
       buf_target  = buf_target.split(0.chr).first
-      buf_target  = "\\??\\" << from_path     
-      length      = buf_target.size * 2 # sizeof(WCHAR)
-      wide_string = multi_to_wide(buf_target)
+      buf_target  = "\\??\\" << from_path
+      wide_string = multi_to_wide(buf_target)[0..-3]
       
       # REPARSE_JDATA_BUFFER
       rdb = [
@@ -102,26 +124,27 @@ class Dir
 
       bytes = [0].pack('L')
 
-      bool = DeviceIoControl(
-         handle,
-         CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 41, METHOD_BUFFERED, FILE_ANY_ACCESS),
-         rdb,
-         rdb.size,
-         0,
-         0,
-         bytes,
-         0
-      )
-      
-      unless bool
-         error = 'DeviceIoControl() failed: ' + get_last_error
-         RemoveDirectory(to)
-         CloseHandle(handle)        
-         raise error
+      begin
+         bool = DeviceIoControl(
+            handle,
+            CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 41, METHOD_BUFFERED, 0),
+            rdb,
+            rdb.size,
+            0,
+            0,
+            bytes,
+            0
+         )
+         
+         unless bool
+            error = 'DeviceIoControl() failed: ' + get_last_error
+            RemoveDirectory(to_path)
+            raise error
+         end
+      ensure
+         CloseHandle(handle)
       end
       
-      CloseHandle(handle)
-      
       self  
    end
    
@@ -150,4 +173,4 @@ class Dir
    class << self
       alias reparse_dir? junction?
    end
-end
+end

data/test/{tc_dir.rb → test_dir.rb}

@@ -1,252 +1,259 @@
 ###########################################################################
-# tc_dir.rb
+# test_dir.rb
 #
-# Test suite for the win32-dir package.  Note that some of these tests
-# may fail, because some constants are simply not defined, depending on
-# your operating system and version of certain DLL files.
-#
-# You should run this test case via the 'rake test' task.
+# Test suite for the win32-dir library.  You should run this test case
+# via the 'rake test' task.
 ###########################################################################
+require 'rubygems'
+gem 'test-unit'
+
 require 'test/unit'
 require 'win32/dir'
 require 'fileutils'
 
-puts "Some tests may fail because some constants aren't defined on your system."
-puts "This is not unexpected."
-
 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")
+   end
+
    def setup
-      @from       = "from"
-      @ascii_to   = "to"
+      @ascii_to   = "test_to_directory"
       @unicode_to = "Ελλάσ" # Greek - the word is 'Hellas'
-      Dir.mkdir(@from)
+      @test_file  = File.join(@@from, "test.txt")
+      Dir.mkdir(@@from)
    end
    
    def test_version
-      assert_equal('0.3.2', Dir::VERSION)
+      assert_equal('0.3.3', Dir::VERSION)
    end
   
-   def test_create_junction
+   def test_create_junction_basic
       assert_respond_to(Dir, :create_junction)
-      assert_nothing_raised{ Dir.create_junction(@ascii_to, @from) }
-      assert_nothing_raised{ Dir.create_junction(@unicode_to, @from) }
-      
-      # If we've gotten this far, make sure files created in the @from
-      # directory show up in the linked directories.
-      File.open(@from + "\\test.txt", "w+"){ |f| f.puts "Hello World" }
-      
-      assert_equal(Dir.entries(@from), Dir.entries(@ascii_to))
-      assert_equal(Dir.entries(@from), Dir.entries(@unicode_to))
+   end
+
+   def test_create_junction_ascii
+      assert_nothing_raised{ Dir.create_junction(@ascii_to, @@from) }
+      File.open(@test_file, 'w'){ |fh| fh.puts "Hello World" }
+      assert_equal(Dir.entries(@@from), Dir.entries(@ascii_to))
+   end
+
+   def test_create_junction_unicode
+      assert_nothing_raised{ Dir.create_junction(@unicode_to, @@from) }
+      File.open(@test_file, 'w'){ |fh| fh.puts "Hello World" }
+      assert_equal(Dir.entries(@@from), Dir.entries(@unicode_to))
    end
    
    def test_is_junction
       assert_respond_to(Dir, :junction?)
-      assert_respond_to(Dir, :reparse_dir?) # alias
-      assert_nothing_raised{ Dir.junction?(@from) }
-      assert_nothing_raised{ Dir.create_junction(@ascii_to, @from) }
-      
-      assert_equal(false, Dir.junction?(@from))
+      assert_nothing_raised{ Dir.create_junction(@ascii_to, @@from) }
+      assert_equal(false, Dir.junction?(@@from))
       assert_equal(true, Dir.junction?(@ascii_to))
    end
+
+   def test_reparse_dir_alias
+      assert_respond_to(Dir, :reparse_dir?) # alias
+      assert_equal(true, Dir.method(:reparse_dir?) == Dir.method(:junction?))
+   end
    
    def test_is_empty
       assert_respond_to(Dir, :empty?)
-      assert_equal(false, Dir.empty?("C:\\")) # One would hope
-      assert_equal(true, Dir.empty?(@from))
+      assert_equal(false, Dir.empty?("C:\\")) # One would think
+      assert_equal(true, Dir.empty?(@@from))
    end
 
    def test_admintools
-      assert_not_nil(Dir::ADMINTOOLS, "+IGNORE+")
+      assert_not_nil(Dir::ADMINTOOLS)
       assert_kind_of(String, Dir::ADMINTOOLS)
    end
    
    def test_altstartup
-      assert_not_nil(Dir::ALTSTARTUP, "+IGNORE+")
+      assert_not_nil(Dir::ALTSTARTUP)
       assert_kind_of(String, Dir::ALTSTARTUP)
    end
    
    def test_appdata
-      assert_not_nil(Dir::APPDATA, "+IGNORE+")
+      assert_not_nil(Dir::APPDATA)
       assert_kind_of(String, Dir::APPDATA)
    end
    
    def test_bitbucket
-      assert_not_nil(Dir::BITBUCKET, "+IGNORE+")
+      assert_not_nil(Dir::BITBUCKET)
       assert_kind_of(String, Dir::BITBUCKET)
    end
    
    def test_cdburn_area
-      assert_not_nil(Dir::CDBURN_AREA, "+IGNORE+")
+      assert_not_nil(Dir::CDBURN_AREA)
       assert_kind_of(String, Dir::CDBURN_AREA)
    end
    
    def test_common_admintools
-      assert_not_nil(Dir::COMMON_ADMINTOOLS, "+IGNORE+")
+      assert_not_nil(Dir::COMMON_ADMINTOOLS)
       assert_kind_of(String, Dir::COMMON_ADMINTOOLS)
    end
    
    def test_common_altstartup
-      assert_not_nil(Dir::COMMON_ALTSTARTUP, "+IGNORE+")
+      assert_not_nil(Dir::COMMON_ALTSTARTUP)
       assert_kind_of(String, Dir::COMMON_ALTSTARTUP)
    end
    
    def test_common_appdata
-      assert_not_nil(Dir::COMMON_APPDATA, "+IGNORE+")
+      assert_not_nil(Dir::COMMON_APPDATA)
       assert_kind_of(String, Dir::COMMON_APPDATA)
    end
    
    def test_common_desktopdirectory
-      assert_not_nil(Dir::COMMON_DESKTOPDIRECTORY, "+IGNORE+")
+      assert_not_nil(Dir::COMMON_DESKTOPDIRECTORY)
       assert_kind_of(String, Dir::COMMON_DESKTOPDIRECTORY)
    end
    
    def test_common_documents
-      assert_not_nil(Dir::COMMON_DOCUMENTS, "+IGNORE+")
+      assert_not_nil(Dir::COMMON_DOCUMENTS)
       assert_kind_of(String, Dir::COMMON_DOCUMENTS)
    end
    
    def test_common_favorites
-      assert_not_nil(Dir::COMMON_FAVORITES, "+IGNORE+")
+      assert_not_nil(Dir::COMMON_FAVORITES)
       assert_kind_of(String, Dir::COMMON_FAVORITES)
    end
    
    def test_common_music
-      assert_not_nil(Dir::COMMON_MUSIC, "+IGNORE+")
+      assert_not_nil(Dir::COMMON_MUSIC)
       assert_kind_of(String, Dir::COMMON_MUSIC)
    end
    
    def test_common_pictures
-      assert_not_nil(Dir::COMMON_PICTURES, "+IGNORE+")
+      assert_not_nil(Dir::COMMON_PICTURES)
       assert_kind_of(String, Dir::COMMON_PICTURES)
    end
    
    def test_common_programs
-      assert_not_nil(Dir::COMMON_PROGRAMS, "+IGNORE+")
+      assert_not_nil(Dir::COMMON_PROGRAMS)
       assert_kind_of(String, Dir::COMMON_PROGRAMS)
    end
    
    def test_common_startmenu
-      assert_not_nil(Dir::COMMON_STARTMENU, "+IGNORE+")
+      assert_not_nil(Dir::COMMON_STARTMENU)
       assert_kind_of(String, Dir::COMMON_STARTMENU)
    end
    
    def test_common_startup
-      assert_not_nil(Dir::COMMON_STARTUP, "+IGNORE+")
+      assert_not_nil(Dir::COMMON_STARTUP)
       assert_kind_of(String, Dir::COMMON_STARTUP)
    end
    
    def test_common_templates
-      assert_not_nil(Dir::COMMON_TEMPLATES, "+IGNORE+")
+      assert_not_nil(Dir::COMMON_TEMPLATES)
       assert_kind_of(String, Dir::COMMON_TEMPLATES)
    end
    
    def test_common_video
-      assert_not_nil(Dir::COMMON_VIDEO, "+IGNORE+")
+      assert_not_nil(Dir::COMMON_VIDEO)
       assert_kind_of(String, Dir::COMMON_VIDEO)
    end
    
    def test_controls
-      assert_not_nil(Dir::CONTROLS, "+IGNORE+")
+      assert_not_nil(Dir::CONTROLS)
       assert_kind_of(String, Dir::CONTROLS)
    end
    
    def test_cookies
-      assert_not_nil(Dir::COOKIES, "+IGNORE+")
+      assert_not_nil(Dir::COOKIES)
       assert_kind_of(String, Dir::COOKIES)
    end
    
    def test_desktop
-      assert_not_nil(Dir::DESKTOP, "+IGNORE+")
+      assert_not_nil(Dir::DESKTOP)
       assert_kind_of(String, Dir::DESKTOP)
    end
    
    def test_desktopdirectory
-      assert_not_nil(Dir::DESKTOPDIRECTORY, "+IGNORE+")
+      assert_not_nil(Dir::DESKTOPDIRECTORY)
       assert_kind_of(String, Dir::DESKTOPDIRECTORY)
    end
    
    def test_drives
-      assert_not_nil(Dir::DRIVES, "+IGNORE+")
+      assert_not_nil(Dir::DRIVES)
       assert_kind_of(String, Dir::DRIVES)
    end
 
    def test_favorites
-      assert_not_nil(Dir::FAVORITES, "+IGNORE+")
+      assert_not_nil(Dir::FAVORITES)
       assert_kind_of(String, Dir::FAVORITES)
    end
    
    def test_fonts
-      assert_not_nil(Dir::FONTS, "+IGNORE+")
+      assert_not_nil(Dir::FONTS)
       assert_kind_of(String, Dir::FONTS)
    end
    
    def test_history
-      assert_not_nil(Dir::HISTORY, "+IGNORE+")
+      assert_not_nil(Dir::HISTORY)
       assert_kind_of(String, Dir::HISTORY)
    end
    
    def test_internet
-      assert_not_nil(Dir::INTERNET, "+IGNORE+")
+      assert_not_nil(Dir::INTERNET)
       assert_kind_of(String, Dir::INTERNET)
    end
    
    def test_internet_cache
-      assert_not_nil(Dir::INTERNET_CACHE, "+IGNORE+")
+      assert_not_nil(Dir::INTERNET_CACHE)
       assert_kind_of(String, Dir::INTERNET_CACHE)
    end
    
    def test_local_appdata
-      assert_not_nil(Dir::LOCAL_APPDATA, "+IGNORE+")
+      assert_not_nil(Dir::LOCAL_APPDATA)
       assert_kind_of(String, Dir::LOCAL_APPDATA)
    end
    
    def test_mydocuments
-      assert_not_nil(Dir::MYDOCUMENTS, "+IGNORE+")
+      assert_not_nil(Dir::MYDOCUMENTS)
       assert_kind_of(String, Dir::MYDOCUMENTS)
    end
    
    def test_local_mymusic
-      assert_not_nil(Dir::MYMUSIC, "+IGNORE+")
+      assert_not_nil(Dir::MYMUSIC)
       assert_kind_of(String, Dir::MYMUSIC)
    end
    
    def test_local_mypictures
-      assert_not_nil(Dir::MYPICTURES, "+IGNORE+")
+      assert_not_nil(Dir::MYPICTURES)
       assert_kind_of(String, Dir::MYPICTURES)
    end
    
    def test_local_myvideo
-      assert_not_nil(Dir::MYVIDEO, "+IGNORE+")
+      assert_not_nil(Dir::MYVIDEO)
       assert_kind_of(String, Dir::MYVIDEO)
    end
    
    def test_nethood
-      assert_not_nil(Dir::NETHOOD, "+IGNORE+")
+      assert_not_nil(Dir::NETHOOD)
       assert_kind_of(String, Dir::NETHOOD)
    end
    
    def test_network
-      assert_not_nil(Dir::NETWORK, "+IGNORE+")
+      assert_not_nil(Dir::NETWORK)
       assert_kind_of(String, Dir::NETWORK)
    end
 
    def test_personal
-      assert_not_nil(Dir::PERSONAL, "+IGNORE+")
+      assert_not_nil(Dir::PERSONAL)
       assert_kind_of(String, Dir::PERSONAL)
    end
    
    def test_printers
-      assert_not_nil(Dir::PRINTERS, "+IGNORE+")
+      assert_not_nil(Dir::PRINTERS)
       assert_kind_of(String, Dir::PRINTERS)
    end
    
    def test_printhood
-      assert_not_nil(Dir::PRINTHOOD, "+IGNORE+")
+      assert_not_nil(Dir::PRINTHOOD)
       assert_kind_of(String, Dir::PRINTHOOD)
    end
    
    def test_profile
-      assert_not_nil(Dir::PROFILE, "+IGNORE+")
+      assert_not_nil(Dir::PROFILE)
       assert_kind_of(String, Dir::PROFILE)
    end
    
@@ -257,58 +264,58 @@ class TC_Win32_Dir < Test::Unit::TestCase
    #end
    
    def test_program_files
-      assert_not_nil(Dir::PROGRAM_FILES, "+IGNORE+")
+      assert_not_nil(Dir::PROGRAM_FILES)
       assert_kind_of(String, Dir::PROGRAM_FILES)
    end
    
    def test_program_files_common
-      assert_not_nil(Dir::PROGRAM_FILES_COMMON, "+IGNORE+")
+      assert_not_nil(Dir::PROGRAM_FILES_COMMON)
       assert_kind_of(String, Dir::PROGRAM_FILES_COMMON)
    end
    
    def test_programs
-      assert_not_nil(Dir::PROGRAMS, "+IGNORE+")
+      assert_not_nil(Dir::PROGRAMS)
       assert_kind_of(String, Dir::PROGRAMS)
    end
    
    def test_recent
-      assert_not_nil(Dir::RECENT, "+IGNORE+")
+      assert_not_nil(Dir::RECENT)
       assert_kind_of(String, Dir::RECENT)
    end
    
    def test_sendto
-      assert_not_nil(Dir::SENDTO, "+IGNORE+")
+      assert_not_nil(Dir::SENDTO)
       assert_kind_of(String, Dir::SENDTO)
    end
    
    def test_startmenu
-      assert_not_nil(Dir::STARTMENU, "+IGNORE+")
+      assert_not_nil(Dir::STARTMENU)
       assert_kind_of(String, Dir::STARTMENU)
    end
    
    def test_startup
-      assert_not_nil(Dir::STARTUP, "+IGNORE+")
+      assert_not_nil(Dir::STARTUP)
       assert_kind_of(String, Dir::STARTUP)
    end
    
    def test_system
-      assert_not_nil(Dir::SYSTEM, "+IGNORE+")
+      assert_not_nil(Dir::SYSTEM)
       assert_kind_of(String, Dir::SYSTEM)
    end
    
    def test_templates
-      assert_not_nil(Dir::TEMPLATES, "+IGNORE+")
+      assert_not_nil(Dir::TEMPLATES)
       assert_kind_of(String, Dir::TEMPLATES)
    end
 
    def test_windows_dir
-      assert_not_nil(Dir::WINDOWS, "+IGNORE+")
+      assert_not_nil(Dir::WINDOWS)
       assert_kind_of(String, Dir::WINDOWS)
    end
 
    def teardown
       FileUtils.rm_rf(@ascii_to)
       FileUtils.rm_rf(@unicode_to)
-      FileUtils.rm_rf(@from)
+      FileUtils.rm_rf(@@from)
    end
 end

data/win32-dir.gemspec

@@ -2,23 +2,24 @@ require "rubygems"
 
 spec = Gem::Specification.new do |gem|
    gem.name        = "win32-dir"
-   gem.version     = "0.3.2"
-   gem.author      = "Daniel J. Berger"
+   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/tc_dir.rb"
+   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.5.1")
+   gem.add_dependency("windows-pr", ">= 0.9.3")
+   gem.rubyforge_project = "win32utils"
 end
 
 if $0 == __FILE__
-   Gem.manage_gems
+   Gem.manage_gems if Gem::RubyGemsVersion.to_f < 1.0
    Gem::Builder.new(spec).build
 end

metadata

@@ -1,39 +1,42 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
-specification_version: 1
 name: win32-dir
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
-date: 2007-07-25 00:00:00 -06:00
-summary: Extra constants and methods for the Dir class on Windows.
-require_paths: 
-- lib
-email: djberg96@gmail.com
-homepage: http://www.rubyforge.org/projects/win32utils
-rubyforge_project: 
-description: Extra constants and methods for the Dir class on 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: 0.3.3
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Daniel J. Berger
+- Park Heesob
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2009-03-30 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.3
+    version: 
+description: Extra constants and methods for the Dir class on Windows.
+email: djberg96@gmail.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
+- CHANGES
+- MANIFEST
 files: 
 - lib/win32/dir.rb
-- test/CVS
-- test/tc_dir.rb
+- test/test_dir.rb
 - CHANGES
-- CVS
 - examples
 - lib
 - MANIFEST
@@ -41,27 +44,31 @@ files:
 - README
 - test
 - win32-dir.gemspec
-test_files: 
-- test/tc_dir.rb
+has_rdoc: true
+homepage: http://www.rubyforge.org/projects/win32utils
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: 
-- README
-- CHANGES
-- MANIFEST
-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.5.1
-    version: 
+rubyforge_project: win32utils
+rubygems_version: 1.3.1
+signing_key: 
+specification_version: 2
+summary: Extra constants and methods for the Dir class on Windows.
+test_files: 
+- test/test_dir.rb