require-magic 0.4.1 → 0.5.0

data/README.rdoc

@@ -11,31 +11,33 @@ require 'require_magic'
 # alternatively to only include require_dsl
 require 'require_dsl'
 
-Require.magic [path relative to current file location] do |magic|
+Folder.enter [path relative to current file location] do |folder|
   # from new location, enter a subdir
-  magic.enter [subdir] do |path|        
-    magic.require_all('**/*.rb').except(/sound\/*.rb/).require  
+  folder.enter [subdir] do |path|        
+    folder.all('**/*.rb').except(/sound\/*.rb/).require  
   end
 
   # from new location, enter a subdir
-  magic.enter [another subdir] do |path|           
+  folder.enter [another subdir] do |path|           
     # use file blobs here
-    magic.require_all('**/*.rb').require
+    folder.all('**/*.rb').require
   end
 
   # from new location, enter a subdir
-  magic.enter [yet another subdir] do |path|         
+  folder.enter [yet another 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  
-    magic.require_all('blip/**/*.rb').matching(/_mixin.rb/, /.*\/power/).except(/sound/, /disco/).require
+    folder.all('blip/**/*.rb').matching(/_mixin.rb/, /.*\/power/).except(/sound/, /disco/).require
   end
 
 end
 
-Require.magic '../spec/fixtures' do |magic|
-  magic.enter 'game' do |path|
-    list = magic.require_all('**/*.rb')    
+# use current path as folder
+Folder.enter do |folder| 
+  folder.all('**/*.rb').require
+  folder.enter 'game' do |path|
+    list = folder.all('**/*.rb')    
     # puts list.matching('sound', 'network').except(/sound/).show_require(:relative)
     list.matching('sound', 'network').except(/sound/).require
   end

data/lib/require-dsl.rb

@@ -2,18 +2,24 @@ require 'rake'
 require 'fileutils'
 require 'util/util'
 
-module Require
+module Folder
 
-  def self.magic(path, &block) 
-    yield Magic.new path
+  def self.enter(path = '.', &block) 
+    m = Magic.new 
+    m.enter path      
+    yield m
+    m.dir_stack.pop 
   end
   
   module MagicList 
     attr_accessor :base_path
     attr_accessor :rel_path
         
-    def require(file)
-      require file
+    def do_require
+      each do |file|
+        require file
+      end 
+      self
     end
 
     def show_require(*options)
@@ -77,25 +83,25 @@ module Require
     attr_accessor :current_path
     attr_accessor :dir_stack
     
-    def initialize(dir)      
+    def initialize      
       @dir_stack = []
       @current_path = FileUtils.pwd
-      @current_path = enter(dir)      
     end
     
     def enter(dir)       
       FileUtils.cd dir
-      dir_stack.push path = FileUtils.pwd 
+      dir_stack.push path = FileUtils.pwd   
       @current_path = path
       if block_given?
-        yield path
-         dir_stack.pop            
-         current_path = dir_stack.last
+        yield path            
+        current_path = dir_stack.last
+        old_dir = dir_stack.last if dir_stack.pop 
+        FileUtils.cd old_dir if old_dir               
       end      
       path
     end
 
-    def require_all(*globs)      
+    def all(*globs)      
       list = FileList.new(globs)
       list.extend(MagicList)  
       list.base_path = dir_stack.first 

data/spec/require-dsl_spec.rb

@@ -2,15 +2,32 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "RequireMagic" do
   it "works" do
-    Require.magic '../spec/fixtures' do |magic|
-      magic.enter 'game' do |path|
-        list = magic.require_all('**/*.rb')                                                    
-        l1 = list.matching( 'sound', 'network').except(/sound/).show_require(:relative).inspect
-        l1.should include("network/network.rb")
+    Folder.enter '../spec/fixtures' do |folder|
+      folder.enter 'game' do |path|
+        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
+      folder.enter 'game' do |path|
+        list = folder.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  
+  
+  
 end

metadata

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