ringleader 0.0.2 → 1.0.0

data/assets/underscore-min.js

@@ -0,0 +1,32 @@
+// Underscore.js 1.3.3
+// (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc.
+// Underscore is freely distributable under the MIT license.
+// Portions of Underscore are inspired or borrowed from Prototype,
+// Oliver Steele's Functional, and John Resig's Micro-Templating.
+// For all details and documentation:
+// http://documentcloud.github.com/underscore
+(function(){function r(a,c,d){if(a===c)return 0!==a||1/a==1/c;if(null==a||null==c)return a===c;a._chain&&(a=a._wrapped);c._chain&&(c=c._wrapped);if(a.isEqual&&b.isFunction(a.isEqual))return a.isEqual(c);if(c.isEqual&&b.isFunction(c.isEqual))return c.isEqual(a);var e=l.call(a);if(e!=l.call(c))return!1;switch(e){case "[object String]":return a==""+c;case "[object Number]":return a!=+a?c!=+c:0==a?1/a==1/c:a==+c;case "[object Date]":case "[object Boolean]":return+a==+c;case "[object RegExp]":return a.source==
+c.source&&a.global==c.global&&a.multiline==c.multiline&&a.ignoreCase==c.ignoreCase}if("object"!=typeof a||"object"!=typeof c)return!1;for(var f=d.length;f--;)if(d[f]==a)return!0;d.push(a);var f=0,g=!0;if("[object Array]"==e){if(f=a.length,g=f==c.length)for(;f--&&(g=f in a==f in c&&r(a[f],c[f],d)););}else{if("constructor"in a!="constructor"in c||a.constructor!=c.constructor)return!1;for(var h in a)if(b.has(a,h)&&(f++,!(g=b.has(c,h)&&r(a[h],c[h],d))))break;if(g){for(h in c)if(b.has(c,h)&&!f--)break;
+g=!f}}d.pop();return g}var s=this,I=s._,o={},k=Array.prototype,p=Object.prototype,i=k.slice,J=k.unshift,l=p.toString,K=p.hasOwnProperty,y=k.forEach,z=k.map,A=k.reduce,B=k.reduceRight,C=k.filter,D=k.every,E=k.some,q=k.indexOf,F=k.lastIndexOf,p=Array.isArray,L=Object.keys,t=Function.prototype.bind,b=function(a){return new m(a)};"undefined"!==typeof exports?("undefined"!==typeof module&&module.exports&&(exports=module.exports=b),exports._=b):s._=b;b.VERSION="1.3.3";var j=b.each=b.forEach=function(a,
+c,d){if(a!=null)if(y&&a.forEach===y)a.forEach(c,d);else if(a.length===+a.length)for(var e=0,f=a.length;e<f;e++){if(e in a&&c.call(d,a[e],e,a)===o)break}else for(e in a)if(b.has(a,e)&&c.call(d,a[e],e,a)===o)break};b.map=b.collect=function(a,c,b){var e=[];if(a==null)return e;if(z&&a.map===z)return a.map(c,b);j(a,function(a,g,h){e[e.length]=c.call(b,a,g,h)});if(a.length===+a.length)e.length=a.length;return e};b.reduce=b.foldl=b.inject=function(a,c,d,e){var f=arguments.length>2;a==null&&(a=[]);if(A&&
+a.reduce===A){e&&(c=b.bind(c,e));return f?a.reduce(c,d):a.reduce(c)}j(a,function(a,b,i){if(f)d=c.call(e,d,a,b,i);else{d=a;f=true}});if(!f)throw new TypeError("Reduce of empty array with no initial value");return d};b.reduceRight=b.foldr=function(a,c,d,e){var f=arguments.length>2;a==null&&(a=[]);if(B&&a.reduceRight===B){e&&(c=b.bind(c,e));return f?a.reduceRight(c,d):a.reduceRight(c)}var g=b.toArray(a).reverse();e&&!f&&(c=b.bind(c,e));return f?b.reduce(g,c,d,e):b.reduce(g,c)};b.find=b.detect=function(a,
+c,b){var e;G(a,function(a,g,h){if(c.call(b,a,g,h)){e=a;return true}});return e};b.filter=b.select=function(a,c,b){var e=[];if(a==null)return e;if(C&&a.filter===C)return a.filter(c,b);j(a,function(a,g,h){c.call(b,a,g,h)&&(e[e.length]=a)});return e};b.reject=function(a,c,b){var e=[];if(a==null)return e;j(a,function(a,g,h){c.call(b,a,g,h)||(e[e.length]=a)});return e};b.every=b.all=function(a,c,b){var e=true;if(a==null)return e;if(D&&a.every===D)return a.every(c,b);j(a,function(a,g,h){if(!(e=e&&c.call(b,
+a,g,h)))return o});return!!e};var G=b.some=b.any=function(a,c,d){c||(c=b.identity);var e=false;if(a==null)return e;if(E&&a.some===E)return a.some(c,d);j(a,function(a,b,h){if(e||(e=c.call(d,a,b,h)))return o});return!!e};b.include=b.contains=function(a,c){var b=false;if(a==null)return b;if(q&&a.indexOf===q)return a.indexOf(c)!=-1;return b=G(a,function(a){return a===c})};b.invoke=function(a,c){var d=i.call(arguments,2);return b.map(a,function(a){return(b.isFunction(c)?c||a:a[c]).apply(a,d)})};b.pluck=
+function(a,c){return b.map(a,function(a){return a[c]})};b.max=function(a,c,d){if(!c&&b.isArray(a)&&a[0]===+a[0])return Math.max.apply(Math,a);if(!c&&b.isEmpty(a))return-Infinity;var e={computed:-Infinity};j(a,function(a,b,h){b=c?c.call(d,a,b,h):a;b>=e.computed&&(e={value:a,computed:b})});return e.value};b.min=function(a,c,d){if(!c&&b.isArray(a)&&a[0]===+a[0])return Math.min.apply(Math,a);if(!c&&b.isEmpty(a))return Infinity;var e={computed:Infinity};j(a,function(a,b,h){b=c?c.call(d,a,b,h):a;b<e.computed&&
+(e={value:a,computed:b})});return e.value};b.shuffle=function(a){var b=[],d;j(a,function(a,f){d=Math.floor(Math.random()*(f+1));b[f]=b[d];b[d]=a});return b};b.sortBy=function(a,c,d){var e=b.isFunction(c)?c:function(a){return a[c]};return b.pluck(b.map(a,function(a,b,c){return{value:a,criteria:e.call(d,a,b,c)}}).sort(function(a,b){var c=a.criteria,d=b.criteria;return c===void 0?1:d===void 0?-1:c<d?-1:c>d?1:0}),"value")};b.groupBy=function(a,c){var d={},e=b.isFunction(c)?c:function(a){return a[c]};
+j(a,function(a,b){var c=e(a,b);(d[c]||(d[c]=[])).push(a)});return d};b.sortedIndex=function(a,c,d){d||(d=b.identity);for(var e=0,f=a.length;e<f;){var g=e+f>>1;d(a[g])<d(c)?e=g+1:f=g}return e};b.toArray=function(a){return!a?[]:b.isArray(a)||b.isArguments(a)?i.call(a):a.toArray&&b.isFunction(a.toArray)?a.toArray():b.values(a)};b.size=function(a){return b.isArray(a)?a.length:b.keys(a).length};b.first=b.head=b.take=function(a,b,d){return b!=null&&!d?i.call(a,0,b):a[0]};b.initial=function(a,b,d){return i.call(a,
+0,a.length-(b==null||d?1:b))};b.last=function(a,b,d){return b!=null&&!d?i.call(a,Math.max(a.length-b,0)):a[a.length-1]};b.rest=b.tail=function(a,b,d){return i.call(a,b==null||d?1:b)};b.compact=function(a){return b.filter(a,function(a){return!!a})};b.flatten=function(a,c){return b.reduce(a,function(a,e){if(b.isArray(e))return a.concat(c?e:b.flatten(e));a[a.length]=e;return a},[])};b.without=function(a){return b.difference(a,i.call(arguments,1))};b.uniq=b.unique=function(a,c,d){var d=d?b.map(a,d):a,
+e=[];a.length<3&&(c=true);b.reduce(d,function(d,g,h){if(c?b.last(d)!==g||!d.length:!b.include(d,g)){d.push(g);e.push(a[h])}return d},[]);return e};b.union=function(){return b.uniq(b.flatten(arguments,true))};b.intersection=b.intersect=function(a){var c=i.call(arguments,1);return b.filter(b.uniq(a),function(a){return b.every(c,function(c){return b.indexOf(c,a)>=0})})};b.difference=function(a){var c=b.flatten(i.call(arguments,1),true);return b.filter(a,function(a){return!b.include(c,a)})};b.zip=function(){for(var a=
+i.call(arguments),c=b.max(b.pluck(a,"length")),d=Array(c),e=0;e<c;e++)d[e]=b.pluck(a,""+e);return d};b.indexOf=function(a,c,d){if(a==null)return-1;var e;if(d){d=b.sortedIndex(a,c);return a[d]===c?d:-1}if(q&&a.indexOf===q)return a.indexOf(c);d=0;for(e=a.length;d<e;d++)if(d in a&&a[d]===c)return d;return-1};b.lastIndexOf=function(a,b){if(a==null)return-1;if(F&&a.lastIndexOf===F)return a.lastIndexOf(b);for(var d=a.length;d--;)if(d in a&&a[d]===b)return d;return-1};b.range=function(a,b,d){if(arguments.length<=
+1){b=a||0;a=0}for(var d=arguments[2]||1,e=Math.max(Math.ceil((b-a)/d),0),f=0,g=Array(e);f<e;){g[f++]=a;a=a+d}return g};var H=function(){};b.bind=function(a,c){var d,e;if(a.bind===t&&t)return t.apply(a,i.call(arguments,1));if(!b.isFunction(a))throw new TypeError;e=i.call(arguments,2);return d=function(){if(!(this instanceof d))return a.apply(c,e.concat(i.call(arguments)));H.prototype=a.prototype;var b=new H,g=a.apply(b,e.concat(i.call(arguments)));return Object(g)===g?g:b}};b.bindAll=function(a){var c=
+i.call(arguments,1);c.length==0&&(c=b.functions(a));j(c,function(c){a[c]=b.bind(a[c],a)});return a};b.memoize=function(a,c){var d={};c||(c=b.identity);return function(){var e=c.apply(this,arguments);return b.has(d,e)?d[e]:d[e]=a.apply(this,arguments)}};b.delay=function(a,b){var d=i.call(arguments,2);return setTimeout(function(){return a.apply(null,d)},b)};b.defer=function(a){return b.delay.apply(b,[a,1].concat(i.call(arguments,1)))};b.throttle=function(a,c){var d,e,f,g,h,i,j=b.debounce(function(){h=
+g=false},c);return function(){d=this;e=arguments;f||(f=setTimeout(function(){f=null;h&&a.apply(d,e);j()},c));g?h=true:i=a.apply(d,e);j();g=true;return i}};b.debounce=function(a,b,d){var e;return function(){var f=this,g=arguments;d&&!e&&a.apply(f,g);clearTimeout(e);e=setTimeout(function(){e=null;d||a.apply(f,g)},b)}};b.once=function(a){var b=false,d;return function(){if(b)return d;b=true;return d=a.apply(this,arguments)}};b.wrap=function(a,b){return function(){var d=[a].concat(i.call(arguments,0));
+return b.apply(this,d)}};b.compose=function(){var a=arguments;return function(){for(var b=arguments,d=a.length-1;d>=0;d--)b=[a[d].apply(this,b)];return b[0]}};b.after=function(a,b){return a<=0?b():function(){if(--a<1)return b.apply(this,arguments)}};b.keys=L||function(a){if(a!==Object(a))throw new TypeError("Invalid object");var c=[],d;for(d in a)b.has(a,d)&&(c[c.length]=d);return c};b.values=function(a){return b.map(a,b.identity)};b.functions=b.methods=function(a){var c=[],d;for(d in a)b.isFunction(a[d])&&
+c.push(d);return c.sort()};b.extend=function(a){j(i.call(arguments,1),function(b){for(var d in b)a[d]=b[d]});return a};b.pick=function(a){var c={};j(b.flatten(i.call(arguments,1)),function(b){b in a&&(c[b]=a[b])});return c};b.defaults=function(a){j(i.call(arguments,1),function(b){for(var d in b)a[d]==null&&(a[d]=b[d])});return a};b.clone=function(a){return!b.isObject(a)?a:b.isArray(a)?a.slice():b.extend({},a)};b.tap=function(a,b){b(a);return a};b.isEqual=function(a,b){return r(a,b,[])};b.isEmpty=
+function(a){if(a==null)return true;if(b.isArray(a)||b.isString(a))return a.length===0;for(var c in a)if(b.has(a,c))return false;return true};b.isElement=function(a){return!!(a&&a.nodeType==1)};b.isArray=p||function(a){return l.call(a)=="[object Array]"};b.isObject=function(a){return a===Object(a)};b.isArguments=function(a){return l.call(a)=="[object Arguments]"};b.isArguments(arguments)||(b.isArguments=function(a){return!(!a||!b.has(a,"callee"))});b.isFunction=function(a){return l.call(a)=="[object Function]"};
+b.isString=function(a){return l.call(a)=="[object String]"};b.isNumber=function(a){return l.call(a)=="[object Number]"};b.isFinite=function(a){return b.isNumber(a)&&isFinite(a)};b.isNaN=function(a){return a!==a};b.isBoolean=function(a){return a===true||a===false||l.call(a)=="[object Boolean]"};b.isDate=function(a){return l.call(a)=="[object Date]"};b.isRegExp=function(a){return l.call(a)=="[object RegExp]"};b.isNull=function(a){return a===null};b.isUndefined=function(a){return a===void 0};b.has=function(a,
+b){return K.call(a,b)};b.noConflict=function(){s._=I;return this};b.identity=function(a){return a};b.times=function(a,b,d){for(var e=0;e<a;e++)b.call(d,e)};b.escape=function(a){return(""+a).replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#x27;").replace(/\//g,"&#x2F;")};b.result=function(a,c){if(a==null)return null;var d=a[c];return b.isFunction(d)?d.call(a):d};b.mixin=function(a){j(b.functions(a),function(c){M(c,b[c]=a[c])})};var N=0;b.uniqueId=
+function(a){var b=N++;return a?a+b:b};b.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g};var u=/.^/,n={"\\":"\\","'":"'",r:"\r",n:"\n",t:"\t",u2028:"\u2028",u2029:"\u2029"},v;for(v in n)n[n[v]]=v;var O=/\\|'|\r|\n|\t|\u2028|\u2029/g,P=/\\(\\|'|r|n|t|u2028|u2029)/g,w=function(a){return a.replace(P,function(a,b){return n[b]})};b.template=function(a,c,d){d=b.defaults(d||{},b.templateSettings);a="__p+='"+a.replace(O,function(a){return"\\"+n[a]}).replace(d.escape||
+u,function(a,b){return"'+\n_.escape("+w(b)+")+\n'"}).replace(d.interpolate||u,function(a,b){return"'+\n("+w(b)+")+\n'"}).replace(d.evaluate||u,function(a,b){return"';\n"+w(b)+"\n;__p+='"})+"';\n";d.variable||(a="with(obj||{}){\n"+a+"}\n");var a="var __p='';var print=function(){__p+=Array.prototype.join.call(arguments, '')};\n"+a+"return __p;\n",e=new Function(d.variable||"obj","_",a);if(c)return e(c,b);c=function(a){return e.call(this,a,b)};c.source="function("+(d.variable||"obj")+"){\n"+a+"}";return c};
+b.chain=function(a){return b(a).chain()};var m=function(a){this._wrapped=a};b.prototype=m.prototype;var x=function(a,c){return c?b(a).chain():a},M=function(a,c){m.prototype[a]=function(){var a=i.call(arguments);J.call(a,this._wrapped);return x(c.apply(b,a),this._chain)}};b.mixin(b);j("pop,push,reverse,shift,sort,splice,unshift".split(","),function(a){var b=k[a];m.prototype[a]=function(){var d=this._wrapped;b.apply(d,arguments);var e=d.length;(a=="shift"||a=="splice")&&e===0&&delete d[0];return x(d,
+this._chain)}});j(["concat","join","slice"],function(a){var b=k[a];m.prototype[a]=function(){return x(b.apply(this._wrapped,arguments),this._chain)}});m.prototype.chain=function(){this._chain=true;return this};m.prototype.value=function(){return this._wrapped}}).call(this);

