confidante 0.24.0 → 0.28.0.pre.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe9a513f9fdcb08619d3986c004dcee9c02c3d5e78a2bae0a51495697d4d9810
-  data.tar.gz: 89e336a3bc74d822bf53345f811fb8c55f016fc670f58560fdb87ced7e57ba48
+  metadata.gz: f8ac46c68d6bfd2a11cdf7f45c28bacb2f884fb376f6eb584083cc38d7be68d1
+  data.tar.gz: 549b7e47f1e9029c5d985ef3e12afab203a3a213922b0f265d59d280b7011842
 SHA512:
-  metadata.gz: 8651168a0765fd5bb60d1d861d3889ff2b45a252e871e6656b8280cc6606329c9933356bbb309393106248c0e141e8b913e560a18db1404e6afa5d95b22d7e6b
-  data.tar.gz: 43a13833566e56cdc0563af23793c0906ae75c1565544e27c51cb812d2d434c11f88fc3637f5de7a2471078d3ed7e060c419a51bb0d059fe9c4f27767b1c4863
+  metadata.gz: e807811a10780eaa47d1905ee289b27cd70de564b5c9219b3d4162f36c78d278a693f611c6e06ffb42d53ece2b2fa69cc24d24ce01488f87afd2c5064fd72f05
+  data.tar.gz: d2efc39f1d98d0493b0e88c40f4617a742b05da2a7363000ec02d7d39bd986c7e667ece9e5286c59187220c40b00f499e77d8ef9873880f1d5a480e71c523ee0

data/CODE_OF_CONDUCT.md

@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at tobyclemson@gmail.com. All
+reported by contacting the project team at maintainers@infrablocks.io. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify dependencies in lino.gemspec

data/Gemfile.lock

@@ -1,118 +1,165 @@
 PATH
   remote: .
   specs:
-    confidante (0.24.0)
+    confidante (0.28.0.pre.4)
       activesupport (>= 4)
-      hiera (~> 3.3, >= 3.3.1)
-      shikashi (~> 0.6)
+      hiera (>= 3.3, < 4)
+      shikashi (>= 0.6, < 1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.1)
+    activesupport (6.1.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
+    ast (2.4.2)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.6)
-    diff-lcs (1.3)
+    concurrent-ruby (1.1.8)
+    diff-lcs (1.4.4)
+    docile (1.4.0)
     evalhook (0.6.0)
       partialruby (~> 0.3)
       sexp_processor (~> 4.0)
-    excon (0.73.0)
-    faraday (1.0.1)
+    excon (0.82.0)
+    faraday (1.4.2)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
       multipart-post (>= 1.2, < 3)
-    gem-release (2.1.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.1.0)
+    gem-release (2.2.1)
     getsource (0.2.2)
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
-    hiera (3.6.0)
-    i18n (1.8.2)
+    hiera (3.7.0)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    lino (1.5.0)
+    lino (3.0.0)
       hamster (~> 3.0)
       open4 (~> 1.3)
-    minitest (5.14.1)
+    minitest (5.14.4)
     multipart-post (2.1.1)
-    octokit (4.18.0)
+    octokit (4.21.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
+    parallel (1.20.1)
+    parser (3.0.1.1)
+      ast (~> 2.4.1)
     partialruby (0.3.0)
       ruby2ruby (~> 2)
       ruby_parser (~> 3)
-    public_suffix (4.0.5)
-    rake (13.0.1)
-    rake_circle_ci (0.7.0)
+    public_suffix (4.0.6)
+    rainbow (3.0.0)
+    rake (13.0.3)
+    rake_circle_ci (0.9.0)
       colored2 (~> 3.1)
       excon (~> 0.72)
       rake_factory (~> 0.23)
       sshkey (~> 2.0)
-    rake_factory (0.27.0)
+    rake_factory (0.29.0)
       activesupport (>= 4)
       rake (~> 13.0)
-    rake_github (0.5.0)
+    rake_github (0.7.0)
       colored2 (~> 3.1)
       octokit (~> 4.16)
       rake_factory (~> 0.23)
       sshkey (~> 2.0)
-    rake_gpg (0.12.0)
+    rake_gpg (0.16.0)
       rake_factory (>= 0.23, < 1)
       ruby_gpg2 (>= 0.6, < 1)
-    rake_ssh (0.4.0)
+    rake_ssh (0.6.0)
       colored2 (~> 3.1)
       rake_factory (~> 0.23)
       sshkey (~> 2.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.15.0)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.5.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.7.0)
