fspath 2.0.3 → 2.0.4

data/README.markdown

@@ -2,7 +2,7 @@
 
 Better than Pathname
 
-Check out fspath-mac and fspath-xattr.
+Check out [fspath-mac](https://rubygems.org/gems/fspath-mac) and [fspath-xattr](https://rubygems.org/gems/fspath-xattr).
 
 ## Synopsis
 

data/fspath.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'fspath'
-  s.version     = '2.0.3'
+  s.version     = '2.0.4'
   s.summary     = %q{Better than Pathname}
   s.homepage    = "http://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']

data/lib/fspath.rb

@@ -96,13 +96,13 @@ class FSPath < Pathname
 
   # Escape characters in glob pattern
   def escape_glob
-    self.class.new(@path.gsub(/([\*\?\[\]\{\}])/, '\\\\\1'))
+    self.class.new(escape_glob_string)
   end
 
   # Expand glob
   def glob(*args, &block)
     flags = args.last.is_a?(Fixnum) ? args.pop : nil
-    args = [File.join(self, *args)]
+    args = [File.join(escape_glob_string, *args)]
     args << flags if flags
     self.class.glob(*args, &block)
   end
@@ -136,6 +136,12 @@ class FSPath < Pathname
   def parts(&block)
     split_names(@path).flatten
   end
+
+private
+
+  def escape_glob_string
+    @path.gsub(/([\*\?\[\]\{\}])/, '\\\\\1')
+  end
 end
 
 module Kernel

data/spec/fspath_spec.rb

@@ -1,4 +1,5 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'rspec'
 require 'fspath'
 
 describe FSPath do
@@ -189,6 +190,11 @@ describe FSPath do
       FSPath.should_receive(:glob).with('a/b/c/**/*', @flags)
       FSPath('a/b/c').glob('**', '*', @flags)
     end
+
+    it "should escape glob characters in path itself" do
+      FSPath.should_receive(:glob).with('somewhere \[a b c\]/**/*')
+      FSPath('somewhere [a b c]').glob('**', '*')
+    end
   end
 
   describe "path parts" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fspath
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 2
   - 0
-  - 3
-  version: 2.0.3
+  - 4
+  version: 2.0.4
 platform: ruby
 authors: 
 - Ivan Kuchin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-10 00:00:00 Z
+date: 2012-03-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -46,7 +46,6 @@ files:
 - fspath.gemspec
 - lib/fspath.rb
 - spec/fspath_spec.rb
-- spec/spec_helper.rb
 homepage: http://github.com/toy/fspath
 licenses: 
 - MIT
@@ -76,11 +75,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: fspath
-rubygems_version: 1.8.13
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Better than Pathname
 test_files: 
 - spec/fspath_spec.rb
-- spec/spec_helper.rb
 has_rdoc: 

data/spec/spec_helper.rb

@@ -1,2 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-require 'rspec'