globby 0.0.2 → 0.1.0

data/README.md

@@ -1,6 +1,6 @@
 # globby
 
-globby is a [`.gitignore`](http://www.kernel.org/pub/software/scm/git/docs/gitignore.html)-compatible
+globby is a [`.gitignore`](http://www.kernel.org/pub/software/scm/git/docs/gitignore.html)-style
 file globber for ruby.
 
 ## Installation
@@ -9,8 +9,14 @@ Put `gem 'globby'` in your Gemfile.
 
 ## Usage
 
-    Globby.select(rules) # all files matched by the rules
-    Globby.reject(rules) # all other files
+    # all files matched by the rules
+    Globby.select(rules)
+
+    # all other files
+    Globby.reject(rules)
+
+    # ooh chaining!
+    Globby.select(rules).reject(other_rules)
 
 ### An example:
 

data/lib/globby.rb

@@ -1,27 +1,29 @@
 require 'set'
 require '../globby/lib/globby/glob'
+require '../globby/lib/globby/globject'
+require '../globby/lib/globby/result'
 
 module Globby
   class << self
-    def select(patterns, source = get_files_and_dirs, result = {:files => Set.new, :dirs => Set.new})
+    def select(patterns, source = GlObject.all)
+      result = GlObject.new
       evaluate_patterns(patterns, source, result)
-  
-      if result[:dirs] && result[:dirs].size > 0
+
+      if result.dirs && result.dirs.size > 0
         # now go merge/subtract files under directories
-        dir_patterns = result[:dirs].map{ |dir| "/#{dir}**" }
-        evaluate_patterns(dir_patterns, {:files => source[:files]}, result)
+        dir_patterns = result.dirs.map{ |dir| "/#{dir}**" }
+        evaluate_patterns(dir_patterns, GlObject.new(source.files), result)
       end
 
-      result[:files].to_a.sort
+      Result.new result.files, source.dirs
     end
-  
-    def reject(patterns = [])
-      source = get_files_and_dirs
-      (source[:files] - select(patterns, source)).sort
+
+    def reject(patterns, source = GlObject.all)
+      Result.new(source.files - select(patterns, source), source.dirs)
     end
-  
+
    private
-  
+
     def evaluate_patterns(patterns, source, result)
       patterns.each do |pattern|
         next unless pattern =~ /\A[^#]/
@@ -34,20 +36,12 @@ module Globby
       method, candidates = glob.inverse? ?
         [:subtract, result] :
         [:merge, source]
-  
-      dir_matches = glob.match(candidates[:dirs])
+
+      dir_matches = glob.match(candidates.dirs)
       file_matches = []
-      file_matches = glob.match(candidates[:files]) unless glob.directory? || glob.exact_match? && !dir_matches.empty?
-      result[:dirs].send method, dir_matches unless dir_matches.empty?
-      result[:files].send method, file_matches unless file_matches.empty?
-    end
-  
-    def get_files_and_dirs
-      files, dirs = Dir.glob('**/*', File::FNM_DOTMATCH).
-        reject { |f| f =~ /(\A|\/)\.\.?\z/ }.
-        partition { |f| File.file?(f) || File.symlink?(f) }
-      dirs.map!{ |d| d + "/" }
-      {:files => files, :dirs => dirs}
+      file_matches = glob.match(candidates.files) unless glob.directory? || glob.exact_match? && !dir_matches.empty?
+      result.dirs.send method, dir_matches unless dir_matches.empty?
+      result.files.send method, file_matches unless file_matches.empty?
     end
   end
 end

data/lib/globby/glob.rb

@@ -27,7 +27,7 @@ module Globby
 
     # see https://www.kernel.org/doc/man-pages/online/pages/man7/glob.7.html
     GLOB_BRACKET_EXPR = /
-      \[ # brackets 
+      \[ # brackets
         !? # (maybe) negation
         \]? # (maybe) right bracket
         (?: # one or more:
@@ -47,7 +47,7 @@ module Globby
 
     def to_regexp
       parts = @pattern.split(GLOB_TOKENIZER) - [""]
-  
+
       result = parts.first.sub!(/\A\//, '') ? '\A' : '(\A|/)'
       parts.each do |part|
         result << part_to_regexp(part)

data/lib/globby/globject.rb

@@ -0,0 +1,18 @@
+module Globby
+  class GlObject
+    attr_reader :files, :dirs
+
+    def initialize(files = Set.new, dirs = Set.new)
+      @files = files
+      @dirs = dirs
+    end
+
+    def self.all
+      files, dirs = Dir.glob('**/*', File::FNM_DOTMATCH).
+        reject { |f| f =~ /(\A|\/)\.\.?\z/ }.
+        partition { |f| File.file?(f) || File.symlink?(f) }
+      dirs.map!{ |d| d + "/" }
+      new(files, dirs)
+    end
+  end
+end

data/lib/globby/result.rb

@@ -0,0 +1,20 @@
+module Globby
+  class Result < Array
+    def initialize(files, dirs)
+      @dirs = dirs
+      super files.sort
+    end
+
+    def select(patterns)
+      Globby::select(patterns, to_globject)
+    end
+
+    def reject(patterns)
+      Globby::reject(patterns, to_globject)
+    end
+
+    def to_globject
+      GlObject.new(self, @dirs)
+    end
+  end
+end

data/spec/gitignore_spec.rb

@@ -36,25 +36,25 @@ describe Globby do
   def prepare_gitignore
     ignore = <<-IGNORE.gsub(/^ +/, '')
       # here we go...
-  
+
       # some dotfiles
       .hidden
-  
+
       # html, but just in the root
       /*.html
-  
+
       # all rb files anywhere
       *.rb
-  
+
       # except rb files immediately under foobar
       !foobar/*.rb
-  
+
       # this will match foo/bar but not bar
       bar/
-  
+
       # this will match nothing
       foo*bar/baz.pdf
-  
+
       # this will match baz/ and foobar/baz/
       baz
     IGNORE

data/spec/globby_spec.rb

@@ -3,6 +3,13 @@ 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}
+  end
+
   describe ".select" do
     context "a blank line" do
       it "should return nothing" do
@@ -79,7 +86,10 @@ describe Globby do
   def files(files)
     files = Array(files)
     files.sort!
-    dirs = files.grep(/\//).map { |file| file.sub(/[^\/]+\z/, '') }.uniq.sort
-    {:files => files, :dirs => dirs}
+    dirs = files.grep(/\//).map(&:dup).inject([]) { |ary, file|
+      ary << file while file.sub!(/[^\/]+\z/, '')
+      ary
+    }.uniq.sort
+    Globby::GlObject.new files, dirs
   end
 end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 2
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Jon Jensen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-25 00:00:00 Z
+date: 2013-01-29 00:00:00 Z
 dependencies: []
 
 description: find files using .gitignore-style globs
@@ -31,6 +31,8 @@ files:
 - Rakefile
 - README.md
 - lib/globby/glob.rb
+- lib/globby/globject.rb
+- lib/globby/result.rb
 - lib/globby.rb
 - spec/gitignore_spec.rb
 - spec/globby_spec.rb
@@ -70,7 +72,7 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: .gitignore-compatible file globber
+summary: .gitignore-style file globber
 test_files: []
 
 has_rdoc: