consul-template-generator 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 8bc42e4ac6ae599136ce6b8c458d8a72bc1db9c2
-  data.tar.gz: eaa801befcdbc1196ad2bc753c7ec5e0ff3960e1
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    M2ZiNGE1Yzc5NGZhMTMwYWJmNDhmMjg0NDRhODM4MDU4N2UxYzcwOA==
+  data.tar.gz: !binary |-
+    MmU1ODM0M2QyYjlkYzlhMzIzY2JiMThkZDE3OTQ0ODE1M2MxZDVmMQ==
 SHA512:
-  metadata.gz: 5f036b92be9660f0478e4c6dd514fffa2ce65bb89f25e3ebd8818d3d4bcb5982d333d9a6fab02dc7fb8cb7dc9488278f1298c082479b72a2a1b9b1b45cb350be
-  data.tar.gz: ed9399d2f4c696d89b7e30a69dfd7280066517ea7fabf578c3b35615967116468e556aff9e8814f4d5a2c0a3ff3fad5790443b8a33c3f54412997e97405dce7e
+  metadata.gz: !binary |-
+    ZGMwYmI1YTI3YTVkMzQ0OTcxZDkxM2Y5NTIzMTkzYmM0YzE5NjA3YjU2NmIz
+    Mjk5ZmJiOWFhYjIwZjFjNDUxMDAyNWYwMmJjMGVjNjRiOTM2YmMyYzc5YjZh
+    OWIyN2U3ZWNkMmY2NWY1ZTkyNTkzNjY2NTg0NmM4MzRmYTkxZWY=
+  data.tar.gz: !binary |-
+    ZDA1MmI3M2QxZGJmODU1MmMwYmEzZTBjMThkMjc2Y2FlMGNjM2IyZjNjYTFi
+    ODkyZDMxY2JmNWQ4MjI2YWQxZTdmNWY0ZTdmYmYwYWU4OGQzNTZjYmZlYTFh
+    Yjg0ZjBlNDI3NGQzNjM3NTAzYTA4YmZmMDRmNTYzZmExZjBhZmE=

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    consul-template-generator (0.3.3)
-      diplomat (~> 0.12.0)
+    consul-template-generator (0.3.4)
+      differ (~> 0.1.2)
+      diplomat (~> 0.13.0)
       popen4 (~> 0.1.2)
 
 GEM
@@ -14,7 +15,8 @@ GEM
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
-    diplomat (0.12.0)
+    differ (0.1.2)
+    diplomat (0.13.1)
       faraday (~> 0.9)
       json (~> 1.8)
     docile (1.1.5)

data/bin/consul-template-generator

@@ -67,6 +67,11 @@ EOC
     options[:unset_proxy] = true
   end
 
+  options[:diff_changes] = false
+  opts.on(nil, '--diff-changes', "Print diff'ed template prior to upload") do |u|
+    options[:diff_changes] = true
+  end
+
   options[:log_level] = :info
   opts.on('-l LOG_LEVEL', '--log-level LOG_LEVEL', "Log level, options are 'debug', 'info', 'error' [default: info]") do |l|
     options[:log_level] = l.to_sym
@@ -110,7 +115,15 @@ if options[:unset_proxy]
   ENV['http_proxy'] = nil
 end
 
-CMD.configure(options[:consul], options[:templates], options[:session_key], options[:log_level], options[:graphite_host], options[:graphite_paths])
+CMD.configure(
+    options[:consul],
+    options[:templates],
+    options[:session_key],
+    options[:log_level],
+    options[:graphite_host],
+    options[:graphite_paths],
+    options[:diff_changes],
+)
 
 ec = 1
 cmd = ARGV[0]

data/consul-template-generator.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov-console', '~> 0.2'
   spec.add_development_dependency 'webmock', '~> 1.21'
   spec.add_development_dependency 'rack', '~> 1.6'
-  spec.add_dependency 'diplomat', '~> 0.12.0'
-  spec.add_dependency 'popen4', '~> 0.1.2'
+  spec.add_dependency 'diffy', '~> 3.0'
+  spec.add_dependency 'diplomat', '~> 0.13'
+  spec.add_dependency 'popen4', '~> 0.1'
 end

data/lib/consul/template/generator/cmd.rb

@@ -7,7 +7,7 @@ module Consul
         include Consul::Template::Generator
         class << self
 
