path2 0.1.1 → 0.2.0

data/lib/path2.rb

@@ -3,17 +3,17 @@ require 'thread'
 class Path
 
   def initialize(*args)
-    @id                   = generate_id
-    @self                 = "path2_#{@id}"
-    @semaphore            = Mutex.new
+    @options              = args.last.is_a?(Hash) ? args.pop : {}
+    @options[:recursive]  ||= false
     @entries              = build_entries(*args)
-    Thread.current[@self] = {}
   end
 
   def find(arg)
-    cache("find_#{arg}") do
-      grep(/#{arg}/)
-    end
+    grep(/#{arg}/).first
+  end
+
+  def join(path)
+    Path.new(find(path))
   end
 
   def grep(pattern)
@@ -25,43 +25,29 @@ class Path
   end
 
   def push(*paths)
-    @entries.concat(build_entries(*paths)).uniq!
+    entries.concat(build_entries(*paths)).uniq!
   end
 
   def pop(*args)
     args.each do |x|
-      @entries.delete_if {|y| File.expand_path(x) == y }
+      entries.delete_if {|y| File.expand_path(x) == y }
     end
   end
 
   private
 
   def dir(path)
-    Dir["#{path}/**/*"]
+    if @options[:recursive]
+      Dir["#{path}/*"] + Dir["#{path}/**/*"]
+    else
+      Dir["#{path}/*"]
+    end
   end
 
   def build_entries(*paths)
-    @semaphore.synchronize {
-      paths.map{|path| dir(File.expand_path(path)) }.flatten.uniq
-    }
+    paths.map{|path| dir(File.expand_path(path)) }.flatten.uniq
   end
   
-  def cache(name, &block)
-    _thread(name) || _thread(name, &block)
-  end
-
-  def _thread(name, &block)
-    if block_given?
-      Thread.current[@self][name] = block.call
-    else
-      Thread.current[@self][name]
-    end
-  end
-  
-  def generate_id
-    Time.now.to_i
-  end
-
 end
 
 def Path(*args)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: path2
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-06 00:00:00.000000000 Z
+date: 2012-05-08 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: bryann83@gmail.com
@@ -32,12 +32,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1513887647798597346
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1513887647798597346
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11