consult 0.10.0.pre → 0.11.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04de1a20dd8943a9c3740bcdd00a2b087c4dd8c706deb8ad47896f72a643ca6b
-  data.tar.gz: 03211311d716648cee6d9d42fb834919b616428015c860e48cbc0e04ae111e4b
+  metadata.gz: 58d62339283d46a14150b6caab33d0384a97a79b37d19bfbfc138543e4d3a382
+  data.tar.gz: ae6386a07043591f5f98717f9818cc5bf644d911a3692caded61c286d4eb536b
 SHA512:
-  metadata.gz: c21b28fc79d2480d57e16aad107ecaf6d3e1f38609c781222263b1c98d6cd6e9dd903fc822a5e99ac89bd22f981ae19b9eb74f418ea62f1ec989ac9c6544948c
-  data.tar.gz: a9fa5fc6d4af723125ed276a69391036eef91a2eef94ffe4e46d1587fa5154b8ad6f5411ec51f6bc74ba0edfcf97a99b950b361d3a76462bea75b5df9a19202c
+  metadata.gz: 05e436db69ccc2475d0f1b782eeeec63383369b2d045b0a4d16c35684054504e63325804b763b1c9792013ca858d39377e6760d49d1355baf0414baeaffc1ea5
+  data.tar.gz: 8f34be0ea90091269c8ab77e9ecf4b672aa952f9d4654fd9d6d52209f49da575bea7bc109ad9d6ed32dce0d34b303af2126a2a8ab48e91e6c87453edf559c8f6

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.pre'
+  VERSION = '0.11.0.pre'
 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.pre
+  version: 0.11.0.pre
 platform: ruby
 authors:
 - Jeff Fraser
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-09 00:00:00.000000000 Z
+date: 2023-04-04 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: 1.3.1
 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.