From 28adef0aef25e0775573562726d833e4d4790e9c Mon Sep 17 00:00:00 2001
From: Rob Lucas <roblucas@insicuri.net>
Date: Mon, 16 May 2022 10:35:13 +0100
Subject: [PATCH] Make compatible with Ruby 3

---
 lib/.envied.rb.swp          | Bin 0 -> 16384 bytes
 lib/envied.rb               |  10 +++++-----
 lib/envied/configuration.rb |   2 +-
 spec/configuration_spec.rb  |   2 +-
 spec/envied_spec.rb         |   2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100644 lib/.envied.rb.swp

diff --git a/lib/.envied.rb.swp b/lib/.envied.rb.swp
new file mode 100644
index 0000000000000000000000000000000000000000..da942a4de95bbff197af13402ed223900a6f0689
GIT binary patch
literal 16384
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
P>z{V<GuZyV`2qG{e&8XQ

literal 0
HcmV?d00001

diff --git a/lib/envied.rb b/lib/envied.rb
index e557b45..ba274d5 100644
--- a/lib/envied.rb
+++ b/lib/envied.rb
@@ -15,13 +15,13 @@ class << self
 
   def self.require(*args, **options)
     requested_groups = (args && !args.empty?) ? args : ENV['ENVIED_GROUPS']
-    env!(requested_groups, options)
-    error_on_duplicate_variables!(options)
-    error_on_missing_variables!(options)
-    error_on_uncoercible_variables!(options)
+    env!(requested_groups, **options)
+    error_on_duplicate_variables!(**options)
+    error_on_missing_variables!(**options)
+    error_on_uncoercible_variables!(**options)
 
     intercept_env_vars!
-    ensure_spring_after_fork_require(args, options)
+    ensure_spring_after_fork_require(args, **options)
   end
 
   def self.env!(requested_groups, **options)
diff --git a/lib/envied/configuration.rb b/lib/envied/configuration.rb
index 64b643c..437939b 100644
--- a/lib/envied/configuration.rb
+++ b/lib/envied/configuration.rb
@@ -32,7 +32,7 @@ def variable(name, type = :string, **options)
         raise ArgumentError, "#{type.inspect} is not a supported type. Should be one of #{coercer.supported_types}"
       end
       options[:group] = current_group if current_group
-      variables << ENVied::Variable.new(name, type, options)
+      variables << ENVied::Variable.new(name, type, **options)
     end
 
     def group(*names, &block)
diff --git a/spec/configuration_spec.rb b/spec/configuration_spec.rb
index 04be813..828b75c 100644
--- a/spec/configuration_spec.rb
+++ b/spec/configuration_spec.rb
@@ -3,7 +3,7 @@
   it { is_expected.to respond_to :group }
 
   def with_envfile(**options, &block)
-    @config = ENVied::Configuration.new(options, &block)
+    @config = ENVied::Configuration.new(**options, &block)
   end
   attr_reader :config
 
diff --git a/spec/envied_spec.rb b/spec/envied_spec.rb
index 9108120..15e801d 100644
--- a/spec/envied_spec.rb
+++ b/spec/envied_spec.rb
@@ -22,7 +22,7 @@ def set_ENV(env = {})
     end
 
     def configure(**options, &block)
-      @config = ENVied::Configuration.new(options, &block)
+      @config = ENVied::Configuration.new(**options, &block)
     end
 
     def configured_with(**hash)