-          def configure(consul_host, templates, session_key, log_level, graphite_host = nil, graphite_paths = nil)
+          def configure(consul_host, templates, session_key, log_level, graphite_host = nil, graphite_paths = nil, diff_changes = false)
             Consul::Template::Generator.configure do |config|
               config.log_level = log_level
               config.templates = templates
@@ -15,6 +15,7 @@ module Consul
               config.consul_host = consul_host
               config.graphite_host = graphite_host
               config.graphite_paths = graphite_paths || {}
+              config.diff_changes = diff_changes
             end
             @config = Consul::Template::Generator.config
           end
@@ -46,7 +47,7 @@ module Consul
                 @config.logger.info "Session lock acquired..."
                 begin
                   @config.templates.each do |template,template_key|
-                    new_hash = runner.run(template, template_key, uploaded_hashes[template])
+                    new_hash = runner.run(template, template_key, uploaded_hashes[template], @config.diff_changes)
                     unless new_hash.nil?
                       uploaded_hashes[template] =  new_hash
                       if @config.graphite_paths.include? template
@@ -79,7 +80,7 @@ module Consul
             begin
               @config.templates.each do |template,template_key|
                 runner = CTRunner.new
-                result = runner.run(template, template_key)
+                result = runner.run(template, template_key, nil, @config.diff_changes)
                 unless result.nil?
                   if @config.graphite_paths.include? template
                     runner.post_graphite_event @config.graphite_paths[template]

data/lib/consul/template/generator/configuration.rb

@@ -39,7 +39,7 @@ module Consul
       end
 
       class Configuration
-        attr_accessor :templates, :session_key, :consul_template_binary, :logger, :log_level, :graphite_host, :graphite_paths
+        attr_accessor :templates, :session_key, :consul_template_binary, :logger, :log_level, :graphite_host, :graphite_paths, :diff_changes
         attr_accessor :consul_host, :node, :client_options
 
         def initialize
@@ -52,6 +52,7 @@ module Consul
           @client_options = {}
           @logger = Consul::Template::Generator::STDLogger
           @graphite_host = nil
+          @diff_changes = false
         end
 
         def lock_key(key)

data/lib/consul/template/generator/key_value.rb

@@ -35,6 +35,15 @@ module Consul
             raise TemplateUploadError, "Encountered an unexpected error while uploading template: #{e.message}"
           end
         end
+
+        def retrieve_template(template_key)
+          @config.logger.info "Downloading key: #{template_key}"
+          begin
+            Diplomat::Kv.get(template_key, nil, :return, :return)
+          rescue Exception => e
+            raise TemplateUploadError, "Encountered an unexpected error while uploading template: #{e.message}"
+          end
+        end
       end
     end
   end

data/lib/consul/template/generator/run.rb

@@ -1,10 +1,11 @@
+require 'diffy'
 require 'consul/template/generator/ct'
 
 module Consul
   module Template
     module Generator
       class CTRunner
-        def run(template, template_key, comp_hash = nil)
+        def run(template, template_key, comp_hash = nil, diff_changes = false)
           status, body, hash, uploaded_hash = nil, nil, nil, nil
           acquire_lock template_key do
             @config.logger.debug "Attempting to render template: #{template}"
@@ -19,6 +20,14 @@ module Consul
             if comp_hash.nil? || comp_hash != hash
               @config.logger.info "Change in template discovered, attempting to upload to key #{template_key}"
               @config.logger.debug "Existing hash: #{comp_hash || 'nil'}, new hash: #{hash}"
+
+              if diff_changes
+                  @config.logger.info "Diffing templates..."
+                  curr_template = retrieve_template template_key
+                  diff = Diffy::Diff.new(curr_template, body, :include_diff_info => true, :context => 5).to_s(:text)
+                  @config.logger.info diff
+              end
+
               uploaded = upload_template(template_key, body)
               if uploaded
                 @config.logger.info "New template uploaded..."

data/lib/consul/template/generator/version.rb

@@ -1,7 +1,7 @@
 module Consul
   module Template
     module Generator
-      VERSION = '0.3.3'
+      VERSION = '0.3.4'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-template-generator
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Brian Oldfield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,34 +108,48 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: diffy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: diplomat
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: popen4
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0.1'
 description: When using complex consul-template templates or distributing them across
   many hosts, you run the risk of DoSing your consul cluster.  Using consul-template-generator
   you can instead delegate the watching/rendering of templates to a single host and
@@ -181,12 +195,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -202,4 +216,3 @@ test_files:
 - spec/key_value_spec.rb
 - spec/run_spec.rb
 - spec/spec_helper.rb
-has_rdoc: