consul-templaterb 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6f546cec480feae29069b3458138d65bdeacc686b5a0e2a0e6762a306ee7cbe
-  data.tar.gz: edad0a361f2bfc627994e05ea590cb5c1f62c81a1f25aeaaad9c150110e0ed5c
+  metadata.gz: 4575bd9573abe22918149095549c1942aba92f447bc57c9bf466e3f4e692955f
+  data.tar.gz: e0f1daefa7fd071b16becceeb955acbf465a8c63f09a787161ea26786342be5e
 SHA512:
-  metadata.gz: d4882996d68193413e3b9b2cacdb182c14cd6c952b6a53397488689d140e90ce0b6f7cefd898028d85e0cb22114c9a53b1c6333fd06aaa50d73dcc9158560836
-  data.tar.gz: 8cbeeda5ae647a91fe9744a5240c0113f216c29613e802f58ec8ffcbb5b49d632192573fe0e4fd1dc357c498d48c81935d38f3f58886bd72c0d37270100efa7f
+  metadata.gz: d06c13276838fc70fd31beeac8875b89f9b80b9efde59614be9b6b0f272e8fba819ef40424ff3b6f0a300f1f17eb719f16b66dd697b86193e3a3c7b92ea79a11
+  data.tar.gz: 4664f4a357a97d5f3047a328aa4907b08d4dab11d570a961cde0e51d0ac4453649ddb97d76cda113509e93ed43f99c96f69b86d50872d1ab38e2285a811e0f60

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 ## (UNRELEASED)
 
+## 1.8.1 (December 12, 2018)
+
+BUGFIX:
+
+ * Properly fill `template_info` strtucture when hot reload is performed so templates using
+   `template_info()` new function can behave nicely.
+
+NEW FEATURES:
+
+ * template_info now includes `hot_reloading_in_progress: true` when the hotreloading is in progress.
+
 ## 1.8.0 (December 11, 2018)
 
 NEW FEATURES:

data/TemplateAPI.md

@@ -383,15 +383,6 @@ secret('secret/foo', [force_ttl: intInSecond])
 It returns information about current template being rendered.
 The information returned has the following structure:
 
-```json
-{
-  'destination':       destination_file_for_root_template
-  'source':            absolute_path_to_template_file.erb
-  'source_root':       absolute_path_to_root_template.erb
-  'was_rendered_once': true|false
-}
-```
-
 - `destination`: absolute path where the file is gonna be written
 - `source`: the template absolute path file, most of the time, if will be
   equal to `source_root`, except when the current template is included
@@ -413,12 +404,22 @@ I am the file <%= File.basename(template_info['source']) %><%
 %> rendered as <%= File.basename(template_info['destination']) %>
 ```
 
+#### Simple rendering
+
 The command `consul-template template_info.erb` would render:
-`I am the file template_info.erb rendered as template_info`
+
+```
+I am the file template_info.erb rendered as template_info`
+```
+
+#### Rendering with template included into another
 
 If creating a file called include.erb with contents: `<%= render_file('template_info.erb') %>`,
 the command `consul-templaterb --template include.erb:destination_file.txt` would render:
-`I am the file template_info.erb included from template include.erb rendered as destination_file.txt`
+
+```
+I am the file template_info.erb included from template include.erb rendered as destination_file.txt`
+```
 
 </div>
 </details>

data/lib/consul/async/consul_template_render.rb

@@ -80,13 +80,11 @@ module Consul
         new_time = File.ctime(template_file)
         if template_file_ctime != new_time
           begin
-            current_template_info = {}
-            current_template_info.!merge(current_template_info)
-            current_template_info['ready'] = false
+            current_template_info = _build_default_template_info.merge('ready' => false, 'hot_reloading_in_progress' => true)
             @template_file_ctime = new_time
             return update_template(load_template, current_template_info: current_template_info)
           rescue Consul::Async::InvalidTemplateException => e
-            STDERR.puts "****\n[ERROR] HOT Reload of template #{template_file} did fail due to:\n #{e}\n****\n"
+            STDERR.puts "****\n[ERROR] HOT Reload of template #{template_file} did fail due to:\n #{e}\n****\n template_info: #{current_template_info}\n****"
             raise e unless hot_reload_failure == 'keep'
             STDERR.puts "[WARN] Hot reload of #{template_file} was not taken into account, keep running with previous version"
           end

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.8.0'.freeze
+    VERSION = '1.8.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - SRE Core Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-11 00:00:00.000000000 Z
+date: 2018-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
@@ -228,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Implementation of Consul template using Ruby and .erb templating language