require-me 0.5.5 → 0.5.6

data/README.markdown

@@ -14,26 +14,26 @@ require 'require-dsl'  # to include the Require DSL language only
 Folder.enter 'mira' do |folder| # enter subfolder 'mira'
   `# from new location, enter a subdir`
   folder.enter 'subdir' do |path|  # mira/subdir      
-    folder.all('**/*.rb').except(/sound\/*.rb/).require  
+    folder.all('**/*.rb').except(/sound\/*.rb/).do_require  
   end
 
   folder.enter 'another/subdir' do |path|               
-    folder.all('**/*.rb').require # use file blobs here
+    folder.all('**/*.rb').do_require # use file blobs here
   end
 
   folder.enter 'a_subdir' do |path|         
     `# matching and except are to be used as include and exclude filters
     # they each take a list containing regular expressions and strings
     # string arguments are postfixed with .rb internally if not present`  
-    folder.all('blip/**/*.rb').matching(/_mixin.rb/, /.*\/power/).except(/sound/, /disco/).require
+    folder.all('blip/**/*.rb').matching(/_mixin.rb/, /.*\/power/).except(/sound/, /disco/).do_require
 
     folder.enter 'sub_a' do |path|         
       folder.enter 'sub_b' do |path| # a_subdir/sub_a/sub_b         
-        folder.all('grusch/**/*.rb').require
+        folder.all('grusch/**/*.rb').do_require
       end
 
     end
-    folder.all.require    
+    folder.all.do_require    
   end
 end  
 </pre>
@@ -44,8 +44,8 @@ If no argument, current path is used as initial folder
 require 'require-me' # include both the static require helpers and the DSL require language  
   
 Folder.enter do |folder| # use current path as folder
-  folder.all('**/*.rb').require
-  folder.enter 'game' do |path|
+  folder.enter 'game' do |f|
+    folder.require_all # require all .rb files within this folder!  
 
     `# use static require functions`
     Require.base_path path # set base path to use for Require
@@ -55,7 +55,7 @@ Folder.enter do |folder| # use current path as folder
      
     list = path.all('**/*.rb')    
     puts list.matching('sound', 'network').except(/sound/).show_require(:relative)
-    list.matching('sound', 'network').except(/sound/).require
+    list.matching('sound', 'network').except(/sound/).do_require
   end
 end
 </pre>

data/lib/require-dsl.rb

@@ -93,12 +93,12 @@ module Folder
       dir_stack.push path = FileUtils.pwd   
       @current_path = path
       if block_given?
-        yield path            
+        yield self            
         current_path = dir_stack.last
         old_dir = dir_stack.last if dir_stack.pop 
         FileUtils.cd old_dir if old_dir               
       end      
-      path
+      self
     end
 
     def all(*globs)
@@ -109,6 +109,10 @@ module Folder
       list.rel_path = current_path    
       list.freeze
     end
+
+    def require_all
+      all.dup.extend(MagicList).do_require
+    end
         
   end
 end  

data/spec/require-dsl_spec.rb

@@ -3,7 +3,8 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe "RequireMagic" do
   it "works" do
     Folder.enter '../spec/fixtures' do |folder|
-      folder.enter 'game' do |path|
+      folder.enter 'game' do |f|
+        puts f
         list = folder.all('**/*.rb')                                                    
         l1 = list.matching( 'sound', 'network').except(/sound/).do_require        
         l1_res = l1.show_require(:relative).inspect
@@ -18,13 +19,18 @@ describe "RequireMagic" do
   it "works with base folder " do 
     Folder.enter do |folder|
       puts folder.current_path
-      folder.enter 'game' do |path|
-        list = folder.all # ('**/*.rb')                                                    
+      folder.enter 'game' do |f|
+        puts f
+        f.require_all        
+        list = f.all # ('**/*.rb')                                                    
         l1 = list.matching( 'sound', 'network').except(/sound/).show_require(:relative).inspect        
         l1.should include("network/network.rb")
   
         l2 = list.matching( '*/sound', 'network').show_require(:relative).inspect        
         l2.should include("network/network.rb")
+        
+        
+        
       end
     end    
   end  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: require-me
 version: !ruby/object:Gem::Version 
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-03 00:00:00 -04:00
+date: 2010-03-05 00:00:00 -04:00
 default_executable: 
 dependencies: []