globby 0.1.1 → 0.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b9f9316d279400e594fa7fb870e1d34cad379c42
+  data.tar.gz: f6a17b74c29c236adb60637fb7069308e1e1801a
+SHA512:
+  metadata.gz: eda6154d16e52c35a10c8d02093e3d4a6204b2985f2aeefcc869a1faefa7605b3847c8ef9d98afd990c11ec969d4be83148bb7be418ac1ad0a2791490f1eaaf4
+  data.tar.gz: dd851cd69e3d919febf1bbadcee2a93ff54cb689aea6015055558b10c03d5702da1fbdf970e91509339142eef254c93c7a8ebe765dc369337d4f42af6935d9ee

data/README.md

@@ -1,5 +1,7 @@
 # globby
 
+[<img src="https://travis-ci.org/jenseng/globby.svg" />](http://travis-ci.org/jenseng/globby)
+
 globby is a [`.gitignore`](http://www.kernel.org/pub/software/scm/git/docs/gitignore.html)-style
 file globber for ruby.
 
@@ -60,4 +62,4 @@ behaviors are platform independent in globby and can always be used:
 
 ## License
 
-Copyright (c) 2014 Jon Jensen, released under the MIT license
+Copyright (c) 2013-2016 Jon Jensen, released under the MIT license

data/lib/globby/glob.rb

@@ -1,11 +1,12 @@
 module Globby
   class Glob
     def initialize(pattern)
+      pattern = pattern.dup
       @inverse = pattern.sub!(/\A!/, '')
       # remove meaningless wildcards
-      @pattern = pattern.
-        sub(/\A\/?(\*\*\/)+/, '').
-        sub(/(\/\*\*)+\/\*\z/, '/**')
+      pattern.sub!(/\A\/?(\*\*\/)+/, '')
+      pattern.sub!(/(\/\*\*)+\/\*\z/, '/**')
+      @pattern = pattern
     end
 
     def match(files)
@@ -77,7 +78,7 @@ module Globby
         (part.split(/(#{GLOB_WILDCARD})/) - [""]).inject("") do |result, p|
           result << case p
             when '?'; '[^/]'
-            when '*'; '[^/]*'
+            when '*'; '[^/]' + (result.end_with?("/") ? '+' : '*')
             else Regexp.escape(p)
           end
         end

data/spec/gitignore_spec.rb

@@ -2,8 +2,6 @@ require 'globby'
 require 'tmpdir'
 require 'fileutils'
 
-RSpec.configure { |config| config.mock_framework = :mocha }
-
 describe Globby do
   around do |example|
     gitignore_test { example.run }
@@ -12,14 +10,14 @@ describe Globby do
   describe ".select" do
     it "should match .gitignore perfectly" do
       rules = prepare_gitignore
-      Globby.select(rules.split(/\n/)).should == all_files - git_files - untracked
+      expect(Globby.select(rules.split(/\n/))).to eq(all_files - git_files - untracked)
     end
   end
 
   describe ".reject" do
     it "should match the inverse of .gitignore, plus .git" do
       rules = prepare_gitignore
-      Globby.reject(rules.split(/\n/)).should == git_files + untracked
+      expect(Globby.reject(rules.split(/\n/))).to eq(git_files + untracked)
     end
   end
 
@@ -49,6 +47,9 @@ describe Globby do
       # except rb files immediately under foobar
       !foobar/*.rb
 
+      # ooh look **
+      /a/**/*.yuss
+
       # this will match foo/bar but not bar
       bar/
 
@@ -57,6 +58,10 @@ describe Globby do
 
       # this will match baz/ and foobar/baz/
       baz
+
+      # check reinclusion
+      /spec/*
+      !/spec/noignore
     IGNORE
     File.open('.gitignore', 'w'){ |f| f.write ignore }
     ignore
@@ -77,6 +82,10 @@ describe Globby do
       foobar/baz.txt
       foobar/baz.rb
       foobar/baz/lol.wut
+      a/a.yuss
+      a/a/a/a/a.yuss
+      spec/nope
+      spec/noignore
     FILES
     files.each do |file|
       FileUtils.mkdir_p File.dirname(file)
@@ -85,7 +94,7 @@ describe Globby do
   end
 
   def untracked
-    `git status -uall`.gsub(/.*#\n|#\s+|^nothing.*/m, '').split(/\n/)
+    `git status -uall --porcelain`.gsub(/^\?\? /m, '').split(/\n/)
   end
 
   def git_files
@@ -97,4 +106,4 @@ describe Globby do
     Dir.glob('**/*', File::FNM_DOTMATCH).
       select{ |f| File.symlink?(f) || File.file?(f) }.sort
   end
-end
+end

data/spec/globby_spec.rb

@@ -1,84 +1,82 @@
 require 'globby'
 
-RSpec.configure { |config| config.mock_framework = :mocha }
-
 describe Globby do
   it "should support chaining" do
     files = files(%w{foo/bar.rb foo/baz.rb foo/c/bar.html foo/c/c/bar.rb})
-    Globby.select(%w{*rb}, files).
-           reject(%w{baz*}).
-           select(%w{c}).should == %w{foo/c/c/bar.rb}
+    expect(Globby.select(%w{*rb}, files).
+                  reject(%w{baz*}).
+                  select(%w{c})).to eq %w{foo/c/c/bar.rb}
   end
 
   describe ".select" do
     context "a blank line" do
       it "should return nothing" do
         files = files("foo")
-        Globby.select([""], files).should == []
+        expect(Globby.select([""], files)).to eq []
       end
     end
 
     context "a comment" do
       it "should return nothing" do
         files = files("foo")
-        Globby.select(["#"], files).should == []
+        expect(Globby.select(["#"], files)).to eq []
       end
     end
 
     context "a pattern ending in a slash" do
       it "should return a matching directory's contents" do
         files = files(%w{foo/bar/baz foo/bar/baz2})
-        Globby.select(%w{bar/}, files).should == %w{foo/bar/baz foo/bar/baz2}
+        expect(Globby.select(%w{bar/}, files)).to eq %w{foo/bar/baz foo/bar/baz2}
       end
 
       it "should ignore symlinks and regular files" do
         files = files(%w{foo/bar bar/baz})
-        Globby.select(%w{bar/}, files).should == %w{bar/baz}
+        expect(Globby.select(%w{bar/}, files)).to eq %w{bar/baz}
       end
     end
 
     context "a pattern starting in a slash" do
       it "should return only root glob matches" do
         files = files(%w{foo/bar bar/foo})
-        Globby.select(%w{/foo}, files).should == %w{foo/bar}
+        expect(Globby.select(%w{/foo}, files)).to eq %w{foo/bar}
       end
     end
 
     context "a pattern with a *" do
       it "should return matching files" do
         files = files(%w{foo/bar foo/baz})
-        Globby.select(%w{*z}, files).should == %w{foo/baz}
+        expect(Globby.select(%w{*z}, files)).to eq %w{foo/baz}
       end
 
       it "should not glob slashes" do
         files = files(%w{foo/bar foo/baz})
-        Globby.select(%w{foo*bar}, files).should == []
+        expect(Globby.select(%w{foo*bar}, files)).to eq []
       end
     end
 
     context "a pattern with a ?" do
       it "should return matching files" do
         files = files(%w{foo/bar foo/baz})
-        Globby.select(%w{b?z}, files).should == %w{foo/baz}
+        expect(Globby.select(%w{b?z}, files)).to eq %w{foo/baz}
       end
 
       it "should not glob slashes" do
         files = files(%w{foo/bar foo/baz})
-        Globby.select(%w{foo?bar}, files).should == []
+        expect(Globby.select(%w{foo?bar}, files)).to eq []
       end
     end
 
     context "a pattern with a **" do
       it "should match directories recursively" do
         files = files(%w{foo/bar foo/baz foo/c/bar foo/c/c/bar})
-        Globby.select(%w{foo/**/bar}, files).should == %w{foo/bar foo/c/bar foo/c/c/bar}
+        expect(Globby.select(%w{foo/**/bar}, files)).to eq %w{foo/bar foo/c/bar foo/c/c/bar}
       end
     end
 
     context "a pattern with bracket expressions" do
       it "should return matching files" do
         files = files(%w{boo fob f0o foo/bar poo/baz})
-        Globby.select(%w{[e-g][0-9[:alpha:]][!b]}, files).should == %w{f0o foo/bar}
+        expect(Globby.select(%w{[e-g][0-9[:alpha:]][!b]}, files)).to eq %w{f0o foo/bar}
       end
     end
   end
@@ -92,4 +90,4 @@ describe Globby do
     }.uniq.sort
     Globby::GlObject.new files, dirs
   end
-end
+end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: globby
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.1.2
 platform: ruby
 authors:
 - Jon Jensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-15 00:00:00.000000000 Z
+date: 2016-06-15 00:00:00.000000000 Z
 dependencies: []
 description: find files using .gitignore-style globs
 email: jenseng@gmail.com
@@ -18,37 +17,36 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE.txt
-- Rakefile
 - README.md
+- Rakefile
+- lib/globby.rb
 - lib/globby/glob.rb
 - lib/globby/globject.rb
 - lib/globby/result.rb
-- lib/globby.rb
 - spec/gitignore_spec.rb
 - spec/globby_spec.rb
 homepage: http://github.com/jenseng/globby
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.5
 signing_key: 
-specification_version: 3
-summary: .gitignore-style file globber
+specification_version: 4
+summary: ".gitignore-style file globber"
 test_files: []
 has_rdoc: