require_all 1.0.1 → 1.1.0

data/CHANGES

@@ -1,3 +1,8 @@
+1.1.0:
+
+* Add require_rel (require_all relative to the current file)
+* Fix bug in auto-appending .rb ala require
+
 1.0.1:
 
 * Allow require_all to take a directory name as an argument

data/README.textile

@@ -11,38 +11,55 @@ Wouldn't that be nice?  Well, now you can!
 
  <code>require 'require_all'</code>
 
-You can now require_all in a multitude of different ways:
+You can use require_all in a multitude of different ways.
 
- <code>require_all *args</code>
+The easiest way to use require_all is to just point it at a directory
+containing a bunch of .rb files:
 
-One of the easiest ways to require_all is to give it a glob, which will 
-enumerate all the matching files and load them in the proper order. For 
-example, to load all the Ruby files under the 'lib' directory, just do:
+ <code>require_all 'lib'</code>
 
- <code>require_all 'lib/**/*.rb'</code>
+This will find all the .rb files under the lib directory (including all 
+subdirectories as well) and load them.
+
+The proper order to in which to load them is determined automatically.  If the 
+dependencies between the matched files are unresolvable, it will throw the 
+first unresolvable NameError.
 
-If the dependencies between the matched files are unresolvable, it will 
-throw the first unresolvable NameError.
+You can also give it a glob, which will enumerate all the matching files: 
 
-Don't want to give it a glob?  Just give it a list of files:
+ <code>require_all 'lib/**/*.rb'</code>
 
- <code>require_all Dir.glob("blah/**/*.rb").reject { |f| stupid_file(f) }</code>
+It will also accept an array of files:
+
+ <code>require_all Dir.glob("blah/**/*.rb").reject { |f| stupid_file? f }</code>
  
 Or if you want, just list the files directly as arguments:
 
  <code>require_all 'lib/a.rb', 'lib/b.rb', 'lib/c.rb', 'lib/d.rb'</code>
+
+Still have the require File.dirname(__FILE__) blues?  The require_all gem also
+provides a require_rel statement which requires files to relative to the 
+current file.  So you can replace statements like:
+
+ <code>require File.dirname(__FILE__) + '/foobar'</code>
+
+with just a simple require_rel:
+
+ <code>require_rel 'foobar'</code>
+ 
+Even better, require_rel still has the full power of require_all, so you can
+use require_rel to load entire directories of code too.  If "foobar" is a
+directory this will load all the .rb files found under that directory with
+automagic dependency handling.
  
 It's just that easy!  Code loading shouldn't be hard.
 
 h2. Methodology
 
 I didn't invent the approach this gem uses.  It was shamelessly stolen from
-Merb.  Once upon a time at MountainWest RubyConf we were discussing how 
-horrible ActiveSupport's dependencies.rb hijacking of const_missing and
-someone described the approach Merb used to me.  It was so simple and clean!
-Here's how it works:
+Merb (which apparently stole it from elsewhere).  Here's how it works:  
 
-# Enumerate the files in the glob
+# Enumerate the files to be loaded
 # Try to load all of the files.  If we encounter a NameError loading a 
   particular file, store that file in a "try to load it later" list.
 # If all the files loaded, great, we're done!  If not, go through the

data/lib/require_all.rb

@@ -47,7 +47,7 @@ module RequireAll
         if stat.file?
           files = [arg]
         elsif stat.directory?
-          files = Dir.glob "#{arg}/**/*.rb"
+          files = Dir.glob File.join(arg, '**', '*.rb')
         else
           raise ArgumentError, "#{arg} isn't a file or directory"
         end
@@ -55,6 +55,12 @@ module RequireAll
         # If the stat failed, maybe we have a glob!
         files = Dir.glob arg
         
+        # Maybe it's an .rb file and the .rb was omitted
+        if File.file?(arg + '.rb')
+          require(arg + '.rb')
+          return true
+        end
+        
         # If we ain't got no files, the glob failed
         raise LoadError, "no such file to load -- #{arg}" if files.empty?
       end
@@ -107,6 +113,13 @@ module RequireAll
     
     true
   end
+  
+  # Works like require_all, but paths are relative to the caller rather than 
+  # the current working directory
+  def require_rel(path)
+    source_directory = File.dirname caller.first.sub(/:\d+$/, '')
+    require_all File.join(source_directory, path)
+  end
 end
 
 include RequireAll

data/require_all.gemspec

@@ -2,10 +2,10 @@ require 'rubygems'
 
 GEMSPEC = Gem::Specification.new do |s|
   s.name = "require_all"
-  s.version = "1.0.1"
+  s.version = "1.1.0"
   s.authors = "Tony Arcieri"
   s.email = "tony@medioh.com"
-  s.date = "2009-06-09"
+  s.date = "2009-07-18"
   s.summary = "A wonderfully simple way to load your code"
   s.platform = Gem::Platform::RUBY
 

data/spec/fixtures/relative/a.rb

@@ -0,0 +1,2 @@
+class RelativeA
+end

data/spec/fixtures/relative/b/b.rb

@@ -0,0 +1,5 @@
+require_rel '../a'
+require_rel '../c'
+
+class RelativeB
+end

data/spec/fixtures/relative/c/c.rb

@@ -0,0 +1,2 @@
+class RelativeC
+end

data/spec/require_all_spec.rb

@@ -25,7 +25,7 @@ describe "require_all" do
     end
     
     it "works like a drop-in require replacement" do
-      require_all(@base_dir + '/c.rb').should be_true
+      require_all(@base_dir + '/c').should be_true
     end
     
     it "accepts lists of files" do
@@ -44,4 +44,14 @@ describe "require_all" do
       require_all("#{@base_dir}/").should be_true
     end
   end
+end
+
+describe "require_rel" do
+  it "provides require_all functionality relative to the current file" do
+    require File.dirname(__FILE__) + '/fixtures/relative/b/b'
+    
+    defined?(RelativeA).should == "constant"
+    defined?(RelativeB).should == "constant"
+    defined?(RelativeC).should == "constant"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: require_all
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors: 
 - Tony Arcieri
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-09 00:00:00 -06:00
+date: 2009-07-18 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -25,6 +25,9 @@ extra_rdoc_files:
 - CHANGES
 files: 
 - lib/require_all.rb
+- spec/fixtures/relative/a.rb
+- spec/fixtures/relative/b/b.rb
+- spec/fixtures/relative/c/c.rb
 - spec/fixtures/resolvable/a.rb
 - spec/fixtures/resolvable/b.rb
 - spec/fixtures/resolvable/c.rb