Remove dry-validation from dependencies (#333)

* dry-validation only as a runtime dependency

* Fix config requirement

* Various fixes

* rework to satisfy usage of validation_contract

---------

Co-authored-by: Chris LaRose <[email protected]>

Author: BuonOmo

.gitignore

@@ -12,6 +12,7 @@ tmp
 .keep
 .rvmrc
 .rakeTasks
+.ruby-version
 .sass-cache
 Gemfile.lock
 *.gem

.ruby-version

@@ -1,6 +1,5 @@
-$:.push File.expand_path('../lib', __FILE__)
-
-require 'config/version'
+require_relative 'lib/config/version'
+require_relative 'lib/config/dry_validation_requirements'
 
 Gem::Specification.new do |s|
   s.name             = 'config'
@@ -32,8 +31,8 @@ Donate: \e[34mhttps://opencollective.com/rubyconfig/donate\e[0m\n"
   s.required_ruby_version = '>= 2.6.0'
 
   s.add_dependency 'deep_merge', '~> 1.2', '>= 1.2.1'
-  s.add_dependency 'dry-validation', '~> 1.0', '>= 1.0.0'
 
+  s.add_development_dependency 'dry-validation', *Config::DryValidationRequirements::VERSIONS
   s.add_development_dependency 'rake', '~> 12.0', '>= 12.0.0'
 
   # Testing

config.gemspec

@@ -1,6 +1,6 @@
-require 'config/compatibility'
 require 'config/options'
 require 'config/configuration'
+require 'config/dry_validation_requirements'
 require 'config/version'
 require 'config/sources/yaml_source'
 require 'config/sources/hash_source'

lib/config.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Config
+  module DryValidationRequirements
+    VERSIONS = ['~> 1.0', '>= 1.0.0'].freeze
+
+    def self.load_dry_validation!
+      return if defined?(@load_dry_validation)
+
+      begin
+        require 'dry/validation/version'
+        version = Gem::Version.new(Dry::Validation::VERSION)
+        unless VERSIONS.all? { |req| Gem::Requirement.new(req).satisfied_by?(version) }
+          raise LoadError
+        end
+      rescue LoadError
+        raise ::Config::Error, 'Could not find a dry-validation version' \
+          ' matching requirements' \
+          " (#{VERSIONS.map(&:inspect) * ','})"
+      end
+
+      require 'dry/validation'
+      @load_dry_validation = true
+      nil
+    end
+  end
+end

lib/config/compatibility.rb

@@ -0,0 +1,4 @@
+module Config
+  class Error < StandardError
+  end
+end

lib/config/dry_validation_requirements.rb

@@ -1,6 +1,8 @@
+require_relative "../error"
+
 module Config
   module Validation
-    class Error < StandardError
+    class Error < ::Config::Error
 
       def self.format(v_res)
         v_res.errors.group_by(&:path).map do |path, messages|

lib/config/error.rb

@@ -1,3 +1,6 @@
+require_relative '../dry_validation_requirements'
+require_relative '../error'
+
 module Config
   module Validation
     module Schema
@@ -9,7 +12,7 @@ def schema=(value)
       def schema(&block)
         if block_given?
           # Delay require until optional schema validation is requested
-          require 'dry-validation'
+          Config::DryValidationRequirements.load_dry_validation!
           @schema = Dry::Schema.define(&block)
         else
           @schema

lib/config/validation/error.rb

@@ -4,6 +4,10 @@ module Config
   module Validation
     module Validate
       def validate!
+        return unless Config.validation_contract || Config.schema
+
+        Config::DryValidationRequirements.load_dry_validation!
+
         validate_using!(Config.validation_contract)
         validate_using!(Config.schema)
       end

lib/config/validation/schema.rb

@@ -14,13 +14,13 @@
 ##
 # Load Rspec supporting files
 #
-Dir['./spec/support/**/*.rb'].each { |f| require f }
+Dir['./spec/support/**/*.rb'].sort.each { |f| require f }
 
 ##
 # Detect Rails/Sinatra dummy application based on gemfile name substituted by Appraisal
 #
 if ENV['APPRAISAL_INITIALIZED'] || ENV['GITHUB_ACTIONS']
-  app_name = Pathname.new(ENV['BUNDLE_GEMFILE']).basename.sub('.gemfile', '')
+  app_name = File.basename(ENV['BUNDLE_GEMFILE'], '.gemfile')
 else
   /.*?(?<app_name>rails.*?)\.gemfile/ =~ Dir["gemfiles/rails*.gemfile"].sort.last
 end
@@ -33,7 +33,7 @@
 case app_framework
 when 'rails'
   # Load Rails
-  require File.expand_path("../app/#{app_name}/config/environment", __FILE__)
+  require_relative "app/#{app_name}/config/environment"
 
   APP_RAKEFILE = File.expand_path("../app/#{app_name}/Rakefile", __FILE__)
 
@@ -47,7 +47,7 @@
 
 when 'sinatra'
   # Load Sinatra
-  require File.expand_path("../app/#{app_name}/app", __FILE__)
+  require_relative "app/#{app_name}/app"
 
   # Load Rspec
   require 'rspec'