fynd 0.1.2 → 0.1.3

data/README.md

@@ -1,8 +1,6 @@
-# Fynd
+GNU find is too slow. Let's make it slower by rewriting it in Ruby.
 
-I found GNU find to be slow, so I made it slower by rewriting it in Ruby.
-
-Fynd is heavily inspired by the, uh... find command, I guess.
+Files in Fynd are lazy-loaded, much like ActiveRecord. Fynd expressions aren't called until you call `#files`. Fynd is heavily inspired by the, uh... find command, I guess. 
 
 ## Is it any good?
 
@@ -54,4 +52,4 @@ end
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+5. Create new Pull Request

data/benchmarks/find_vs_fynd.rb

@@ -0,0 +1,44 @@
+#!/usr/bin/env ruby
+
+$: << File.dirname(__FILE__) + '/../lib' unless $:.include?(File.dirname(__FILE__) + '/../lib/')
+
+require 'fynd'
+
+# Set up a bunch of test directories
+
+require 'fileutils'
+include FileUtils
+
+test_dir = "/tmp/fynd_tests"
+
+puts "=> making test dir #{test_dir}"
+mkdir_p test_dir
+
+# %w( 5 10 50 100 500 1000 5000 10000 ).each do |count|
+%w( 5 10 50 100 500 1000 5000 10000 ).each do |count|
+  puts "=> filling #{test_dir}/#{count} with #{count} files"
+  mkdir_p "#{test_dir}/#{count}"
+  (1..count.to_i).each do |i|
+    touch "#{test_dir}/#{count}/#{i}"
+  end
+  
+  Benchmark.bmbm(10) do |x|
+    x.report(:find) do 
+      puts %x[ find #{test_dir}/#{count} -type f|wc -l ]
+    end
+
+    x.report(:fynd) do 
+      puts Fynd.find(File.join(test_dir, count)).type(:f).files.count
+    end
+  end
+  
+  puts "=> cleaning up test files"
+  rm_rf test_dir
+  puts
+  puts
+end
+    
+# search a directory with a fairly large number of files. (over 100,000)
+
+
+

data/lib/fynd/criteria.rb

@@ -7,11 +7,12 @@ module Fynd
   class Criteria
     extend Forwardable
 
-    attr_accessor :sieve
+    attr_accessor :sieve, :paths
     
     def_delegators :@sieve, :collection, :conditions
     
     def initialize(*paths)
+      @paths = paths
       @sieve = Sieve.new
       @sieve.collection = []      
       @sieve.conditions = {}
@@ -19,17 +20,8 @@ module Fynd
       @sieve.conditions['operators'] = {}
       @sieve.conditions['tests'] = {}
       
-      # For every path...
-      paths.each do |path|
-        # Pull out all directories
-        # dirs = Dir.glob(File.expand_path(path)).select { |f| File.lstat(f).directory? }
-        # Shove all found files into the collection
-        # @sieve.collection << Dir.glob(File.expand_path(path))
-        @sieve.collection << Find.find(File.expand_path(path)).to_a
-      end
-      
       # Flatten it and strip out non-unique files
-      @sieve.collection.flatten!.uniq!
+      
     end
 
     # def find(*paths)
@@ -38,12 +30,15 @@ module Fynd
     # end
     
     def run
+      @sieve.collection = paths.map do |path|
+        Find.find(File.expand_path(path)).to_a
+      end.flatten.uniq
       sieve.run
       return sieve.files
     end
     
     def files
-      files = sieve.run
+      files = run
       
       if block_given?
         yield files

data/lib/fynd/version.rb

@@ -1,3 +1,3 @@
 module Fynd
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fynd
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-08 00:00:00.000000000 Z
+date: 2012-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -40,6 +40,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- benchmarks/find_vs_fynd.rb
 - fynd.gemspec
 - lib/fynd.rb
 - lib/fynd/actions.rb
@@ -64,7 +65,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4151080051906730584
+      hash: -415099237484484251
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -73,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4151080051906730584
+      hash: -415099237484484251
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24