+      parser (>= 3.0.1.1)
+    rubocop-rake (0.5.1)
+      rubocop
+    rubocop-rspec (2.3.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.4)
     ruby2ruby (2.4.4)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.6)
-    ruby_gpg2 (0.6.0)
+    ruby_gpg2 (0.8.0)
       lino (>= 1.5)
-    ruby_parser (3.14.2)
-      sexp_processor (~> 4.9)
+    ruby_parser (3.16.0)
+      sexp_processor (~> 4.15, >= 4.15.1)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
-    sexp_processor (4.14.1)
+    sexp_processor (4.15.3)
     shikashi (0.6.0)
       evalhook (>= 0.6.0)
       getsource (>= 0.1.0)
+    simplecov (0.21.2)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.3)
     sshkey (2.0.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    zeitwerk (2.3.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.0.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 2.0)
+  bundler
   confidante!
-  gem-release (~> 2.0)
-  rake (~> 13.0)
-  rake_circle_ci (~> 0.3)
-  rake_github (~> 0.3)
-  rake_gpg (~> 0.12)
-  rake_ssh (~> 0.2)
-  rspec (~> 3.9)
+  gem-release
+  rake
+  rake_circle_ci
+  rake_github
+  rake_gpg
+  rake_ssh
+  rspec
+  rubocop
+  rubocop-rake
+  rubocop-rspec
+  simplecov
 
 BUNDLED WITH
-   2.2.3
+   2.2.18

data/README.md

@@ -71,7 +71,7 @@ openssl aes-256-cbc \
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at 
-https://github.com/tobyclemson/confidante. This project is intended to be a 
+https://github.com/infrablocks/confidante. This project is intended to be a 
 safe, welcoming space for collaboration, and contributors are expected to adhere
 to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 require 'rake_circle_ci'
 require 'rake_github'
@@ -5,13 +7,16 @@ require 'rake_ssh'
 require 'rake_gpg'
 require 'securerandom'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
-task :default => :spec
-
-RSpec::Core::RakeTask.new(:spec)
+task default: %i[
+  library:fix
+  test:unit
+]
 
 namespace :encryption do
   namespace :passphrase do
+    desc 'Generate encryption passphrase for CI GPG key'
     task :generate do
       File.open('config/secrets/ci/encryption.passphrase', 'w') do |f|
         f.write(SecureRandom.base64(36))
@@ -23,81 +28,100 @@ end
 namespace :keys do
   namespace :deploy do
     RakeSSH.define_key_tasks(
-        path: 'config/secrets/ci/',
-        comment: 'maintainers@infrablocks.io')
+      path: 'config/secrets/ci/',
+      comment: 'maintainers@infrablocks.io'
+    )
   end
 
   namespace :gpg do
     RakeGPG.define_generate_key_task(
-        output_directory: 'config/secrets/ci',
-        name_prefix: 'gpg',
-        owner_name: 'InfraBlocks Maintainers',
-        owner_email: 'maintainers@infrablocks.io',
-        owner_comment: 'confidante CI Key')
+      output_directory: 'config/secrets/ci',
+      name_prefix: 'gpg',
+      owner_name: 'InfraBlocks Maintainers',
+      owner_email: 'maintainers@infrablocks.io',
+      owner_comment: 'confidante CI Key'
+    )
   end
 end
 
+RuboCop::RakeTask.new
+
+namespace :library do
+  desc 'Run all checks of the library'
+  task check: [:rubocop]
+
+  desc 'Attempt to automatically fix issues with the library'
+  task fix: [:'rubocop:auto_correct']
+end
+
+namespace :test do
+  RSpec::Core::RakeTask.new(:unit)
+end
+
 RakeCircleCI.define_project_tasks(
-    namespace: :circle_ci,
-    project_slug: 'github/infrablocks/confidante'
+  namespace: :circle_ci,
+  project_slug: 'github/infrablocks/confidante'
 ) do |t|
   circle_ci_config =
