tiller 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dfd522a871acfb08c4e631ef2fce9d7afac65e2
-  data.tar.gz: e73da3abffb92950f877c1e79368cfb845b3843b
+  metadata.gz: a6a2cb59355573ce5ebb05972afcf096288662e4
+  data.tar.gz: 353d75c047d51da10149e14c65abe0af0523615c
 SHA512:
-  metadata.gz: 0e224129e75ab34e3e8c568f8b80e8599542dd8e5509db67d3e161aeda291e1c3f66f1a17807450d436814d616f0e582de605d7d101d24304e9060a3d190477a
-  data.tar.gz: de983f07887c98f3f9f91430420ab8780810a3be927e63f7d2502763027ee7740e70112273e72cb2c4992f282f8954d980c4aa7b9b2ca24299ce1ae94dcf1de1
+  metadata.gz: eabac5f8d95506361d2dcfbc00fbb0d3155dc744532f624ce98634159158c6d1865f15d21e5afaf26abe18dfec8f38021d2f18f970040274d888f2c089418254
+  data.tar.gz: 48fa0a3da0bf19a1cfcc626e91acb63516ff03066567b4f6fbe69b43fbdf11ea94d7354c916ed6adc4687a08777e29c43463a013bed55974c4028c96c6dfb835

data/bin/tiller

@@ -4,7 +4,7 @@
 # didn't have an existing gem named after it!
 # Mark Round <github@markround.com>
 
-VERSION = '0.2.2'
+VERSION = '0.2.3'
 
 require 'erb'
 require 'ostruct'
@@ -44,7 +44,7 @@ module Tiller
   # Parse command-line arguments
   config[:no_exec] = false
   config[:verbose] = false
-  config[:api_enable] = false
+  config['api_enable'] = false
 
   optparse = OptionParser.new do |opts|
     opts.on('-n', '--no-exec', 'Do not execute a replacement process') do

data/lib/tiller/api.rb

@@ -15,53 +15,61 @@ API_PORT=6275
 # after it has generated templates and forked a child process.
 
 def tiller_api(tiller_api_hash)
+
   api_port = tiller_api_hash['config']['api_port'] ?
       tiller_api_hash['config']['api_port'] : API_PORT
 
-  puts "Tiller API starting on port #{api_port}" if tiller_api_hash['config'][:verbose]
+  puts "Tiller API starting on port #{api_port}"
 
   server = TCPServer.new(api_port)
 
   loop do
-    socket = server.accept
-    request = socket.gets
-    (method, uri, http_version) = request.split
+    begin
+      socket = server.accept
+      request = socket.gets
+      (method, uri, http_version) = request.split
 
-    if uri =~ /^\/v([0-9]+)\//
-      api_version = uri.split('/')[1]
-    end
+      if uri =~ /^\/v([0-9]+)\//
+        api_version = uri.split('/')[1]
+      end
 
-    # Defaults
-    response = handle_404
-
-    # Routing
-    case method
-      when 'GET'
-        case uri
-          when '/ping'
-            response = handle_ping
-          when /^\/v([0-9]+)\/config/
-            response = handle_config(api_version, tiller_api_hash)
-          when /^\/v([0-9]+)\/globals/
-            response = handle_globals(api_version, tiller_api_hash)
-          when /^\/v([0-9]+)\/templates/
-            response = handle_templates(api_version, tiller_api_hash)
-          when /^\/v([0-9]+)\/template\//
-            template = uri.split('/')[3]
-            response = handle_template(api_version, tiller_api_hash, template)
-        end
-    end
+      # Defaults
+      response = handle_404
+
+      # Routing
+      case method
+        when 'GET'
+          case uri
+            when '/ping'
+              response = handle_ping
+            when /^\/v([0-9]+)\/config/
+              response = handle_config(api_version, tiller_api_hash)
+            when /^\/v([0-9]+)\/globals/
+              response = handle_globals(api_version, tiller_api_hash)
+            when /^\/v([0-9]+)\/templates/
+              response = handle_templates(api_version, tiller_api_hash)
+            when /^\/v([0-9]+)\/template\//
+              template = uri.split('/')[3]
+              response = handle_template(api_version, tiller_api_hash, template)
+          end
+      end
 
