require_relative_dir 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc2c0b7e0c3e204cce27a38f26147a277dc70a9f3dc5cccf61bd095db32a6600
-  data.tar.gz: f52022c23ec705627cf213d13d837c342dc6733e5122ddbaa089b28b263d0cd9
+  metadata.gz: 1ceb9301310b33670b1cf305a4f9eb2121356e153e4462708143515352ae4938
+  data.tar.gz: ad2bb7325488969ab7ab9b9c5516940d125abb6350335b62a873195b7a4ccf8d
 SHA512:
-  metadata.gz: 2cab7b31b54641a231ab3985883a8b095a2f125444c22ba193f3ebf79bba5e43980a5abe07c469f56aaf14fe0480a67264a27a6a232a5c528d5d020170961af3
-  data.tar.gz: 15af8406a2a364e64830f9e8e4f5ec73d17b38e50412fbbccfac6f5b5788c9c12bfc5a5196f268645033b159fec8e506e4351b2822263068d474091fa31cd3cf
+  metadata.gz: cba67309c2b6e5ddc99ae8adf3b7d32909dac9df08101504daa98bff6f2db8abd5d322c09210f42942b4a2fde5d89bb1973750ae3feb1ead018382a9da971217
+  data.tar.gz: 941ba5b79cc0aa292668d8176548d30dab58163f115971b65d9dcdb9df72758dbb6bf1ebad2f234bf2d57cfc3b12fbf5cab95b9ade905112353381f95d71c1e0

data/.github/workflows/require_relative_dir.yml

@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu ]
-        ruby: [ 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, head ]
+        ruby: [ 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, '3.0', head ]
         usage: [ modern, legacy ]
     steps:
       - name: checkout

data/README.md

@@ -21,12 +21,17 @@ using RequireRelativeDir
 
 require_relative_dir 'concerns'  # requires all of 'your_gem_or_app/concerns/'
 require_relative_dir 'utils', except: 'big_and_unused_for_now'
+require_relative_dir 'tools', first: 'base'
 
 class Whatever
   # ...
 end
 ```
 
+Options:
+* `except`: files to exclude
+* `first`: files to load before the rest
+
 ### Legacy usage
 
 While the above usage with `using` is the recommended way, the method `require_relative_dir`

data/lib/require_relative_dir.rb

@@ -5,15 +5,13 @@ require 'require_relative_dir/version'
 module RequireRelativeDir
   SAME_AS_CALLER_NAME = Object.new
 
-  def require_relative_dir(dir_name = SAME_AS_CALLER_NAME, except: nil)
-    caller_path = caller_locations(1..1).first.absolute_path
-    dir_name = File.basename(caller_path, '.*') if dir_name == SAME_AS_CALLER_NAME
-    base_path = File.dirname(caller_path)
-    path = File.expand_path("#{base_path}/#{dir_name}")
+  def require_relative_dir(dir_name = SAME_AS_CALLER_NAME, except: nil, first: nil)
+    path = RequireRelativeDir.find_base(dir_name)
     raise LoadError, "Directory '#{path}' not found" unless Dir.exist?(path)
 
     paths = Dir["#{path}/*.rb"].sort
-    paths = RequireRelativeDir.remove_exceptions(paths, except) if except
+    paths = RequireRelativeDir.remove_exceptions(paths, path, except) if except
+    paths = RequireRelativeDir.put_first(paths, path, first) if first
     paths.each { |file| require file }
   end
 
@@ -25,11 +23,34 @@ module RequireRelativeDir
   extend self
 
   # @api private
-  def self.remove_exceptions(paths, except)
-    except = Array(except).map(&:to_s)
-    except.map! { |exception| File.extname(exception) == '.rb' ? exception[0...-3] : exception }
-    paths.reject { |file| except.delete File.basename(file, '.rb') }
-  ensure
-    raise ArgumentError, "The following exceptions where not found: #{except.join(', ')}" unless except.empty?
+  def self.remove_exceptions(paths, base, except)
+    except = as_ruby_files(except, base)
+    new_paths = paths - except
+    if new_paths.size + except.size != paths.size
+      not_found = (except - paths).map { |file| File.basename(file, '.rb') }
+      raise ArgumentError, "The following exceptions where not found: #{not_found.join(', ')}" unless not_found.empty?
+    end
+    new_paths
+  end
+
+  # @api private
+  def self.put_first(paths, base, first)
+    first = as_ruby_files(first, base)
+    first | paths
+  end
+
+  def self.as_ruby_files(names, base)
+    names = Array(names).map(&:to_s)
+    names.map! do |name|
+      ext = '.rb' unless File.extname(name) == '.rb'
+      "#{base}/#{name}#{ext}"
+    end
+  end
+
+  def self.find_base(dir_name)
+    caller_path = caller_locations(2..2).first.absolute_path
+    dir_name = File.basename(caller_path, '.*') if dir_name == SAME_AS_CALLER_NAME
+    base_path = File.dirname(caller_path)
+    File.expand_path("#{base_path}/#{dir_name}")
   end
 end

data/lib/require_relative_dir/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RequireRelativeDir
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: require_relative_dir
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Marc-Andre Lafortune
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-09 00:00:00.000000000 Z
+date: 2021-01-13 00:00:00.000000000 Z
 dependencies: []
 description: Basic utility to require a directory.
 email:
@@ -49,7 +49,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Basic utility to require a directory.