data/dev_scripts/Procfile

@@ -1,6 +1,7 @@
 # loop: ruby sleep_loop.rb 5
 # listen: sleep 3 && ncat -k -l 10001
+listen: ncat -k -l 10001
 # slow_echo: sleep 10 && ruby echo_server.rb
 # echo: ruby echo_server.rb
-sleep: sleep 30
-# stubborn: ruby stubborn.rb
+# sleep: sleep 30
+stubborn: ruby stubborn.rb

data/dev_scripts/stubborn.rb

@@ -1,3 +1,7 @@
+trap "INT" do
+  STDERR.puts "BRO DON'T INTERRUPT ME"
+end
+
 trap "HUP" do
   STDERR.puts "LOL, NOT QUITTING"
 end

data/dev_scripts/test.yml

@@ -2,7 +2,9 @@
 test:
   dir: "./dev_scripts"
   # command: "ncat -k -l 10001"
-  command: "bundle exec foreman start"
+  command: "bundle exec foreman start 2>&1 | tee fail.log"
+  # command: sleep 10
   server_port: 10000
-  port: 10001
+  app_port: 10001
   idle_timeout: 10
+  startup_timeout: 5

data/dev_scripts/wait_fork_tree.rb

@@ -0,0 +1,15 @@
+if fork
+  if fork
+    puts "parent #{$$}"
+    sleep 1
+    puts "exiting #{$$}"
+  else
+    puts "child 2 #{$$}"
+    sleep 0.25
+    puts "child 2 exiting #{$$}"
+  end
+else
+  puts "child #{$$}"
+  sleep 0.5
+  puts "exiting #{$$}"
+end

