confidante 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5d57db671f90e99991dca29339b9a34f87bc228
-  data.tar.gz: 69c3a3a5183109090c6719752877c7668f53577c
+  metadata.gz: 678e803092f7eca50c5fdb3e30702c8eb2c07f3f
+  data.tar.gz: 4b5555c36ec0a0ff609cd41d7756753bda085281
 SHA512:
-  metadata.gz: fc6bcf05777805980f352a97401622f3a00a9cc6393595e928c872de64df623205ca0973d9a35deabde006acac8147b6a1bb27e1b31752ce566feeda0ee0f899
-  data.tar.gz: d6f4805529c8fd51d207fc80dc193ba489b74ba39efdf6831dbe449dc6fecbc844112ab1521b8f148a4a81b85a515a2a1f9e93754ca679b3820c5365645db7ad
+  metadata.gz: f7a90fb1d38661e092679fc01791de9a2f175d1574cf48a5e630a547a4fdf8a4d2836fcc53a5cab9a4699a08a8dd49e047bb7a8308d851333cea2087f0980eae
+  data.tar.gz: e16dc70ee1da23f6f444a73b1a020881b21384c3f75ed64e19090fb09a55c10bea69d03ea7952c35b5d3b375e7bde86cf4cdd99c566efe23aab0fa45e501fed5

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p648
+2.3.1

data/Gemfile.lock

@@ -1,15 +1,24 @@
 PATH
   remote: .
   specs:
-    confidante (0.1.0)
+    confidante (0.2.0)
+      activesupport (~> 5.1, >= 5.1.1)
       hiera (~> 3.3, >= 3.3.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (5.1.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    concurrent-ruby (1.0.5)
     diff-lcs (1.3)
     gem-release (0.7.4)
     hiera (3.4.1)
+    i18n (0.8.6)
+    minitest (5.10.3)
     rake (10.5.0)
     rspec (3.6.0)
       rspec-core (~> 3.6.0)
@@ -24,6 +33,9 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.6.0)
     rspec-support (3.6.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby

data/confidante.gemspec

@@ -24,9 +24,10 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.0'
+  spec.required_ruby_version = '>= 2.3'
 
   spec.add_dependency 'hiera', '~> 3.3', '>= 3.3.1'
+  spec.add_dependency 'activesupport', '~> 5.1', '>= 5.1.1'
 
   spec.add_development_dependency 'bundler', '~> 1.14'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/confidante.rb

@@ -1,4 +1,8 @@
 require 'confidante/version'
+require 'confidante/configuration'
+
+require 'hiera/backend/env_backend'
+require 'hiera/backend/overrides_backend'
 
 module Confidante
 end

data/lib/confidante/configuration.rb

@@ -0,0 +1,45 @@
+require 'hiera'
+require 'active_support'
+require 'active_support/core_ext/hash/keys'
+
+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
+
+      @overrides = options[:overrides]
+      @scope = options[:scope]
+      @hiera = options[:hiera]
+    end
+
+    def for_overrides(overrides)
+      Configuration.new(
+          overrides: overrides,
+          scope: @scope,
+          hiera: @hiera)
+    end
+
+    def for_scope(scope)
+      Configuration.new(
+          overrides: @overrides,
+          scope: scope,
+          hiera: @hiera)
+    end
+
+    def method_missing(method, *args, &block)
+      @hiera.lookup(
+          method.to_s,
+          nil,
+          {cwd: Dir.pwd}
+              .merge(@scope)
+              .merge({overrides: @overrides}))
+    end
+  end
+end

data/lib/confidante/version.rb

@@ -1,3 +1,3 @@
 module Confidante
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/hiera/backend/env_backend.rb

@@ -0,0 +1,20 @@
+require 'hiera'
+
+class Hiera
+  module Backend
+    class Env_backend
+      def initialize
+        Hiera.debug('Hiera environment backend starting')
+      end
+
+      def lookup(key, scope, order_override, resolution_type, context)
+        Hiera.debug(
+            "Looking up #{key} in environment backend with #{resolution_type}")
+
+        Backend.parse_answer(
+            ENV[key.upcase] || throw(:no_such_key),
+            scope)
+      end
+    end
+  end
+end

data/lib/hiera/backend/overrides_backend.rb

@@ -0,0 +1,20 @@
+require 'hiera'
+
+class Hiera
+  module Backend
+    class Overrides_backend
+      def initialize
+        Hiera.debug('Hiera overrides backend starting')
+      end
+
+      def lookup(key, scope, order_override, resolution_type, context)
+        Hiera.debug(
+            "Looking up #{key} in overrides backend with #{resolution_type}")
+
+        Backend.parse_answer(
+            scope[:overrides][key.to_sym] || throw(:no_such_key),
+            scope)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: confidante
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Toby Clemson
@@ -14,76 +14,96 @@ dependencies:
   name: hiera
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.3.1
   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
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 description: A configuration engine combining environment variables, programmatic
@@ -94,9 +114,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-version
+- ".gitignore"
+- ".rspec"
+- ".ruby-version"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -107,7 +127,10 @@ files:
 - bin/setup
 - confidante.gemspec
 - lib/confidante.rb
+- lib/confidante/configuration.rb
 - lib/confidante/version.rb
+- lib/hiera/backend/env_backend.rb
+- lib/hiera/backend/overrides_backend.rb
 homepage: https://github.com/tobyclemson/confidante
 licenses:
 - MIT
@@ -118,17 +141,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A configuration engine over hiera.