chamber 2.14.3 → 3.0.0rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08e636d1674a305c9d330e9adf5be147b1e5c2d2c57f131da98a216e3d3b3111'
-  data.tar.gz: 7848e6ca2e2e4de843eedc65f9ca5315c18e71f9a8a2ba67a37c0ea46930a482
+  metadata.gz: 3119f8787d3c63913a0ab69a0114cbf6d43a154ad1703aef610a2b02720b0cbc
+  data.tar.gz: ed25f8e4a9f93045c94aba4776fa6a0296f9db9f1312e4a1dadeb35343eba140
 SHA512:
-  metadata.gz: 8337ba8c0c7cc899f40bb712a455e5ee56e878ed11f6258e0917863acf194b4cac1a4b11ff087a4c72ed7e5550972fc2d097dafd5b26492a40c8094bd33a744a
-  data.tar.gz: 27b49b8592d343b050491f2a2d22cbd69323989ac031abc9d6a2bf375a30887cd16580d9c76259a4475c9f42d6603aa73769754b454bbfa55bac98e493ae9c3b
+  metadata.gz: acc3d5daf9e6570ccf16e76b8433e8d0912cdd85f4858f6634ee37531aa6a1c53b47621afeb21c0b9524eea6f8af3a02b52872f843b28a3f94d3e20bfa582880
+  data.tar.gz: 39a117062b19f734066f11c405730e499cc0325e6b2e3fd208aa68a930645e28f6b88f4f98e43133e8b70457d82ac3860f426b1385611b0d4b924003f79f0490

data/lib/chamber/adapters/cloud/heroku.rb

@@ -20,18 +20,18 @@ class   Heroku
     self.app       = app
   end
 
-  def add_environment_variable(name, value)
+  def add_environment_variable(name, value) # rubocop:disable Metrics/AbcSize
     value   = value.gsub(/\n/, '\n') if value
     request = ::Net::HTTP::Patch.new(config_vars_uri)
 
     request['Authorization'] = "Bearer #{api_token}"
     request['Accept']        = 'application/vnd.heroku+json; version=3'
     request['Content-Type']  = 'application/json'
-    request.body             = ::JSON.dump({ name => value })
+    request.body             = ::JSON.dump(::Hash[name, value])
 
     response = ::JSON.parse(response(request).body)
 
-    fail NameError, response['message'] if response['message']
+    fail ::NameError, response['message'] if response['message']
 
     response
   end
@@ -44,7 +44,7 @@ class   Heroku
 
     response = ::JSON.parse(response(request).body)
 
-    fail NameError, response['message'] if response['message']
+    fail ::NameError, response['message'] if response['message']
 
     response
   end

data/lib/chamber/binary/circle_ci.rb

@@ -1,16 +1,17 @@
 # frozen_string_literal: true
 
 require 'thor'
-require 'chamber/core_ext/hash'
 require 'chamber/commands/cloud/clear'
 require 'chamber/commands/cloud/push'
 require 'chamber/commands/cloud/pull'
 require 'chamber/commands/cloud/compare'
+require 'chamber/refinements/hash'
 
 module  Chamber
 module  Binary
-class   CircleCi < Thor
-  include Thor::Actions
+class   CircleCi < ::Thor
+  include ::Thor::Actions
+  using ::Chamber::Refinements::Hash
 
   class_option :api_token,
                type:     :string,
@@ -49,7 +50,7 @@ class   CircleCi < Thor
 
   def clear
     Commands::Cloud::Clear.call(**options
-                                    .transform_keys(&:to_sym)
+                                    .deep_transform_keys(&:to_sym)
                                     .merge(shell: self, adapter: 'circle_ci'))
   end
 
@@ -81,7 +82,7 @@ class   CircleCi < Thor
 
   def push
     Commands::Cloud::Push.call(**options
-                                   .transform_keys(&:to_sym)
+                                   .deep_transform_keys(&:to_sym)
                                    .merge(shell: self, adapter: 'circle_ci'))
   end
 
