pathspec 0.0.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a0eb87d15ea86cb98dce7e2ca41f6939418c3b57
-  data.tar.gz: 084dc186f9fbf2f8c4a7ed8268cfa1c78e296728
+SHA256:
+  metadata.gz: 959defcb28199d86bb69d1b7854937c677e37dc71521f44693a42411897acf01
+  data.tar.gz: dfa517e7b72d5aede4eb9daf642fda9266c1f82454bed03b3b776934f5c56c95
 SHA512:
-  metadata.gz: 17ccc33fba7022b67fe0da1f9c02fbb6bd4e2d6d8e40fcb0d8ed0420f9733ace1692de35e69151e948b788cf007d7ea49f8c1760809ab02b672e61af16aac9e0
-  data.tar.gz: a1d2fa238ea0fbc47083c25a4372a6d55848e200b1b850701e63ef12a191c06141b00f0a1871c14b46fe3e8366dcf1dfcf3b588a99f81b2d48117fbefe6eadd5
+  metadata.gz: b1824b7ce0c951017a51d501f5e18299d1fa0400ca0c6db54b9b774c4aa08a3587504d98cd578b99296cf34aad2e07593292563014a0fcc09f72697194b1327c
+  data.tar.gz: 96ab89b84afdc3f69b24f0f84bd5740c2ebee3048246ca5d482bc3f24f08dbda542b03f3a6efb02d33d6cdd225646e1ef2cadaa43be3d1069f1912cfa4f99da1

data/CHANGELOG.md

