consult 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4545a86745cdd4600995f4a162cf9c3378ea61083b3670166e2e8e94a9e6103a
-  data.tar.gz: f48258760913efbb7e44bf17c7b2ac14e4e38d9563c6cb1d4c3a94b7c7c37aed
+  metadata.gz: ceefd393d6806ded58ba8e26053b884ccb16be5621cfed34143b1117c621da40
+  data.tar.gz: a5b86a629c6c01295dc89504cc7bf37b60cba8b821df29991fe1ad2ea41d9af6
 SHA512:
-  metadata.gz: 5fdb5ecc269d4ffd29fdef55fa315e7471089b8f68e897de6a2641415a5fb0f7bcdd56d05c7ccc7be0b58757076cd2b05f65727ebdc5c7efe32c9bfe33e36ec9
-  data.tar.gz: 991eca37d6a392c21bab7ca620ae64608d4b6313e0048f376c84fc627234675fb79990d6c151a327c8bb53fa07b47937cb0f2782f0dd4df91762139eca6fc989
+  metadata.gz: 784828276c69a2f83f34a2169738f6053f4c035a3fe3b8a4b3925fed3dcb90f2a364d1e02032a1020f6e35cbbedee3eab4c833b444868d9fb9b9df2670a5df79
+  data.tar.gz: 1dc1fcb576c04a9a56ebd02d8af93f3e5ecf2bdf63037918cd915e7475b8bef00d901d504428dd8d8d1aba9b99c66dd020830465288d69df58ccfaa1a780f910

data/.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
         type: string
 
     docker:
-      - image: circleci/ruby:<< parameters.ruby_version >>
+      - image: cimg/ruby:<< parameters.ruby_version >>
       - image: consul:1.3.0
       - image: vault:0.11.3
         environment:
@@ -76,3 +76,4 @@ workflows:
               ruby_version:
                 - '2.5'
                 - '2.7'
+                - '3.1'

data/.ruby-version

@@ -1 +1 @@
-2.5.3
+3.1.0

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 #### Unreleased
 
+#### 0.11.0
+
+* Enable support for Ruby 3.1 ([#36](https://github.com/veracross/consult/pull/36))
+* Bump Diplomat version & better testing for default parameters ([#37](https://github.com/veracross/consult/pull/37) & [#39](https://github.com/veracross/consult/pull/39))
+* Avoid loading Railtie if SKIP_CONSULT is truthy ([#40](https://github.com/veracross/consult/pull/40))
+
 #### 0.10.0
 
 * Switch from Travis to CircleCI, and set up testing for multiple Ruby versions ([#25](https://github.com/veracross/consult/pull/25) & [#34](https://github.com/veracross/consult/pull/34))

data/consult.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.executables   = ['consult']
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'diplomat', '~> 2.0.2'
+  spec.add_dependency 'diplomat', '~> 2.6'
   spec.add_dependency 'vault', '>= 0.10.0', '< 1.0.0'
 
   spec.add_development_dependency 'bundler'

data/lib/consult/cli.rb

@@ -15,7 +15,7 @@ module Consult
 
     def parse(args = ARGV)
       @opts = parse_options(args)
-      Consult.load @opts
+      Consult.load **@opts
     end
 
     def render

data/lib/consult/template.rb

@@ -75,7 +75,7 @@ module Consult
 
     def consul_contents(location)
       [@config[location]].compact.flatten.map do |key|
-        Diplomat::Kv.get(key, options: nil, not_found: :return, found: :return).force_encoding 'utf-8'
+        Diplomat::Kv.get(key, options: {}, not_found: :return, found: :return).force_encoding 'utf-8'
       end.join
     end
 

data/lib/consult/template_functions.rb

@@ -16,12 +16,12 @@ module Consult
     ############
     # Consul
     ############
-    def service(key, scope: :all, options: nil, meta: nil)
+    def service(key, scope: :all, options: {}, meta: {})
       Diplomat::Service.get(key, scope, options, meta)
     end
 
     # Execute a prepared query
-    def query(name_or_id, options: nil)
+    def query(name_or_id, options: {})
       Diplomat::Query.execute(name_or_id, options)
     end
 
@@ -30,7 +30,7 @@ module Consult
       query(*args)&.Nodes&.map { |node| node['Node'] }
     end
 
-    def key(key, options: nil, not_found: :reject, found: :return)
+    def key(key, options: {}, not_found: :reject, found: :return)
       Diplomat::Kv.get(key, options, not_found, found)
     end
 

data/lib/consult/version.rb

@@ -1,3 +1,3 @@
 module Consult
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 end

data/lib/consult.rb

@@ -24,7 +24,15 @@ module Consult
       root directory: config_dir
       yaml = root.join('config', 'consult.yml')
 
-      @all_config = yaml.exist? ? YAML.safe_load(ERB.new(yaml.read).result, [], [], true, symbolize_names: true).to_h : {}
+      @all_config = if yaml.exist?
+        if Gem::Version.new(YAML::VERSION) < Gem::Version.new('4.0')
+          YAML.safe_load(ERB.new(yaml.read).result, [], [], true, symbolize_names: true).to_h
+        else
+          YAML.safe_load(ERB.new(yaml.read).result, aliases: true, symbolize_names: true).to_h
+        end
+      end
+
+      @all_config ||= {}
 
       @config = @all_config[:shared].to_h.deep_merge @all_config[env&.to_sym].to_h
       @templates = @config[:templates]&.map { |name, config| Template.new(name, config.merge(verbose: verbose)) } || []
@@ -92,4 +100,6 @@ module Consult
   end
 end
 
-require 'consult/rails/engine' if defined?(Rails)
+if defined?(Rails) && !%w[1 true].include?(ENV['SKIP_CONSULT'].to_s.downcase)
+  require 'consult/rails/engine'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consult
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Jeff Fraser
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-16 00:00:00.000000000 Z
+date: 2023-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diplomat
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: vault
   requirement: !ruby/object:Gem::Requirement
@@ -209,8 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Manage consul/vault backed template files in Ruby.