@@ -96,7 +97,7 @@ class   CircleCi < Thor
 
   def pull
     Commands::Cloud::Pull.call(**options
-                                   .transform_keys(&:to_sym)
+                                   .deep_transform_keys(&:to_sym)
                                    .merge(shell: self, adapter: 'circle_ci'))
   end
 
@@ -114,7 +115,7 @@ class   CircleCi < Thor
 
   def compare
     Commands::Cloud::Compare.call(**options
-                                      .transform_keys(&:to_sym)
+                                      .deep_transform_keys(&:to_sym)
                                       .merge(shell: self, adapter: 'circle_ci'))
   end
 end

data/lib/chamber/binary/heroku.rb

@@ -1,16 +1,17 @@
 # frozen_string_literal: true
 
 require 'thor'
-require 'chamber/core_ext/hash'
 require 'chamber/commands/cloud/clear'
 require 'chamber/commands/cloud/push'
 require 'chamber/commands/cloud/pull'
 require 'chamber/commands/cloud/compare'
+require 'chamber/refinements/hash'
 
 module  Chamber
 module  Binary
-class   Heroku < Thor
-  include Thor::Actions
+class   Heroku < ::Thor
+  include ::Thor::Actions
+  using ::Chamber::Refinements::Hash
 
   class_option :app,
                type:     :string,
@@ -37,7 +38,7 @@ class   Heroku < Thor
 
   def clear
     Commands::Cloud::Clear.call(**options
-                                    .transform_keys(&:to_sym)
+                                    .deep_transform_keys(&:to_sym)
                                     .merge(shell: self, adapter: 'heroku'))
   end
 
@@ -69,7 +70,7 @@ class   Heroku < Thor
 
   def push
     Commands::Cloud::Push.call(**options
-                                   .transform_keys(&:to_sym)
+                                   .deep_transform_keys(&:to_sym)
                                    .merge(shell: self, adapter: 'heroku'))
   end
 
@@ -84,7 +85,7 @@ class   Heroku < Thor
 
   def pull
     Commands::Cloud::Pull.call(**options
-                                   .transform_keys(&:to_sym)
+                                   .deep_transform_keys(&:to_sym)
                                    .merge(shell: self, adapter: 'heroku'))
   end
 
@@ -102,7 +103,7 @@ class   Heroku < Thor
 
   def compare
     Commands::Cloud::Compare.call(**options
-                                      .transform_keys(&:to_sym)
+                                      .deep_transform_keys(&:to_sym)
                                       .merge(shell: self, adapter: 'heroku'))
   end
 end

data/lib/chamber/binary/runner.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'thor'
-require 'chamber/core_ext/hash'
 require 'chamber/rubinius_fix'
 require 'chamber/binary/travis'
 require 'chamber/binary/heroku'
@@ -13,11 +12,13 @@ require 'chamber/commands/sign'
 require 'chamber/commands/verify'
 require 'chamber/commands/compare'
 require 'chamber/commands/initialize'
+require 'chamber/refinements/hash'
 
 module  Chamber
 module  Binary
-class   Runner < Thor
-  include Thor::Actions
+class   Runner < ::Thor
+  include ::Thor::Actions
+  using ::Chamber::Refinements::Hash
 
   source_root ::File.expand_path('../../../templates', __dir__)
 
@@ -93,7 +94,7 @@ class   Runner < Thor
                          'Useful for debugging.'
 
   def show
-    puts Commands::Show.call(**options.transform_keys(&:to_sym).merge(shell: self))
+    puts Commands::Show.call(**options.deep_transform_keys(&:to_sym).merge(shell: self))
   end
 
   ################################################################################
@@ -101,7 +102,7 @@ class   Runner < Thor
   desc 'files', 'Lists the settings files which are parsed with the given options'
 
   def files
-    puts Commands::Files.call(**options.transform_keys(&:to_sym).merge(shell: self))
+    puts Commands::Files.call(**options.deep_transform_keys(&:to_sym).merge(shell: self))
   end
 
   ################################################################################
@@ -131,7 +132,7 @@ class   Runner < Thor
                           'destination of the comparison'
 
   def compare
