magicloader 0.9.1 → 0.9.2

data/lib/magic_loader.rb

@@ -92,10 +92,15 @@ module MagicLoader
       # previously caused NameErrors until they've all been loaded or no new
       # files can be loaded, indicating unresolvable dependencies.
       files.each do |file|
+        original_constants = Module.constants
+        
         begin
           require file
           load_order << file
         rescue NameError => ex
+          new_constants = Module.constants - original_constants
+          new_constants.each { |name| Object.send(:remove_const, name) }
+          
           failed << file
           first_name_error ||= ex
         end

data/lib/magic_loader/tasks.rb

@@ -92,7 +92,7 @@ module MagicLoader
       data = File.read path
       
       # Remove trailing whitespace from the file so it doesn't grow
-      data.sub!(/\w+$/m, '')
+      data.sub!(/\s+$/m, '')
       
       magic_matches = data.match(MAGIC_REGEXP)
       case magic_matches

data/magicloader.gemspec

@@ -7,7 +7,7 @@ GEMSPEC = Gem::Specification.new do |s|
 Painless code dependency management. Think Bundler, but for managing file load
 ordering dependencies.
 EOD
-  s.version = "0.9.1"
+  s.version = "0.9.2"
   s.authors = "Tony Arcieri"
   s.email = "bascule@gmail.com"
   s.homepage = "http://github.com/tarcieri/MagicLoader"

data/spec/fixtures/circular/y.rb

@@ -0,0 +1,3 @@
+module Outer
+  class Y < Z; end
+end

data/spec/fixtures/circular/z.rb

@@ -0,0 +1,3 @@
+module Outer
+  class Z < Y; end
+end

data/spec/magic_loader_spec.rb

@@ -17,6 +17,14 @@ describe MagicLoader do
           MagicLoader.require_all File.expand_path('../fixtures/unresolvable/*.rb', __FILE__)
         end.should raise_error(NameError)
       end
+      
+      it "cleans up after constants if dependencies can't be resolved" do
+        proc do
+          MagicLoader.require_all File.expand_path('../fixtures/circular/*.rb', __FILE__)
+        end.should raise_error(NameError)
+        
+        defined?(Outer).should be_false
+      end
     end
   
     describe "syntactic sugar" do

data/spec/tmp/example.rb

@@ -1,5 +1,4 @@
 # OMFG IMPORTANT CRAP DON'T DELETE THIS
-
 #-----BEGIN MAGICLOADER MAGIC BLOCK-----
 # Automagically generated by MagicLoader. Editing may
 # result in bad juju. Edit at your own risk!

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: magicloader
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 63
   prerelease: false
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - Tony Arcieri
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-03 00:00:00 -06:00
+date: 2010-10-25 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -32,6 +32,8 @@ extra_rdoc_files:
 files: 
 - lib/magic_loader/tasks.rb
 - lib/magic_loader.rb
+- spec/fixtures/circular/y.rb
+- spec/fixtures/circular/z.rb
 - spec/fixtures/resolvable/a.rb
 - spec/fixtures/resolvable/b.rb
 - spec/fixtures/resolvable/c.rb