fun_with_files 0.0.5 → 0.0.6

data/Gemfile

@@ -7,10 +7,10 @@ source "http://rubygems.org"
 # Include everything needed to run rake, tests, features, etc.
 
 group :development do
-  gem "shoulda", ">= 0"
+  gem "shoulda", ">= 3.5"
   gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.3.0"
-  gem "jeweler", "~> 1.8.4"
+  gem "bundler", "~> 1.3.5"
+  gem "jeweler", "~> 1.8.7"
 end
 
 gem "xdg"

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/files/file_path.rb

@@ -359,10 +359,46 @@ module FunWith
         end
       end
       
-      
+      # Require ALL THE RUBY!
+      # This may be a bad idea...
+      # 
+      # Sometimes it fails to require a file because one of the necessary prerequisites
+      # hasn't been required yet (NameError).  requir catches this failure and stores 
+      # the failed requirement in order to try it later.  Doesn't fail until it goes through
+      # a full loop where none of the required files were successful.
       def requir
         if self.directory?
-          self.glob( :recursive => true, :ext => "rb" ).map(&:requir)
+          requirements = self.glob( :recursive => true, :ext => "rb" )
+          successfully_required = 1337  # need to break into initial loop
+          failed_requirements = []
+          error_messages = []
+          
+          while requirements.length > 0 && successfully_required > 0
+            successfully_required = 0
+            failed_requirements = []
+            error_messages = []
+            
+            for requirement in requirements
+              begin
+                requirement.requir
+                successfully_required += 1
+              rescue Exception => e
+                failed_requirements << requirement
+                error_messages << "#{e.message} (#{e.class})"
+              end
+            end
+            
+            requirements = failed_requirements
+          end
+          
+          if failed_requirements.length > 0
+            msg = "requiring directory #{self} failed:\n"
+            for message in error_messages
+              msg << "\n\terror message: #{message}"
+            end
+            
+            raise NameError.new(msg)
+          end
         else
           require self.expand.gsub( /\.rb$/, '' )
         end

data/test/loadable_dir/dir5/a.rb

@@ -0,0 +1,2 @@
+class A < B
+end

data/test/loadable_dir/dir5/b.rb

@@ -0,0 +1,2 @@
+class B < C
+end

data/test/loadable_dir/dir5/c.rb

@@ -0,0 +1,2 @@
+class C < D
+end

data/test/loadable_dir/dir5/d.rb

@@ -0,0 +1,4 @@
+# class D should be the last one it tries to load, but the first that doesn't
+# fail because of a missing parent class.
+class D
+end

data/test/test_globbing.rb

@@ -6,6 +6,6 @@ class TestGlobbing < FunWith::Files::TestCase
     @loadable_dir = FunWith::Files.root("test", "loadable_dir")
     assert @loadable_dir.directory?
     @globs = @loadable_dir.glob( :recursive => true, :ext => "rb" )
-    assert_equal 4, @globs.length
+    assert_equal 8, @globs.length
   end
 end

data/test/test_loading.rb

@@ -24,4 +24,12 @@ class TestLoading < FunWith::Files::TestCase
     FunWith::Files.root( "test", "loadable_dir", "dir4" ).load
     assert defined?( LoadedOrRequiredModule::Loaded4 ), "FunWith::Files::LoadedOrRequiredModule::Loaded4 should be defined now."
   end
+  
+  should "requir a directory which requires multiple passes to complete" do
+    FunWith::Files.root( "test", "loadable_dir", "dir5" ).requir
+    assert defined?(A)
+    assert defined?(B)
+    assert defined?(C)
+    assert defined?(D)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fun_with_files
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.5
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 1.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 1.8.7
 description: ! "  A more intuitive syntax for performing a variety of file actions.
   Examples:\n    \"/\".fwf_filepath.join('usr', 'bin', 'bash').touch\n    FunWith::Files::FilePath.home(\"Music\").glob(:ext
   => \"mp3\", :recurse => true)\n    home = FunWith::Files::FilePath.home\n    home.touch(
@@ -140,6 +140,10 @@ files:
 - ./test/loadable_dir/dir2/file2.rb
 - ./test/loadable_dir/dir3/file3.rb
 - ./test/loadable_dir/dir4/file4.rb
+- ./test/loadable_dir/dir5/a.rb
+- ./test/loadable_dir/dir5/b.rb
+- ./test/loadable_dir/dir5/c.rb
+- ./test/loadable_dir/dir5/d.rb
 - ./test/test_descent.rb
 - ./test/test_directory_builder.rb
 - ./test/test_file_path.rb
@@ -167,7 +171,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -363617118462161826
+      hash: 1257082353176487045
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: