require_all 1.5.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0acf6c3cfe3c05348dc4f39a44862b3ff9e1588
-  data.tar.gz: dfd83ec51fd0c052866242da84e23ee677baa107
+  metadata.gz: 3e7c0c747bfdb3c3c59c6561700e67736f43949f
+  data.tar.gz: 4e83ce18c619ab69e6d663afe349f8d2c3a112b5
 SHA512:
-  metadata.gz: 5cf536e611f4a5d089be5890d01775628b564051d7c60d9f1827abea02b0b4b9eafad8270be8951000612f02d8f4ba0713ce396bc4190a712a9cddf30bcb4b0d
-  data.tar.gz: 9108afdd13f81ad242b5e9824ef6eb2477326d4979f1d51bae39739c256eaaa64046f3c1f777a08bde1fc6eacb974bcd70847a316adfde8c5198acb565d426cf
+  metadata.gz: e409b3c92b49698fe477322570fb6965956bd5ec75683afd341ae2a483eb621f87b7c5db39642cf6768895bb31ea75d3f18bcd6501ba6819bd1731ad48737311
+  data.tar.gz: 96ce20ca7ef905cfaa035e98c2e1a02aaff7c5fda41455fc59ba90654f568deb107d072a8773c0ae7a550eef0c41be0a71bae8ae1175803360583f12c4fe8b15

data/.travis.yml

@@ -1,16 +1,16 @@
-rvm:
- - 2.4.0
- - 2.3.3
- - 2.2.6
- - jruby-19mode
- - rbx-3
- - ruby-head
-notifications:
-  recipients:
-    - jarmo.p@gmail.com
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-19mode
-    - rvm: rbx-3
-
+rvm:
+ - 2.5.0
+ - 2.4.3
+ - 2.3.6
+ - jruby-19mode
+ - rbx-3
+ - ruby-head
+notifications:
+  recipients:
+    - jarmo.p@gmail.com
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-19mode
+    - rvm: rbx-3
+

data/CHANGES

@@ -1,45 +1,55 @@
-1.5.0:
-
-* Merged PR #13 (https://github.com/jarmo/require_all/pull/13).
-* Merged PR #18 (https://github.com/jarmo/require_all/pull/18).
-
-1.4.0:
-
-* License is now correctly as MIT. Thanks to Eric Kessler for pull request #16.
-
-1.3.3:
-
-* Support empty directories without crashing. Issue #11. Thanks to Eric Kessler.
-
-1.3.2:
-
-* Add license to gemspec.
-
-1.3.1:
-
-* README improvements.
-
-1.3.0:
-
-* Make everything work with Ruby 1.9 and 2.0. Awesome! Thanks to Aaron Klaassen.
-
-1.2.0:
-
-* Add load_all, and load_rel which behave similarly to require_all/require_rel except that Kernel#load is used
-* Add autoload_all and autoload_rel (see README and/or specs for examples of usage)
-* Minor bug fixes
-* Improved specs
-
-1.1.0:
-
-* Add require_rel (require_all relative to the current file)
-* Fix bug in auto-appending .rb ala require
-
-1.0.1:
-
-* Allow require_all to take a directory name as an argument
-
-1.0.0:
-
-* Initial release (was originally load_glob, converted to require_all which is
-  a lot cooler, seriously trust me)
+2.0.0:
+
+* Merged PR #24 (https://github.com/jarmo/require_all/pull/24)
+  Prior to version 2, RequireAll attempted to automatically resolve dependencies between files, thus
+  allowing them to be required in any order. Whilst convenient, the approach used (of rescuing
+  `NameError`s and later retrying files that failed to load) was fundamentally unsafe and can result
+  in incorrect behaviour (for example issue #8, plus more detail and discussion in #21).
+
+  Thanks to Joe Horsnell (@joehorsnell)
+
+1.5.0:
+
+* Merged PR #13 (https://github.com/jarmo/require_all/pull/13).
+* Merged PR #18 (https://github.com/jarmo/require_all/pull/18).
+
+1.4.0:
+
+* License is now correctly as MIT. Thanks to Eric Kessler for pull request #16.
+
+1.3.3:
+
+* Support empty directories without crashing. Issue #11. Thanks to Eric Kessler.
+
+1.3.2:
+
+* Add license to gemspec.
+
+1.3.1:
+
+* README improvements.
+
+1.3.0:
+
+* Make everything work with Ruby 1.9 and 2.0. Awesome! Thanks to Aaron Klaassen.
+
+1.2.0:
+
+* Add load_all, and load_rel which behave similarly to require_all/require_rel except that Kernel#load is used
+* Add autoload_all and autoload_rel (see README and/or specs for examples of usage)
+* Minor bug fixes
+* Improved specs
+
+1.1.0:
+
+* Add require_rel (require_all relative to the current file)
+* Fix bug in auto-appending .rb ala require
+
+1.0.1:
+
+* Allow require_all to take a directory name as an argument
+
+1.0.0:
+
+* Initial release (was originally load_glob, converted to require_all which is
+  a lot cooler, seriously trust me)

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
-
-gemspec
-gem 'coveralls', :require => false
+source 'https://rubygems.org'
+
+gemspec
+gem 'coveralls', require: false

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Jarmo Pertman
+Copyright (c) Jarmo Pertman
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,128 +1,123 @@
-# require_all
-[![Gem Version](https://badge.fury.io/rb/require_all.png)](http://badge.fury.io/rb/require_all)
-[![Build Status](https://secure.travis-ci.org/jarmo/require_all.png)](http://travis-ci.org/jarmo/require_all)
-[![Coverage](https://coveralls.io/repos/jarmo/require_all/badge.png?branch=master)](https://coveralls.io/r/jarmo/require_all)
-
-A wonderfully simple way to load your code.
-
-Tired of futzing around with `require` statements everywhere, littering your code
-with `require File.dirname(__FILE__)` crap?  What if you could just 
-point something at a big directory full of code and have everything just 
-automagically load regardless of the dependency structure?  
-
-Wouldn't that be nice?  Well, now you can!
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'require_all'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install require_all
-
-## Usage
-
-```ruby
-require 'require_all'
-
-# load all ruby files in the directory "lib" and its subdirectories
-require_all 'lib'
-
-# or load all files by using glob
-require_all 'lib/**/*.rb'
-
-# or load files in an Array
-require_all Dir.glob("blah/**/*.rb").reject { |f| stupid_file? f }
-
-# or load manually specified files
-require_all 'lib/a.rb', 'lib/b.rb', 'lib/c.rb', 'lib/d.rb'
-```
-
-You can also load files relative to the current file by using `require_rel`:
-
-```ruby
-# Instead of
-require File.dirname(__FILE__) + '/foobar'
-
-# you can do simply like this
-require_rel 'foobar'
-```
-
-You can give all the same argument types to the `require_rel` as for `require_all`.
-
-It is recommended to use `require_rel` instead of `require_all` since it will require files relatively
-to the current file (`__FILE__`) as opposed to loading files relative from the working directory.
-
-`load_all` and `load_rel` methods also exist to use `Kernel#load` instead of `Kernel#require`!
-
-The proper order to in which to load files is determined automatically for you.
- 
-It's just that easy!  Code loading shouldn't be hard.
-
-## autoload_all
-
-This library also includes methods for performing `autoload` - what a bargain!
-
-Similar syntax is used as for `require_(all|rel)` and `load_(all|rel)` methods with some caveats:
-
-* Directory and file names have to reflect namespaces and/or constant names:
-
-```ruby
-# lib/dir1/dir2/my_file.rb
-module Dir1
-  module Dir2
-    class MyFile
-    end
-  end
-end
-
-# lib/loader.rb
-autoload_all File.dirname(__FILE__) + "/dir1"
-```
-
-* A `base_dir` option has to be specified if loading directories or files from some other location
-  than top-level directory:
-
-```ruby
-# lib/dir1/other_file.rb
-autoload_all File.dirname(__FILE__) + "/dir2/my_file.rb",
-             :base_dir => File.dirname(__FILE__) + "/../dir1"
-```
-  
-* All namespaces will be created dynamically by `autoload_all` - this means that `defined?(Dir1)` will
-  return `"constant"` even if `my_file.rb` is not yet loaded!
-
-Of course there's also an `autoload_rel` method:
-```ruby
-autoload_rel "dir2/my_file.rb", :base_dir => File.dirname(__FILE__) + "/../dir1"
-```
-
-If having some problems with `autoload_all` or `autoload_rel` then set `$DEBUG=true` to see how files
-are mapped to their respective modules and classes.
-
-## Methodology (except for autoload_{all|rel})
-
-* Enumerate the files to be loaded
-* Try to load all of the files.  If we encounter a `NameError` loading a 
-  particular file, store that file in a "try to load it later" list.
-* If all the files loaded, great, we're done! If not, go through the
-  "try to load it later" list again rescuing `NameError` the same way.
-* If we walk the whole "try to load it later" list and it doesn't shrink
-  at all, we've encountered an unresolvable dependency.  In this case,
-  `require_all` will rethrow the first `NameError` it encountered.
-
-## Questions? Comments? Concerns?
-
-You can reach the author on github or by email [jarmo.p@gmail.com](mailto:jarmo.p@gmail.com)
-
-## License
-
-Jarmo Pertman
-
-MIT (see the LICENSE file for details)
+# require_all
+[![Gem Version](https://badge.fury.io/rb/require_all.png)](http://badge.fury.io/rb/require_all)
+[![Build Status](https://secure.travis-ci.org/jarmo/require_all.png)](http://travis-ci.org/jarmo/require_all)
+[![Coverage](https://coveralls.io/repos/jarmo/require_all/badge.png?branch=master)](https://coveralls.io/r/jarmo/require_all)
+
+A wonderfully simple way to load your code.
+
+Tired of futzing around with `require` statements everywhere, littering your code
+with `require File.dirname(__FILE__)` crap?  What if you could just
+point something at a big directory full of code and have everything just
+automagically load?
+
+Wouldn't that be nice?  Well, now you can!
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'require_all'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install require_all
+
+## Usage
+
+```ruby
+require 'require_all'
+
+# load all ruby files in the directory "lib" and its subdirectories
+require_all 'lib'
+
+# or load all files by using glob
+require_all 'lib/**/*.rb'
+
+# or load files in an Array
+require_all Dir.glob("blah/**/*.rb").reject { |f| stupid_file? f }
+
+# or load manually specified files
+require_all 'lib/a.rb', 'lib/b.rb', 'lib/c.rb', 'lib/d.rb'
+```
+
+You can also load files relative to the current file by using `require_rel`:
+
+```ruby
+# Instead of
+require File.dirname(__FILE__) + '/foobar'
+
+# you can do simply like this
+require_rel 'foobar'
+```
+
+You can give all the same argument types to the `require_rel` as for `require_all`.
+
+It is recommended to use `require_rel` instead of `require_all` since it will require files relatively
+to the current file (`__FILE__`) as opposed to loading files relative from the working directory.
+
+`load_all` and `load_rel` methods also exist to use `Kernel#load` instead of `Kernel#require`!
+
+Files are required in alphabetical order and if there are files in nested directories, they are
+required depth-first. If a `NameError` caused by a reference to an uninitialised constant is
+encountered during the requiring process, then a `RequireAll::LoadError` will be thrown,
+indicating the file that needs the dependency adding to.
+
+## autoload_all
+
+This library also includes methods for performing `autoload` - what a bargain!
+
+Similar syntax is used as for `require_(all|rel)` and `load_(all|rel)` methods with some caveats:
+
+* Directory and file names have to reflect namespaces and/or constant names:
+
+```ruby
+# lib/dir1/dir2/my_file.rb
+module Dir1
+  module Dir2
+    class MyFile
+    end
+  end
+end
+
+# lib/loader.rb
+autoload_all File.dirname(__FILE__) + "/dir1"
+```
+
+* A `base_dir` option has to be specified if loading directories or files from some other location
+  than top-level directory:
+
+```ruby
+# lib/dir1/other_file.rb
+autoload_all File.dirname(__FILE__) + "/dir2/my_file.rb",
+             base_dir: File.dirname(__FILE__) + "/../dir1"
+```
+
+* All namespaces will be created dynamically by `autoload_all` - this means that `defined?(Dir1)` will
+  return `"constant"` even if `my_file.rb` is not yet loaded!
+
+Of course there's also an `autoload_rel` method:
+```ruby
+autoload_rel "dir2/my_file.rb", base_dir: File.dirname(__FILE__) + "/../dir1"
+```
+
+If having some problems with `autoload_all` or `autoload_rel` then set `$DEBUG=true` to see how files
+are mapped to their respective modules and classes.
+
+## Version compatibility and upgrading
+
+As of version 2, RequireAll will raise a `RequireAll::LoadError` if it encounters a `NameError`
+caused by a reference to an uninitialised constant during the requiring process. As such, it is not
+backwards compatible with version 1.x, but simple to upgrade by adding any requires to load
+dependencies in files that need them. See [CHANGES](CHANGES) for more details.
+
+## Questions? Comments? Concerns?
+
+You can reach the author on github or by email [jarmo.p@gmail.com](mailto:jarmo.p@gmail.com)
+
+## License
+
+MIT (see the [LICENSE](LICENSE) file for details)

data/lib/require_all.rb

@@ -5,6 +5,8 @@
 #++
 
 module RequireAll
+  LoadError = Class.new(::LoadError)
+
   # A wonderfully simple way to load your code.
   #
   # The easiest way to use require_all is to just point it at a directory
@@ -14,10 +16,9 @@ module RequireAll
   #  require_all 'lib'
   #
   # This will find all the .rb files under the lib directory and load them.
-  # The proper order to load them in will be determined automatically.
   #
-  # If the dependencies between the matched files are unresolvable, it will 
-  # throw the first unresolvable NameError.
+  # If a file required by require_all references a constant that is not yet
+  # loaded, a RequireAll::LoadError will be thrown.
   #
   # You can also give it a glob, which will enumerate all the matching files: 
   #
@@ -35,7 +36,7 @@ module RequireAll
     # Handle passing an array as an argument
     args.flatten!
 
-    options = {:method => :require}
+    options = {method: :require}
     options.merge!(args.pop) if args.last.is_a?(Hash)
 
     if args.empty?
@@ -92,51 +93,15 @@ module RequireAll
       return true
     end
 
-    files.map! { |file_| File.expand_path file_ }
-    files.sort!
-
-    begin
-      failed = []
-      first_name_error = nil
-
-      # Attempt to load each file, rescuing which ones raise NameError for
-      # undefined constants.  Keep trying to successively reload files that 
-      # previously caused NameErrors until they've all been loaded or no new
-      # files can be loaded, indicating unresolvable dependencies.
-      files.each do |file_|
-        begin
-          __require(options[:method], file_)
-        rescue NameError => ex
-          failed << file_
-          first_name_error ||= ex
-        rescue ArgumentError => ex
-          # Work around ActiveSuport freaking out... *sigh*
-          #
-          # ActiveSupport sometimes throws these exceptions and I really
-          # have no idea why.  Code loading will work successfully if these
-          # exceptions are swallowed, although I've run into strange 
-          # nondeterministic behaviors with constants mysteriously vanishing.
-          # I've gone spelunking through dependencies.rb looking for what 
-          # exactly is going on, but all I ended up doing was making my eyes 
-          # bleed.
-          #
-          # FIXME: If you can understand ActiveSupport's dependencies.rb 
-          # better than I do I would *love* to find a better solution
-          raise unless ex.message["is not missing constant"]
-
-          STDERR.puts "Warning: require_all swallowed ActiveSupport 'is not missing constant' error"
-          STDERR.puts ex.backtrace[0..9]
-        end
-      end
-
-      # If this pass didn't resolve any NameErrors, we've hit an unresolvable
-      # dependency, so raise one of the exceptions we encountered.
-      if failed.size == files.size
-        raise first_name_error
-      else
-        files = failed
+    files.map { |file_| File.expand_path file_ }.sort.each do |file_|
+      begin
+        __require(options[:method], file_)
+      rescue NameError => e
+        # Only wrap NameError exceptions for uninitialized constants
+        raise e unless e.instance_of?(NameError) && e.message.include?('uninitialized constant')
+        raise LoadError, "Could not require #{file_} (#{e}). Please require the necessary files"
       end
-    end until failed.empty?
+    end
 
     true
   end
@@ -156,7 +121,7 @@ module RequireAll
 
   # Loads all files like require_all instead of requiring
   def load_all(*paths)
-    require_all paths, :method => :load
+    require_all paths, method: :load
   end
 
   # Loads all files by using relative paths of the caller rather than
@@ -167,7 +132,7 @@ module RequireAll
 
     source_directory = File.dirname caller.first.sub(/:\d+$/, '')
     paths.each do |path|
-      require_all File.join(source_directory, path), :method => :load
+      require_all File.join(source_directory, path), method: :load
     end
   end
 
@@ -197,7 +162,7 @@ module RequireAll
   # For example loading only my_file.rb from dir1/dir2 with autoload_all:
   #
   #   autoload_all File.dirname(__FILE__) + '/dir1/dir2/my_file',
-  #                :base_dir => File.dirname(__FILE__) + '/dir1'
+  #                base_dir: File.dirname(__FILE__) + '/dir1'
   #
   # WARNING: All modules will be created even if files themselves aren't loaded yet, meaning
   # that all the code which depends of the modules being loaded or not will not work, like usages
@@ -212,11 +177,11 @@ module RequireAll
     return false if paths.empty?
     require "pathname"
 
-    options = {:method => :autoload}
+    options = {method: :autoload}
     options.merge!(paths.pop) if paths.last.is_a?(Hash)
 
     paths.each do |path|
-      require_all path, {:base_dir => path}.merge(options)
+      require_all path, {base_dir: path}.merge(options)
     end
   end
 
@@ -226,14 +191,14 @@ module RequireAll
     return false if paths.empty?
     require "pathname"
 
-    options = {:method => :autoload}
+    options = {method: :autoload}
     options.merge!(paths.pop) if paths.last.is_a?(Hash)
 
     source_directory = File.dirname caller.first.sub(/:\d+$/, '')
     paths.each do |path|
       file_path = Pathname.new(source_directory).join(path).to_s
-      require_all file_path, {:method => :autoload,
-                              :base_dir => source_directory}.merge(options)
+      require_all file_path, {method: :autoload,
+                              base_dir: source_directory}.merge(options)
     end
   end
 

data/require_all.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "require_all"
-  s.version = "1.5.0"
+  s.version = "2.0.0"
   s.authors = ["Jarmo Pertman", "Tony Arcieri"]
   s.email = "jarmo.p@gmail.com"
   s.summary = "A wonderfully simple way to load your code"

data/spec/autoload_shared.rb

@@ -9,18 +9,18 @@ shared_examples_for "#autoload_all syntactic sugar" do
 
   it "accepts files with and without extensions" do
     is_expected.not_to be_loaded("Autoloaded::Module2::LongerName")
-    expect(send(@method, @base_dir + '/module2/longer_name', :base_dir => @autoload_base_dir)).to be_truthy
+    expect(send(@method, @base_dir + '/module2/longer_name', base_dir: @autoload_base_dir)).to be_truthy
     is_expected.to be_loaded("Autoloaded::Module2::LongerName")
 
     is_expected.not_to be_loaded("Autoloaded::Module1::A")
-    expect(send(@method, @base_dir + '/module1/a.rb', :base_dir => @autoload_base_dir)).to be_truthy
+    expect(send(@method, @base_dir + '/module1/a.rb', base_dir: @autoload_base_dir)).to be_truthy
     is_expected.to be_loaded("Autoloaded::Module1::A")
   end
 
   it "accepts lists of files" do
     is_expected.not_to be_loaded("Autoloaded::Module1::A", "Autoloaded::Module2::LongerName",
                          "Autoloaded::Module2::Module3::B")
-    expect(send(@method, @file_list, :base_dir => @autoload_base_dir)).to be_truthy
+    expect(send(@method, @file_list, base_dir: @autoload_base_dir)).to be_truthy
     is_expected.to be_loaded("Autoloaded::Module1::A", "Autoloaded::Module2::LongerName",
                      "Autoloaded::Module2::Module3::B")
   end
@@ -28,7 +28,7 @@ shared_examples_for "#autoload_all syntactic sugar" do
   it "is totally cool with a splatted list of arguments" do
     is_expected.not_to be_loaded("Autoloaded::Module1::A", "Autoloaded::Module2::LongerName",
                          "Autoloaded::Module2::Module3::B")
-    expect(send(@method, *(@file_list << {:base_dir => @autoload_base_dir}))).to be_truthy
+    expect(send(@method, *(@file_list << {base_dir: @autoload_base_dir}))).to be_truthy
     is_expected.to be_loaded("Autoloaded::Module1::A", "Autoloaded::Module2::LongerName",
                      "Autoloaded::Module2::Module3::B")
   end
@@ -36,7 +36,7 @@ shared_examples_for "#autoload_all syntactic sugar" do
   it "will load all .rb files under a directory without a trailing slash" do
     is_expected.not_to be_loaded("Autoloaded::Module1::A", "Autoloaded::Module2::LongerName",
                          "Autoloaded::Module2::Module3::B")
-    expect(send(@method, @base_dir, :base_dir => @autoload_base_dir)).to be_truthy
+    expect(send(@method, @base_dir, base_dir: @autoload_base_dir)).to be_truthy
     is_expected.to be_loaded("Autoloaded::Module1::A", "Autoloaded::Module2::LongerName",
                      "Autoloaded::Module2::Module3::B")
   end
@@ -44,7 +44,7 @@ shared_examples_for "#autoload_all syntactic sugar" do
   it "will load all .rb files under a directory with a trailing slash" do
     is_expected.not_to be_loaded("Autoloaded::Module1::A", "Autoloaded::Module2::LongerName",
                          "Autoloaded::Module2::Module3::B")
-    expect(send(@method, "#{@base_dir}/", :base_dir => @autoload_base_dir)).to be_truthy
+    expect(send(@method, "#{@base_dir}/", base_dir: @autoload_base_dir)).to be_truthy
     is_expected.to be_loaded("Autoloaded::Module1::A", "Autoloaded::Module2::LongerName",
                      "Autoloaded::Module2::Module3::B")
   end
@@ -52,7 +52,7 @@ shared_examples_for "#autoload_all syntactic sugar" do
   it "will load all files specified by a glob" do
     is_expected.not_to be_loaded("Autoloaded::Module1::A", "Autoloaded::Module2::LongerName",
                          "Autoloaded::Module2::Module3::B")
-    expect(send(@method, "#{@base_dir}/**/*.rb", :base_dir => @autoload_base_dir)).to be_truthy
+    expect(send(@method, "#{@base_dir}/**/*.rb", base_dir: @autoload_base_dir)).to be_truthy
     is_expected.to be_loaded("Autoloaded::Module1::A", "Autoloaded::Module2::LongerName",
                      "Autoloaded::Module2::Module3::B")
   end
@@ -78,7 +78,7 @@ shared_examples_for "#autoload_all syntactic sugar" do
   end
 
   it "raises LoadError if :base_dir doesn't exist" do
-    expect {send(@method, @base_dir, :base_dir => @base_dir + "/non_existing_dir")}.
+    expect {send(@method, @base_dir, base_dir: @base_dir + "/non_existing_dir")}.
             to raise_exception(LoadError)
   end
 end

data/spec/autoload_spec.rb

@@ -4,21 +4,21 @@ require File.dirname(__FILE__) + '/autoload_shared.rb'
 describe "autoload_all" do
 
   subject { self }
-  
+
   it "provides require_all functionality by using 'autoload' instead of 'require'" do
     is_expected.not_to be_loaded("Autoloaded::Module1::A", "Autoloaded::Module2::LongerName", "Autoloaded::Module2::Module3::B")
-    autoload_all File.dirname(__FILE__) + "/fixtures/autoloaded"
+    autoload_all fixture_path('autoloaded')
     is_expected.to be_loaded("Autoloaded::Module1::A", "Autoloaded::Module2::LongerName", "Autoloaded::Module2::Module3::B")
   end
 
   it "doesn't autoload files with wrong module names" do
-    autoload_all File.dirname(__FILE__) + "/fixtures/autoloaded"
+    autoload_all fixture_path('autoloaded')
     is_expected.not_to be_loaded("Autoloaded::WrongModule::WithWrongModule", "WrongModule::WithWrongModule")
   end
 
   it "autoloads class nested into another class" do
     is_expected.not_to be_loaded("Autoloaded::Class1", "Autoloaded::Class1::C")
-    autoload_all File.dirname(__FILE__) + "/fixtures/autoloaded"
+    autoload_all fixture_path('autoloaded')
     is_expected.to be_loaded("Autoloaded::Class1")
     expect(Autoloaded::Class1).to be_a Class
     is_expected.to be_loaded("Autoloaded::Class1::C")
@@ -26,17 +26,16 @@ describe "autoload_all" do
 
   it "needs to specify base_dir for autoloading if loading something from under top-level module directory" do
     is_expected.not_to be_loaded("Autoloaded::Module1::A", "Autoloaded::Module2::LongerName", "Autoloaded::Module2::Module3::B")
-    autoload_all File.dirname(__FILE__) + "/fixtures/autoloaded/module1"
+    autoload_all fixture_path('autoloaded/module1')
     is_expected.not_to be_loaded("Autoloaded::Module1::A", "Autoloaded::Module2::LongerName", "Autoloaded::Module2::Module3::B")
 
-    autoload_all File.dirname(__FILE__) + "/fixtures/autoloaded/module1",
-                 :base_dir => File.dirname(__FILE__) + "/fixtures/autoloaded"
+    autoload_all fixture_path('autoloaded/module1'), base_dir: fixture_path('autoloaded')
     is_expected.to be_loaded("Autoloaded::Module1::A")
     is_expected.not_to be_loaded("Autoloaded::Module2::LongerName", "Autoloaded::Module2::Module3::B")
   end
 
   before(:all) do
-    @base_dir = File.dirname(__FILE__) + '/fixtures/autoloaded'
+    @base_dir = fixture_path('autoloaded')
     @method = :autoload_all
     @autoload_base_dir = @base_dir
   end
@@ -49,25 +48,24 @@ describe "autoload_rel" do
 
   it "provides autoload_all functionality relative to the current file" do
     is_expected.not_to be_loaded("Modules::Module1::First", "Modules::Module2::Second", "Modules::Zero")
-    require File.dirname(__FILE__) + '/fixtures/autoloaded_rel/modules/zero'
+    require fixture_path('autoloaded_rel/modules/zero')
     is_expected.to be_loaded("Modules::Module1::First", "Modules::Module2::Second", "Modules::Zero")
   end
 
   it "needs to specify base_dir for autoloading if loading something from under top-level module directory" do
     is_expected.not_to be_loaded("Autoloaded::Module1::A", "Autoloaded::Module2::LongerName", "Autoloaded::Module2::Module3::B")
-    autoload_rel "./fixtures/autoloaded/module1"
+    autoload_rel relative_fixture_path('autoloaded/module1')
     is_expected.not_to be_loaded("Autoloaded::Module1::A", "Autoloaded::Module2::LongerName", "Autoloaded::Module2::Module3::B")
 
-    autoload_rel "./fixtures/autoloaded/module1",
-                 :base_dir => File.dirname(__FILE__) + "/fixtures/autoloaded"
+    autoload_rel relative_fixture_path('autoloaded/module1'), base_dir: fixture_path('autoloaded')
     is_expected.to be_loaded("Autoloaded::Module1::A")
     is_expected.not_to be_loaded("Autoloaded::Module2::LongerName", "Autoloaded::Module2::Module3::B")
   end
 
   before(:all) do
-    @base_dir = './fixtures/autoloaded'
+    @base_dir = relative_fixture_path('autoloaded')
     @method = :autoload_rel
-    @autoload_base_dir = File.dirname(__FILE__) + "/fixtures/autoloaded"
+    @autoload_base_dir = fixture_path('autoloaded')
   end
   it_should_behave_like "#autoload_all syntactic sugar"
 end

data/spec/fixtures/error/a.rb

@@ -0,0 +1,3 @@
+class A
+  non_existent_method
+end

data/spec/fixtures/resolvable/a.rb

@@ -1 +1,3 @@
+require_relative 'c'
+
 class A < C; end

data/spec/load_spec.rb

@@ -2,11 +2,11 @@ require File.dirname(__FILE__) + '/spec_helper.rb'
 require File.dirname(__FILE__) + '/require_shared.rb'
 
 describe "load_all" do
-  
+
   subject { self }
 
   it "provides require_all functionality but using 'load' instead of 'require'" do
-    require_all File.dirname(__FILE__) + '/fixtures/resolvable'
+    require_all fixture_path('resolvable')
     expect(C.new).to be_cool
 
     class C
@@ -18,12 +18,12 @@ describe "load_all" do
     expect(C.new).not_to be_cool
     C.send :remove_method, :cool?
 
-    load_all File.dirname(__FILE__) + '/fixtures/resolvable'
+    load_all fixture_path('resolvable')
     expect(C.new).to be_cool
   end
 
   before(:all) do
-    @base_dir = File.dirname(__FILE__) + '/fixtures/autoloaded'
+    @base_dir = fixture_path('autoloaded')
     @method = :load_all
   end
   it_should_behave_like "#require_all syntactic sugar"
@@ -34,7 +34,7 @@ describe "load_rel" do
   subject { self }
 
   it "provides load_all functionality relative to the current file" do
-    require File.dirname(__FILE__) + '/fixtures/relative/d/d'
+    require fixture_path('relative/d/d')
 
     is_expected.to be_loaded("RelativeA", "RelativeC", "RelativeD")
     expect(RelativeD.new).to be_ok
@@ -48,7 +48,7 @@ describe "load_rel" do
     expect(RelativeD.new).not_to be_ok
     RelativeD.send :remove_method, :ok?
 
-    load File.dirname(__FILE__) + '/fixtures/relative/d/d.rb'
+    load fixture_path('relative/d/d.rb')
     expect(RelativeD.new).to be_ok
   end
 

data/spec/require_spec.rb

@@ -5,22 +5,35 @@ describe "require_all" do
 
   subject { self }
 
-  describe "dependency resolution" do
-    it "handles load ordering when dependencies are resolvable" do
-      require_all File.dirname(__FILE__) + '/fixtures/resolvable/*.rb'
+  context "when files correctly declare their dependencies" do
+    it "requires them successfully" do
+      require_all fixture_path('resolvable/*.rb')
 
       is_expected.to be_loaded("A", "B", "C", "D")
     end
+  end
+
+  context "errors" do
+    it "raises RequireAll:LoadError if files do not declare their dependencies" do
+      expect do
+        require_all fixture_path('unresolvable/*.rb')
+      end.to raise_error(RequireAll::LoadError) do |error|
+        expect(error.cause).to be_a NameError
+        expect(error.message).to match /Please require the necessary files/
+      end
+    end
 
-    it "raises NameError if dependencies can't be resolved" do
+    it "raises other NameErrors if encountered" do
       expect do
-        require_all File.dirname(__FILE__) + '/fixtures/unresolvable/*.rb'
-      end.to raise_error(NameError)
+        require_all fixture_path('error')
+      end.to raise_error(NameError) do |error|
+        expect(error.message).to match /undefined local variable or method `non_existent_method'/
+      end
     end
   end
 
   before(:all) do
-    @base_dir = File.dirname(__FILE__) + '/fixtures/autoloaded'
+    @base_dir = fixture_path('autoloaded')
     @method = :require_all
   end
   it_should_behave_like "#require_all syntactic sugar"
@@ -31,14 +44,14 @@ describe "require_rel" do
   subject { self }
 
   it "provides require_all functionality relative to the current file" do
-    require File.dirname(__FILE__) + '/fixtures/relative/b/b'
+    require fixture_path('relative/b/b')
 
     is_expected.to be_loaded("RelativeA", "RelativeB", "RelativeC")
     is_expected.not_to be_loaded("RelativeD")
   end
 
   before(:all) do
-    @base_dir = './fixtures/autoloaded'
+    @base_dir = relative_fixture_path('autoloaded')
     @method = :require_rel
   end
   it_should_behave_like "#require_all syntactic sugar"

data/spec/spec_helper.rb

@@ -1,30 +1,38 @@
-require "simplecov"
-require "coveralls"
-
-SimpleCov.formatter = Coveralls::SimpleCov::Formatter
-SimpleCov.start 
-
-require File.dirname(__FILE__) + '/../lib/require_all.rb'
-
-module SpecHelper
-  def unload_all
-    %w{A B C D WrongModule Autoloaded Modules
-       RelativeA RelativeB RelativeC RelativeD}.each do |const|
-      Object.send(:remove_const, const) rescue nil
-    end
-    $LOADED_FEATURES.delete_if {|f| f =~ /autoloaded|relative|resolvable/}
-  end
-
-  def loaded?(*klazzes)
-    klazzes.all? {|klazz| Object.class_eval(klazz) rescue nil}
-  end
-end
-
-RSpec.configure do |config|
-  config.include SpecHelper
-  config.color = true
-
-  config.before do
-    unload_all
-  end
-end
+require "simplecov"
+require "coveralls"
+
+SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+SimpleCov.start
+
+require File.dirname(__FILE__) + '/../lib/require_all.rb'
+
+module SpecHelper
+  def fixture_path(fixture_name, relative_dir = File.dirname(__FILE__))
+    File.join(relative_dir, 'fixtures', fixture_name)
+  end
+
+  def relative_fixture_path(fixture_name)
+    fixture_path(fixture_name, '.')
+  end
+
+  def unload_all
+    %w{A B C D WrongModule Autoloaded Modules
+       RelativeA RelativeB RelativeC RelativeD}.each do |const|
+      Object.send(:remove_const, const) rescue nil
+    end
+    $LOADED_FEATURES.delete_if {|f| f =~ /autoloaded|error|relative|resolvable/}
+  end
+
+  def loaded?(*klazzes)
+    klazzes.all? {|klazz| Object.class_eval(klazz) rescue nil}
+  end
+end
+
+RSpec.configure do |config|
+  config.include SpecHelper
+  config.color = true
+
+  config.before do
+    unload_all
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: require_all
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Jarmo Pertman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-29 00:00:00.000000000 Z
+date: 2018-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -82,6 +82,7 @@ files:
 - spec/fixtures/autoloaded_rel/modules/module1/first.rb
 - spec/fixtures/autoloaded_rel/modules/module2/second.rb
 - spec/fixtures/autoloaded_rel/modules/zero.rb
+- spec/fixtures/error/a.rb
 - spec/fixtures/relative/a.rb
 - spec/fixtures/relative/b/b.rb
 - spec/fixtures/relative/c/c.rb
@@ -139,6 +140,7 @@ test_files:
 - spec/fixtures/autoloaded_rel/modules/module1/first.rb
 - spec/fixtures/autoloaded_rel/modules/module2/second.rb
 - spec/fixtures/autoloaded_rel/modules/zero.rb
+- spec/fixtures/error/a.rb
 - spec/fixtures/relative/a.rb
 - spec/fixtures/relative/b/b.rb
 - spec/fixtures/relative/c/c.rb