need 1.0.3 → 1.1.0

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.1.0 / 2008-05-24
+
+* 1 major enhancement
+  * need can now optionally take a path rather than a block
+  * thanks simonmenke
+
 === 1.0.3 / 2008-05-23
 
 * 1 minor enhancement

data/Manifest.txt

@@ -5,4 +5,6 @@ Rakefile
 lib/need.rb
 test/test_files/file_a.rb
 test/test_files/file_b.rb
+test/test_files/file_c.rb
+test/test_files/require_file.rb
 test/test_need.rb

data/README.txt

@@ -18,15 +18,14 @@ use need.
 
   In file_a:
   need{"extensions/file_b"}
-
-Note that the block syntax is necessary. Need uses the binding of the block to determine the
-location of your file and correctly perform your relative require for you.
+  need "extensions/file_b"
 
 == FEATURES/PROBLEMS:
 
 == SYNOPSIS:
 
   need{"relative/path/to/file"}
+  need "relative/path/to/file"
 
 == REQUIREMENTS:
 

data/lib/need.rb

@@ -1,11 +1,25 @@
 module Need
-  VERSION = '1.0.3'
+  VERSION = '1.1.0'
   
   # need takes a block which should contain a string of the relative path to the file
   # you wish to need.
-  def need(&block)
-    require File.expand_path(File.join(File.dirname(eval("__FILE__",block)),block.call))
+  def need(file=nil, &block)
+    if block_given?
+      require File.expand_path(File.join(File.dirname(eval("__FILE__",block)),block.call))
+    elsif file
+      require File.expand_path(File.join(File.dirname(caller_file(1)),file))
+    end
   end
+  
+  def caller_file(level=0)
+    if caller[level]
+      File.expand_path(caller[level].split(":").first)
+    else
+      nil
+    end
+  end
+  
+  private :caller_file
 end
 
 class Object

data/test/test_files/file_a.rb

@@ -1 +1 @@
-need{"file_b"}
+need{"require_file"}

data/test/test_files/file_b.rb

@@ -1,3 +1 @@
-def file_b_method?
-  true
-end
+need "require_file"

data/test/test_files/file_c.rb

@@ -0,0 +1 @@
+require "require_file"

data/test/test_files/require_file.rb

@@ -0,0 +1,3 @@
+def file_loaded?
+  true
+end

data/test/test_need.rb

@@ -1,9 +1,18 @@
 require "test/unit"
 require "need"
-need {"test_files/file_a"}
 
 class TestNeed < Test::Unit::TestCase
-  def test_need
-    assert file_b_method?, "file_b was not needed correctly"
+  def test_need_with_block
+    need {"test_files/file_a"}
+    assert file_loaded?, "require_file was not needed correctly"
+  end
+  def test_need_with_argument
+    need  "test_files/file_b"
+    assert file_loaded?, "require_file was not needed correctly"
+  end
+  def test_require
+    assert_raise LoadError do
+      require  "test_files/file_c"
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: need
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors: 
 - Drew Olson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-23 00:00:00 -05:00
+date: 2008-05-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,9 +19,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.1
+        version: 1.5.3
     version: 
-description: "== DESCRIPTION:  Need makes ruby relative requires just work. Simply need a file with a relative path and the file will always be required correctly, regardless of what file your application is being launched through. Typically, ruby projects would unshift lib onto $PATH or use the File.dirname(__FILE__) trick. Using need means you don't have to worry about either of these.  Assume you have two files, one directly in lib and the other in lib/extensions. Let's assume that file_a in lib requires file_b, in lib/extensions. Previously, you would doing some crazy load path unshifting or use the __FILE__ trick to make these requires flexible enough to work when your app is being accessed by rake, through a test suite, or required as a gem. Now, just use need.  In file_a: need{\"extensions/file_b\"}"
+description: "== DESCRIPTION:  Need makes ruby relative requires just work. Simply need a file with a relative path and the file will always be required correctly, regardless of what file your application is being launched through. Typically, ruby projects would unshift lib onto $PATH or use the File.dirname(__FILE__) trick. Using need means you don't have to worry about either of these.  Assume you have two files, one directly in lib and the other in lib/extensions. Let's assume that file_a in lib requires file_b, in lib/extensions. Previously, you would doing some crazy load path unshifting or use the __FILE__ trick to make these requires flexible enough to work when your app is being accessed by rake, through a test suite, or required as a gem. Now, just use need.  In file_a: need{\"extensions/file_b\"} need \"extensions/file_b\""
 email: drew@drewolson.org
 executables: []
 
@@ -39,6 +39,8 @@ files:
 - lib/need.rb
 - test/test_files/file_a.rb
 - test/test_files/file_b.rb
+- test/test_files/file_c.rb
+- test/test_files/require_file.rb
 - test/test_need.rb
 has_rdoc: true
 homepage: http://need.rubyforge.org