win32-dir 0.3.6 → 0.3.7

data/CHANGES

@@ -1,3 +1,8 @@
+== 0.3.7 - 18-Jul-2010
+* Modified Dir.glob and Dir[] to handle backslashes in path names.
+* Added tests for the modified Dir.glob and Dir[] behavior.
+* Removed the old non-gem install Rake task.
+
 == 0.3.6 - 6-Feb-2010
 * Bug fixes for Ruby 1.9.x. Thanks go to Kendall Gifford for the spot and
   the patch.

data/Rakefile

@@ -1,22 +1,15 @@
 require 'rake'
 require 'rake/testtask'
 
-desc "Install the win32-dir package (non-gem)"
-task :install do
-  dest = File.join(Config::CONFIG['sitelibdir'], 'win32')
-  Dir.mkdir(dest) unless File.exists? dest
-  cp 'lib/win32/dir.rb', dest, :verbose => true
-end
-
 namespace 'gem' do
-  desc "Build the gem"
+  desc "Create the win32-dir gem"
   task :build do
     Dir["*.gem"].each{ |f| File.delete(f) }
     spec = eval(IO.read('win32-dir.gemspec'))
     Gem::Builder.new(spec).build
   end
   
-  desc "Install the win32-dir package as a gem"
+  desc "Install the win32-dir gem"
   task :install => [:build] do
     file = Dir["*.gem"].first
     sh "gem install #{file}"

data/lib/win32/dir.rb

@@ -30,7 +30,7 @@ class Dir
   extend Windows::SystemInfo
    
   # The version of the win32-dir library.
-  VERSION = '0.3.6'
+  VERSION = '0.3.7'
    
   # Dynamically set each of the CSIDL_ constants
   constants.grep(/CSIDL/).each{ |constant|
@@ -67,6 +67,26 @@ class Dir
   class << self
     remove_method :getwd
     remove_method :pwd
+    alias :old_glob :glob
+    alias :old_ref :[]
+    remove_method :glob
+    remove_method :[]
+  end
+
+  # Same as the standard MRI Dir.glob method except that it handles
+  # backslashes in path names.
+  #
+  def self.glob(glob_pattern, flags = 0, &block)
+    glob_pattern = glob_pattern.tr("\\", "/") 
+    old_glob(glob_pattern, flags, &block)
+  end
+
+  # Same as the standard MRI Dir[] method except that it handles
+  # backslashes in path names.
+  #
+  def self.[](glob_pattern)
+    glob_pattern = glob_pattern.tr("\\", "/") 
+    old_ref(glob_pattern)
   end
    
   # Returns the present working directory. Unlike MRI, this method always

data/test/test_win32_dir.rb

@@ -28,7 +28,30 @@ class TC_Win32_Dir < Test::Unit::TestCase
   end
    
   def test_version
-    assert_equal('0.3.6', Dir::VERSION)
+    assert_equal('0.3.7', Dir::VERSION)
+  end
+
+  test 'glob handles backslashes' do
+    pattern = "C:\\Program Files\\Common Files\\System\\*.dll"
+    assert_nothing_raised{ Dir.glob(pattern) }
+    assert_true(Dir.glob(pattern).size > 0)
+  end
+
+  test 'glob still observes flags' do
+    assert_nothing_raised{ Dir.glob('*', File::FNM_DOTMATCH ) }
+    assert_true(Dir.glob('*', File::FNM_DOTMATCH).include?('.'))
+  end
+
+  test 'glob still honors block' do
+    array = []
+    assert_nothing_raised{ Dir.glob('*', File::FNM_DOTMATCH ){ |m| array << m } }
+    assert_true(array.include?('.'))
+  end
+
+  test 'ref handles backslashes' do
+    pattern = "C:\\Program Files\\Common Files\\System\\*.dll"
+    assert_nothing_raised{ Dir[pattern] }
+    assert_true(Dir[pattern].size > 0)
   end
   
   def test_create_junction_basic

data/win32-dir.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name      = 'win32-dir'
-  spec.version   = '0.3.6'
+  spec.version   = '0.3.7'
   spec.authors   = ['Daniel J. Berger', 'Park Heesob']
   spec.license   = 'Artistic 2.0'
   spec.email     = 'djberg96@gmail.com'

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: win32-dir
 version: !ruby/object:Gem::Version 
-  version: 0.3.6
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 7
+  version: 0.3.7
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -10,29 +15,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-06 00:00:00 -07:00
+date: 2010-07-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: windows-pr
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 9
         version: 1.0.9
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: test-unit
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 6
         version: 2.0.6
-    version: 
+  type: :development
+  version_requirements: *id002
 description: "    The win32-dir library provides extra methods and constants for the\n    builtin Dir class. The constants provide a convenient way to identify\n    certain directories across all versions of Windows. Some methods have\n    been added, such as the ability to create junctions. Others have been\n    modified to provide a more consistent result for MS Windows.\n"
 email: djberg96@gmail.com
 executables: []
@@ -65,18 +78,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: win32utils
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Extra constants and methods for the Dir class on Windows.