consul-template-generator 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba8f1717006ac33f420edd8b83719bdb68aae412
-  data.tar.gz: c0069022ebf8e26f26565428d15d7d553b791169
+  metadata.gz: 8be4b2612c0cdde3c4ddc78e08af58fddae3fb12
+  data.tar.gz: 594615f00d8f7f8ee0c97923d78666b600fd8755
 SHA512:
-  metadata.gz: 63b020316a8f3291225f0ecc82e95e9ecd60b0a99205ecad5c5e8089c6c19c457422a292959fb724ee38dc60a9e1aea4e4b6b21924fe3fd2cb41fa1495ac29ae
-  data.tar.gz: 05eec4beb3cd09c1135ae92c59ded085fb678adec808ce483ff38f0fe35ead70510f439713c64a6e5bf0ebce7856ad205b2f7ed4e751cb17ba313b657bc0e6b4
+  metadata.gz: c7aeee64cbdfe213d140a5f2a3c13d2cbfed1988a5e4bcf8fb1522abfc5ae68f755cde2156bafa5a6d8c3baef426f419b58f989562dce00b618a61e688e20396
+  data.tar.gz: e449b39989b443d9f19a0f1405658c50ed96163cfc1fcf271a151e3dc0841d4ccb0256204768286e50f3a01d9a37daffd7c583b351b15077842b6506a123752b

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.2.0
+bundler_args: --binstubs
+script: "bin/rspec --format doc"

data/README.md