-    # Response
-    socket.print "HTTP/1.1 #{response[:status]}\r\n" +
-                     "Content-Type: application/json\r\n" +
-                     "Server: Tiller #{VERSION} / API v#{API_VERSION}\r\n"
-                     "Content-Length: #{response[:content].bytesize}\r\n" +
-                     "Connection: close\r\n"
-    socket.print "\r\n"
-    socket.print response[:content]
-    socket.close
+      # Response
+      socket.print "HTTP/1.1 #{response[:status]}\r\n" +
+                       "Content-Type: application/json\r\n" +
+                       "Server: Tiller #{VERSION} / API v#{API_VERSION}\r\n"
+                       "Content-Length: #{response[:content].bytesize}\r\n" +
+                       "Connection: close\r\n"
+      socket.print "\r\n"
+      socket.print response[:content]
+      socket.close
+
+    rescue Exception => e
+      puts "Error : Exception in Tiller API thread : #{e.class.name}\n#{e}"
+      next
+    end
   end
+
 end
 
 

data/lib/tiller/api/handlers/config.rb

@@ -1,11 +1,11 @@
-require 'json'
+require 'tiller/json'
 require 'tiller/api/handlers/404'
 
 def handle_config(api_version, tiller_api_hash)
   case api_version
     when 'v1'
       {
-          :content => tiller_api_hash['config'].to_json,
+          :content => dump_json(tiller_api_hash['config']),
           :status => '200 OK'
       }
     else

data/lib/tiller/api/handlers/globals.rb

@@ -1,11 +1,11 @@
-require 'json'
+require 'tiller/json'
 require 'tiller/api/handlers/404'
 
 def handle_globals(api_version, tiller_api_hash)
   case api_version
     when 'v1'
       {
-          :content => tiller_api_hash['global_values'].to_json,
+          :content => dump_json(tiller_api_hash['global_values']),
           :status => '200 OK'
       }
     else

data/lib/tiller/api/handlers/template.rb

@@ -1,4 +1,4 @@
-require 'json'
+require 'tiller/json'
 require 'tiller/api/handlers/404'
 
 def handle_template(api_version, tiller_api_hash, template)
@@ -6,7 +6,7 @@ def handle_template(api_version, tiller_api_hash, template)
     when 'v1'
       if tiller_api_hash['templates'].has_key?(template)
         {
-            :content => tiller_api_hash['templates'][template].to_json,
+            :content => dump_json(tiller_api_hash['templates'][template]),
             :status => '200 OK'
         }
       else

data/lib/tiller/api/handlers/templates.rb

@@ -1,11 +1,11 @@
-require 'json'
+require 'tiller/json'
 require 'tiller/api/handlers/404'
 
 def handle_templates(api_version, tiller_api_hash)
   case api_version
     when 'v1'
         {
-            :content => tiller_api_hash['templates'].keys.to_json,
+            :content => dump_json(tiller_api_hash['templates'].keys),
             :status => '200 OK'
         }
       else

data/lib/tiller/json.rb

@@ -0,0 +1,15 @@
+# Switchable JSON dumpers. If Oj gem is installed then we'll use that,
+# otherwise we'll fall back to to_json. This is because to_json may have issues
+# with encoding, but I don't want to force people to install a C-language
+# gem, along with a compiler and ruby development libraries etc.
+
+require 'json'
+
+def dump_json(structure)
+  begin
+    require 'Oj'
+    Oj.dump(structure, :mode => :compat)
+  rescue LoadError
+    structure.to_json
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiller
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Mark Round
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-20 00:00:00.000000000 Z
+date: 2014-10-22 00:00:00.000000000 Z
 dependencies: []
 description: A tool to create configuration files in Docker containers from a variety
   of sources. See https://github.com/markround/tiller for examples and documentation.
@@ -43,6 +43,7 @@ files:
 - lib/tiller/data/file.rb
 - lib/tiller/data/random.rb
 - lib/tiller/datasource.rb
+- lib/tiller/json.rb
 - lib/tiller/template/file.rb
 - lib/tiller/templatesource.rb
 homepage: http://www.markround.com