win32-dir 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0abef2cc454787626bc32d89de4bc1d1dc1e20ce
-  data.tar.gz: b042f768bc130b2b5eb6eaa7699b8804c3218d4c
+  metadata.gz: fc264e17d1f2e530579a3a8fcc10b3551a3614f9
+  data.tar.gz: 33499544ea2cd22078cc9270de270cb66a19d1f9
 SHA512:
-  metadata.gz: f3a6e1540dcecf539acc55d0de4dc465f9c811d0ab427a7fdd12e3f458718f19ba5ea9bea5121ed8b0a34b5fb200390d59e4a861c3cff68cfadce90da01c072b
-  data.tar.gz: 3e3c8f2ef6369233dcdba2fcbc8048c5ae18db79da9d24417ba6265bf13b43d64fae0d73ac6d067b6fad5a6edf4fa241e210f91c260541780762fdd45fc11f21
+  metadata.gz: aa1143644ec25286a8e5da0842e549c4d43435b8322f9c266ee153ff06c3122adb4c1469f500687881b85476b05111636b7c88a7d5b87f3f90c9127cdf41207c
+  data.tar.gz: c18966592a496f45d5338a3c3772d30692975d96031914f7522f586dc42fb0a369e9489ec374de9ec3cf6ebff440663c92e64e4bc78baf909faa2ff1fcd7151d

data/CHANGES

@@ -1,3 +1,8 @@
+== 0.4.5 - 23-Sep-2013
+* Yet another encoding fix, this time one that affected JRuby.
+* Fixed the Dir[] and Dir.glob methods so they match the spec. Thanks go
+  to Chris Westbrook for the spot.
+
 == 0.4.4 - 22-Sep-2013
 * Yet another encoding fix. Thanks go to Rob Reynolds for the patch.
 

data/lib/win32/dir.rb

@@ -8,7 +8,7 @@ class Dir
   extend Dir::Functions
 
   # The version of the win32-dir library.
-  VERSION = '0.4.4'
+  VERSION = '0.4.5'
 
   # CSIDL constants
   csidl = Hash[
@@ -93,7 +93,11 @@ class Dir
       end
     end
 
-    Dir.const_set(key, path.encode(Encoding.default_external)) if path
+    begin
+      Dir.const_set(key, path.encode(Encoding.default_external)) if path
+    rescue Encoding::UndefinedConversionError
+      Dir.const_set(key, path.encode('UTF-8')) if path
+    end
   }
 
   # Set Dir::MYDOCUMENTS to the same as Dir::PERSONAL if undefined
@@ -108,8 +112,13 @@ class Dir
     # backslashes in path names.
     #
     def glob(glob_pattern, flags = 0, &block)
-      glob_pattern = glob_pattern.tr("\\", "/")
-      old_glob(glob_pattern, flags, &block)
+      if glob_pattern.is_a?(Array)
+        temp = glob_pattern.map!{ |pattern| pattern.tr("\\", "/") }
+      else
+        temp = glob_pattern.tr("\\", "/")
+      end
+
+      old_glob(temp, flags, &block)
     end
 
     alias old_ref []
@@ -117,9 +126,9 @@ class Dir
     # Same as the standard MRI Dir[] method except that it handles
     # backslashes in path names.
     #
-    def [](glob_pattern)
-      glob_pattern = glob_pattern.tr("\\", "/")
-      old_ref(glob_pattern)
+    def [](*glob_patterns)
+      temp = glob_patterns.map!{ |pattern| pattern.tr("\\", "/") }
+      old_ref(*temp)
     end
 
     # JRuby normalizes the path by default.
@@ -160,8 +169,11 @@ class Dir
         if GetLongPathNameW(path2, path3, path3.size) == 0
           raise SystemCallError.new("GetLongPathNameW", FFI.errno)
         end
-
-        path3.strip.encode(Encoding.default_external)
+        begin
+          path3.strip.encode(Encoding.default_external)
+        rescue Encoding::UndefinedConversionError
+          path3.strip.encode('UTF-8')
+        end
       end
 
       alias :pwd :getwd
@@ -347,7 +359,11 @@ class Dir
     jname = jname.bytes.to_a.pack('C*')
     jname = jname.force_encoding("UTF-16LE")
     raise "Junction name came back as #{jname}" unless jname[0..3] == "\\??\\".encode("UTF-16LE")
-    File.expand_path(jname[4..-1].encode(Encoding.default_external))
+    begin
+      File.expand_path(jname[4..-1].encode(Encoding.default_external))
+    rescue Encoding::UndefinedConversionError
+      File.expand_path(jname[4..-1].encode('UTF-8'))
+    end
   end
 
   # Returns whether or not +path+ is empty.  Returns false if +path+ is not

data/test/test_win32_dir.rb

@@ -25,7 +25,7 @@ class TC_Win32_Dir < Test::Unit::TestCase
   end
 
   test "version number is set to expected value" do
-    assert_equal('0.4.4', Dir::VERSION)
+    assert_equal('0.4.5', Dir::VERSION)
   end
 
   test 'glob handles backslashes' do
@@ -34,6 +34,13 @@ class TC_Win32_Dir < Test::Unit::TestCase
     assert_true(Dir.glob(pattern).size > 0)
   end
 
+  test 'glob handles multiple strings' do
+    pattern1 = "C:\\Program Files\\Common Files\\System\\*.dll"
+    pattern2 = "C:\\Windows\\*.exe"
+    assert_nothing_raised{ Dir.glob([pattern1, pattern2]) }
+    assert_true(Dir.glob([pattern1, pattern2]).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?('.'))
@@ -51,6 +58,13 @@ class TC_Win32_Dir < Test::Unit::TestCase
     assert_true(Dir[pattern].size > 0)
   end
 
+  test 'ref handles multiple arguments' do
+    pattern1 = "C:\\Program Files\\Common Files\\System\\*.dll"
+    pattern2 = "C:\\Windows\\*.exe"
+    assert_nothing_raised{ Dir[pattern1, pattern2] }
+    assert_true(Dir[pattern1, pattern2].size > 0)
+  end
+
   test "create_junction basic functionality" do
     assert_respond_to(Dir, :create_junction)
   end

data/win32-dir.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: win32-dir
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-22 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi