ravioli 0.1.8 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e56ab68185fd144f082af7ecf11f18725ad872ffab08684d72c1bdff8a4d3672
-  data.tar.gz: a304ea94ee11385fad332140b8b521ca1d2f3fb1ba71e8baf0c46a3e73054b89
+  metadata.gz: 319a36e063b7926065d63a7bad7284f2e997ecc161000cea2a0583c8fb5a68ce
+  data.tar.gz: cc085fc7660369588072aa59abd5aacfb4658ca2438c2f1544d26436bb17dcc0
 SHA512:
-  metadata.gz: 307d77cdd70599a9c81d19eec6fc8206fb4a524a05e42d0a2a20edac514b4287be510be6708aefb5b18c61444f1e21e5816aca58355693c801a8fd627d00cd39
-  data.tar.gz: 3436f7252744290a5cc7242d501c1751b79c0ca7e9266b5d39c5e11efbf57269c81822819e77d2760ad8957a85f83cdaec24c4a6ebdec4c790bd8e3154c4d0ab
+  metadata.gz: a4c13002dc24f8faab15a1d3d329bd626b93e8c2290744a01f5da7fd8fc71e2ebc1fa835886418070014603295c31f722dc8e88d6ead711115f18edbf1a6e373
+  data.tar.gz: 7cdf9515b01290c85f61ea7292daf7a63c8b870736455d2ffe0eba7e4f5749ecd1bdf331ac40206afa735a5cea774e8028f0b52f72b91c6e9fbc7359d5a870f3

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
@@ -137,19 +140,19 @@ module Ravioli
     end
 
     # Load a file either with a given path or by name (e.g. `config/whatever.yml` or `:whatever`)
-    def load_file(path, options = {})
-      config = parse_config_file(path, options)
+    def load_file(path, **options)
+      config = parse_config_file(path, **options)
       configuration.append(config) if config.present?
     rescue => error
       warn "Could not load config file #{path}", error
     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
@@ -218,10 +221,9 @@ module Ravioli
     # rubocop:enable Style/MissingRespondToMissing
     # rubocop:enable Style/MethodMissingSuper
 
-    def parse_config_file(path, options = {})
+    def parse_config_file(path, **options)
       # Stash a reference to the file we're parsing, so we can reload it later if it tries to use
       # the configuration object
-      @current_path = path
       path = path_to_config_file_path(path)
 
       config = case path.extname.downcase
@@ -262,14 +264,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
@@ -283,7 +285,7 @@ module Ravioli
     def parse_yaml_config_file(path)
       contents = File.read(path)
       erb = ERB.new(contents).tap { |renderer| renderer.filename = path.to_s }
-      YAML.safe_load(erb.result, [Symbol], aliases: true)
+      YAML.safe_load(erb.result, permitted_classes: [Symbol], aliases: true)
     end
 
     def path_to_config_file_path(path, extnames: EXTNAMES, quiet: false)

data/lib/ravioli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ravioli
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.1
 platform: ruby
 authors:
 - Flip Sasser
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-11 00:00:00.000000000 Z
+date: 2022-05-04 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