require-me 0.6.2 → 0.6.4

data/README.markdown

@@ -2,7 +2,6 @@
 
 Includes a DSL for requiring files and folders and some also some static utility functions which can be used in combination. 
 These tools in combination facilitates managing requiring various subfolder structures.
-FIXED 
 
 ## Require DSL ##
   
@@ -57,7 +56,28 @@ Folder.enter do |folder| # use current path as folder
     puts list.matching('sound', 'network').except(/sound/).show_require(:relative)
     list.matching('sound', 'network').except(/sound/).do_require
   end
+end  
+</pre>
+
+Using 'require_me' method #
+
+<pre>
+
+# lib/gamer.rb
+Folder.require_me '../fixtures/game/game.rb'
+Folder.enter '../fixtures/game' do |f|
+  f.require_me 'game.rb'
+end   
+
+# Set context in block using 'enter_here' method
+
+# fixtures/game/game.rb
+# ensure context is set relative to here for require statements within block
+Folder.enter_here(__FILE__) do
+  # require graphics within the game folder!
+  Folder.require_me 'graphics/graphics'
 end
+
 </pre>
 
 ## Static helpers ##

data/lib/playground.rb

@@ -6,4 +6,6 @@ end
 
 run "A" do |a|
   puts a * 2
-end  
+end   
+
+puts File.dirname(__FILE__)

data/lib/require-dsl.rb

@@ -13,17 +13,44 @@ module Folder
     m.exit
   end 
 
+  def self.enter_here(file, &block) 
+    m = Magic.new      
+    path = File.dirname(file)
+    m.enter path    
+    if block_given?
+      yield m
+    end
+    m.exit
+  end 
+
+
   def self.require_all(*folders)
     return Magic.new.all.dup.extend(MagicList).do_require if folders.empty?
     folders.each do |folder|
-      enter folder do |f|
+      enter folder do |f| 
         f.all.dup.extend(MagicList).do_require
       end
     end
   end
 
+  def self.show_require_all(*folders)
+    return Magic.new.all.dup.extend(MagicList).show_require if folders.empty?
+    folders.each do |folder|
+      enter folder do |f|  
+        f.all.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     
+  end      
   
   module MagicList 
     attr_accessor :base_path
@@ -40,7 +67,7 @@ module Folder
       each do |f|                                                      
         if options.include? :relative                                 
           file_path = File.join(rel_path, f)
-          path = Require::Dir.relative_path(base_path, file_path)
+          path = Require::Directory.relative_path(base_path, file_path)
         end
         path = File.join(base_path, f) if !options.include? :relative
         path
@@ -101,6 +128,10 @@ module Folder
       @dir_stack = []
       @current_path = FileUtils.pwd
     end
+
+    def to_s
+      "path: #{current_path}, directory stack: #{dir_stack.inspect}"
+    end
     
     def enter(dir)   
       path = FileUtils.pwd
@@ -139,6 +170,10 @@ module Folder
         end
       end
     end
+
+    def require_me(*files)
+      return all(files).dup.extend(MagicList).do_require     
+    end      
         
   end
 end  

data/lib/require-me.rb

@@ -84,7 +84,7 @@ protected
       includes_rexp = options[:include]
       excludes_rexp = options[:exclude]      
             
-      Dir.glob(path).each {|f| 
+      ::Dir.glob(path).each {|f| 
         next if excludes_rexp &&  match(f, excludes_rexp)
         if !includes_rexp || match(f, includes_rexp)
           puts_trace "require: #{f}", options

data/lib/util/util.rb

@@ -1,7 +1,7 @@
 require 'pathname'
 
 module Require
-  module Dir
+  module Directory
     def self.relative_path(base_path, path)
       path.gsub! /#{Regexp.escape base_path}/ 
       p1 = Pathname.new base_path

data/spec/require-dsl_spec.rb

@@ -3,18 +3,17 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe "RequireMagic" do
   it "Folder.enter works " do          
     puts FileUtils.pwd
-    Folder.enter 'fixtures/game' do |folder|            
-      puts "Current 1:" + folder.current_path          
+    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          
+    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 '../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
@@ -27,28 +26,31 @@ describe "RequireMagic" do
   end
   
   it "works with require_all " do          
-    Folder.enter('fixtures/game') do |folder|            
-      puts "Current 1:" + folder.current_path    
+    Folder.enter('../fixtures/game') do |folder|            
+      # puts "Current 1:" + folder.current_path    
       folder.require_all 'graphics', 'network', 'sound'
     end
   end
 
   it "works with require_all " do          
-    Folder.enter 'fixtures' do |f|
+    Folder.require_me '../fixtures/game/game.rb'
+    
+    Folder.enter '../fixtures/game' do |f|
       f.require_all
+      f.require_me 'game.rb'
     end            
   end
 
   it "works with require_all " do          
-    Folder.require_all 'fixtures' 
+    Folder.require_all '../fixtures' 
   end
 
   
   it "works with base folder " do  
-    Folder.enter 'fixtures' do |folder|
-      puts "Current 2:" + folder.current_path
+    Folder.enter '../fixtures' do |folder|
+      # puts "Current 2:" + folder.current_path
       folder.enter 'game' do |f|
-        puts f
+        # puts f
         f.require_all        
         list = f.all # ('**/*.rb')                                                    
         l1 = list.matching( 'sound', 'network').except(/sound/).show_require(:relative).inspect        

data/spec/require_more_spec.rb

@@ -0,0 +1,12 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "static folder functions" do
+  it "show work with here" do          
+    Folder.here(__FILE__).require_me '../fixtures/game/game.rb'
+  end             
+
+  it "show work with require_me" do          
+    Folder.require_me '../fixtures/game/game.rb'  
+  end               
+    
+end

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'spec'))
 # require 'require-dsl'
 require 'require-me'
 require 'rspec'

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: require-me
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  prerelease: false
+  segments: 
+  - 0
+  - 6
+  - 4
+  version: 0.6.4
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-06 00:00:00 -04:00
+date: 2010-03-18 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -42,27 +47,26 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Facilitates requiring select ruby files in folders
 test_files: 
-- spec/fixtures/game/game.rb
-- spec/fixtures/game/graphics/graphics.rb
-- spec/fixtures/game/network/network.rb
-- spec/fixtures/game/sound/sound.rb
 - spec/require-dsl_spec.rb
+- spec/require_more_spec.rb
 - spec/spec_helper.rb
 - test/test_require_folder.rb
 - test/test_require_folders.rb

data/spec/fixtures/game/game.rb

@@ -1 +0,0 @@
-puts "Game was included"

data/spec/fixtures/game/graphics/graphics.rb

@@ -1 +0,0 @@
-puts "Graphics was included"

data/spec/fixtures/game/network/network.rb

@@ -1 +0,0 @@
-puts "Network was included"

data/spec/fixtures/game/sound/sound.rb

@@ -1 +0,0 @@
-puts "Sound was included"