rails-creds 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 180c1ca9192de8e7d152b8287d51031006f724e76e35620c7c19111c97cca536
-  data.tar.gz: dc4cb85e4083a01a2b825b5568cc56e0391d932e3c9683c466c55f72d676656b
+  metadata.gz: a713e64a2dc6c6e291bb0973929f4cb44441eb59c0d359870e0b932e5d4fcc3c
+  data.tar.gz: 483da513f4671cde3fc1e2cf83a2b04b5bc456e3fbc564079afd2085002da33b
 SHA512:
-  metadata.gz: 56cd8bd00245b4e15d5a9b145e420e8f330a7d76a5db58a38d9580d97b4cdf3319ce10ddc52c6b7de1a4611e20c2a69a836978c21e1af988e50025548ee7f8e1
-  data.tar.gz: d017e6fbaf58ae2844a91bd820930054696b2b438ec995ff7fc37a1cad8b5f2983fcde085662afa8e15d489552fd0f81b1e989ffc921429c080c4d79122a022a
+  metadata.gz: 12c4b010d5370eaabfbafcac7c02b2bb9173b2a0e106f76523719f6c5c6fe8273b2ead284fe85ca767ff789c62e844d0f12cbc9679a05823c1343fa1c5a5fbf3
+  data.tar.gz: f3446191d7149a213fcff4277b78354a652a41166743ea341e4191bfe79e5a1bed73a5ee83bcfed8162252c5b8d204ef025a6f400d7656f5ba42bf41aa0f39f3

data/CHANGELOG.md

@@ -1,24 +1,30 @@
-# 0.2.3 (2019-08-19)
+## 0.3.0 (2019-09-19)
 
-Fixed:
+### Breaking changes
+
+- _(Possibly breaking)_ Scoped creds are now merged with top level creds ([#23](https://github.com/mikker/rails-creds/pull/23))
+
+## 0.2.3 (2019-08-19)
+
+### Fixed:
 
   - Require strip_heredoc extension before use
 
-# 0.2.1
+## 0.2.1
 
-Changed:
+## Changed:
 
   - Credentials are now memoized after successful read.
 
-# 0.2.0
+## 0.2.0
 
-Changed:
+### Changed:
 
   - Creds will now warn about missing credentials when the encrypted file isn't
     found. It will afterwards be a Null Object and return `nil` on every key.
   - When encrypted credentials are found but the master key file AND env
     variable is missing, Creds will return a special error with explanation.
 
-# 0.1.0
+## 0.1.0
 
 Initial version

data/README.md

@@ -10,17 +10,9 @@ Given encrypted credentials looking like:
 
 ```yaml
 ---
-default: &default
-  super_secret: 'shared between environments'
-
-development:
-  <<: *default
-
-test:
-  <<: *default
+super_secret: 'shared between environments'
 
 production:
-  <<: *default
   super_secret: 'you can override defaults for individual environments'
 ```
 

data/creds.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rails", "> 5.2"
 
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 12.3"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "standard", "~> 0.1.0"
-end
+end

data/lib/creds.rb

@@ -58,7 +58,10 @@ class Creds
   private
 
   def fetch_credentials_for_current_env
-    Rails.application.credentials.fetch(Rails.env.to_sym)
+    base = Rails.application.credentials.config
+    scoped = base.fetch(Rails.env.to_sym)
+    base.delete(Rails.env.to_sym)
+    base.merge(scoped)
   rescue KeyError
     raise MissingEnvError, Rails.env
   end
@@ -70,6 +73,7 @@ class Creds
   def master_key_present?
     return true if ENV["RAILS_MASTER_KEY"]
     return true if File.exist?(Rails.root.join("config", "master.key"))
+
     false
   end
 end

data/lib/creds/errors.rb

@@ -32,14 +32,7 @@ class Creds
   Here's an example of how your credentials could look:
 
   ---
-  default: &default
-    aws_key: 'shared between environments'
-  
-  development:
-    <<: *default
-  
-  test:
-    <<: *default
+  aws_key: 'shared between environments'
   
   production:
     <<: *default

data/lib/creds/version.rb

@@ -1,3 +1,3 @@
 class Creds
-  VERSION = "0.2.3".freeze
+  VERSION = "0.3.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-creds
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Mikkel Malmberg
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-19 00:00:00.000000000 Z
+date: 2019-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,14 +44,14 @@ dependencies:
     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
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Shorter, env-scoped version of Rails' credentials