data/dev_scripts/wait_test.rb

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby -wKU
+
+
+pid = Process.spawn "ruby wait_fork_tree.rb", :pgroup => true
+puts "forked: #{pid}"
+
+# unicorn-style
+def reap(pid)
+  begin
+    wpid = Process.waitpid(-1)#, Process::WNOHANG)
+    if wpid
+      puts "got child pid #{wpid}"
+    else
+      puts "no child pid"
+      # return
+    end
+  rescue Errno::ECHILD
+    puts "NO CHILD"
+    break
+  end while true
+end
+
+reap pid
+
+# welp, can't wait for grandchildren. oh well.

data/dev_scripts/webserver.rb

@@ -0,0 +1,4 @@
+require "ringleader"
+server = Ringleader::Server.new "0.0.0.0", 42000
+trap(:INT) { server.terminate; exit }
+sleep

data/lib/ringleader.rb

@@ -2,12 +2,15 @@ require "ringleader/version"
 
 require "yaml"
 require "ostruct"
+require "json"
 require "celluloid"
 require "celluloid/io"
+require "reel"
 require "pty"
 require "trollop"
 require "rainbow"
 require "color"
+require "pathname"
 
 module Ringleader
 end
@@ -16,7 +19,10 @@ require "ringleader/config"
 require "ringleader/name_logger"
 require "ringleader/wait_for_exit"
 require "ringleader/wait_for_port"
