require-me 0.5.6 → 0.6.0

data/README.markdown

@@ -44,7 +44,7 @@ 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.enter 'game' do |f|
+  folder.enter 'game' do |f| # enter doesn't work with special folders '.' and '..' yet
     folder.require_all # require all .rb files within this folder!  
 
     `# use static require functions`

data/lib/playground.rb

@@ -0,0 +1,9 @@
+def run(a, &block)
+  puts "hello"
+  yield a
+  puts "goodbye"
+end
+
+run "A" do |a|
+  puts a * 2
+end  

data/lib/require-dsl.rb

@@ -5,11 +5,17 @@ require 'util/util'
 module Folder
 
   def self.enter(path = '.', &block) 
-    m = Magic.new 
-    m.enter path      
-    yield m
-    m.dir_stack.pop 
-  end
+    m = Magic.new      
+    puts "Path:#{path}"
+    paths = path.split('/')
+    puts paths
+    paths.each{|p| m.enter p}        
+    if block_given?
+      yield m
+    end                                            
+    puts "Path:#{path}"
+    path.split('/').each{|p| m.exit p }                 
+  end 
   
   module MagicList 
     attr_accessor :base_path
@@ -88,19 +94,27 @@ module Folder
       @current_path = FileUtils.pwd
     end
     
-    def enter(dir)       
-      FileUtils.cd dir
+    def enter(dir)
+      puts "cd #{dir}"
+      FileUtils.cd dir if !dir.empty?
       dir_stack.push path = FileUtils.pwd   
       @current_path = path
       if block_given?
-        yield self            
-        current_path = dir_stack.last
-        old_dir = dir_stack.last if dir_stack.pop 
-        FileUtils.cd old_dir if old_dir               
+        yield self                    
+        exit(dir)              
       end      
       self
     end
 
+    def exit(dir)
+      current_path = dir_stack.last
+      old_dir = dir_stack.last if dir_stack.pop 
+      puts "cd .."      
+      # FileUtils.cd old_dir if old_dir               
+      FileUtils.cd '..'
+    end
+
+
     def all(*globs)
       globs = '**/*.rb' if globs.empty?      
       list = FileList.new(globs)
@@ -110,8 +124,13 @@ module Folder
       list.freeze
     end
 
-    def require_all
-      all.dup.extend(MagicList).do_require
+    def require_all(*folders)
+      return all.dup.extend(MagicList).do_require if folders.empty?
+      folders.each do |folder|
+        enter folder do |f|
+          f.all.dup.extend(MagicList).do_require
+        end
+      end
     end
         
   end

data/spec/require-dsl_spec.rb

@@ -1,24 +1,41 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "RequireMagic" do
-  it "works" do
-    Folder.enter '../spec/fixtures' do |folder|
+  it "Folder.enter works " do          
+    puts FileUtils.pwd
+    Folder.enter 'fixtures/game' do |folder|            
+      puts "Current 1:" + folder.current_path          
+    end
+    Folder.enter('fixtures/game') do |folder|            
+      puts "Current 2:" + folder.current_path          
+    end
+  end
+
+  it "just works " do          
+    Folder.enter 'fixtures' do |folder| # oops!
       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
         l1_res.should include("network/network.rb")
-
+  
         l2 = list.matching( '*/sound', 'network').show_require(:relative).inspect        
         l2.should include("network/network.rb")
       end
     end    
   end
-
-  it "works with base folder " do 
-    Folder.enter do |folder|
-      puts folder.current_path
+  
+  it "works with require_all " do          
+    Folder.enter('fixtures/game') do |folder|            
+      puts "Current 1:" + folder.current_path          
+      # f.require_all 'graphics', 'network', 'sound'
+    end
+  end
+  
+  it "works with base folder " do  
+    Folder.enter 'fixtures' do |folder|
+      puts "Current 2:" + folder.current_path
       folder.enter 'game' do |f|
         puts f
         f.require_all        
@@ -27,13 +44,9 @@ describe "RequireMagic" do
         l1.should include("network/network.rb")
   
         l2 = list.matching( '*/sound', 'network').show_require(:relative).inspect        
-        l2.should include("network/network.rb")
-        
-        
-        
+        l2.should include("network/network.rb")                      
       end
     end    
-  end  
-  
+  end    
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: require-me
 version: !ruby/object:Gem::Version 
-  version: 0.5.6
+  version: 0.6.0
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-05 00:00:00 -04:00
+date: 2010-03-06 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -23,6 +23,7 @@ extra_rdoc_files:
 - LICENSE
 - README.markdown
 files: 
+- lib/playground.rb
 - lib/require-dsl.rb
 - lib/require-me.rb
 - lib/util/util.rb