file-find 0.3.6 → 0.3.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTNmNWQwYTQ0NDdjNzQ5NDI4YjFjZWY0YjFmZjUzMmY0ZDJmZDNlZA==
+    ODkxZjA0Y2IyNjQwOGJiMjVhYzBlOWM2MDJmNTU2YTA3YmRiNGVmZg==
   data.tar.gz: !binary |-
-    YzU0Mzg2ZjA1ZGE2ZDcyOTAxMDZkNWI5YWE3MzI3MDYxNGViYTJmYw==
-!binary "U0hBNTEy":
+    MTlkYmUzYzBmOWE2Nzk0ZTVkMzk3OGU0NDZlZDg4MGM2MjRiN2I5OA==
+SHA512:
   metadata.gz: !binary |-
-    YjM2Mjk1YTFlNmIwMzQ3YTNkNmIxOWNlZDE1YjEzOWFjOTVjMzBjNzMzZGYz
-    YTJjNTJjYmQ0ZGYyM2ViYWY4YWJiNTg4YzFmNGUzNTBkNjQyNTUxYWZmNjRk
-    ZGYxZDU3YTdjNDA1YjJmNWU0MjVkOTU4YzcwZjljNGMyZTMwNzA=
+    MjY4YzA4Y2I3ZTdkNWZmYWJmYTc1M2ZhMzQxOTk2MGJhOTllNmZjMzljMDUz
+    ZmZhYTVlNTk4MDMwYjkwYjA1N2ZiNmE3ODllNDBjMjU3YjcxMmFjZDg5MTU2
+    NWI3ZjkwMWQ5NjkyMDI4YzMxNjBiZjZkMjFjNDc5YzI3MTQ5NTk=
   data.tar.gz: !binary |-
-    MDg3NjA3OGRiOWFhYzZmZjVkYTk5YjQ5MjRkMDQxZDYyNzZlOGIxMjVmNTUz
-    MjZmMWMxZWY1ZWRhZWFlYzUzMGIxMGRhZTE0ODMxZGYyMjFhM2M4NDRmMjBh
-    YTNkMTQ4MjhmMzQwN2RhNjg3ZDc4NmI2YmExNTJmOWMzOTgwMjU=
+    YjYyYTNmZGUyODI2OGZiZTA0MGJmYTg1OWFhOGFkMWY5Yjg5MjkyNmJkYjI1
+    MjI3NzcwM2VkMzc5YTkwYmY0MmE2ZTlkYWQ4NTU1ZDBmN2YyZTA1MzYwYTY1
+    NGQ2MmI3NmY4OWE4N2Q1MTk2NTM1OTI3YTQ2NjhjNWE5OTQ5MWM=

data/CHANGES

@@ -1,3 +1,7 @@
+== 0.3.7 - 15-Jan-2014
+* Fixed a bug with brackets in the path name. Thanks go to Jeremy Lawler
+  for the spot and the patch.
+
 == 0.3.6 - 6-Sep-2013
 * Removed rbconfig from library and test file. Just use File::ALT_SEPARATOR
   to check for Windows instead.

data/file-find.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name      = 'file-find'
-  spec.version   = '0.3.6'
+  spec.version   = '0.3.7'
   spec.author    = 'Daniel Berger'
   spec.license   = 'Artistic 2.0'
   spec.summary   = 'A better way to find files'

data/lib/file/find.rb

@@ -10,7 +10,7 @@ end
 
 class File::Find
   # The version of the file-find library
-  VERSION = '0.3.6'
+  VERSION = '0.3.7'
 
   # :stopdoc:
   VALID_OPTIONS = %w/
@@ -236,7 +236,6 @@ class File::Find
           file = File.join(path, file)
 
           stat_method = @follow ? :stat : :lstat
-
           # Skip files we cannot access, stale links, etc.
           begin
             stat_info = File.send(stat_method, file)
@@ -247,7 +246,8 @@ class File::Find
             retry if stat_method.to_s != 'lstat'
           end
 
-          glob = File.join(File.dirname(file), @name)
+          # We need to escape any brackets in the directory name.
+          glob = File.join(File.dirname(file).gsub(/([\[\]])/,'\\\\\1'), @name)
 
           # Dir[] doesn't like backslashes
           if File::ALT_SEPARATOR

data/test/test_file_find.rb

@@ -63,7 +63,7 @@ class TC_File_Find < Test::Unit::TestCase
   end
 
   def test_version
-    assert_equal('0.3.6', File::Find::VERSION)
+    assert_equal('0.3.7', File::Find::VERSION)
   end
 
   def test_path
@@ -229,6 +229,41 @@ class TC_File_Find < Test::Unit::TestCase
     assert_nil(@rule1.maxdepth)
   end
 
+  # This test is a little uglier because we actually check to make sure
+  # we're looking at the right subdir, not just a filename shows up.
+  # I did this because I'm a little paranoid about the directory
+  # not getting mangled. - jlawler.
+  #
+  def test_dirs_with_brackets
+    omit_if(@@windows, 'dirs with brackets test skipped on MS Windows')
+
+    bracket_files = [ 'bracket/a[1]/a.foo', 'bracket/a [2] /b.foo', 'bracket/[a] b [c]/d.foo' ].sort
+    bracket_paths = [ 'bracket/a[1]', 'bracket/a [2] ', 'bracket/[a] b [c]', 'bracket/[z] x' ].sort
+
+    bracket_paths.each{ |e| mkpath(e) }
+    bracket_files.each{ |e| touch(e) }
+
+    @file_rule = File::Find.new(
+      :ftype => 'file',
+      :path  => ['bracket']
+    )
+
+    @dir_rule = File::Find.new(
+      :path => ['bracket'],
+      :ftype => 'directory'
+    )
+
+    file_results = @file_rule.find.sort
+
+    assert_equal(bracket_files.size,file_results.size)
+    path = file_results.first.chomp(bracket_files.first)
+
+    # Confirm the first thing in results is the first thing in bracket_paths
+    assert_not_equal(path, file_results.first)
+    assert_equal(bracket_files, file_results.map{ |e| e.sub(path,'') }.sort )
+    assert_equal(bracket_paths, @dir_rule.find.sort )
+  end
+
   def test_maxdepth_file
     mkpath('a1/a2/a3')
     touch('a1/a.foo')
@@ -246,7 +281,7 @@ class TC_File_Find < Test::Unit::TestCase
     assert_equal(['a.foo'], @rule2.find.map{ |e| File.basename(e) })
 
     @rule2.maxdepth = 3
-    assert_equal(['a.foo', 'b.foo', 'c.foo'], @rule2.find.map{ |e| File.basename(e) })
+    assert_equal(['a.foo', 'b.foo', 'c.foo'], @rule2.find.map{ |e| File.basename(e) }.sort)
 
     @rule2.maxdepth = nil
     assert_equal(
@@ -444,6 +479,7 @@ class TC_File_Find < Test::Unit::TestCase
     rm_rf(@link1) unless @@windows
     rm_rf('a')
     rm_rf('a1')
+    rm_rf('bracket')
     rm_rf('z.min') if File.exists?('z.min')
 
     @rule1 = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: file-find
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Daniel Berger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-06 00:00:00.000000000 Z
+date: 2014-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: shards
-rubygems_version: 2.0.3
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
 summary: A better way to find files