-      YAML.load_file('config/secrets/circle_ci/config.yaml')
+    YAML.load_file('config/secrets/circle_ci/config.yaml')
 
-  t.api_token = circle_ci_config["circle_ci_api_token"]
+  t.api_token = circle_ci_config['circle_ci_api_token']
   t.environment_variables = {
-      ENCRYPTION_PASSPHRASE:
-          File.read('config/secrets/ci/encryption.passphrase')
-              .chomp
+    ENCRYPTION_PASSPHRASE:
+        File.read('config/secrets/ci/encryption.passphrase')
+            .chomp
   }
+  t.checkout_keys = []
   t.ssh_keys = [
-      {
-          hostname: "github.com",
-          private_key: File.read('config/secrets/ci/ssh.private')
-      }
+    {
+      hostname: 'github.com',
+      private_key: File.read('config/secrets/ci/ssh.private')
+    }
   ]
 end
 
 RakeGithub.define_repository_tasks(
-    namespace: :github,
-    repository: 'infrablocks/confidante',
+  namespace: :github,
+  repository: 'infrablocks/confidante'
 ) do |t|
   github_config =
-      YAML.load_file('config/secrets/github/config.yaml')
+    YAML.load_file('config/secrets/github/config.yaml')
 
-  t.access_token = github_config["github_personal_access_token"]
+  t.access_token = github_config['github_personal_access_token']
   t.deploy_keys = [
-      {
-          title: 'CircleCI',
-          public_key: File.read('config/secrets/ci/ssh.public')
-      }
+    {
+      title: 'CircleCI',
+      public_key: File.read('config/secrets/ci/ssh.public')
+    }
   ]
 end
 
 namespace :pipeline do