+require "ringleader/process"
 require "ringleader/socket_proxy"
 require "ringleader/app"
-require "ringleader/app_proxy"
+require "ringleader/app_serializer"
+require "ringleader/controller"
+require "ringleader/server"
 require "ringleader/cli"

data/lib/ringleader/app.rb

@@ -1,154 +1,121 @@
 module Ringleader
 
-  # Represents a running instance of an application.
+  # A configured application.
+  #
+  # Listens on a port, starts and runs the app process on demand, and proxies
+  # network data to the process.
   class App
-    include Celluloid
+    include Celluloid::IO
     include Celluloid::Logger
-    include NameLogger
 
-    attr_reader :config
-
-    # Create a new App instance.
-    #
-    # config - a configuration object for this app
     def initialize(config)
       @config = config
-      @starting = @running = false
-      @restart_file = File.expand_path(config.dir + "/tmp/restart.txt")
-      @mtime = File.exist?(@restart_file) ? File.mtime(@restart_file).to_i : 0
+      @process = Process.new(config)
+      enable! unless config.disabled
+    end
+
+    def name
+      @config.name
+    end
+
+    def enabled?
+      @enabled
     end
 
-    # Public: query if the app is running
     def running?
-      @running
+      @process.running?
     end
 
-    # Public: start the application.
-    #
-    # This method is intended to be used synchronously. If the app is already
-    # running, it'll return immediately. If the app hasn't been started, or is
-    # in the process of starting, this method blocks until it starts or fails to
-    # start correctly.
-    #
-    # Returns true if the app started, false if not.
     def start