-    Commands::Compare.call(**options.transform_keys(&:to_sym).merge(shell: self))
+    Commands::Compare.call(**options.deep_transform_keys(&:to_sym).merge(shell: self))
   end
 
   ################################################################################
@@ -151,7 +152,7 @@ class   Runner < Thor
                          'what values would be encrypted'
 
   def secure
-    Commands::Secure.call(**options.transform_keys(&:to_sym).merge(shell: self))
+    Commands::Secure.call(**options.deep_transform_keys(&:to_sym).merge(shell: self))
   end
 
   ################################################################################
@@ -170,9 +171,9 @@ class   Runner < Thor
 
   def sign
     if options[:verify]
-      Commands::Verify.call(**options.transform_keys(&:to_sym).merge(shell: self))
+      Commands::Verify.call(**options.deep_transform_keys(&:to_sym).merge(shell: self))
     else
-      Commands::Sign.call(**options.transform_keys(&:to_sym).merge(shell: self))
+      Commands::Sign.call(**options.deep_transform_keys(&:to_sym).merge(shell: self))
     end
   end
 
@@ -186,7 +187,7 @@ class   Runner < Thor
                 default: false
 
   def init
-    Commands::Initialize.call(**options.transform_keys(&:to_sym).merge(shell: self))
+    Commands::Initialize.call(**options.deep_transform_keys(&:to_sym).merge(shell: self))
   end
 end
 end

data/lib/chamber/binary/travis.rb

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
 require 'thor'
-require 'chamber/core_ext/hash'
 require 'chamber/commands/travis/secure'
+require 'chamber/refinements/hash'
 
 module  Chamber
 module  Binary
-class   Travis < Thor
+class   Travis < ::Thor
+  using ::Chamber::Refinements::Hash
+
   desc 'secure',
        'Uses your Travis CI public key to encrypt the settings you have ' \
        'chosen not to commit to the repo'
@@ -26,7 +28,9 @@ class   Travis < Thor
                          'which are marked as "_secure"'
 
   def secure
-    Commands::Travis::Secure.call(**options.transform_keys(&:to_sym).merge(shell: self))
+    Commands::Travis::Secure.call(**options
+                                    .deep_transform_keys(&:to_sym)
+                                    .merge(shell: self))
   end
 end
 end

data/lib/chamber/commands/securable.rb

@@ -2,15 +2,18 @@
 
 require 'shellwords'
 require 'chamber/instance'
+require 'chamber/refinements/hash'
 
 module  Chamber
 module  Commands
 module  Securable
+  using ::Chamber::Refinements::Hash
+
   def initialize(only_sensitive: nil, **args)
     super(**args)
 
     ignored_settings_options        = args
-                                        .merge(files: ignored_settings_filepaths)
+                                        .deep_merge(files: ignored_settings_filepaths)
                                         .reject { |k, _v| k == 'basepath' }
     self.ignored_settings_instance  = Chamber::Instance.new(**ignored_settings_options)
     self.current_settings_instance  = Chamber::Instance.new(**args)

data/lib/chamber/context_resolver.rb

@@ -41,7 +41,6 @@ class   ContextResolver
                                     options[:basepath] + 'settings*.yml',
                                     options[:basepath] + 'settings',
                                   ]
-
     options[:signature_name]    = options[:signature_name]
 
     options

data/lib/chamber/encryption_methods/public_key.rb

@@ -20,33 +20,7 @@ class   PublicKey
       unencrypted_value = decryption_key.private_decrypt(decoded_string)
 
       begin
-        _unserialized_value = begin
-                                YAML.safe_load(unencrypted_value,
-                                               aliases:           true,
-                                               permitted_classes: [
-                                                                    ::Date,
-                                                                    ::Time,
-                                                                    ::Regexp,
-                                                                  ])
-                              rescue ::Psych::DisallowedClass => error
-                                warn <<-HEREDOC
-WARNING: Recursive data structures (complex classes) being loaded from Chamber
-has been deprecated and will be removed in 3.0.
-
-See https://github.com/thekompanee/chamber/wiki/Upgrading-To-Chamber-3.0#limiting-complex-classes
-for full details.
-
-#{error.message}
-
-Called from: '#{caller.to_a[8]}'
-                                HEREDOC
-
-                                if YAML.respond_to?(:unsafe_load)
-                                  YAML.unsafe_load(unencrypted_value)
-                                else
-                                  YAML.load(unencrypted_value)
-                                end
-                              end
+        _unserialized_value = YAML.load(unencrypted_value)
       rescue TypeError
         unencrypted_value
       end

