pathspec 0.0.1 → 0.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a0eb87d15ea86cb98dce7e2ca41f6939418c3b57
+  data.tar.gz: 084dc186f9fbf2f8c4a7ed8268cfa1c78e296728
+SHA512:
+  metadata.gz: 17ccc33fba7022b67fe0da1f9c02fbb6bd4e2d6d8e40fcb0d8ed0420f9733ace1692de35e69151e948b788cf007d7ea49f8c1760809ab02b672e61af16aac9e0
+  data.tar.gz: a1d2fa238ea0fbc47083c25a4372a6d55848e200b1b850701e63ef12a191c06141b00f0a1871c14b46fe3e8366dcf1dfcf3b588a99f81b2d48117fbefe6eadd5

data/README.md

@@ -1,9 +1,13 @@
 pathspec-ruby
 =============
 
-Match Path Specifications (.gitignore) in Ruby with ease!
+Match Path Specifications, such as .gitignore, in Ruby!
 
-Gitignore functionality ported from [Python pathspec](https://pypi.python.org/pypi/pathspec/0.2.2) by [@cpburnz](https://github.com/cpburnz/python-path-specification)
+Follows .gitignore syntax defined on [gitscm](http://git-scm.com/docs/gitignore)
+
+.gitignore functionality ported from [Python pathspec](https://pypi.python.org/pypi/pathspec/0.2.2) by [@cpburnz](https://github.com/cpburnz/python-path-specification)
+
+[Travis Status](https://travis-ci.org/highb/pathspec-ruby) ![Travis CI Status](https://travis-ci.org/highb/pathspec-ruby.svg?branch=master)
 
 ## Build/Install from Rubygems
 ```shell
@@ -32,7 +36,7 @@ gitignore.match 'abc/important.txt'
 # Give a path somewhere in the filesystem, and the Pathspec will return all
 # matching files underneath.
 # Returns ['/src/repo/abc/', '/src/repo/abc/123']
-gitignore.match_tree '/src/repo' # ['/src/repo/abc/', '/src/repo/abc/123']
+gitignore.match_tree '/src/repo'
 
 # Give an enumerable of paths, and Pathspec will return the ones that match.
 # Returns ['/abc/123', '/abc/']
@@ -46,4 +50,4 @@ cd pathspec-ruby && bash ./build_from_source.sh
 ```
 
 ## Contributing
-Pull requests, bug reports, and feature requests welcome! :smile: I've tried to write exhaustive tests (simplecov 100% coverage, woohoo!) but who knows what cases I've missed.
+Pull requests, bug reports, and feature requests welcome! :smile: I've tried to write exhaustive tests but who knows what cases I've missed.

data/lib/pathspec.rb

@@ -35,11 +35,11 @@ class PathSpec
   # Check if any files in a given directory or subdirectories match the specs
   # Returns matched paths or nil if no paths matched
   def match_tree(root)
-    root = Pathname.new(root)
+    rootpath = Pathname.new(root)
     matching = []
 
     Find.find(root) do |path|
-      relpath = Pathname.new(path).relative_path_from(root).to_s
+      relpath = Pathname.new(path).relative_path_from(rootpath).to_s
       relpath += '/' if File.directory? path
       if match(relpath)
         matching << path
@@ -49,14 +49,19 @@ class PathSpec
     matching
   end
 
+  def match_path(path, root='/')
+    rootpath = Pathname.new(drive_letter_to_path(root))
+    relpath = Pathname.new(drive_letter_to_path(path)).relative_path_from(rootpath).to_s
+    relpath = relpath + '/' if path[-1].chr == '/'
+
+    match(relpath)
+  end
+
   def match_paths(paths, root='/')
-    root = Pathname.new(root)
     matching = []
 
     paths.each do |path|
-      relpath = Pathname.new(path).relative_path_from(root).to_s if root != '/'
-      relpath = relpath + '/' if path[-1] == '/'
-      if match(relpath)
+      if match_path(path, root)
         matching << path
       end
     end
@@ -64,6 +69,10 @@ class PathSpec
     matching
   end
 
+  def drive_letter_to_path(path)
+    path.gsub(/^([a-zA-z]):\//, '/\1/')
+  end
+
   # Generate specs from a filename, such as a .gitignore
   def self.from_filename(filename, type=:git)
     self.from_lines(File.open(filename, 'r'))

data/lib/pathspec/gitignorespec.rb

@@ -76,6 +76,14 @@ class GitIgnoreSpec < RegexSpec
         pattern_segs[-1] = '**'
       end
 
+      # Handle platforms with backslash separated paths
+      if File::SEPARATOR == '\\'
+        path_sep = '\\\\'
+      else
+        path_sep = '/'
+      end
+
+
       # Build regular expression from pattern.
       regex = '^'
       need_slash = false
@@ -92,34 +100,34 @@ class GitIgnoreSpec < RegexSpec
           # A normalized pattern beginning with double-asterisks
           # ('**') will match any leading path segments.
           elsif i == 0
-            regex.concat('(?:.+/)?')
+            regex.concat("(?:.+#{path_sep})?")
             need_slash = false
 
           # A normalized pattern ending with double-asterisks ('**')
           # will match any trailing path segments.
           elsif i == regex_end
-            regex.concat('/.*')
+            regex.concat("#{path_sep}.*")
 
           # A pattern with inner double-asterisks ('**') will match
           # multiple (or zero) inner path segments.
           else
-            regex.concat('(?:/.+)?')
+            regex.concat("(?:#{path_sep}.+)?")
             need_slash = true
           end
 
         # Match single path segment.
         elsif seg == '*'
           if need_slash
-            regex.concat('/')
+            regex.concat(path_sep)
           end
 
-          regex.concat('[^/]+')
+          regex.concat("[^#{path_sep}]+")
           need_slash = true
 
         else
           # Match segment glob pattern.
           if need_slash
-            regex.concat('/')
+            regex.concat(path_sep)
           end
 
           regex.concat(translate_segment_glob(seg))
@@ -155,7 +163,7 @@ class GitIgnoreSpec < RegexSpec
 
     while i < pattern.size
       # Get next character.
-      char = pattern[i]
+      char = pattern[i].chr
       i += 1
 
       # Escape the character.
@@ -187,18 +195,18 @@ class GitIgnoreSpec < RegexSpec
       elsif char == '['
         j = i
         # Pass brack expression negation.
-        if j < pattern.size && pattern[j] == '!'
+        if j < pattern.size && pattern[j].chr == '!'
           j += 1
         end
 
         # Pass first closing braket if it is at the beginning of the
         # expression.
-        if j < pattern.size && pattern[j] == ']'
+        if j < pattern.size && pattern[j].chr == ']'
           j += 1
         end
 
         # Find closing braket. Stop once we reach the end or find it.
-        while j < pattern.size && pattern[j] != ']'
+        while j < pattern.size && pattern[j].chr != ']'
           j += 1
         end
 
@@ -207,7 +215,7 @@ class GitIgnoreSpec < RegexSpec
           expr = '['
 
           # Braket expression needs to be negated.
-          if pattern[i] == '!'
+          if pattern[i].chr == '!'
             expr += '^'
             i += 1
 
@@ -216,13 +224,13 @@ class GitIgnoreSpec < RegexSpec
           # `fnmatch.translate()` escapes the caret ('^') as a
           # literal. To maintain consistency with undefined behavior,
           # I am escaping the '^' as well.
-          elsif pattern[i] == '^'
+          elsif pattern[i].chr == '^'
             expr += '\\^'
             i += 1
           end
 
           # Escape brackets contained within pattern
-          if pattern[i] == ']' && i != j
+          if pattern[i].chr == ']' && i != j
             expr += '\]'
             i += 1
           end

metadata

@@ -1,87 +1,78 @@
 --- !ruby/object:Gem::Specification
 name: pathspec
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.0.2
 platform: ruby
 authors:
 - Brandon High
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Use to match path patterns such as gitignore
-email: 
+email: bh@brandon-high.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- LICENSE
+- README.md
+- lib/pathspec.rb
 - lib/pathspec/gitignorespec.rb
 - lib/pathspec/regexspec.rb
 - lib/pathspec/spec.rb
-- lib/pathspec.rb
-- LICENSE
-- README.md
-- CHANGELOG.md
-homepage: https://github.com/highb/pathspec-ruby
+homepage: http://rubygems.org/gems/pathspec
 licenses:
 - Apache
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3379845117464924390
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
-summary: ! 'PathSpec: for matching path patterns'
+specification_version: 4
+summary: 'PathSpec: for matching path patterns'
 test_files: []