r_creds 0.2.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 355bd57c7b2ef3d439272e1dae2a0a58d512a1901bbd0ceb8d0b444f4d53f28f
-  data.tar.gz: '08cf613107791096f38dd13213267bb48fc7ab97b3ca5f2b5079a787bd0a7a66'
+  metadata.gz: 6dd1860431415700bcdb3c5cfe8249ab7e347148ef6eae93ba7abc5baac2e2d5
+  data.tar.gz: bc7d1438135385c86674116f2cb578d9bfd286a87b000023d97b63a2416370c9
 SHA512:
-  metadata.gz: 1d5948ec954d7f0f0169879902295444f797ea6f09c84de104cd81da35320e1ee76865e2277137a6d934dcd28a17f1c50673d2ebcf86da26c7f0573c53a549a8
-  data.tar.gz: e736f5120c567151ad481a89c3602f1189ad9a58502ae955606600042408419d03db988fdc6965c94fc8b5a68541cd16245ae43272834ad1488c4eac9e8349bc
+  metadata.gz: '03859241069cfdf516736ea7c5ec7c4642044bf3f198c85878197691d392b19440bc97fca15809e663bf4d99c05daecd89636db73f8549fb9977fe7b07c6fb95'
+  data.tar.gz: 9e924fd9095f29ceb92c2109b782110d88c3df2f7fe293e6e29fc390008f042afd3084ab314d5cd9cc7cb4b8f421a9556dd818d4455c4792b6bf0f3bbda847f2

data/README.md

@@ -1,6 +1,6 @@
-# RCreds
+# RCreds v1.0.0
 
-RCreds makes working with Rails 5.2 credentials easier
+RCreds makes working with Rails 5.2/6.0 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

@@ -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,31 @@ 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
+
+    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.new 'RCreds works with 5.2 and above'
     end
+
+    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.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r_creds
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.0
 platform: ruby
 authors:
 - OrestF
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-09 00:00:00.000000000 Z
+date: 2019-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,8 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: RCreds makes working with Rails 5.2 credentials easier