data/lib/chamber/encryption_methods/ssl.rb

@@ -35,7 +35,7 @@ class   Ssl
     Base64.strict_encode64(encrypted_data)
   end
 
-  def self.decrypt(key, value, decryption_keys) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength
+  def self.decrypt(key, value, decryption_keys) # rubocop:disable Metrics/AbcSize
     if decryption_keys.nil?
       value
     else
@@ -62,33 +62,7 @@ class   Ssl
       end
 
       begin
-        _unserialized_value = begin
-                                YAML.safe_load(unencrypted_value,
-                                               aliases:           true,
-                                               permitted_classes: [
-                                                                    ::Date,
-                                                                    ::Time,
-                                                                    ::Regexp,
-                                                                  ])
-                              rescue ::Psych::DisallowedClass => error
-                                warn <<-HEREDOC
-WARNING: Recursive data structures (complex classes) being loaded from Chamber
-has been deprecated and will be removed in 3.0.
-
-See https://github.com/thekompanee/chamber/wiki/Upgrading-To-Chamber-3.0#limiting-complex-classes
-for full details.
-
-#{error.message}
-
-Called from: '#{caller.to_a[8]}'
-                                HEREDOC
-
-                                if YAML.respond_to?(:unsafe_load)
-                                  YAML.unsafe_load(unencrypted_value)
-                                else
-                                  YAML.load(unencrypted_value)
-                                end
-                              end
+        _unserialized_value = YAML.load(unencrypted_value)
       rescue TypeError
         unencrypted_value
       end

data/lib/chamber/file.rb

@@ -4,6 +4,7 @@ require 'pathname'
 require 'yaml'
 require 'erb'
 require 'chamber/files/signature'
+require 'chamber/refinements/hash'
 
 ###
 # Internal: Represents a single file containing settings information in a given
@@ -11,6 +12,8 @@ require 'chamber/files/signature'
 #
 module  Chamber
 class   File < Pathname
+  using ::Chamber::Refinements::Hash
+
   attr_accessor :namespaces,
                 :decryption_keys,
                 :encryption_keys,
@@ -139,37 +142,11 @@ class   File < Pathname
     @secure_prefix_pattern ||= Regexp.escape(secure_prefix)
   end
 
-  def file_contents_hash # rubocop:disable Metrics/CyclomaticComplexity
+  def file_contents_hash
     file_contents = read
     erb_result    = ERB.new(file_contents).result
 
-    begin
-      YAML.safe_load(erb_result,
-                     aliases:           true,
-                     permitted_classes: [
-                                          ::Date,
-                                          ::Time,
-                                          ::Regexp,
-                                        ]) || {}
-    rescue ::Psych::DisallowedClass => error
-      warn <<-HEREDOC
-WARNING: Recursive data structures (complex classes) being loaded from Chamber
-has been deprecated and will be removed in 3.0.
-
-See https://github.com/thekompanee/chamber/wiki/Upgrading-To-Chamber-3.0#limiting-complex-classes
-for full details.
-
-#{error.message}
-
-Called from: '#{caller.to_a[2]}'
-      HEREDOC
-
-      if YAML.respond_to?(:unsafe_load)
-        YAML.unsafe_load(erb_result) || {}
-      else
-        YAML.load(erb_result) || {}
-      end
-    end
+    (YAML.load(erb_result) || {}).deep_transform_keys(&:to_s)
   rescue Errno::ENOENT
     {}
   end

data/lib/chamber/file_set.rb

@@ -256,15 +256,9 @@ class   FileSet
 
   private
 
-  # rubocop:disable Performance/ChainArrayAllocation
   def all_files