@@ -0,0 +1,3 @@
+[![Build Status](https://travis-ci.org/socrata-platform/consul-template-generator.svg)](https://travis-ci.org/socrata-platform/consul-template-generator)
+
+# TODO

data/bin/consul-template-generator

@@ -50,6 +50,16 @@ EOC
   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
   end
+
+  options[:cycle_sleep] = 0.5
+  opts.on(nil, '--cycle-sleep CYCLE_SLEEP', "Sleep interval in seconds between each template rendering [default: 0.5]") do |s|
+    options[:cycle_sleep] = s.to_f
+  end
+
+  options[:lock_sleep] = 1.0
+  opts.on(nil, '--lock-sleep LOCK_SLEEP', "Sleep interval in seconds between each attempt to obtain a session lock [default: 1.0]") do |s|
+    options[:cycle_sleep] = s.to_f
+  end
 end
 
 opt_parser.parse!
@@ -70,7 +80,7 @@ ec = 1
 cmd = ARGV[0]
 case cmd
 when 'run'
-    ec = CMD.run
+    ec = CMD.run(options[:cycle_sleep], options[:lock_sleep])
 when 'once'
     ec = CMD.run_once
 else

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

@@ -15,7 +15,9 @@ module Consul
           end
         end
 
-        def self.run
+        def self.run(cycle_sleep = nil, lock_sleep = nil)
+          cycle_sleep ||= 0.5
+          lock_sleep ||= 1.0
           config = Consul::Template::Generator.config
           uploaded_hash = nil
           begin
@@ -24,7 +26,7 @@ module Consul
               config.logger.info "Session lock acquired..."
               begin
                 uploaded_hash = runner.run(uploaded_hash) || uploaded_hash
-                sleep 5
+                sleep cycle_sleep
               rescue Interrupt
                 raise # Re-raise to break this rescue block
               rescue ConsulSessionExpired
@@ -33,20 +35,20 @@ module Consul
               rescue Exception => e
                 config.logger.error "An error occurred while updating template: #{e.message}"
                 config.logger.debug "Sleeping before attempting to update again..."
-                sleep 5
+                sleep lock_sleep
                 break
               end until false
             end
           rescue Interrupt
-            config.logger.error "Recieved interrupt signal, exiting..."
+            config.logger.error "Received interrupt signal, exiting..."
             break
           rescue Exception => e
             config.logger.info "Unable to obtain session lock: #{e.message}"
             config.logger.debug "Sleeping before attempting lock session again..."
             begin
-              sleep 5
+              sleep lock_sleep
             rescue Interrupt
-              config.logger.error "Recieved interrupt signal, exiting..."
+              config.logger.error "Received interrupt signal, exiting..."
               break
             end
           end until false

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

@@ -1,7 +1,7 @@
 module Consul
   module Template
     module Generator
-      VERSION = '0.1.0'
+      VERSION = '0.1.1'
     end
   end
 end

data/spec/ct_spec.rb

@@ -26,6 +26,7 @@ describe 'Consul::Template::Generator::CTRunner' '#render_template' do
     Consul::Template::Generator.configure do |config|
       config.template = '/etc/test-template.ctmpl'
       config.template_key = '/test-template'
+      config.consul_template_binary = 'consul-template'
     end
   end
 

data/spec/init_spec.rb

@@ -11,6 +11,7 @@ describe 'Consul::Template::Generator::CTRunner' '#initialize' do
       config.template = 'test-session-template.ctmpl'
       config.template_key = 'test-session-template'
       config.node = 'test-node'
+      config.consul_template_binary = 'consul-template'
     end
   end
 

data/spec/key_value_spec.rb

@@ -13,12 +13,13 @@ describe 'Consul::Template::Generator::CTRunner' '#acquire_lock' do
       config.template = 'test-template.ctmpl'
       config.template_key = '/test-template'
       config.consul_host = '127.0.0.1:8500'
+      config.consul_template_binary = 'consul-template'
       config.log_level = :off
     end
   end
 
-  context 'aquires lock' do
-    it 'clean lock acquisision' do
+  context 'acquires lock' do
+    it 'clean lock acquisition' do
       runner = CTRunner.new('test-session')
       runner.acquire_lock do
        expect(true).to be_truthy ## This is simply to assert we are able to execute code in the block
@@ -42,12 +43,13 @@ describe 'Consul::Template::Generator::CTRunner' '#acquire_session_lock' do
       config.template = 'test-template.ctmpl'
       config.template_key = '/test-template'
       config.consul_host = '127.0.0.1:8500'
+      config.consul_template_binary = 'consul-template'
       config.log_level = :off
     end
   end
 
-  context 'aquires session lock' do
-    it 'clean lock acquisision' do
+  context 'acquires session lock' do
+    it 'clean lock acquisition' do
       runner = CTRunner.new('test-session')
       runner.acquire_session_lock do
        expect(true).to be_truthy ## This is simply to assert we are able to execute code in the block
@@ -72,6 +74,7 @@ describe 'Consul::Template::Generator::CTRunner' '#upload_template' do
         config.template = 'test-template.ctmpl'
         config.template_key = '/test-template'
         config.consul_host = '127.0.0.1:8500'
+        config.consul_template_binary = 'consul-template'
         config.log_level = :off
       end
     end
@@ -90,6 +93,7 @@ describe 'Consul::Template::Generator::CTRunner' '#upload_template' do
         config.template = 'test-template.ctmpl'
         config.template_key = '/test-template-failure'
         config.consul_host = '127.0.0.1:8500'
+        config.consul_template_binary = 'consul-template'
         config.log_level = :off
       end
     end

data/spec/run_spec.rb

@@ -19,7 +19,7 @@ describe 'Consul::Template::Generator::CTRunner' '#run' do
       expect(hash).to eql(exp_hash)
     end
 
-    it "does't upload unchanged template" do
+    it "doesn't upload unchanged template" do
       exp_hash = 'bbf9afe7431caf5f89a608bc31e8d822'
       expect(@runner).to receive(:render_template).with(no_args).and_return([0, 'test body', exp_hash])
       expect(@runner).not_to receive(:upload_template)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: consul-template-generator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Brian Oldfield
@@ -150,8 +150,10 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
+- README.md
 - bin/consul-template-generator
 - consul-template-generator.gemspec
 - lib/consul/template/generator.rb