-      if restart?
-        info "tmp/restart.txt modified, restarting..."
-        stop
-      end
-
-      if @running
-        true
-      elsif @starting
-        wait :running
-      else
-        start_app
+      return if @process.running?
+      info "starting #{@config.name}..."
+      if @process.start
+        start_activity_timer
       end
     end
 
-    # Public: stop the application.
-    #
-    # Sends a SIGHUP to the app's process, and expects it to exit like a sane
-    # and well-behaved application within 30 seconds before sending a SIGTERM.
     def stop
-      return unless @pid
+      return unless @process.running?
+      info "stopping #{@config.name}..."
+      stop_activity_timer
+      @process.stop
+    end
 
-      info "stopping `#{config.command}`"
-      @master.close unless @master.closed?
-      Process.kill "SIGHUP", -@pid
+    def restart
+      stop
+      start
+    end
 
-      timer = after 30 do
-        if @running
-          warn "process #{@pid} did not shut down cleanly, killing it"
-          Process.kill "SIGTERM", -@pid
-        end
-      end
+    def enable
+      return if @server
+      @server = TCPServer.new @config.host, @config.server_port
+      @enabled = true
+      run!
+    rescue Errno::EADDRINUSE
+      error "could not bind to #{@config.host}:#{@config.server_port} for #{@config.name}!"
+      @server = nil
+    end
 
