consul-templaterb 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c585b885aba40b8fcb72ac48c82f4dfd90ea4cbb9949976aa33eecf8a6a109a3
-  data.tar.gz: 1a35639786fb7c3dad6f23bd890816763997f025299a99608291212cc8c07695
+  metadata.gz: dff2b22aa59dd10c76e17b02ad83bc2d3f5d0b6e2e2502ad94c2436c9c93f074
+  data.tar.gz: f41245cc9d75fd2c326fa573643e6dee67eb2e9743c9862da2710e41114fba3f
 SHA512:
-  metadata.gz: 50afc5d1cdfb2aa269673be86561dc4c8fde3334f9de4b2a9361714f1e35b47a0235d828a17c93d6e50345873bbb396075bd0762f6ad7062fe97ba51eda1c1c3
-  data.tar.gz: 9286bd23cf9d41e01b0585521eb0e7c41bead41a82b571baa687e7f3734fdfd238cce67b7b45bcadbe2565111dc118b49d659061ec20a9deaa2d0dd6fa0bf016
+  metadata.gz: 6a2cc201720dd43f08ac085e7df34bafaa63379a3eabd801e188f587a2ff5448ec2c657e7984c47dddc516a0fc6d8ce61c5ab4cb426ff76101e671f0c523855e
+  data.tar.gz: 7dea5e8d25aade2cfb621faa461f496183dcdfa77a8b3862fd2e030d042c05722692517bdaf8de382566946948eaa6aaeb3b91596c7bda08c1ef17690cc1f8dc

data/.gitignore

@@ -7,6 +7,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+/samples/ready
 /samples/*.json
 /samples/*.xml
 /samples/*.html
@@ -21,5 +22,5 @@
 
 # rspec failure tracking
 .rspec_status
-# Max OS
+# Mac OS
 .DS_Store

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 ## (UNRELEASED)
 
+## 1.0.7 (March 16, 2018)
+
+BUG FIXES:
+
+* Do not execute reload command at startup if destination file exists and is unchanged
+
+IMPROVEMENTS:
+
+* samples/*.html.erb files have doctype as first line
+
 ## 1.0.6 (March 16, 2018)
 
 IMPROVEMENTS:

data/README.md

@@ -1,4 +1,4 @@
-# Consul::Templaterb
+# Consul::Templaterb [![Build Status](https://api.travis-ci.org/criteo/consul-templaterb.svg?branch=master)](https://travis-ci.org/criteo/consul-templaterb)
 
 This GEM is both a library and an executable that allows to generate files
 using data from Consul (Discovery and Key/Value Store) easily using ruby's
@@ -117,7 +117,7 @@ $ consul-templaterb --help
 USAGE: bin/consul-templaterb [[options]]
     -h, --help                       Show help
     -v, --version                    Show Version
-    -c, --consul-addr=<address>      Address of Consul, eg: http://locahost:8500
+    -c, --consul-addr=<address>      Address of Consul, eg: http://localhost:8500
         --consul-token=<token>       Use a token to connect to Consul
     -w, --wait=<min_duration>        Wait at least n seconds before each template generation
     -r, --retry-delay=<min_duration> Min Retry delay on Error/Missing Consul Index

data/bin/consul-templaterb

@@ -67,7 +67,7 @@ optparse = OptionParser.new do |opts|
     exit 0
   end
 
-  opts.on('-c', '--consul-addr=<address>', String, 'Address of Consul, eg: http://locahost:8500') do |consul_url|
+  opts.on('-c', '--consul-addr=<address>', String, 'Address of Consul, eg: http://localhost:8500') do |consul_url|
     options[:consul][:base_url] = consul_url
   end
 

data/lib/consul/async/consul_endpoint.rb

@@ -7,7 +7,7 @@ module Consul
     class ConsulConfiguration
       attr_reader :base_url, :token, :retry_duration, :min_duration, :wait_duration, :max_retry_duration, :retry_on_non_diff,
                   :missing_index_retry_time_on_diff, :missing_index_retry_time_on_unchanged, :debug
-      def initialize(base_url: 'http://locahost:8500',
+      def initialize(base_url: 'http://localhost:8500',
                      debug: { network: false },
                      token: nil,
                      retry_duration: 10,

data/lib/consul/async/consul_template_render.rb

@@ -27,6 +27,7 @@ module Consul
         @output_file = output_file
         @template_manager = template_manager
         @last_result = ''
+        @last_result = File.read(output_file) if File.exist? output_file
         @template = load_template
       end
 

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.0.6'.freeze
+    VERSION = '1.0.7'.freeze
   end
 end

data/samples/checks.html.erb

@@ -14,8 +14,7 @@
       'info'
     end
   end
-  %>
-<%= render_file 'common/header.html.erb' %>
+  %><%= render_file 'common/header.html.erb' %>
 <style type="text/css">
 .check {
   transition: opacity 1s ease-out;

data/samples/common/header.html.erb

@@ -6,8 +6,7 @@
   tools = (ENV['CONSUL_TOOLS'] || 'criteo_choregraphies,checks,services,nodes,keys').split(",")
   suffix = ENV['CONSUL_TOOLS_PREFIX'] || '.html'
   prefix = ENV['CONSUL_TOOLS_SUFFIX'] || ''
-%>
-<!DOCTYPE html>
+%><!DOCTYPE html>
 <html lang="en">
   <head>
     <meta charset="utf-8">

data/samples/criteo_choregraphies.html.erb

@@ -2,8 +2,7 @@
    require 'json'
    require 'date'
    @current_time = Time.now.utc
-%>
-<%= render_file 'common/header.html.erb' %>
+%><%= render_file 'common/header.html.erb' %>
 <main role="main" class="container">
   <div>
   <h1>Show all choregraphie information</h1>

data/samples/services.html.erb

@@ -14,8 +14,7 @@
       'info'
     end
   end
-  %>
-<%= render_file 'common/header.html.erb' %>
+  %><%= render_file 'common/header.html.erb' %>
 <% require 'base64'
    require 'json'
    require 'date'
@@ -69,4 +68,4 @@
 <% end%>
 </ul>
 <% end%>
-<%= render_file 'common/footer.html.erb' %>
+<%= render_file 'common/footer.html.erb' %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - SRE Core Services