consult 1.0.0.pre → 1.0.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0cf440030413aa3a130de66a00f1b349a232dfe0a56a8517c5fda6590bef31a
-  data.tar.gz: 63e51ae272e2504f3be979d10a4d46c2d954210b68c6cb2584a481862f80f8c9
+  metadata.gz: 1c7a54f7fb838f2f50a3553e2f798b75d569cf227c4c9d927d2185d4b597f882
+  data.tar.gz: be503dd900d460f14d8ae2ecaddd6eec05193859b2668d32762dd62e3e2f4cb1
 SHA512:
-  metadata.gz: 41891ee20a9018c7db6ed5c366a87273e5b58102813f3e7db6ff6c906b4ed7c390eaa898fdb6a5c9a849f399ca19753ca6c2541e20945a81ff309a2aa3a21e5b
-  data.tar.gz: b3ad3e1a3d688292eecdbd2e2984fa347b5bae91024d9a5f65f2ec5ca340326ae336a8f9d0693c0c7978960912fb0c35d3eb2f5595b90733ecc218e54e65e48c
+  metadata.gz: f736a61ae78df99d70d778ec0a61bbaf6b702cc2e7d7b5e10f4a4c40682dd21cb72975cb49d6db28b502334b3027c793b17caa2b3a818f20fb05e52389a84a55
+  data.tar.gz: e786886e41c2a6c81b169c4d781465e422bae03b059b65dd6b156c8d30c2530c773157d752a150d569e514a56e6ccfa05b537f498d9bcc8c1078bdb336109688

data/CHANGELOG.md

@@ -9,6 +9,7 @@
 * Development: adjust require's to be able to run CLI from any folder
 * Enable defining vars at the env block level, rather than only on template blocks
 * Create directories for rendered files as needed
+* Add the `skip_missing_template` config for templates
 
 #### 0.11.0
 

data/README.md

@@ -98,6 +98,13 @@ test:
       vars:
         test_specific_key: and_the_value
 
+    extra_test_config:
+      # normally there's an error for missing templates, but this can be allowed via config
+      skip_missing_template: true
+      # config files are also processed through ERB, so paths can be made dynamic
+      path: config/templates/<%= ENV['extra_test_file'] %>.yml
+      dest: config/extra_test_config.yml
+
 production:
   # vars can be defined at the environment level, which are available to these templates
   vars:

data/lib/consult/template.rb

@@ -19,6 +19,10 @@ module Consult
     end
 
     def render(save: true)
+      if contents.empty? && @config[:skip_missing_template]
+        return
+      end
+
       # Attempt to render
       renderer = ERB.new(contents, nil, '-')
       result = renderer.result(binding)
@@ -76,20 +80,34 @@ module Consult
 
     # Concatenate all the source templates together, in the order provided
     def contents
-      ordered_locations.map do |location|
+      @_contents ||= ordered_locations.map do |location|
         location.to_s.start_with?('consul') ? consul_contents(location) : disk_contents(location)
-      end.join
+      end.compact.join
     end
 
     def consul_contents(location)
       [@config[location]].compact.flatten.map do |key|
-        Diplomat::Kv.get(key, options: {}, not_found: :return, found: :return).force_encoding 'utf-8'
+        Diplomat::Kv.get(key, {}, :reject, :return).force_encoding 'utf-8'
+      rescue Diplomat::KeyNotFound
+        if @config[:skip_missing_template]
+          STDERR.puts "Consult: Skipping missing template: #{name}"
+          next
+        end
+
+        raise
       end.join
     end
 
     def disk_contents(location)
       [public_send(location)].compact.flatten.map do |file_path|
         File.read file_path, encoding: 'utf-8'
+      rescue Errno::ENOENT
+        if @config[:skip_missing_template]
+          STDERR.puts "Consult: Skipping missing template: #{name}"
+          next
+        end
+
+        raise
       end.join
     end
   end

data/lib/consult/version.rb

@@ -1,3 +1,3 @@
 module Consult
-  VERSION = '1.0.0.pre'
+  VERSION = '1.0.0.pre1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consult
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre
+  version: 1.0.0.pre1
 platform: ruby
 authors:
 - Jeff Fraser
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-18 00:00:00.000000000 Z
+date: 2023-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diplomat