-      wait :running # wait for the exit callback
-      timer.cancel
-    rescue Errno::ESRCH, Errno::EPERM
-      exited
-    end
-
-    # Internal: callback for when the application port has opened
-    def port_opened
-      info "listening on #{config.hostname}:#{config.app_port}"
-      signal :running, true
-    end
-
-    # Internal: callback for when the process has exited.
-    def exited
-      debug "pid #{@pid} has exited"
-      info "exited."
-      @running = false
-      @pid = nil
-      @wait_for_port.terminate if @wait_for_port.alive?
-      @wait_for_exit.terminate if @wait_for_exit.alive?
-      signal :running, false
-    end
-
-    # Private: start the application process and associated infrastructure
-    #
-    # Intended to be synchronous, as it blocks until the app has started (or
-    # failed to start).
-    #
-    # Returns true if the app started, false if not.
-    def start_app
-      @starting = true
-      info "starting process `#{config.command}`"
-
-      # give the child process a terminal so output isn't buffered
-      @master, slave = PTY.open
-      @pid = Process.spawn %Q(bash -c "#{config.command}"),
-        :in => slave,
-        :out => slave,
-        :err => slave,
-        :chdir => config.dir,
-        :pgroup => true
-      slave.close
-      proxy_output @master
-      debug "started with pid #{@pid}"
-
-      @wait_for_exit = WaitForExit.new @pid, Actor.current
-      @wait_for_port = WaitForPort.new config.hostname, config.app_port, Actor.current
-
-      timer = after config.startup_timeout do
-        warn "application startup took more than #{config.startup_timeout}"
-        stop!
-      end
+    def disable
+      info "disabling #{@config.name}..."
+      return unless @server
+      stop_activity_timer
+      @process.stop
+      @server.close
+      @server = nil
+      @enabled = false
+    end
 
