anyway_config 2.5.3 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6fee4af14bfa83eab99562506f1dbeaf3826f3da3f204f3f117787aa5b04b9c
-  data.tar.gz: 16f081b27030e63ef69ad58a3fae0029fe6c983c2056574b73ef86d9dbb249a5
+  metadata.gz: 9b60f98c1d44ca23fb8c0c822aca4220791c280e814ff2e3e7b1013e857c53bd
+  data.tar.gz: 564d6f9e3ec6f78d796f7ce36892ec54bd55b2d3485b2ce9717de153fe968e28
 SHA512:
-  metadata.gz: 0c07338e57bdac6d238e848901c91aabf38011dd7dc4a9c0d39be8a582c5814da411e310f9f7f58d75de06ef2458eb92255bd4889f6f7e0d98b14416cfbcbe35
-  data.tar.gz: a51191c4933cac6c78530e7b0f1f3b8c43a5dc8414a1758544ab7f1ebba708e01e99789d0383df365bb0ba9eb71e7137b16a3efc564329f4cd1e2e5bbb70e73a
+  metadata.gz: 995ab4acf51e8bc9ac989a50d307c6a2a3cec924f3ccce9b09246de0d87b1930b5cb3b62f1eee74c8a6ba5f00f1eb5efee1e8ea1257418b47bb1074e9a7df683
+  data.tar.gz: 0372ae383cfe16192b69bf42ac183a6a8291074bfd07282e8bf4a9efce803a151151091194d58a002481cfd16d56aa5cc226b5a5d5b1cf9d103c7009ff9eee17

data/CHANGELOG.md

@@ -2,7 +2,15 @@
 
 ## master
 
-## 2.5.4 (2023-09-12)
+## 2.6.0 (2023-12-18)
+
+- Add `rails local_credentials:edit` command to manipulate local credentials in Rails 7.1+. ([@palkan][])
+
+## 2.5.4 (2023-10-15)
+
+- Fix tracing with empty config keys. ([@palkan][])
+
+## 2.5.3 (2023-09-12)
 
 - Do not activate Rails secrets loaders in 7.1+. ([@palkan][])
 

data/README.md

@@ -738,7 +738,7 @@ It's useful to have a personal, user-specific configuration in development, whic
 We support this by looking at _local_ files when loading the configuration data:
 
 - `<config_name>.local.yml` files (next to\* the _global_ `<config_name>.yml`)
-- `config/credentials/local.yml.enc` (for Rails >= 6, generate it via `rails credentials:edit --environment local`).
+- `config/credentials/local.yml.enc` (for Rails >= 7.1, generate it via `rails local_credentials:edit`; for Rails >= 6.0, <7.1 you can also use `rails credentials:edit -e local`).
 
 \* If the YAML config path is not a default one (i.e., set via `<CONFIG_NAME>_CONF`), we look up the local
 config at this location, too.
