require 0.2.0 → 0.2.1

data/README.markdown

@@ -46,9 +46,46 @@ require File.expand_path("#{File.dirname(__FILE_)}/../require")
 Require.lib!
 </pre>
 
-What does <code>Require.lib!</code> do?
-
 * Activates sinatra and haml gems
 * Requires sinatra, haml, and sass
 * Adds vendor/authlogic/lib to the load paths
-* Requires authlogic
+* Requires authlogic
+
+Gemspec
+-------
+
+You can also use <code>Require</code> to generate a <code>Gem::Specification</code> instance.
+
+<pre>
+require 'rubygems'
+gem 'require'
+require 'require'
+
+Require do
+
+  gem(:sinatra, '=0.9.4') { require 'sinatra/base' }
+
+  gemspec do
+    author 'Your Name'
+    dependencies do
+      gem :sinatra
+    end
+    email 'your@email.com'
+    name 'my_project'
+    homepage "http://github.com/your_name/#{name}"
+    summary ""
+    version '0.1.0'
+  end
+end
+</pre>
+
+Then use it in your <code>rakefile</code>:
+
+<pre>
+require File.dirname(__FILE_) + "/require"
+
+desc "Package gem"
+Rake::GemPackageTask.new(Require.gemspec) do |pkg|
+  pkg.gem_spec = Require.gemspec
+end
+</pre>

data/lib/require.rb

@@ -13,12 +13,12 @@ class Require
       dsl.all *args
     end
   
-    def call(&block)
-      dsl(true).call &block
+    def call(force_root=nil, &block)
+      dsl(force_root).call &block
     end
     
-    def dsl(force=false)
-      @dsl[root(force)] ||= Dsl.new
+    def dsl(force_root=nil)
+      @dsl[root(force_root)] ||= Dsl.new
     end
   
     def get(*args)
@@ -71,28 +71,28 @@ class Require
   
     def reset(&block)
       @dsl = {}
-      call &block
+      call caller[0], &block
     end
   
-    def root(force=false)
-      paths = caller.collect do |p|
-        File.expand_path(p.split(':').first)
-      end
-      path = paths.detect do |p|
-        !p.index(/\/require[-\.\d]*\/lib\//) &&
-        !p.include?('/rubygems/specification.rb') &&
-        !p.include?('/lib/rake/') && 
-        !p.include?('/lib/spec/')
-      end
-      paths = @dsl.keys.sort { |a,b| b.length <=> a.length }
+    def root(force=nil)
       if force
-        File.dirname(path)
+        return clean_caller(force)
       else
-        paths.detect { |p| path[0..p.length-1] == p }
+        roots = @dsl.keys.sort { |a,b| b.length <=> a.length }
+        root = roots.detect do |r|
+          caller.detect do |c|
+            clean_caller(c)[0..r.length-1] == r
+          end
+        end
+        root ? root : raise("You have not executed a Require block (Require not configured)")
       end
     end
   
     private
+    
+    def clean_caller(string)
+      File.dirname(File.expand_path(string.split(':').first))
+    end
   
     def dir_exists?(path)
       File.exists?(path) && File.directory?(path)
@@ -134,5 +134,5 @@ class Require
 end
 
 def Require(&block)
-  Require.call &block
+  Require.call caller[0], &block
 end

data/require.rb

@@ -11,7 +11,7 @@ Require do
     name 'require'
     homepage "http://github.com/winton/#{name}"
     summary "Manage your project's dependencies with a pretty DSL"
-    version '0.2.0'
+    version '0.2.1'
   end
   
   rakefile do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: require
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Winton Welsh