-      @running = wait :running
-      @starting = false
-      timer.cancel
+    def finalize
+      @server.close if @server
+    end
 
-      @running
-    rescue Errno::ENOENT
-      debug "could not start process `#{config.command}`"
-      false
+    def run
+      info "listening for connections for #{@config.name} on #{@config.host}:#{@config.server_port}"
+      loop { handle_connection! @server.accept }
+    rescue IOError
+      @server.close if @server
     end
 
-    # Private: proxy output streams to the logger.
-    #
-    # Fire and forget, runs in its own thread.
-    def proxy_output(input)
-      Thread.new do
-        until input.eof?
-          info input.gets.strip
-        end
+    def handle_connection(socket)
+      _, port, host = socket.peeraddr
+      debug "received connection from #{host}:#{port}"
+
+      started = @process.start
+      if started
+        proxy_to_app! socket
+        reset_activity_timer
+      else
+        error "could not start app"
+        socket.close
       end
     end
 
-    # Check the mtime of the tmp/restart.txt file. If modified, restart the app.
-    def restart?
-      if File.exist?(@restart_file)
-        new_mtime = File.mtime(@restart_file).to_i
-        if new_mtime > @mtime
-          @mtime = new_mtime
-          true
+    def proxy_to_app(socket)
+      SocketProxy.new socket, @config.host, @config.app_port
+    end
+
+    def start_activity_timer
+      return if @activity_timer || @config.idle_timeout == 0
+      @activity_timer = every @config.idle_timeout do
+        if @process.running?
+          info "#{@config.name} has been idle for #{@config.idle_timeout} seconds, shutting it down"
+          @process.stop
         end
       end
     end
 
-  end
+    def reset_activity_timer
+      start_activity_timer
+      @activity_timer.reset
+    end
+
+    def stop_activity_timer
+      if @activity_timer
+        @activity_timer.cancel
+        @activity_timer = nil
+      end
+    end
 
+  end
 end

data/lib/ringleader/app_serializer.rb

@@ -0,0 +1,15 @@
+module Ringleader
+  class AppSerializer
+    def initialize(app)
+      @app = app
+    end
+
+    def to_json(*args)
+      {
+        "name" => @app.name,
+        "enabled" => @app.enabled?,
+        "running" => @app.running?
+      }.to_json(*args)
+    end
+  end
+end

data/lib/ringleader/cli.rb

@@ -2,8 +2,6 @@ module Ringleader
   class CLI
     include Celluloid::Logger
 
-    TERMINAL_COLORS = [:red, :green, :yellow, :blue, :magenta, :cyan]
-
     def run(argv)
       # hide "shutdown" info message until after opts are validated
       Celluloid.logger.level = ::Logger::ERROR
