From d7b8f26243cb37792ea3c8d085a9531e962b1f86 Mon Sep 17 00:00:00 2001
From: Kelley Reynolds <kelley_reynolds@apple.com>
Date: Tue, 23 Oct 2018 16:08:03 -0400
Subject: [PATCH 1/2] Fix a few warnings that appear in ruby 2.5

---
 lib/configatron/proc.rb        | 2 +-
 test/functional/configatron.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/configatron/proc.rb b/lib/configatron/proc.rb
index 3ea7a07..5b3249c 100644
--- a/lib/configatron/proc.rb
+++ b/lib/configatron/proc.rb
@@ -11,7 +11,7 @@ def initialize(&block)
     end
 
     def call
-      unless @val
+      unless defined? @val
         val = self.block.call
         self.execution_count += 1
         if finalize?
diff --git a/test/functional/configatron.rb b/test/functional/configatron.rb
index af6791a..3e6bc19 100644
--- a/test/functional/configatron.rb
+++ b/test/functional/configatron.rb
@@ -159,7 +159,7 @@ class Critic::Functional::ConfigatronTest < Critic::Functional::Test
   describe 'nil value' do
     it 'remembers a nil value' do
       @kernel.a = nil
-      assert_equal(nil, @kernel.a)
+      assert_nil @kernel.a
     end
   end
 end

From ecaca348479d54b7426913fc34589a6ce2ccb08b Mon Sep 17 00:00:00 2001
From: Kelley Reynolds <kelley_reynolds@apple.com>
Date: Tue, 23 Oct 2018 16:12:53 -0400
Subject: [PATCH 2/2] Fix File.exists? deprecation warning

---
 lib/configatron/integrations/rails.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/configatron/integrations/rails.rb b/lib/configatron/integrations/rails.rb
index fc52b8a..ae5ccf7 100644
--- a/lib/configatron/integrations/rails.rb
+++ b/lib/configatron/integrations/rails.rb
@@ -42,7 +42,7 @@ def self.init(root = nil, env = nil)
       config_files.collect! {|config| File.expand_path(config)}.uniq!
 
       config_files.each do |config|
-        if File.exists?(config)
+        if File.exist?(config)
           # puts "Configuration: #{config}"
           require config
         end