get_env 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 840c77f6c35baeec3560a6fb8b64667fffe6e477d344c0b4d92e2b18f9a89758
-  data.tar.gz: '0916cd555771f013375a4d42b190ee04736e101a0e1a9e963eb004cc899cb9bf'
+  metadata.gz: 573449592055de9a5cf540a80ac3bcf9cf37c30c8a8270d0a354d382dadec9a6
+  data.tar.gz: fe49d463cecf35f961809aa7c6e2ea71cabcf846b36e7d5bde33fd12577e3e20
 SHA512:
-  metadata.gz: c636397567c57c93a12cbefc88bbed42e42fc6511a488971840af66a91b2aa8de92173412b9ba88ab9aee689c10307536181723f5e8d1a1fada132778ac0c3cd
-  data.tar.gz: b1b43cea47ab2af9a9f1adbfda13319e0598d4a73566529dcfc8e4496276903804f295feaf4e8a4ca2b0132917cd9d3a3c50ea29c31d3f8dc08698266690bf4c
+  metadata.gz: 0c1c7974ef31f6b82e9bb6d3acfcb7cf77eed8303662d808740195b800a695f8149a99321c90c6d04836880889b93cb690094b8904d820786597b436747818b3
+  data.tar.gz: 7e4fe1661df9f16f37d2c4184348223852bb7f91fdced7ad729d0eb6fb698f1555d91546b84be4f9b6b44e9597150264ebdf728e03d5fc9db4f76998e7e62fb8

data/lib/get_env/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GetEnv
-  VERSION = '0.2.0'
+  VERSION = '0.2.2'
 end

data/lib/get_env.rb

@@ -3,30 +3,48 @@
 require 'get_env/version'
 
 module GetEnv
-  def self.[](key)
-    return nil if key.nil?
+  class << self
+    def [](key)
+      return nil if key.nil?
 
-    v = ENV[key].to_i
-    return v if v.to_s == ENV[key]
+      v = ENV[key].to_i
+      return v if v.to_s == ENV[key]
 
-    v = ENV[key].to_f
-    return v if v.to_s == ENV[key]
+      v = ENV[key].to_f
+      return v if v.to_s == ENV[key]
 
-    return false if ENV[key] == 'false'
-    return true if ENV[key] == 'true'
+      return false if ENV[key] == 'false'
+      return true if ENV[key] == 'true'
 
-    ENV[key]
-  end
+      ENV[key]
+    end
+
+    def fetch(*args, &block)
+      case args
+      in [key, default] then fetch_with_default(key, default)
+      in [key] then fetch_without_default(key, &block)
+      else raise ArgumentError
+      end
+    end
+
+    private
+
+    def fetch_with_default(key, default)
+      if ENV.has_key?(key)
+        self[key]
+      else
+        default
+      end
+    end
 
-  def self.fetch(key, default = nil)
-    if ENV.has_key?(key)
-      self[key]
-    elsif !default.nil?
-      default
-    elsif block_given?
-      yield
-    else
-      ENV.fetch(key) # Will raise a KeyError
+    def fetch_without_default(key, &block)
+      if ENV.has_key?(key)
+        self[key]
+      elsif block_given?
+        block.call
+      else
+        ENV.fetch(key) # Will raise a KeyError
+      end
     end
   end
 end

data/lib/rubocop/cop/lint/no_env.rb

@@ -15,7 +15,9 @@ module RuboCop
       #
       #   # good
       #   GetEnv.fetch(...)
-      class NoENV < Cop
+      class NoENV < Base
+        extend AutoCorrector
+
         MSG = 'Use `GetEnv` instead of `ENV`.'
 
         def_node_matcher :is_ENV_index?, '(send (const nil? :ENV) :[] _key)'
@@ -25,11 +27,7 @@ module RuboCop
           parent = node.parent
           return unless is_ENV_index?(parent) || is_ENV_fetch?(parent)
 
-          add_offense(node)
-        end
-
-        def autocorrect(node)
-          lambda do |corrector|
+          add_offense(node) do |corrector|
             if Gem::Version.new(RuboCop::Version.version) >= Gem::Version.new('0.82.0')
               corrector.replace(node, 'GetEnv')
             else

data/spec/get_env_spec.rb

@@ -53,6 +53,10 @@ RSpec.describe GetEnv do
       expect(GetEnv.fetch('SOME_NON_EXISTANT_FLOAT', 3.21)).to eq(3.21)
     end
 
+    it 'allows nil as a default value' do
+      expect(GetEnv.fetch('SOME_NON_EXISTANT_FLOAT', nil)).to be_nil
+    end
+
     it 'raises an exception if not found and no default is specified' do
       expect do
         GetEnv.fetch('SOME_NON_EXISTANT_FLOAT')
@@ -63,5 +67,10 @@ RSpec.describe GetEnv do
       v = GetEnv.fetch('SOME_NON_EXISTANT_FLOAT') { 3.21 }
       expect(v).to eq(3.21)
     end
+
+    it 'raises when given too few or too many arguments' do
+      expect { GetEnv.fetch }.to raise_error(ArgumentError)
+      expect { GetEnv.fetch('FOO', 1, 2) }.to raise_error(ArgumentError)
+    end
   end
 end

data/spec/rubocop/cop/lint/no_env_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe RuboCop::Cop::Lint::NoENV do
     it 'registers an offense when using `ENV`' do
       expect_offense(<<~RUBY)
         FOO = ENV['FOO']
-              ^^^ Use `GetEnv` instead of `ENV`.
+              ^^^ Lint/NoENV: Use `GetEnv` instead of `ENV`.
       RUBY
 
       expect_correction(<<~RUBY)
@@ -34,7 +34,7 @@ RSpec.describe RuboCop::Cop::Lint::NoENV do
     it 'registers an offense when using `ENV`' do
       expect_offense(<<~RUBY)
         do_the_thing(ENV.fetch('FOO'))
-                     ^^^ Use `GetEnv` instead of `ENV`.
+                     ^^^ Lint/NoENV: Use `GetEnv` instead of `ENV`.
       RUBY
 
       expect_correction(<<~RUBY)
@@ -45,7 +45,7 @@ RSpec.describe RuboCop::Cop::Lint::NoENV do
     it 'registers an offense when using `ENV` with a default value' do
       expect_offense(<<~RUBY)
         a = x + ENV.fetch('FOO', 42)
-                ^^^ Use `GetEnv` instead of `ENV`.
+                ^^^ Lint/NoENV: Use `GetEnv` instead of `ENV`.
       RUBY
 
       expect_correction(<<~RUBY)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: get_env
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Simon Mathieu
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-26 00:00:00.000000000 Z
+date: 2025-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -118,11 +118,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
 summary: Read values from ENV in a reasonable way
 test_files:
-- spec/spec_helper.rb
 - spec/get_env_spec.rb
 - spec/rubocop/cop/lint/no_env_spec.rb
+- spec/spec_helper.rb