@@ -18,9 +16,18 @@ module Ringleader
 
       configure_logging(opts.verbose ? "debug" : "info")
 
-      configs = Config.new(argv.first).apps.values
-      colorized = assign_colors configs, opts.boring
-      start_app_server colorized
+      apps = Config.new(argv.first, opts.boring).apps
+
+      controller = Controller.new(apps)
+      Server.new(controller, opts.host, opts.port)
+
+      # gracefully die instead of showing an interrupted sleep below
+      trap("INT") do
+        controller.stop
+        exit
+      end
+
+      sleep
     end
 
     def configure_logging(level)
@@ -32,41 +39,9 @@ module Ringleader
       end
     end
 
-    def assign_colors(configs, boring=false)
-      if boring
-        configs.map.with_index do |config, i|
-          config.color = TERMINAL_COLORS[ i % TERMINAL_COLORS.length ]
-          config
-        end
-      else
-        offset = 360/configs.size
-        configs.map.with_index do |config, i|
-          config.color = Color::HSL.new(offset * i, 100, 50).html
-          config
-        end
-      end
-    end
-
-    def start_app_server(app_configs)
-      apps = app_configs.map do |app_config|
-        app = App.new app_config
-        AppProxy.new app, app_config
-        app
-      end
-
-      # gracefully die instead of showing an interrupted sleep below
-      trap("INT") do
-        info "shutting down..."
-        apps.each { |app| app.stop! }
-        exit
-      end
-
-      sleep
-    end
-
     def die(msg)
       error msg
-      exit -1
+      exit(-1)
     end
 
     def parser
@@ -110,28 +85,40 @@ something like this:
     ---
     # name of app (used in logging)
     main_app:
-      # working directory, where to start the app from
-      dir: "~/apps/main"
-      # the command to run to start up the app server. Executed under "bash -c".
-      command: "foreman start"
-      # the host to listen on, defaults to 127.0.0.1
-      hostname: 0.0.0.0
-      # the port ringleader listens on
-      server_port: 3000
-      # the port the application listens on
-      app_port: 4000
-      # idle timeout in seconds, defaults to #{Config::DEFAULT_IDLE_TIMEOUT}. 0 means "never".
-      idle_timeout: 6000
-      # application startup timeout, defaults to #{Config::DEFAULT_STARTUP_TIMEOUT}.
-      startup_timeout: 180
-    other_app:
-      [...]
+
+      # Required settings
+      dir: "~/apps/main"       # Working directory
+      command: "foreman start" # The command to run to start up the app server.
+                               # Executed under "bash -c".
+      server_port: 3000        # The port ringleader listens on
+      app_port: 4000           # The port the application listens on
+
+      # Optional settings
+      host: 127.0.0.1          # The host ringleader should listen on
+      idle_timeout: 6000       # Idle timeout in seconds
+      startup_timeout: 180     # Application startup timeout
+      disabled: true           # Set the app to be disabled when ringleader starts
+
+      # If you have an application managed by rvm, this setting automatically
+      # adds the rvm-specific shell setup before executing the given command.
+      # This supersedes the `command` setting.
+      rvm: "foreman start"
 
 OPTIONS
         banner
 
-        opt "verbose", "log at debug level", :long => "--verbose", :short => "-v", :type => :boolean
-        opt "boring", "use boring colors instead of a fabulous rainbow", :long => "--boring", :short => "-b", :type => :boolean, :default => false
+        opt "verbose", "log at debug level",
+          :long => "--verbose", :short => "-v",
+          :type => :boolean, :default => false
+        opt "host", "host for web control panel",
+          :long => "--host", :short => "-H",
+          :default => "localhost"
+        opt "port", "port for the web control panel",
+          :long => "--port", :short => "-p",
+          :type => :integer, :default => 42000
+        opt "boring", "use boring colors instead of a fabulous rainbow",
+          :long => "--boring", :short => "-b",
+          :type => :boolean, :default => false
 
       end
     end