require-me 0.6.0 → 0.6.1

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

data/lib/require-dsl.rb

@@ -6,15 +6,11 @@ module Folder
 
   def self.enter(path = '.', &block) 
     m = Magic.new      
-    puts "Path:#{path}"
-    paths = path.split('/')
-    puts paths
-    paths.each{|p| m.enter p}        
+    m.enter path    
     if block_given?
       yield m
-    end                                            
-    puts "Path:#{path}"
-    path.split('/').each{|p| m.exit p }                 
+    end
+    m.exit
   end 
   
   module MagicList 
@@ -94,24 +90,23 @@ module Folder
       @current_path = FileUtils.pwd
     end
     
-    def enter(dir)
-      puts "cd #{dir}"
+    def enter(dir)   
+      path = FileUtils.pwd
+      dir_stack.push path    
       FileUtils.cd dir if !dir.empty?
-      dir_stack.push path = FileUtils.pwd   
-      @current_path = path
+      @current_path = FileUtils.pwd
       if block_given?
         yield self                    
-        exit(dir)              
+        exit              
       end      
       self
     end
 
-    def exit(dir)
+    def exit
       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 '..'
+      old_dir = dir_stack.last 
+      dir_stack.pop 
+      FileUtils.cd old_dir if old_dir               
     end
 
 

data/spec/require-dsl_spec.rb

@@ -29,7 +29,7 @@ describe "RequireMagic" do
   it "works with require_all " do          
     Folder.enter('fixtures/game') do |folder|            
       puts "Current 1:" + folder.current_path          
-      # f.require_all 'graphics', 'network', 'sound'
+      folder.require_all 'graphics', 'network', 'sound'
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: require-me
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors: 
 - Kristian Mandrup