require 0.1.8 → 0.2.0

data/README.markdown

@@ -22,9 +22,10 @@ Create <code>require.rb</code> in your project's root directory:
 
 <pre>
 require 'rubygems'
+gem 'require'
 require 'require'
 
-Require File.dirname(__FILE__) do
+Require do
 
   gem(:sinatra, '=0.9.4') { require 'sinatra/base' }
   gem(:haml, '=2.2.16') { require %w(haml sass) }
@@ -43,8 +44,11 @@ Then in your library file (<code>lib/whatever.rb</code>):
 <pre>
 require File.expand_path("#{File.dirname(__FILE_)}/../require")
 Require.lib!
-  # Activates sinatra and haml gems
-  # Requires sinatra, haml, and sass
-  # Adds vendor/authlogic/lib to the load paths
-  # Requires authlogic
-</pre>
+</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

data/lib/require.rb

@@ -4,117 +4,135 @@ require "#{File.dirname(__FILE__)}/require/gemspec"
 
 class Require
   
-  @@dsl = Dsl.new
-  @@gemspec = Gemspec.new
-  @@root = nil
+  @dsl = {}
+  @gemspec = {}
   
-  def self.all(*args)
-    @@dsl.all *args
-  end
+  class <<self
   
-  def self.call(root=nil, &block)
-    @@root = File.expand_path(root) if root
-    @@dsl.call &block
-  end
+    def all(*args)
+      dsl.all *args
+    end
   
-  def self.get(*args)
-    @@dsl.get *args
-  end
+    def call(&block)
+      dsl(true).call &block
+    end
+    
+    def dsl(force=false)
+      @dsl[root(force)] ||= Dsl.new
+    end
   
-  def self.instance
-    @@gemspec.instance
-  end
+    def get(*args)
+      dsl.get *args
+    end
   
-  def self.name
-    @@gemspec.name
-  end
+    def gemspec
+      (@gemspec[root] ||= Gemspec.new).instance
+    end
   
-  def self.method_missing(method, value=nil, options=nil)
-    method = method.to_s
-    if method.include?('!')
-      method = method.gsub!('!', '').intern
-      gem = get(:gem, method)
-      profile = get(method)
-      if profile
-        profile.dsl.each do |dsl|
-          if dsl.gem?
-            require_gem! dsl.name, dsl.version, dsl.dsl
-          elsif dsl.load_path?
-            load_path! dsl.path
-          elsif dsl.require?
-            require! dsl.path
+    def name
+      (@gemspec[root] ||= Gemspec.new).name
+    end
+  
+    def method_missing(method, value=nil, options=nil)
+      method = method.to_s
+      if method.include?('!')
+        method = method.gsub!('!', '').intern
+        gem = get(:gem, method)
+        profile = get(method)
+        if profile
+          profile.dsl.each do |dsl|
+            if dsl.gem?
+              require_gem! dsl.name, dsl.version, dsl.dsl
+            elsif dsl.load_path?
+              load_path! dsl.path
+            elsif dsl.require?
+              require! dsl.path
+            end
           end
+        elsif gem
+          require_gem! gem.name
+        end
+      else
+        raise "Require##{method} does not exist"
+      end
+    end
+    
+    def require!(paths)
+      return unless paths
+      [ paths ].flatten.each do |path|
+        path_with_root = "#{root}/#{path}"
+        if file_exists?(path_with_root)
+          Kernel.require path_with_root
+        else
+          Kernel.require path
         end
-      elsif gem
-        require_gem! gem.name
       end
-    else
-      raise "Require##{method} does not exist"
     end
-  end
-  
-  def self.reset(root=nil, &block)
-    @@dsl = Dsl.new
-    @@gemspec = Gemspec.new
-    call root, &block
-  end
   
-  def self.root
-    @@root
-  end
+    def reset(&block)
+      @dsl = {}
+      call &block
+    end
   
-  private
+    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 }
+      if force
+        File.dirname(path)
+      else
+        paths.detect { |p| path[0..p.length-1] == p }
+      end
+    end
   
-  def self.file_exists?(path)
-    (File.exists?(path) && File.file?(path)) ||
-    (File.exists?("#{path}.rb") && File.file?("#{path}.rb"))
-  end
+    private
   
-  def self.dir_exists?(path)
-    File.exists?(path) && File.directory?(path)
-  end
+    def dir_exists?(path)
+      File.exists?(path) && File.directory?(path)
+    end
   
-  def self.load_path!(paths)
-    return unless paths
-    [ paths ].flatten.each do |path|
-      path_with_root = "#{root}/#{path}"
-      if root && dir_exists?(path_with_root)
-        $: << path_with_root
-      else
-        $: << path
-      end
+    def file_exists?(path)
+      (File.exists?(path) && File.file?(path)) ||
+      (File.exists?("#{path}.rb") && File.file?("#{path}.rb"))
     end
-  end
   