@@ -1054,7 +1054,13 @@ describe_options(
 
 Anyway Config comes with Ruby type signatures (RBS).
 
-To use them with Steep, add `library "anyway_config"` to your Steepfile.
+To use them with Steep, add the following your `Steepfile`:
+
+```ruby
+library "pathname"
+library "optparse"
+library "anyway_config"
+```
 
 We also provide an API to generate a type signature for your config class:
 

data/lib/.rbnext/2.7/anyway/auto_cast.rb

@@ -13,9 +13,9 @@ module Anyway
 
         case val
         when Hash
-          val.transform_values { |_1| call(_1) }
+          val.transform_values { |_1| it = _1;call(it) }
         when ARRAY_RXP
-          val.split(/\s*,\s*/).map { |_1| call(_1) }
+          val.split(/\s*,\s*/).map { |_1| it = _1;call(it) }
         when /\A(true|t|yes|y)\z/i
           true
         when /\A(false|f|no|n)\z/i

data/lib/.rbnext/2.7/anyway/config.rb

@@ -154,7 +154,7 @@ module Anyway # :nodoc:
         if block
           load_callbacks << BlockCallback.new(block)
         else
-          load_callbacks.push(*names.map { |_1| NamedCallback.new(_1) })
+          load_callbacks.push(*names.map { |_1| it = _1;NamedCallback.new(it) })
         end
       end
 
@@ -380,7 +380,7 @@ module Anyway # :nodoc:
       trace&.keep_if { |key| self.class.config_attributes.include?(key.to_sym) }
 
       # Run on_load callbacks
-      self.class.load_callbacks.each { |_1| _1.apply_to(self) }
+      self.class.load_callbacks.each { |_1| it = _1;it.apply_to(self) }
 
       # Set trace after we write all the values to
       # avoid changing the source to accessor
@@ -389,14 +389,14 @@ module Anyway # :nodoc:
       self
     end
 
-    def load_from_sources(base_config, **options)
+    def load_from_sources(base_config, **__kwrest__)
       Anyway.loaders.each do |(_id, loader)|
-        Utils.deep_merge!(base_config, loader.call(**options))
+        Utils.deep_merge!(base_config, loader.call(**__kwrest__))
       end
       base_config
     end
 
-    def dig(*keys) ;  values.dig(*keys); end
+    def dig(*__rest__) ;  values.dig(*__rest__); end
 
     def to_h() ;  values.deep_dup.deep_freeze; end
 

data/lib/.rbnext/2.7/anyway/tracing.rb

@@ -26,12 +26,12 @@ module Anyway
         value.dig(*__rest__, &__block__)
       end; respond_to?(:ruby2_keywords, true) && (ruby2_keywords :dig)
 
-      def record_value(val, *path, **opts)
+      def record_value(val, *path, **__kwrest__)
         key = path.pop
         trace = if val.is_a?(Hash)
-          Trace.new.tap { |_1| _1.merge_values(val, **opts) }
+          Trace.new.tap { |_1| it = _1;it.merge_values(val, **__kwrest__) }
         else
-          Trace.new(:value, val, **opts)
+          Trace.new(:value, val, **__kwrest__)
         end
 
         target_trace = path.empty? ? self : value.dig(*path)
@@ -40,14 +40,14 @@ module Anyway
         val
       end
 
-      def merge_values(hash, **opts)
+      def merge_values(hash, **__kwrest__)
         return hash unless hash
 
         hash.each do |key, val|
           if val.is_a?(Hash)
-            value[key.to_s].merge_values(val, **opts)
+            value[key.to_s].merge_values(val, **__kwrest__)
           else
-            value[key.to_s] = Trace.new(:value, val, **opts)
+            value[key.to_s] = Trace.new(:value, val, **__kwrest__)
           end
         end
 
@@ -84,7 +84,7 @@ module Anyway
 
       def to_h
         if trace?
-          value.transform_values(&:to_h).tap { |_1| _1.default_proc = nil }
+          value.transform_values(&:to_h).tap { |_1| it = _1;it.default_proc = nil }
         else
           {value: value, source: source}
         end
@@ -174,13 +174,13 @@ module Anyway
 
     module_function
 
-    def trace!(type, *path, **opts)
+    def trace!(type, *path, **__kwrest__)
       return yield unless Tracing.tracing?
       val = yield
       if val.is_a?(Hash)
-        Tracing.current_trace.merge_values(val, type: type, **opts)
-      else
-        Tracing.current_trace.record_value(val, *path, type: type, **opts)
+        Tracing.current_trace.merge_values(val, type: type, **__kwrest__)
+      elsif !path.empty?
+        Tracing.current_trace.record_value(val, *path, type: type, **__kwrest__)
       end
       val
     end

data/lib/.rbnext/2.7/anyway/type_casting.rb

@@ -34,7 +34,7 @@ module Anyway
 
       if array
         raw_arr = raw.is_a?(String) ? raw.split(/\s*,\s*/) : Array(raw)
-        raw_arr.map { |_1| caster.call(_1) }
+        raw_arr.map { |_1| it = _1;caster.call(it) }
       else
         caster.call(raw)
       end

data/lib/.rbnext/3.0/anyway/auto_cast.rb

@@ -13,9 +13,9 @@ module Anyway
 
         case val
         when Hash
-          val.transform_values { call(_1) }
+          val.transform_values { it = _1;call(it) }
         when ARRAY_RXP
-          val.split(/\s*,\s*/).map { call(_1) }
+          val.split(/\s*,\s*/).map { it = _1;call(it) }
         when /\A(true|t|yes|y)\z/i
           true
         when /\A(false|f|no|n)\z/i

data/lib/.rbnext/3.0/anyway/config.rb

@@ -154,7 +154,7 @@ module Anyway # :nodoc:
         if block
           load_callbacks << BlockCallback.new(block)
         else
-          load_callbacks.push(*names.map { NamedCallback.new(_1) })
+          load_callbacks.push(*names.map { it = _1;NamedCallback.new(it) })
         end
       end
 
@@ -380,7 +380,7 @@ module Anyway # :nodoc:
       trace&.keep_if { |key| self.class.config_attributes.include?(key.to_sym) }
 
       # Run on_load callbacks
-      self.class.load_callbacks.each { _1.apply_to(self) }
+      self.class.load_callbacks.each { it = _1;it.apply_to(self) }
 
       # Set trace after we write all the values to
       # avoid changing the source to accessor
@@ -389,14 +389,14 @@ module Anyway # :nodoc:
       self
     end
 
-    def load_from_sources(base_config, **options)
+    def load_from_sources(base_config, **__kwrest__)
       Anyway.loaders.each do |(_id, loader)|
-        Utils.deep_merge!(base_config, loader.call(**options))
+        Utils.deep_merge!(base_config, loader.call(**__kwrest__))
       end
       base_config
     end
 
-    def dig(*keys) ;  values.dig(*keys); end
+    def dig(*__rest__) ;  values.dig(*__rest__); end
 
     def to_h() ;  values.deep_dup.deep_freeze; end
 

data/lib/.rbnext/3.0/anyway/loaders/base.rb

@@ -6,8 +6,8 @@ module Anyway
       include Tracing
 
       class << self
-        def call(local: Anyway::Settings.use_local_files, **opts)
-          new(local: local).call(**opts)
+        def call(local: Anyway::Settings.use_local_files, **__kwrest__)
+          new(local: local).call(**__kwrest__)
         end
       end
 

data/lib/.rbnext/3.0/anyway/tracing.rb

@@ -26,12 +26,12 @@ module Anyway
         value.dig(...)
       end; respond_to?(:ruby2_keywords, true) && (ruby2_keywords :dig)
 
-      def record_value(val, *path, **opts)
+      def record_value(val, *path, **__kwrest__)
         key = path.pop
         trace = if val.is_a?(Hash)
-          Trace.new.tap { _1.merge_values(val, **opts) }
+          Trace.new.tap { it = _1;it.merge_values(val, **__kwrest__) }
         else
-          Trace.new(:value, val, **opts)
+          Trace.new(:value, val, **__kwrest__)
         end
 
         target_trace = path.empty? ? self : value.dig(*path)
@@ -40,14 +40,14 @@ module Anyway
         val
       end
 
-      def merge_values(hash, **opts)
+      def merge_values(hash, **__kwrest__)
         return hash unless hash
 
         hash.each do |key, val|
           if val.is_a?(Hash)
-            value[key.to_s].merge_values(val, **opts)
+            value[key.to_s].merge_values(val, **__kwrest__)
           else
-            value[key.to_s] = Trace.new(:value, val, **opts)
+            value[key.to_s] = Trace.new(:value, val, **__kwrest__)
           end
         end
 
@@ -84,7 +84,7 @@ module Anyway
 
       def to_h
         if trace?
-          value.transform_values(&:to_h).tap { _1.default_proc = nil }
+          value.transform_values(&:to_h).tap { it = _1;it.default_proc = nil }
         else
           {value: value, source: source}
         end
@@ -174,13 +174,13 @@ module Anyway
 
     module_function
 
-    def trace!(type, *path, **opts)
+    def trace!(type, *path, **__kwrest__)
       return yield unless Tracing.tracing?
       val = yield
       if val.is_a?(Hash)
-        Tracing.current_trace.merge_values(val, type: type, **opts)
-      else
-        Tracing.current_trace.record_value(val, *path, type: type, **opts)
+        Tracing.current_trace.merge_values(val, type: type, **__kwrest__)
+      elsif !path.empty?
+        Tracing.current_trace.record_value(val, *path, type: type, **__kwrest__)
       end
       val
     end

data/lib/.rbnext/3.1/anyway/config.rb

@@ -154,7 +154,7 @@ module Anyway # :nodoc:
         if block
           load_callbacks << BlockCallback.new(block)
         else
-          load_callbacks.push(*names.map { NamedCallback.new(_1) })
+          load_callbacks.push(*names.map { it = _1;NamedCallback.new(it) })
         end
       end
 
@@ -380,7 +380,7 @@ module Anyway # :nodoc:
       trace&.keep_if { |key| self.class.config_attributes.include?(key.to_sym) }
 
       # Run on_load callbacks
-      self.class.load_callbacks.each { _1.apply_to(self) }
+      self.class.load_callbacks.each { it = _1;it.apply_to(self) }
 
       # Set trace after we write all the values to
       # avoid changing the source to accessor
@@ -389,14 +389,14 @@ module Anyway # :nodoc:
       self
     end
 
-    def load_from_sources(base_config, **options)
+    def load_from_sources(base_config, **__kwrest__)
       Anyway.loaders.each do |(_id, loader)|
-        Utils.deep_merge!(base_config, loader.call(**options))
+        Utils.deep_merge!(base_config, loader.call(**__kwrest__))
       end
       base_config
     end
 
-    def dig(*keys) = values.dig(*keys)
+    def dig(*__rest__) ;  values.dig(*__rest__); end
 
     def to_h() = values.deep_dup.deep_freeze
 

data/lib/.rbnext/3.1/anyway/loaders/base.rb

@@ -6,8 +6,8 @@ module Anyway
       include Tracing
 
       class << self
-        def call(local: Anyway::Settings.use_local_files, **opts)
-          new(local: local).call(**opts)
+        def call(local: Anyway::Settings.use_local_files, **__kwrest__)
+          new(local: local).call(**__kwrest__)
         end
       end
 

data/lib/.rbnext/3.1/anyway/tracing.rb

@@ -26,12 +26,12 @@ module Anyway
         value.dig(...)
       end
 
-      def record_value(val, *path, **opts)
+      def record_value(val, *path, **__kwrest__)
         key = path.pop
         trace = if val.is_a?(Hash)
-          Trace.new.tap { _1.merge_values(val, **opts) }
+          Trace.new.tap { it = _1;it.merge_values(val, **__kwrest__) }
         else
-          Trace.new(:value, val, **opts)
+          Trace.new(:value, val, **__kwrest__)
         end
 
         target_trace = path.empty? ? self : value.dig(*path)
@@ -40,14 +40,14 @@ module Anyway
         val
       end
 
-      def merge_values(hash, **opts)
+      def merge_values(hash, **__kwrest__)
         return hash unless hash
 
         hash.each do |key, val|
           if val.is_a?(Hash)
-            value[key.to_s].merge_values(val, **opts)
+            value[key.to_s].merge_values(val, **__kwrest__)
           else
-            value[key.to_s] = Trace.new(:value, val, **opts)
+            value[key.to_s] = Trace.new(:value, val, **__kwrest__)
           end
         end
 
@@ -84,7 +84,7 @@ module Anyway
 
       def to_h
         if trace?
-          value.transform_values(&:to_h).tap { _1.default_proc = nil }
+          value.transform_values(&:to_h).tap { it = _1;it.default_proc = nil }
         else
           {value: value, source: source}
         end
@@ -174,13 +174,13 @@ module Anyway
 
     module_function
 
-    def trace!(type, *path, **opts)
+    def trace!(type, *path, **__kwrest__)
       return yield unless Tracing.tracing?
       val = yield
       if val.is_a?(Hash)
-        Tracing.current_trace.merge_values(val, type: type, **opts)
-      else
-        Tracing.current_trace.record_value(val, *path, type: type, **opts)
+        Tracing.current_trace.merge_values(val, type: type, **__kwrest__)
+      elsif !path.empty?
+        Tracing.current_trace.record_value(val, *path, type: type, **__kwrest__)
       end
       val
     end