require-me 0.7.4 → 0.7.5

data/lib/folder/folder.rb

@@ -61,12 +61,28 @@ module Folder
     require relative_path(req_file, source, 'test')
   end
 
+  def self.require_all_recursive(*folders)
+    if folders.empty?           
+      magics = Magic.new.all_recursive
+      return magics.dup.extend(MagicList).do_require
+    end
+    folders.each do |folder|
+      enter folder do |f| 
+        fs = f.all_recursive
+        fs.dup.extend(MagicList).do_require 
+      end
+    end
+  end    
 
   def self.require_all(*folders)
-    return Magic.new.all.dup.extend(MagicList).do_require if folders.empty?
+    if folders.empty?           
+      magics = Magic.new.all
+      return magics.dup.extend(MagicList).do_require
+    end
     folders.each do |folder|
       enter folder do |f| 
-        f.all.dup.extend(MagicList).do_require
+        fs = f.all        
+        fs.dup.extend(MagicList).do_require 
       end
     end
   end
@@ -75,23 +91,49 @@ module Folder
     require_all File.dirname(file_name)               
   end
 
-  def self.show_require_all(*folders)
-    return Magic.new.all.dup.extend(MagicList).show_require if folders.empty?
+  def self.require_all_recursive_here(file_name) 
+    require_all_recursive File.dirname(file_name)               
+  end
+
+  def self.show_require_all_recursive(*folders)  
+    if folders.empty?      
+      magics = Magic.new.all_recursive
+      return magics.dup.extend(MagicList).show_require
+    end
     folders.each do |folder|
-      enter folder do |f|  
-        f.all.dup.extend(MagicList).show_require
+      enter folder do |f| 
+        fs = f.all_recursive
+        fs.dup.extend(MagicList).show_require 
       end
     end
   end
 
+  def self.show_require_all(*folders)  
+    if folders.empty?      
+      magics = Magic.new.all
+      return magics.dup.extend(MagicList).show_require
+    end
+    folders.each do |folder|
+      enter folder do |f| 
+        fs = f.all        
+        fs.dup.extend(MagicList).show_require 
+      end
+    end
+  end
 
   def self.here(file)
     FileUtils.cd File.dirname(file)
     self
   end    
 
-  def self.require_me(*files)
-    return Magic.new.all(files).dup.extend(MagicList).do_require     
+  def self.require_me_recursive(*files) 
+    magics = Magic.new.all_recursive(files)    
+    return magics.dup.extend(MagicList).do_require     
+  end
+
+  def self.require_me(*files) 
+    magics = Magic.new.all(files)    
+    return magics.dup.extend(MagicList).do_require     
   end      
   
 

data/lib/folder/magic.rb

@@ -45,12 +45,19 @@ module Folder
     end
 
 
-    def all(*globs)
+    def all_recursive(*globs)
       globs = '**/*.rb' if globs.empty?      
       list = FileList.new(globs) 
       magic_list(list) 
     end
 
+    def all(*globs)
+      globs = '*.rb' if globs.empty?      
+      list = FileList.new(globs) 
+      magic_list(list) 
+    end
+
+
     def require_all(*folders)  
       return require_all_here(folders[0]) if folders.size == 1 && folders[0] =~ '.rb'
       relative = {:relative_to => relative_path || ''}
@@ -74,15 +81,49 @@ module Folder
       end
     end
 
+    def require_all_recursive(*folders)  
+      return require_all_here(folders[0]) if folders.size == 1 && folders[0] =~ '.rb'
+      relative = {:relative_to => relative_path || ''}
+      relative = folders.pop if folders && !folders.empty? && folders.last.kind_of?(Hash)      
+
+      # puts "relative_to: #{relative[:relative_to]}"
+
+      if folders.empty?
+        files = all_recursive.dup.extend(MagicList)
+        files.rel_path = relative[:relative_to]
+        return files.do_require        
+      end
+
+      # puts "iterate"
+      folders.each do |folder|   
+        enter folder do |f|   
+          file = f.all_recursive.dup.extend(MagicList)
+          require_relative_to = relative ? relative_to(folder, relative) : folder                     
+          file.do_require(require_relative_to)
+        end
+      end
+    end
+
+
     def require_me(*files)
       file = all(files).dup.extend(MagicList)
       file.do_require(relative_path)     
     end      
 
+    def require_me_recursive(*files)
+      file = all_recursive(files).dup.extend(MagicList)
+      file.do_require(relative_path)     
+    end      
+
     def require_all_here(file_name) 
       require_all File.dirname(file_name)               
     end
 
+    def require_all_recursive_here(file_name) 
+      require_all_recursive File.dirname(file_name)               
+    end
+
+
     protected  
     
     def relative_to(folder, relative)

data/spec/dsl/recursive/slammer.rb

@@ -0,0 +1 @@
+puts "Slammer included"

data/spec/dsl/require-dsl_spec.rb

@@ -15,7 +15,7 @@ describe "RequireMagic" do
   it "just works " do          
     Folder.enter '../../fixtures' do |folder| # oops!
       folder.enter 'game' do |f|
-        list = f.all('**/*.rb')                                                    
+        list = f.all_recursive #('**/*.rb')                                                    
         l1 = list.matching( 'sound', 'network').except(/sound/)
   
         # require fx 'game/network/network.rb'
@@ -81,8 +81,8 @@ describe "RequireMagic" do
         folder.enter 'game' do |f|
           f.relative_to_me # set implicit by default          
           
-          f.require_all        
-          list = f.all # ('**/*.rb')                                                    
+          f.require_all_recursive        
+          list = f.all_recursive # ('**/*.rb')                                                    
           l1 = list.matching( 'sound', 'network').except(/sound/).show_require(:relative).inspect        
           l1.should include("network/network.rb")
   

data/test/test_require_folder.rb

@@ -1,4 +1,4 @@
-require 'require-magic'
+require 'require-me'
 require "unit_test_require"
  
 class TestRequireFolder < UnitTestRequire

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 4
-  version: 0.7.4
+  - 5
+  version: 0.7.5
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -69,6 +69,7 @@ files:
 - spec/blip.rb
 - spec/dsl/blap.rb
 - spec/dsl/blup.rb
+- spec/dsl/recursive/slammer.rb
 - spec/dsl/require-dsl_spec.rb
 - spec/require_more_spec.rb
 - spec/spec_helper.rb
@@ -112,6 +113,7 @@ test_files:
 - spec/blip.rb
 - spec/dsl/blap.rb
 - spec/dsl/blup.rb
+- spec/dsl/recursive/slammer.rb
 - spec/dsl/require-dsl_spec.rb
 - spec/require_more_spec.rb
 - spec/spec_helper.rb