jamis-fuzzy_file_finder 1.0.0 → 1.0.1

data/fuzzy_file_finder.gemspec

@@ -1,14 +1,14 @@
 
-# Gem::Specification for Fuzzy_file_finder-1.0.0
+# Gem::Specification for Fuzzy_file_finder-1.0.1
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{fuzzy_file_finder}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jamis Buck"]
-  s.date = %q{2008-10-09}
+  s.date = %q{2008-10-11}
   s.description = %q{an implementation of TextMate's cmd-T search functionality}
   s.email = %q{jamis@jamisbuck.org}
   s.extra_rdoc_files = ["lib/fuzzy_file_finder.rb", "README.rdoc"]
@@ -31,3 +31,26 @@ Gem::Specification.new do |s|
   else
   end
 end
+
+
+# # Original Rakefile source (requires the Echoe gem):
+# 
+# begin
+#   require 'echoe'
+# rescue LoadError
+#   abort "You'll need to have `echoe' installed to use Net::SSH's Rakefile"
+# end
+# 
+# require './lib/fuzzy_file_finder'
+# version = FuzzyFileFinder::Version::STRING.dup
+# if ENV['SNAPSHOT'].to_i == 1
+#   version << "." << Time.now.utc.strftime("%Y%m%d%H%M%S")
+# end
+# 
+# Echoe.new('fuzzy_file_finder', version) do |p|
+#   p.author           = "Jamis Buck"
+#   p.email            = "jamis@jamisbuck.org"
+#   p.summary          = "an implementation of TextMate's cmd-T search functionality"
+# 
+#   p.rdoc_pattern     = /^(lib|README.rdoc)/
+# end

data/lib/fuzzy_file_finder.rb

@@ -37,7 +37,7 @@ class FuzzyFileFinder
   module Version
     MAJOR = 1
     MINOR = 0
-    TINY  = 0
+    TINY  = 1
     STRING = [MAJOR, MINOR, TINY].join(".")
   end
 
@@ -88,24 +88,29 @@ class FuzzyFileFinder
     end
   end
 
-  # The root of the directory tree to search.
-  attr_reader :root
+  # The roots directory trees to search.
+  attr_reader :roots
 
   # The maximum number of files and directories (combined).
   attr_reader :ceiling
 
-  # The number of directories beneath +root+
+  # The number of directories beneath all +roots+
   attr_reader :directory_count
 
-  # The number of files beneath +root+
+  # The number of files beneath all +roots+
   attr_reader :file_count
 
   # Initializes a new FuzzyFileFinder. This will scan the
   # given +directory+, using +ceiling+ as the maximum number
   # of entries to scan. If there are more than +ceiling+ entries
   # a TooManyEntries exception will be raised.
-  def initialize(directory=".", ceiling=10_000)
-    @root = Directory.new(directory)
+  def initialize(directories=['.'], ceiling=10_000)
+    directories = directories.any? ? directories : ['.']
+
+    # expand any paths with ~
+    root_dirnames = directories.map { |d| File.expand_path(d) }.select { |d| File.directory?(d) }
+
+    @roots = root_dirnames.map { |d| Directory.new(d) }
     @ceiling = ceiling
     rescan!
   end
@@ -114,10 +119,10 @@ class FuzzyFileFinder
   # you'll need to call this to force the finder to be aware of
   # the changes.
   def rescan!
-    root.children.clear
+    roots.each { |r| r.children.clear }
     @file_count = 0
     @directory_count = 0
-    follow_tree(root.name, root)
+    roots.each { |r| follow_tree(r.name, r) }
   end
 
   # Takes the given +pattern+ (which must be a string) and searches
@@ -168,7 +173,9 @@ class FuzzyFileFinder
     file_regex_raw = "^(.*?)" << make_pattern(file_name_part) << "(.*)$"
     file_regex = Regexp.new(file_regex_raw, Regexp::IGNORECASE)
 
-    do_search(path_regex, path_parts.length, file_regex, root, &block)
+    roots.each do |root|
+        do_search(path_regex, path_parts.length, file_regex, root, &block)
+    end
   end
 
   # Takes the given +pattern+ (which must be a string, formatted as
@@ -185,7 +192,7 @@ class FuzzyFileFinder
 
   # Displays the finder object in a sane, non-explosive manner.
   def inspect #:nodoc:
-    "#<%s:0x%x root=%s, files=%d, directories=%d>" % [self.class.name, object_id, root.name.inspect, file_count, directory_count]
+    "#<%s:0x%x roots=%s, files=%d, directories=%d>" % [self.class.name, object_id, roots.map { |r| r.name.inspect }.join(", "), file_count, directory_count]
   end
 
   private
@@ -285,10 +292,13 @@ class FuzzyFileFinder
         path_match_score = 1
       end
 
+      # determine whether +under+ is one of our root objects or not
+      is_root = roots.any? { |root| root == under }
+
       # For each child of the directory, search under subdirectories, or
       # match files.
       under.children.each do |entry|
-        full = under == root ? entry.name : File.join(under.name, entry.name)
+        full = is_root ? entry.name : File.join(under.name, entry.name)
         if entry.directory?
           do_search(path_regex, path_segments, file_regex, entry, &block)
         elsif (path_regex.nil? || path_match) && file_match = entry.name.match(file_regex)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jamis-fuzzy_file_finder
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Jamis Buck
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-09 00:00:00 -07:00
+date: 2008-10-11 00:00:00 -07:00
 default_executable: 
 dependencies: []