r_creds 0.2.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 355bd57c7b2ef3d439272e1dae2a0a58d512a1901bbd0ceb8d0b444f4d53f28f
-  data.tar.gz: '08cf613107791096f38dd13213267bb48fc7ab97b3ca5f2b5079a787bd0a7a66'
+  metadata.gz: 4dabe6bdee40775f9f0f9f4d01f16bea0ab6189dd25eb5d8cf9c306f2680a16b
+  data.tar.gz: c04ff62f0cef7c5209d17521820e20cb22c1f6aa22d2908167866d68d742e273
 SHA512:
-  metadata.gz: 1d5948ec954d7f0f0169879902295444f797ea6f09c84de104cd81da35320e1ee76865e2277137a6d934dcd28a17f1c50673d2ebcf86da26c7f0573c53a549a8
-  data.tar.gz: e736f5120c567151ad481a89c3602f1189ad9a58502ae955606600042408419d03db988fdc6965c94fc8b5a68541cd16245ae43272834ad1488c4eac9e8349bc
+  metadata.gz: a63a2e294b20d00462610f613f1ac4c67286753a9a30c38271db08ebf844c44fde6d861829d20e7ec7cdfcab6caa08940f3ed24b978308fff410d1e4569d19f3
+  data.tar.gz: 28aede2cc183cfdb7aa3a6af2ece6fcc32a60fe224bb843b829eb3f8cda725361339ded63bb700c942a4553d878f36267b7dcef2debe108771f2cca52c022424

data/README.md

@@ -1,6 +1,6 @@
-# RCreds
+# RCreds v1.1.0
 
-RCreds makes working with Rails 5.2 credentials easier
+RCreds makes working with Rails 5.2/6/7 credentials easier
 
 ## Installation
 
@@ -42,10 +42,14 @@ RCreds.fetch(:aws, :access_key_id, default: 'some_default_test_key') # output: s
 ```
 RCreds searches for values in following order: credentials.yml > ENV > default and returns nil if nothing match
 
-RCreds uses `Rails.env` to determinate environment. But you can set any environement.
+# DEPRECATED 
+`Rails 6 loads only one specific environment credentials and does not allow to cahnge it.` 
+
+RCreds uses `Rails.env` to determinate environment. But you can set any environment.
 ```ruby
 RCreds.fetch(:aws, :access_key_id, environment: 'production')
 ```
+`Will be removed in next version`
 
 ## Development
 

data/lib/r_creds/fetcher.rb

@@ -3,7 +3,7 @@ module RCreds
     class NoRailsError < StandardError; end
 
     def initialize(keys, default, environment)
-      @keys = keys
+      @keys = keys.map!(&:to_sym)
       @default = default
       @environment = environment
     end
@@ -22,7 +22,7 @@ module RCreds
     end
 
     def fetch
-      cred = Rails.application.credentials.dig(environment, *keys)
+      cred = send("fetch_rails_#{@rails_version}")
 
       presence?(cred) || presence?(ENV[keys.join('_').upcase]) || default
     end
@@ -41,10 +41,32 @@ module RCreds
       cred.respond_to?(:empty?) ? !!cred.empty? : !cred
     end
 
+    def fetch_rails_5
+      Rails.application.credentials.dig(environment, *keys)
+    end
+
+    def fetch_rails_6
+      if rails6_multi_env?
+        puts "WARNING! Environment choice does not work in Rails >= 6. Fetching credentials for '#{Rails.env}'" if presence?(@environment)
+        Rails.application.credentials.dig(*keys)
+      else
+        Rails.application.credentials.dig(environment, *keys)
+      end
+    end
+    alias fetch_rails_7 fetch_rails_6
+
+    def rails6_multi_env?
+      Rails.application.credentials.content_path.basename.to_s != 'credentials.yml.enc'
+    end
+
     def check_rails
-      return true if defined?(::Rails)
+      return define_rails_strategy && true if defined?(::Rails)
+
+      raise NoRailsError, 'RCreds works with 5.2 and above'
+    end
 
-      raise NoRailsError.new 'RCreds works with 5.2 and above'
+    def define_rails_strategy
+      @rails_version = Rails.version.to_i
     end
   end
 end

data/lib/r_creds/version.rb

@@ -1,3 +1,3 @@
 module RCreds
-  VERSION = "0.2.1"
+  VERSION = '1.1.0'.freeze
 end

data/lib/r_creds.rb

@@ -1,5 +1,5 @@
-require "r_creds/version"
-require_relative "r_creds/fetcher"
+require 'r_creds/version'
+require_relative 'r_creds/fetcher'
 
 module RCreds
   def self.fetch(*keys, default: nil, environment: nil)

data/r_creds.gemspec

@@ -1,41 +1,30 @@
-
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "r_creds/version"
+require 'r_creds/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "r_creds"
+  spec.name          = 'r_creds'
   spec.version       = RCreds::VERSION
-  spec.authors       = ["OrestF"]
-  spec.email         = ["falchuko@gmail.com"]
+  spec.authors       = ['OrestF']
+  spec.email         = ['falchuko@gmail.com']
 
   spec.summary       = 'RCreds makes working with Rails 5.2 credentials easier'
   spec.description   = 'RCreds makes working with Rails 5.2 credentials easier'
   spec.homepage      = 'https://github.com/coaxsoft/r_creds'
-  spec.license       = "MIT"
-  spec.required_ruby_version = '>= 2.0.0'
-
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-  # to allow pushing to a single host or delete this section to allow pushing to any host.
-  # if spec.respond_to?(:metadata)
-  #   spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
-  # else
-  #   raise "RubyGems 2.0 or newer is required to protect against " \
-  #     "public gem pushes."
-  # end
+  spec.license       = 'MIT'
+  spec.required_ruby_version = '>= 2.2.0'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
-  spec.bindir        = "exe"
+  # spec.files = Dir.chdir(File.expand_path(__dir__)) do
+  #   `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  # end
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
   spec.files = Dir['README.md', 'lib/**/*', 'lib/*', 'r_creds.gemspec']
 
-
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake', '~> 12.3'
+  spec.add_development_dependency 'rspec', '~> 3.0'
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: r_creds
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.1.0
 platform: ruby
 authors:
 - OrestF
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-03-09 00:00:00.000000000 Z
+date: 2021-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -68,7 +68,7 @@ homepage: https://github.com/coaxsoft/r_creds
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -76,16 +76,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: RCreds makes working with Rails 5.2 credentials easier
 test_files: []