-    @all_files ||= file_globs
-                     .map { |fg| Pathname.glob(fg) }
-                     .flatten
-                     .uniq
-                     .sort
+    @all_files ||= file_globs.map { |fg| Pathname.glob(fg) }.flatten.uniq.sort # rubocop:disable Performance/ChainArrayAllocation
   end
-  # rubocop:enable Performance/ChainArrayAllocation
 
   def non_namespaced_files
     @non_namespaced_files ||= all_files - namespaced_files

data/lib/chamber/filters/decryption_filter.rb

@@ -2,16 +2,18 @@
 
 require 'openssl'
 require 'base64'
-require 'hashie/mash'
 require 'yaml'
 require 'chamber/encryption_methods/public_key'
 require 'chamber/encryption_methods/ssl'
 require 'chamber/encryption_methods/none'
 require 'chamber/errors/decryption_failure'
+require 'chamber/refinements/deep_dup'
 
 module  Chamber
 module  Filters
 class   DecryptionFilter
+  using ::Chamber::Refinements::DeepDup
+
   BASE64_STRING_PATTERN     = %r{\A[A-Za-z0-9+/]{342}==\z}.freeze
   LARGE_DATA_STRING_PATTERN = %r{
                                   \A                            # Beginning of String
@@ -35,7 +37,7 @@ class   DecryptionFilter
 
   def initialize(data:, secure_key_prefix:, decryption_keys: {}, **_args)
     self.decryption_keys  = decryption_keys || {}
-    self.data             = data.dup
+    self.data             = data.deep_dup
     self.secure_key_token = /\A#{Regexp.escape(secure_key_prefix)}/
   end
 
@@ -46,7 +48,7 @@ class   DecryptionFilter
   protected
 
   def execute(raw_data = data)
-    settings = Hashie::Mash.new
+    settings = {}
 
     raw_data.each_pair do |key, value|
       settings[key] = if value.respond_to? :each_pair
@@ -75,7 +77,6 @@ class   DecryptionFilter
 
   private
 
-  # rubocop:disable Style/RedundantBegin
   def decrypt(key, value)
     method = decryption_method(value)
 
@@ -89,10 +90,9 @@ class   DecryptionFilter
 
     value
   end
-  # rubocop:enable Style/RedundantBegin
 
   def decryption_method(value)
-    if value.is_a?(::String)
+    if value.respond_to?(:match)
       if value.match(BASE64_STRING_PATTERN)
         EncryptionMethods::PublicKey
       elsif value.match(LARGE_DATA_STRING_PATTERN)

data/lib/chamber/filters/encryption_filter.rb

@@ -1,15 +1,17 @@
 # frozen_string_literal: true
 
 require 'openssl'
-require 'hashie/mash'
 require 'yaml'
 require 'chamber/encryption_methods/public_key'
 require 'chamber/encryption_methods/ssl'
 require 'chamber/encryption_methods/none'
+require 'chamber/refinements/deep_dup'
 
 module    Chamber
 module    Filters
 class     EncryptionFilter
+  using ::Chamber::Refinements::DeepDup
+
   BASE64_STRING_PATTERN     = %r{\A[A-Za-z0-9+/]{342}==\z}.freeze
   BASE64_SUBSTRING_PATTERN  = %r{[A-Za-z0-9+/#]*={0,2}}.freeze
   LARGE_DATA_STRING_PATTERN = /
@@ -28,7 +30,7 @@ class     EncryptionFilter
 
   def initialize(data:, secure_key_prefix:, encryption_keys: {}, **_args)
     self.encryption_keys  = encryption_keys || {}
-    self.data             = data.dup
+    self.data             = data.deep_dup
     self.secure_key_token = /\A#{Regexp.escape(secure_key_prefix)}/
   end
 
@@ -39,7 +41,7 @@ class     EncryptionFilter
   protected
 
   def execute(raw_data = data, namespace = nil)
-    raw_data.each_with_object(Hashie::Mash.new) do |(key, value), settings|
+    raw_data.each_with_object({}) do |(key, value), settings|
       settings[key] = if value.respond_to? :each_pair
                         execute(value, namespace || key)
                       elsif key.match(secure_key_token)
@@ -67,7 +69,8 @@ class     EncryptionFilter
 
   def encrypt(namespace, key, value)
     method         = encryption_method(value)
-    encryption_key = encryption_keys[namespace] || encryption_keys[:__default]
+    namespace_key  = namespace ? namespace.to_sym : nil
+    encryption_key = encryption_keys[namespace_key] || encryption_keys[:__default]
 
     return value unless encryption_key
 
@@ -75,7 +78,7 @@ class     EncryptionFilter
   end
 
   def encryption_method(value)
-    value_is_encrypted = value.is_a?(::String) &&
+    value_is_encrypted = value.respond_to?(:match) &&
                            (value.match(BASE64_STRING_PATTERN) ||
                             value.match(LARGE_DATA_STRING_PATTERN))
 

data/lib/chamber/filters/environment_filter.rb

@@ -1,13 +1,16 @@
 # frozen_string_literal: true
 
 require 'yaml'
-require 'hashie/mash'
-
 require 'chamber/errors/environment_conversion'
+require 'chamber/refinements/hash'
+require 'chamber/refinements/deep_dup'
 
 module  Chamber
 module  Filters
 class   EnvironmentFilter
+  using ::Chamber::Refinements::Hash
+  using ::Chamber::Refinements::DeepDup
+
   ###
   # Internal: Allows the existing environment to be injected into the passed in
   # hash.  The hash that is passed in is *not* modified, instead a new hash is
@@ -110,11 +113,9 @@ class   EnvironmentFilter
         { key => execute(value, environment_keys) }
       end,
       lambda do |key, value, environment_key|
-        {
-          key => convert_environment_value(environment_key,
+        { key => convert_environment_value(environment_key,
                                            ENV[environment_key],
-                                           value),
-        }
+                                           value) }
       end,
     )
   end
@@ -122,18 +123,18 @@ class   EnvironmentFilter
   private
 
   def with_environment(settings, parent_keys, hash_block, value_block)
-    environment_hash = Hashie::Mash.new
+    environment_hash = {}
 
     settings.each_pair do |key, value|
       environment_key  = key.to_s.gsub(secure_key_token, '')
-      environment_keys = parent_keys.dup.push(environment_key)
+      environment_keys = parent_keys.deep_dup.push(environment_key)
 
       if value.respond_to? :each_pair
-        environment_hash.merge!(hash_block.call(key, value, environment_keys))
+        environment_hash.deep_merge!(hash_block.call(key, value, environment_keys))
       else
         environment_key = environment_keys.join('_').upcase
 
-        environment_hash.merge!(value_block.call(key, value, environment_key))
+        environment_hash.deep_merge!(value_block.call(key, value, environment_key))
       end
     end
 

data/lib/chamber/filters/failed_decryption_filter.rb

@@ -1,10 +1,13 @@
 # frozen_string_literal: true
 
 require 'chamber/errors/decryption_failure'
+require 'chamber/refinements/deep_dup'
 
 module  Chamber
 module  Filters
 class   FailedDecryptionFilter
+  using ::Chamber::Refinements::DeepDup
+
   BASE64_STRING_PATTERN = %r{\A[A-Za-z0-9+/]{342}==\z}.freeze
 
   def self.execute(**args)
@@ -15,7 +18,7 @@ class   FailedDecryptionFilter
                 :secure_key_token
 
   def initialize(data:, secure_key_prefix:, **_args)
-    self.data             = data.dup
+    self.data             = data.deep_dup
     self.secure_key_token = /\A#{Regexp.escape(secure_key_prefix)}/
   end
 

data/lib/chamber/filters/insecure_filter.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'hashie/mash'
 require 'chamber/filters/secure_filter'
 
 module  Chamber
@@ -22,7 +21,7 @@ class   InsecureFilter < SecureFilter
 
   def execute(raw_data = data) # rubocop:disable Metrics/CyclomaticComplexity
     securable_settings = super
-    settings           = Hashie::Mash.new
+    settings           = {}
 
     securable_settings.each_pair do |key, value|
       value = if value.respond_to? :each_pair