@@ -1 +1,28 @@
-0.0.1: Initial version.
+# pathspec-ruby CHANGELOG
+
+## 0.2.0 (Minor Release)
+- (Feature) A CLI tool, pathspec-rb, is now provided with the gem.
+- (API Change) New namespace for gem: `PathSpec`: Everything is now namespaced under `PathSpec`, to prevent naming collisions with other libraries. Thanks @tenderlove!
+- (License) License version updated to Apache 2. Thanks @kytrinyx!
+- (Maint) Pruned Supported Ruby Versions. We now test: 2.2.9, 2.3.6 and 2.4.3.
+- (Maint) Ruby 2.5.0 testing is blocked on Travis, but should work locally. Thanks @SumLare!
+- (Maint) Added Rubocop and made some corrections
+
+## 0.1.2 (Patch/Bug Fix Release)
+- Fix for regexp matching Thanks @incase! #16
+- File handling cleanup Thanks @martinandert! #13
+- `from_filename` actually works now! Thanks @martinandert! #12
+
+## 0.1.0 (Minor Release)
+- Port new edgecase handling from [python-path-specification](https://github.com/cpburnz/python-path-specification/pull/8). Many thanks to @jdpace! :)
+- Removed EOL Ruby support
+- Added current Ruby stable to Travis testing
+
+## 0.0.2 (Patch/Bug Fix Release)
+- Fixed issues with Ruby 1.8.7/2.1.1
+- Added more testing scripts
+- Fixed Windows path related issues
+- Cleanup unnecessary things in gem
+
+## 0.0.1
+- Initial version.

data/README.md

@@ -1,5 +1,12 @@
-pathspec-ruby
-=============
+# pathspec-ruby
+
+[![Gem Version](https://badge.fury.io/rb/pathspec.svg)](https://badge.fury.io/rb/pathspec) [![Build Status](https://travis-ci.org/highb/pathspec-ruby.svg?branch=master)](https://travis-ci.org/highb/pathspec-ruby) [![Maintainability](https://api.codeclimate.com/v1/badges/4f3b5917e01fb34f790d/maintainability)](https://codeclimate.com/github/highb/pathspec-ruby/maintainability)
+
+[Supported Rubies](https://www.ruby-lang.org/en/downloads/):
+
+- 2.4.6 (Maintenance)
+- 2.5.6 (Stable)
+- 2.6.4 (Stable)
 
 Match Path Specifications, such as .gitignore, in Ruby!
 
@@ -7,21 +14,42 @@ 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
 gem install pathspec
 ```
 
+## CLI Usage
+
+```bash
+➜  test-pathspec cat .gitignore
+*.swp
+/coverage/
+➜  test-pathspec be pathspec-rb specs_match "coverage/foo"
+/coverage/
+➜  test-pathspec be pathspec-rb specs_match "file.swp"
+*.swp
+➜ test-pathspec be pathspec-rb match "file.swp"
+➜ test-pathspec echo $?
+0
+➜  test-pathspec ls
+Gemfile      Gemfile.lock coverage     file.swp     source.rb
+➜  test-pathspec be pathspec-rb tree .
+./coverage
+./coverage/index.html
+./file.swp
+```
+
 ## Usage
+
 ```ruby
 require 'pathspec'
 
 # Create a .gitignore-style Pathspec by giving it newline separated gitignore
 # lines, an array of gitignore lines, or any other enumable object that will
 # give strings matching the .gitignore-style (File, etc.)
-gitignore = Pathspec.new File.read('.gitignore', 'r')
+gitignore = Pathspec.from_filename('spec/files/gitignore_readme')
 
 # Our .gitignore in this example contains:
 # !**/important.txt
@@ -29,25 +57,31 @@ gitignore = Pathspec.new File.read('.gitignore', 'r')
 
 # true, matches "abc/**"
 gitignore.match 'abc/def.rb'
+# CLI equivalent: pathspec.rb -f spec/files/gitignore_readme match 'abc/def.rb'
 
 # false, because it has been negated using the line "!**/important.txt"
 gitignore.match 'abc/important.txt'
+# CLI equivalent: pathspec.rb -f spec/files/gitignore_readme 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'
+# CLI equivalent: pathspec.rb -f spec/files/gitignore_readme tree /src/repo
 
 # Give an enumerable of paths, and Pathspec will return the ones that match.
 # Returns ['/abc/123', '/abc/']
 gitignore.match_paths ['/abc/123', '/abc/important.txt', '/abc/']
+# There is no CLI equivalent to this.
 ```
 
 ## Building/Installing from Source
+
 ```shell
 git clone git@github.com:highb/pathspec-ruby.git
 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 but who knows what cases I've missed.

data/bin/pathspec-rb

@@ -0,0 +1,80 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'optionparser'
+require 'pathspec'
+options = {
+  spec_type: :git,
+  spec_filename: '.gitignore'
+}
+
+optparser = OptionParser.new do |opts|
+  opts.banner = 'Usage: pathspec-rb [options] [subcommand] [path]
+Subcommands:
+  specs_match: Finds all specs matching path.
+  tree: Finds all files under path matching the spec.
+  match: Checks if the path matches any spec.
+EXIT STATUS:
+  0   Matches found.
+  1   No matches found.
+  >1  An error occured.
+'
+  opts.on('-f', '--file FILENAME', String,
+          'A spec file to load. Default: .gitignore') do |filename|
+    unless File.readable?(filename)
+      puts "Error: I couldn't read #{filename}"
+      exit 2
+    end
+
+    options[:spec_filename] = filename
+  end
+  opts.on('-t', '--type [git|regex]', %i[git regex],
+          'Spec file type in FILENAME. Default: git. Available: git and regex.') do |type|
+    options[:spec_type] = type
+  end
+  opts.on('-v', '--verbose', 'Only output if there are matches.') do |_verbose|
+    options[:verbose] = true
+  end
+end
+
+optparser.parse!
+
+command = ARGV[0]
+path = ARGV[1]
+if path
+  spec = PathSpec.from_filename(options[:spec_filename], options[:spec_type])
+else
+  puts optparser.help
+  exit 2
+end
+
+case command
+when 'specs_match'
+  if spec.match?(path)
+    puts "#{path} matches the following specs from #{options[:spec_filename]}:" if options[:verbose]
+    puts spec.specs_matching(path)
+  else
+    puts "#{path} does not match any specs from #{options[:spec_filename]}" if options[:verbose]
+    exit 1
+  end
+when 'tree'
+  tree_matches = spec.match_tree(path)
+  if tree_matches.any?
+    puts "Files in #{path} that match #{options[:spec_filename]}" if options[:verbose]
+    puts tree_matches
+  else
+    puts "No file in #{path} matched #{options[:spec_filename]}" if options[:verbose]
+    exit 1
+  end
+when 'match', ''
+  if spec.match?(path)
+    puts "#{path} matches a spec in #{options[:spec_filename]}" if options[:verbose]
+  else
+    puts "#{path} does not match any specs in #{options[:spec_filename]}" if options[:verbose]
+    exit 1
+  end
+else
+  puts "Unknown sub-command #{command}."
+  puts optparser.help
+  exit 2
+end

data/docs/html/pathspec-rb.html

@@ -0,0 +1,82 @@
+<h1 id="pathspec-rb1">pathspec-rb(1)</h1>
+
+<h2 data-date="2020/01/04" id="name">NAME</h2>
+
+<p>pathspec - Test pathspecs against a specific path</p>
+
+<h2 id="synopsis">SYNOPSIS</h2>
+
+<p><code>pathspec-rb</code> [<code>OPTIONS</code>] [<code>SUBCOMMAND</code>] [<code>PATH</code>] NAME PATH</p>
+
+<h2 id="description">DESCRIPTION</h2>
+
+<p><code>pathspc-rb</code> is a tool that accompanies the pathspec-ruby library to help
+you test what match results the library would find using path specs. You can
+either find all specs matching a path, find all files matching specs, or
+verify that a path would match any spec.</p>
+
+<p>https://github.com/highb/pathspec-ruby</p>
+
+<h2 id="sub-commands">SUB-COMMANDS</h2>
+
+<table>
+  <thead>
+    <tr>
+      <th>Name</th>
+      <th>Description</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td><em>specs_match</em></td>
+      <td>Find all specs matching path</td>
+    </tr>
+  </tbody>
+  <tbody>
+    <tr>
+      <td><em>tree</em></td>
+      <td>Find all files under path matching the spec</td>
+    </tr>
+  </tbody>
+  <tbody>
+    <tr>
+      <td><em>match</em></td>
+      <td>Check if the path matches any spec</td>
+    </tr>
+  </tbody>
+</table>
+
+<h2 id="options">OPTIONS</h2>
+
+<dl>
+  <dt><code>-f &lt;FILENAME&gt;</code>, <code>--file &lt;FILENAME&gt;</code></dt>
+  <dd>Load path specs from the file passed in as argument. If this option is not specified, <code>pathspec-rb</code> defaults to loading <code>.gitignore</code>.</dd>
+  <dt><code>-t [git|regex]</code>, <code>--type [git|regex]</code></dt>
+  <dd>Type of spec expected in the loaded specs file (see <code>-f</code> option). Defaults to <code>git</code>.</dd>
+  <dt><code>-v</code>, <code>--verbose</code></dt>
+  <dd>Only output if there are matches.</dd>
+</dl>
+
+<h2 id="example">EXAMPLE</h2>
+
+<p>Find all files ignored by git under your source directory:</p>
+
+<pre><code>  $ pathspec-rb tree src/
+</code></pre>
+
+<p>List all spec rules that would match for the specified path:</p>
+
+<pre><code>  $ pathspec-rb specs_match build/
+</code></pre>
+
+<p>Check that a path matches at least one of the specs in a new version of a
+gitignore file:</p>
+
+<pre><code>  $ pathspec-rb match -f .gitignore.new spec/fixtures/
+</code></pre>
+
+<h2 id="author">AUTHOR</h2>
+
+<p>Brandon High highb@users.noreply.github.com</p>
+
+<p>Gabriel Filion</p>

data/docs/man/pathspec-rb.man.1

@@ -0,0 +1,67 @@
+.\" generated by kramdown
+.TH "PATHSPEC\-RB" "1"
+.SH "NAME"
+pathspec \- Test pathspecs against a specific path
+.SH "SYNOPSIS"
+\fBpathspec\-rb\fP [\fBOPTIONS\fP] [\fBSUBCOMMAND\fP] [\fBPATH\fP] NAME PATH
+.SH "DESCRIPTION"
+\fBpathspc\-rb\fP is a tool that accompanies the pathspec\-ruby library to help you test what match results the library would find using path specs\. You can either find all specs matching a path, find all files matching specs, or verify that a path would match any spec\.
+.P
+https://github\.com/highb/pathspec\-ruby
+.SH "SUB\-COMMANDS"
+.TS
+box ;
+lb lb .
+Name	Description	
+=
+.T&
+l l .
+\fIspecs_match\fP	Find all specs matching path	
+_
+.T&
+l l .
+\fItree\fP	Find all files under path matching the spec	
+_
+.T&
+l l .
+\fImatch\fP	Check if the path matches any spec	
+.TE
+.sp
+.SH "OPTIONS"
+.TP
+\fB\-f <FILENAME>\fP, \fB\-\-file <FILENAME>\fP
+Load path specs from the file passed in as argument\. If this option is not specified, \fBpathspec\-rb\fP defaults to loading \fB\&\.gitignore\fP\&\.
+.TP
+\fB\-t [git|regex]\fP, \fB\-\-type [git|regex]\fP
+Type of spec expected in the loaded specs file (see \fB\-f\fP option)\. Defaults to \fBgit\fP\&\.
+.TP
+\fB\-v\fP, \fB\-\-verbose\fP
+Only output if there are matches\.
+.SH "EXAMPLE"
+Find all files ignored by git under your source directory:
+.sp
+.RS 4
+.EX
+  $ pathspec\-rb tree src/
+.EE
+.RE
+.P
+List all spec rules that would match for the specified path:
+.sp
+.RS 4
+.EX
+  $ pathspec\-rb specs_match build/
+.EE
+.RE
+.P
+Check that a path matches at least one of the specs in a new version of a gitignore file:
+.sp
+.RS 4
+.EX
+  $ pathspec\-rb match \-f \.gitignore\.new spec/fixtures/
+.EE
+.RE
+.SH "AUTHOR"
+Brandon High highb@users\.noreply\.github\.com
+.P
+Gabriel Filion

data/docs/pathspec-rb.md

@@ -0,0 +1,64 @@
+# pathspec-rb(1)
+
+{:data-date="2020/01/04"}
+
+## NAME
+
+pathspec - Test pathspecs against a specific path
+
+## SYNOPSIS
+
+`pathspec-rb` [`OPTIONS`] [`SUBCOMMAND`] [`PATH`] NAME PATH
+
+## DESCRIPTION
+
+`pathspc-rb` is a tool that accompanies the pathspec-ruby library to help
+you test what match results the library would find using path specs. You can
+either find all specs matching a path, find all files matching specs, or
+verify that a path would match any spec.
+
+https://github.com/highb/pathspec-ruby
+
+## SUB-COMMANDS
+
+|-
+| Name | Description
+|-
+| *specs_match* | Find all specs matching path
+|-
+| *tree* | Find all files under path matching the spec
+|-
+| *match* | Check if the path matches any spec
+|-
+
+## OPTIONS
+
+`-f <FILENAME>`, `--file <FILENAME>`
+: Load path specs from the file passed in as argument. If this option is not specified, `pathspec-rb` defaults to loading `.gitignore`.
+
+`-t [git|regex]`, `--type [git|regex]`
+: Type of spec expected in the loaded specs file (see `-f` option). Defaults to `git`.
+
+`-v`, `--verbose`
+: Only output if there are matches.
+
+## EXAMPLE
+
+Find all files ignored by git under your source directory:
+
+      $ pathspec-rb tree src/
+
+List all spec rules that would match for the specified path:
+
+      $ pathspec-rb specs_match build/
+
+Check that a path matches at least one of the specs in a new version of a
+gitignore file:
+
+      $ pathspec-rb match -f .gitignore.new spec/fixtures/
+
+## AUTHOR
+
+Brandon High highb@users.noreply.github.com
+
+Gabriel Filion

data/lib/pathspec.rb

@@ -3,15 +3,14 @@ require 'pathspec/regexspec'
 require 'find'
 require 'pathname'
 
+# Main PathSpec class, provides interfaces to various spec implementations
 class PathSpec
   attr_reader :specs
 
-  def initialize(lines=nil, type=:git)
+  def initialize(lines = nil, type = :git)
     @specs = []
 
-    if lines
-      add(lines, type)
-    end
+    add(lines, type) if lines
 
     self
   end
@@ -26,9 +25,7 @@ class PathSpec
 
   def specs_matching(path)
     @specs.select do |spec|
-      if spec.match(path)
-        spec
-      end
+      spec if spec.match(path)
     end
   end
 
@@ -41,58 +38,52 @@ class PathSpec
     Find.find(root) do |path|
       relpath = Pathname.new(path).relative_path_from(rootpath).to_s
       relpath += '/' if File.directory? path
-      if match(relpath)
-        matching << path
-      end
+      matching << path if match(relpath)
     end
 
     matching
   end
 
-  def match_path(path, root='/')
+  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 == '/'
+    relpath += '/' if path[-1].chr == '/'
 
     match(relpath)
   end
 
-  def match_paths(paths, root='/')
+  def match_paths(paths, root = '/')
     matching = []
 
     paths.each do |path|
-      if match_path(path, root)
-        matching << path
-      end
+      matching << path if match_path(path, root)
     end
 
     matching
   end
 
   def drive_letter_to_path(path)
-    path.gsub(/^([a-zA-z]):\//, '/\1/')
+    path.gsub(%r{^([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'))
+  def self.from_filename(filename, type = :git)
+    File.open(filename, 'r') { |io| from_lines(io, type) }
   end
 
-  def self.from_lines(lines, type=:git)
-    self.new lines, type
+  def self.from_lines(lines, type = :git)
+    new lines, type
   end
 
   # Generate specs from lines of text
-  def add(obj, type=:git)
+  def add(obj, type = :git)
     spec_class = spec_type(type)
 
     if obj.respond_to?(:each_line)
       obj.each_line do |l|
         spec = spec_class.new(l.rstrip)
 
-        if !spec.regex.nil? && !spec.inclusive?.nil?
-          @specs << spec
-        end
+        @specs << spec if !spec.regex.nil? && !spec.inclusive?.nil?
       end
     elsif obj.respond_to?(:each)
       obj.each do |l|
@@ -110,9 +101,10 @@ class PathSpec
   end
 
   def spec_type(type)
-    if type == :git
+    case type
+    when :git
       GitIgnoreSpec
-    elsif type == :regex
+    when :regex
       RegexSpec
     else
       raise "Unknown spec type #{type}"