-  def self.require_gem!(name, overwrite_version=nil, overwrite_dsl=nil)
-    gem = get(:gem, name)
-    if gem
-      if overwrite_version || gem.version
-        Kernel.send :gem, name.to_s, overwrite_version || gem.version
-      else
-        Kernel.send :gem, name.to_s
-      end
-      if overwrite_dsl || gem.dsl
-        (overwrite_dsl || gem.dsl).all(:require).each do |dsl|
-          require! dsl.path
+    def load_path!(paths)
+      return unless paths
+      [ paths ].flatten.each do |path|
+        path_with_root = "#{root}/#{path}"
+        if root && dir_exists?(path_with_root)
+          $: << path_with_root
+        else
+          $: << path
         end
       end
     end
-  end
   
-  def self.require!(paths)
-    return unless paths
-    [ paths ].flatten.each do |path|
-      path_with_root = "#{root}/#{path}"
-      if file_exists?(path_with_root)
-        Kernel.require path_with_root
-      else
-        Kernel.require path
+    def require_gem!(name, overwrite_version=nil, overwrite_dsl=nil)
+      gem = get(:gem, name)
+      if gem
+        if overwrite_version || gem.version
+          Kernel.send :gem, name.to_s, overwrite_version || gem.version
+        else
+          Kernel.send :gem, name.to_s
+        end
+        if overwrite_dsl || gem.dsl
+          (overwrite_dsl || gem.dsl).all(:require).each do |dsl|
+            require! dsl.path
+          end
+        end
       end
     end
   end
 end
 
-def Require(root=nil, &block)
-  Require.call root, &block
+def Require(&block)
+  Require.call &block
 end

data/lib/require/gemspec.rb

@@ -1,28 +1,34 @@
 class Require
   class Gemspec
-    
+
     def clean_paths(paths, more=nil)
       paths.collect { |p| p.gsub("#{root}/#{more}", '') }
     end
-    
+  
     def executables
       clean_paths Dir["#{root}/bin/*"], 'bin/'
     end
-    
+  
     def extra_doc_files
       clean_paths Dir["#{root}/README.*"]
     end
-    
+  
     def files
-      ignore = File.read("#{root}/.gitignore").split("\n").collect do |path|
-        "#{root}/#{path.strip}"
-      end
+      gitignore = "#{root}/.gitignore"
+      ignore = 
+        if File.exists?(gitignore)
+          File.read(gitignore).split("\n").collect do |path|
+            "#{root}/#{path.strip}"
+          end
+        else
+          []
+        end
       clean_paths (Dir["#{root}/**/*"] - Dir[*ignore])
     end
-    
+  
     def instance
       raise "Require must be called with a root path parameter" unless root
-      
+    
       defaults = {
         :executables => executables,
         :extra_rdoc_files => extra_doc_files,
@@ -31,7 +37,7 @@ class Require
         :platform => Gem::Platform::RUBY,
         :require_path => 'lib'
       }
-      
+    
       ::Gem::Specification.new do |s|
         Require.get(:gemspec).all.each do |(option, value)|
           case option
@@ -53,13 +59,13 @@ class Require
         end
       end
     end
-    
+  
     def name
       Require.get(:gemspec).get(:name)[1] rescue nil
     end
-    
+  
     def root
-      Require.root
+      @root ||= Require.root
     end
   end
 end

data/lib/require/tasks.rb

@@ -35,8 +35,8 @@ class Require
 end
 
 desc "Package gem"
-Rake::GemPackageTask.new(Require.instance) do |pkg|
-  pkg.gem_spec = Require.instance
+Rake::GemPackageTask.new(Require.gemspec) do |pkg|
+  pkg.gem_spec = Require.gemspec
 end
 
 namespace :gem do

data/require.rb

@@ -1,6 +1,6 @@
 require "#{File.dirname(__FILE__)}/lib/require"
 
-Require File.dirname(__FILE__) do
+Require do
   
   gem(:rake, '=0.8.7') { require 'rake' }
   gem(:rspec, '=1.3.0')
@@ -11,7 +11,7 @@ Require File.dirname(__FILE__) do
     name 'require'
     homepage "http://github.com/winton/#{name}"
     summary "Manage your project's dependencies with a pretty DSL"
-    version '0.1.8'
+    version '0.2.0'
   end
   
   rakefile do

data/spec/require/gemspec_spec.rb

@@ -4,7 +4,8 @@ class Require
   describe Gemspec do
     
     it "should generate a valid gemspec instance" do
-      Require.reset "#{File.dirname(__FILE__)}/../fixture" do
+      Require.stub!(:root).and_return(SPEC + "/fixture")
+      Require.reset do
         gem :rspec, '=1.3.0'
       
         gemspec do
@@ -22,7 +23,7 @@ class Require
       
       FileUtils.mkdir_p(File.expand_path("#{File.dirname(__FILE__)}/../fixture/ignore_me"))
       
-      s = Require.instance
+      s = Require.gemspec
       s.authors.should == [ "Winton Welsh" ]
       s.date.should == Time.utc(Date.today.year, Date.today.mon, Date.today.mday, 8)
       s.default_executable.should == "bin"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: require
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors: 
 - Winton Welsh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-03 00:00:00 -08:00
+date: 2010-02-06 00:00:00 -08:00
 default_executable: 
 dependencies: []