ringleader 1.0.3 → 1.1.0

data/README.md

@@ -63,7 +63,7 @@ Yep. Hook it up with [fluid](http://fluidapp.com) and put it in the menu bar. By
 default it runs at [http://localhost:42000](http://localhost:42000).
 
 
-![screenshot of ringleader control panel](/aniero/ringleader/raw/master/screenshot.png)
+![screenshot of ringleader control panel](screenshot.png)
 
 ## Installation
 
@@ -89,14 +89,16 @@ main_app:
 
   # Optional settings
   host: 127.0.0.1          # The host ringleader should listen on
-  idle_timeout: 6000       # Idle timeout in seconds
+  idle_timeout: 6000       # Idle timeout in seconds, 0 for infinite
   startup_timeout: 180     # Application startup timeout
   disabled: true           # Set the app to be disabled when ringleader starts
   env:                     # Override or set environment variables inherited
     FOO: hello             # from the current environment. Use nil to unset a
     BAR: nil               # var.
-  kill_with: TERM          # Signal to use to kill the process tree with. Use
-                           # KILL if the default (TERM) is leaving zombies.
+  kill_with: INT           # Signal to use to kill the process tree with. Use
+                           # TERM or KILL if the default is leaving zombies.
+  run_on_load: false       # Set this to true to start an app when ringleader
+                           # loads.
 
   # If you have an application managed by rvm, this setting automatically adds
   # the rvm-specific shell setup before executing the given command. This

data/assets/index.html

@@ -13,8 +13,7 @@
         padding-top: 60px; /* 60px to make the container go all the way to the bottom of the top bar */
       }
       .app {
-        padding-bottom: 5px;
-        margin-bottom: 5px;
+        padding: 5px 0;
         border-bottom: 1px solid #CCC;
         clear: both;
       }
@@ -35,6 +34,9 @@
       .app .buttons {
         text-align: right;
       }
+      .app:nth-child(even) {
+        background-color: #eeeeee;
+      }
       .loading {
         padding-top: 5px;
         height: 23px; /* 23 + 5 = 28, height of buttons */

data/dev_scripts/many.yml

@@ -0,0 +1,51 @@
+---
+one:
+  dir: "./dev_scripts"
+  command: "ncat -k -l 10001"
+  server_port: 10001
+  app_port: 20001
+two:
+  dir: "./dev_scripts"
+  command: "ncat -k -l 10002"
+  server_port: 10002
+  app_port: 20002
+three:
+  dir: "./dev_scripts"
+  command: "ncat -k -l 10003"
+  server_port: 10003
+  app_port: 20003
+four:
+  dir: "./dev_scripts"
+  command: "ncat -k -l 10004"
+  server_port: 10004
+  app_port: 20004
+five:
+  dir: "./dev_scripts"
+  command: "ncat -k -l 10005"
+  server_port: 10005
+  app_port: 20005
+six:
+  dir: "./dev_scripts"
+  command: "ncat -k -l 10006"
+  server_port: 10006
+  app_port: 20006
+seven:
+  dir: "./dev_scripts"
+  command: "ncat -k -l 10007"
+  server_port: 10007
+  app_port: 20007
+eight:
+  dir: "./dev_scripts"
+  command: "ncat -k -l 10008"
+  server_port: 10008
+  app_port: 20008
+nine:
+  dir: "./dev_scripts"
+  command: "ncat -k -l 10009"
+  server_port: 10009
+  app_port: 20009
+ten:
+  dir: "./dev_scripts"
+  command: "ncat -k -l 10010"
+  server_port: 10010
+  app_port: 20010

data/lib/ringleader/app.rb

@@ -12,6 +12,7 @@ module Ringleader
       @config = config
       @process = Process.new(config)
       enable! unless config.disabled
+      start if config.run_on_load
     end
 
     def name

data/lib/ringleader/cli.rb

@@ -67,7 +67,7 @@ APPLICATIONS
 
 Ringleader supports any application that runs in the foreground (not
 daemonized), and listens on a port. It expects applications to be well-behaved,
-that is, respond appropriately to SIGHUP for graceful shutdown.
+that is, respond appropriately to SIGINT for graceful shutdown.
 
 When first starting an app, ringleader will wait for the application's port to
 open, at which point it will proxy the incoming connection through.
@@ -95,14 +95,16 @@ something like this:
 
       # Optional settings
       host: 127.0.0.1          # The host ringleader should listen on
-      idle_timeout: 6000       # Idle timeout in seconds
+      idle_timeout: 6000       # Idle timeout in seconds, 0 for infinite
       startup_timeout: 180     # Application startup timeout
       disabled: true           # Set the app to be disabled when ringleader starts
       env:                     # Override or set environment variables inherited
         FOO: hello             # from the current environment. Use nil to unset a
         BAR: nil               # var.
-      kill_with: TERM          # Signal to use to kill the process tree with. Use
-                               # KILL if the default (TERM) is leaving zombies.
+      kill_with: INT           # Signal to use to kill the process tree with. Use
+                               # TERM or KILL if the default is leaving zombies.
+      run_on_load: false       # Set this to true to start an app when ringleader
+                               # loads.
 
       # If you have an application managed by rvm, this setting automatically
       # adds the rvm-specific shell setup before executing the given command.

data/lib/ringleader/config.rb

@@ -37,11 +37,16 @@ module Ringleader
         options["host"] ||= DEFAULT_HOST
         options["idle_timeout"] ||= DEFAULT_IDLE_TIMEOUT
         options["startup_timeout"] ||= DEFAULT_STARTUP_TIMEOUT
-        options["kill_with"] ||= "TERM"
+        options["kill_with"] ||= "INT"
         options["env"] ||= {}
 
+        options["dir"] = File.expand_path options["dir"]
+        unless File.directory?(options["dir"])
+          raise ArgumentError, "#{options["dir"]} does not exist!"
+        end
+
         if command = options.delete("rvm")
-          options["command"] = "source ~/.rvm/scripts/rvm && rvm --with-rubies rvmrc exec -- #{command}"
+          options["command"] = "source ~/.rvm/scripts/rvm && rvm in #{options["dir"]} do #{command}"
         elsif command = options.delete("rbenv")
           options["command"] = "rbenv exec #{command}"
           options["env"]["RBENV_VERSION"] = nil
@@ -51,8 +56,6 @@ module Ringleader
 
         validate name, options
 
-        options["dir"] = File.expand_path options["dir"]
-
         [name, OpenStruct.new(options)]
       end
     end
@@ -61,7 +64,7 @@ module Ringleader
     def validate(name, options)
       REQUIRED_KEYS.each do |key|
         unless options.has_key?(key)
-          raise "#{key} missing in #{name} config" 
+          raise ArgumentError, "#{key} missing in #{name} config"
         end
       end
     end

data/lib/ringleader/version.rb

@@ -1,3 +1,3 @@
 module Ringleader
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

data/spec/fixtures/invalid_app_dir.yml

@@ -0,0 +1,9 @@
+---
+main_site:
+  dir: "~/does_not_exist"
+  command: "bundle exec foreman start"
+  host: "0.0.0.0"
+  server_port: 3000
+  app_port: 4000
+  idle_timeout: 1800
+

data/spec/ringleader/config_spec.rb

@@ -2,6 +2,16 @@ require "spec_helper"
 
 describe Ringleader::Config do
 
+  before :each do
+    File.stub(:directory?) do |arg|
+      if arg =~ %r(/apps/(main|admin|auth))
+        true
+      else
+        false
+      end
+    end
+  end
+
   context "when initialized with a config file" do
     subject { Ringleader::Config.new "spec/fixtures/config.yml" }
 
@@ -36,8 +46,8 @@ describe Ringleader::Config do
         expect(subject.apps["admin"].env).to have_key("OVERRIDE")
       end
 
-      it "sets 'TERM' as the default kill signal" do
-        expect(subject.apps["main_site"].kill_with).to eq("TERM")
+      it "sets 'INT' as the default kill signal" do
+        expect(subject.apps["main_site"].kill_with).to eq("INT")
       end
     end
   end
@@ -66,10 +76,18 @@ describe Ringleader::Config do
     end
   end
 
+  context "when the target directory doesn't exist" do
+    it "raises an exception" do
+      expect {
+        Ringleader::Config.new("spec/fixtures/invalid_app_dir.yml").apps
+      }.to raise_error(/does not exist/)
+    end
+  end
+
   context "with a config with an 'rvm' key instead of a 'command'" do
     it "replaces the rvm command with a command to use rvm" do
       config = Ringleader::Config.new "spec/fixtures/rvm.yml"
-      expect(config.apps["rvm_app"].command).to match(/rvm.*rvmrc.*exec.*foreman/)
+      expect(config.apps["rvm_app"].command).to match(%r(rvm in \S+/apps/main do foreman start))
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ringleader
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-03 00:00:00.000000000 Z
+date: 2013-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -191,6 +191,7 @@ files:
 - bin/ringleader
 - dev_scripts/Procfile
 - dev_scripts/echo_server.rb
+- dev_scripts/many.yml
 - dev_scripts/signaling.rb
 - dev_scripts/signals.rb
 - dev_scripts/sleep_loop.rb
@@ -216,6 +217,7 @@ files:
 - screenshot.png
 - spec/fixtures/config.yml
 - spec/fixtures/invalid.yml
+- spec/fixtures/invalid_app_dir.yml
 - spec/fixtures/no_app_port.yml
 - spec/fixtures/no_server_port.yml
 - spec/fixtures/rbenv.yml
@@ -240,15 +242,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -127958833266147469
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Proxy TCP connections to an on-demand pool of configured applications
 test_files:
 - spec/fixtures/config.yml
 - spec/fixtures/invalid.yml
+- spec/fixtures/invalid_app_dir.yml
 - spec/fixtures/no_app_port.yml
 - spec/fixtures/no_server_port.yml
 - spec/fixtures/rbenv.yml