ravioli 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0f1dc00885f0dfdf291b2e81d158f093808d5200c062ebec79a534332b88f9b
-  data.tar.gz: 6cf7a6e99487f216c3ca1ca0de08d57e7b2b0b2b7a2a5b69c7a23ee58912297b
+  metadata.gz: db780ea4e1fbb555cd42fd3c40f9102a18459a35d917cc214c998372b9599425
+  data.tar.gz: f4f7aa3bcd938fc48127be91f686263019e64728530e0591f687f465f2c63384
 SHA512:
-  metadata.gz: 32c99eb0bd607e0ea8a700397edf49db62079b03c5e54684e4f53302abafdbbb368a0cfc014ccffd2e67f2a2beff2b6110c65cda437c620267be3af8e0389587
-  data.tar.gz: aa552b5b5f826d14fb483b9af2c56de0003fca8d7500dcc97ba842568c91be7b01dfe77bea53ef5775b278ca338913a855a08d0c5a84fb8b4f1a663ea9aa5ee9
+  metadata.gz: 2f6ddf167319edf2337b0f52d4bcf3211c7aaa5062404b834245ac31b0e1e1311ef45a992149b77c04050d6c4d94152d4556cab2f708f4f3706044725a4c2b0d
+  data.tar.gz: d9a6c2ea272073e80182318d8c112ea1a57f44ad85e352e560495c6a216a0f515bdc675c6f0e3a2f54a3a482177316b434989bfa3b191d4e7746186244eb4e67

data/lib/ravioli/builder.rb

@@ -99,6 +99,7 @@ module Ravioli
       load_credentials(
         key_path: "config/master.key",
         env_names: %w[master root],
+        quiet: true,
       )
 
       # Load any environment-specific configuration on top of it. Since Rails will try
@@ -107,6 +108,7 @@ module Ravioli
         "config/credentials/#{Rails.env}",
         key_path: "config/credentials/#{Rails.env}.key",
         env_names: ["master"],
+        quiet: true,
       )
 
       # Apply staging configuration on top of THAT, if need be
@@ -115,6 +117,7 @@ module Ravioli
           "config/credentials/staging",
           env_names: %w[staging master],
           key_path: "config/credentials/staging.key",
+          quiet: true,
         )
       end
     end
@@ -145,11 +148,11 @@ module Ravioli
     end
 
     # Load secure credentials using a key either from a file or the ENV
-    def load_credentials(path = "credentials", key_path: path, env_names: path.split("/").last)
+    def load_credentials(path = "credentials", key_path: path, env_names: path.split("/").last, quiet: false)
       error = nil
       env_names = Array(env_names).map { |env_name| parse_env_name(env_name) }
       env_names.each do |env_name|
-        credentials = parse_credentials(path, env_name: env_name, key_path: key_path)
+        credentials = parse_credentials(path, env_name: env_name, key_path: key_path, quiet: quiet)
         if credentials.present?
           configuration.append(credentials)
           return credentials
@@ -262,14 +265,14 @@ module Ravioli
       env_name.match?(/^RAILS_/) ? env_name : "RAILS_#{env_name.upcase}_KEY"
     end
 
-    def parse_credentials(path, key_path: path, env_name: path.split("/").last)
+    def parse_credentials(path, key_path: path, env_name: path.split("/").last, quiet: false)
       @current_credentials = path
       env_name = parse_env_name(env_name)
       key_path = path_to_config_file_path(key_path, extnames: "key", quiet: true)
       options = {key_path: key_path.to_s}
       options[:env_key] = ENV[env_name].present? ? env_name : "__RAVIOLI__#{SecureRandom.hex(6)}"
 
-      path = path_to_config_file_path(path, extnames: "yml.enc")
+      path = path_to_config_file_path(path, extnames: "yml.enc", quiet: quiet)
       (Rails.application.encrypted(path, **options)&.config || {}).tap do
         @current_credentials = nil
       end

data/lib/ravioli/configuration.rb

@@ -92,9 +92,13 @@ module Ravioli
     # rubocop:disable Style/MethodMissingSuper
     # rubocop:disable Style/MissingRespondToMissing
     def method_missing(method, *args, &block)
+      return super unless args.empty?
+
       # Return proper booleans from query methods
-      return send(method.to_s.chomp("?")).present? if args.empty? && method.to_s.ends_with?("?")
-      super
+      return send(method.to_s.chomp("?")).present? if method.to_s.ends_with?("?")
+
+      # Try to find a matching ENV key
+      fetch_env_key_for(method) { super(method, *args, &block) }
     end
     # rubocop:enable Style/MissingRespondToMissing
     # rubocop:enable Style/MethodMissingSuper

data/lib/ravioli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ravioli
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ravioli
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Flip Sasser
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-11 00:00:00.000000000 Z
+date: 2022-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
-    - - ">="
+        version: '7.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 6.0.3.1
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
-    - - ">="
+        version: '7.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 6.0.3.1
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +92,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -294,7 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Grab a fork and twist all your configuration spaghetti into a single, delicious