-  task :prepare => [
-      :'circle_ci:project:follow',
-      :'circle_ci:env_vars:ensure',
-      :'circle_ci:ssh_keys:ensure',
-      :'github:deploy_keys:ensure'
+  desc 'Prepare CircleCI Pipeline'
+  task prepare: %i[
+    circle_ci:project:follow
+    circle_ci:env_vars:ensure
+    circle_ci:checkout_keys:ensure
+    circle_ci:ssh_keys:ensure
+    github:deploy_keys:ensure
   ]
 end
 
 namespace :version do
-  desc "Bump version for specified type (pre, major, minor, patch)"
+  desc 'Bump version for specified type (pre, major, minor, patch)'
   task :bump, [:type] do |_, args|
     bump_version_for(args.type)
   end
 end
 
-desc "Release gem"
+desc 'Release gem'
 task :release do
-  sh "gem release --tag --push"
+  sh 'gem release --tag --push'
 end
 
 def bump_version_for(version_type)
-  sh "gem bump --version #{version_type} " +
-      "&& bundle install " +
-      "&& export LAST_MESSAGE=\"$(git log -1 --pretty=%B)\" " +
-      "&& git commit -a --amend -m \"${LAST_MESSAGE} [ci skip]\""
+  sh "gem bump --version #{version_type} " \
+     '&& bundle install ' \
+     '&& export LAST_MESSAGE="$(git log -1 --pretty=%B)" ' \
+     '&& git commit -a --amend -m "${LAST_MESSAGE} [ci skip]"'
 end

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'confidante'

data/confidante.gemspec

@@ -1,25 +1,36 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'confidante/version'
 require 'date'
 
+files = %w[
+  bin
+  lib
+  CODE_OF_CONDUCT.md
+  confidante.gemspec
+  Gemfile
+  LICENSE.txt
+  Rakefile
+  README.md
+]
+
 Gem::Specification.new do |spec|
   spec.name = 'confidante'
   spec.version = Confidante::VERSION
-  spec.authors = ['Toby Clemson']
-  spec.email = ['tobyclemson@gmail.com']
+  spec.authors = ['InfraBlocks Maintainers']
+  spec.email = ['maintainers@infrablocks.io']
 
-  spec.date = Date.today.to_s
   spec.summary = 'A configuration engine over hiera.'
   spec.description =
-      'A configuration engine combining environment variables, programmatic ' +
-          'overrides and the power of hiera.'
+    'A configuration engine combining environment variables, programmatic ' \
+    'overrides and the power of hiera.'
   spec.homepage = 'https://github.com/infrablocks/confidante'
   spec.license = 'MIT'
 
   spec.files = `git ls-files -z`.split("\x0").select do |f|
-    f.match(%r{^(bin|lib|CODE_OF_CONDUCT\.md|confidante\.gemspec|Gemfile|LICENSE\.txt|Rakefile|README\.md)})
+    f.match(/^(#{files.map { |g| Regexp.escape(g) }.join('|')})/)
   end
   spec.bindir = 'exe'
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
@@ -27,16 +38,20 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.6.0'
 
-  spec.add_dependency 'hiera', '~> 3.3', '>= 3.3.1'
   spec.add_dependency 'activesupport', '>= 4'
-  spec.add_dependency 'shikashi', '~> 0.6'
-
-  spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rake_circle_ci', '~> 0.3'
-  spec.add_development_dependency 'rake_github', '~> 0.3'
-  spec.add_development_dependency 'rake_ssh', '~> 0.2'
-  spec.add_development_dependency 'rake_gpg', '~> 0.12'
-  spec.add_development_dependency 'rspec', '~> 3.9'
-  spec.add_development_dependency 'gem-release', '~> 2.0'
+  spec.add_dependency 'hiera', '>= 3.3', '< 4'
+  spec.add_dependency 'shikashi', '>= 0.6', '< 1'
+
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'gem-release'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rake_circle_ci'
+  spec.add_development_dependency 'rake_github'
+  spec.add_development_dependency 'rake_gpg'
+  spec.add_development_dependency 'rake_ssh'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop-rake'
+  spec.add_development_dependency 'rubocop-rspec'
+  spec.add_development_dependency 'simplecov'
 end

data/lib/confidante.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'confidante/version'
 require_relative 'confidante/converters'
 require_relative 'confidante/configuration'

data/lib/confidante/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'hiera'
 require 'active_support'
 require 'active_support/core_ext/hash/keys'
@@ -7,50 +9,62 @@ require_relative 'converters'
 module Confidante
   class Configuration
     def initialize(opts = {})
-      options = {
-          overrides: {},
-          scope: {},
-      }.merge(opts.to_options)
-
-      unless options[:hiera]
-        options[:hiera] = Hiera.new(config: 'config/hiera.yaml')
-      end
-
-      unless options[:converters]
-        options[:converters] =
-            [Confidante::Converters::EvaluatingConverter.new]
-      end
+      options = opts.to_options
 
-      @overrides = options[:overrides]
-      @scope = options[:scope]
-      @hiera = options[:hiera]
-      @converters = options[:converters]
+      @overrides = default_overrides(options[:overrides])
+      @scope = default_scope(options[:scope])
+      @hiera = default_hiera(options[:hiera])
+      @converters = default_converters(options[:converters])
     end
 
     def for_overrides(overrides)
       Configuration.new(
-          overrides: overrides,
-          scope: @scope,
-          hiera: @hiera,
-          converters: @converters)
+        overrides: overrides,
+        scope: @scope,
+        hiera: @hiera,
+        converters: @converters
+      )
     end
 
     def for_scope(scope)
       Configuration.new(
-          overrides: @overrides,
-          scope: scope,
-          hiera: @hiera,
-          converters: @converters)
+        overrides: @overrides,
+        scope: scope,
+        hiera: @hiera,
+        converters: @converters
+      )
     end
 
-    def method_missing(method, *args, &block)
+    def method_missing(method, *_args)
       scope =
-          {'cwd' => Dir.pwd}
-              .merge(@scope.stringify_keys)
-              .merge({'overrides' => @overrides.to_h.stringify_keys})
+        { 'cwd' => Dir.pwd }
+        .merge(@scope.stringify_keys)
+        .merge({ 'overrides' => @overrides.to_h.stringify_keys })
       @converters.inject(@hiera.lookup(method.to_s, nil, scope)) do |v, c|
         c.convert(v)
       end
     end
+
+    def respond_to_missing?(_method_name, _include_private = false)
+      true
+    end
+
+    private
+
+    def default_overrides(overrides)
+      overrides || {}
+    end
+
+    def default_scope(scope)
+      scope || {}
+    end
+
+    def default_hiera(hiera)
+      hiera || Hiera.new(config: 'config/hiera.yaml')
+    end
+
+    def default_converters(converters)
+      converters || [Confidante::Converters::EvaluatingConverter.new]
+    end
   end
-end
+end

data/lib/confidante/converters.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require_relative 'converters/evaluating_converter'
 
 module Confidante
   module Converters
   end
-end
+end

data/lib/confidante/converters/evaluating_converter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'shikashi'
 
 module Confidante
@@ -35,7 +37,7 @@ module Confidante
         if thing =~ /^[\[,{]/
           begin
             @sandbox.run(@privileges, thing)
-          rescue Exception
+          rescue StandardError
             thing
           end
         else

data/lib/confidante/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Confidante
-  VERSION = '0.24.0'
+  VERSION = '0.28.0.pre.4'
 end

data/lib/hiera/backend/env_backend.rb

@@ -1,20 +1,26 @@
+# frozen_string_literal: true
+
 require 'hiera'
 
 class Hiera
   module Backend
+    # rubocop:disable Naming/ClassAndModuleCamelCase
     class Env_backend
       def initialize
         Hiera.debug('Hiera environment backend starting')
       end
 
-      def lookup(key, scope, order_override, resolution_type, context)
+      def lookup(key, scope, _order_override, resolution_type, _context)
         Hiera.debug(
-            "Looking up #{key} in environment backend with #{resolution_type}")
+          "Looking up #{key} in environment backend with #{resolution_type}"
+        )
 
         Backend.parse_answer(
-            ENV[key.to_s.upcase] || throw(:no_such_key),
-            scope)
+          ENV[key.to_s.upcase] || throw(:no_such_key),
+          scope
+        )
       end
     end
+    # rubocop:enable Naming/ClassAndModuleCamelCase
   end
-end
+end

data/lib/hiera/backend/overrides_backend.rb

@@ -1,15 +1,19 @@
+# frozen_string_literal: true
+
 require 'hiera'
 
 class Hiera
   module Backend
+    # rubocop:disable Naming/ClassAndModuleCamelCase
     class Overrides_backend
       def initialize
         Hiera.debug('Hiera overrides backend starting')
       end
 
-      def lookup(key, scope, order_override, resolution_type, context)
+      def lookup(key, scope, _order_override, resolution_type, _context)
         Hiera.debug(
-            "Looking up #{key} in overrides backend with #{resolution_type}")
+          "Looking up #{key} in overrides backend with #{resolution_type}"
+        )
 
         overrides = scope && scope['overrides']
         Hiera.debug("Found overrides: #{overrides}")
@@ -22,5 +26,6 @@ class Hiera
         Backend.parse_answer(override || throw(:no_such_key), scope)
       end
     end
+    # rubocop:enable Naming/ClassAndModuleCamelCase
   end
-end
+end

data/lib/shikashi_extensions/sandbox.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'shikashi'
 
 module ShikashiExtensions

metadata

@@ -1,40 +1,37 @@
 --- !ruby/object:Gem::Specification
 name: confidante
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.28.0.pre.4
 platform: ruby
 authors:
-- Toby Clemson
+- InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-29 00:00:00.000000000 Z
+date: 2021-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: hiera
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.1
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.1
+        version: '4'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: hiera
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.3'
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4'
   type: :runtime
@@ -42,138 +39,203 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.3'
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
   name: shikashi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: gem-release
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake_circle_ci
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake_github
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake_ssh
+  name: rake_gpg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake_gpg
+  name: rake_ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: gem-release
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A configuration engine combining environment variables, programmatic
   overrides and the power of hiera.
 email:
-- tobyclemson@gmail.com
+- maintainers@infrablocks.io
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -210,9 +272,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.1
 signing_key: