ernicorn 1.0.1 → 1.0.2

data/README.md

@@ -19,25 +19,32 @@ Installation
 Starting The Server
 -------------------
 
-Use the ernicorn command to start a new RPC server:
+Use the `ernicorn` command to start a new RPC server:
 
-    [rtomayko@iron:ernicorn]$ ernicorn --help
-    Ernicorn is an Ruby BERT-RPC Server based on Unicorn.
+    $ ernicorn --help
+    Usage: ernicorn [options] [config file]
+    Start a Ruby BERT-RPC Server with the given options and config file.
 
-    Basic Command Line Usage:
-      ernicorn [options] <handler>
+    Options
+      -h, --host=<host>          Server address to listen on; default: 0.0.0.0
+      -p, --port=<portno>        Server port to listen on; default: 8149
+      -l, --listen=<host>:<port> Listen addresses. Can be specified multiple times
+          --log-level=0-4        Set the log level
+      -d, --detached             Run as a daemon
+      -P, --pidfile=<file>       Location to write pid file
 
-        -c, --config CONFIG              Unicorn style config file
-        -p, --port PORT                  Port
-        -l, --log-level LOGLEVEL         Log level (0-4)
-        -d, --detached                   Run as a daemon
-        -P, --pidfile PIDFILE            Location to write pid file.
+The ernicorn server attempts to load the config file given or
+`config/ernicorn.rb` when no config file is specified. See the example config
+file [examples/config.rb][c] to get started. All [Unicorn config options][r] are
+supported.
 
-The handler must be given and should be a normal Ruby file that sets up the
-environment and calls `Ernicorn.expose` for any server modules. See the
-[examples/handler.rb][h] file for more info.
+The config file should require any libraries needed for the server and register
+server modules with `Ernicorn.expose(:modulename, TheModule)`. See the
+[examples/handler.rb][h] file for a simple example handler.
 
 [h]: https://github.com/github/ernicorn/blob/master/examples/handler.rb
+[c]: https://github.com/github/ernicorn/blob/master/examples/config.rb
+[r]: http://unicorn.bogomips.org/Unicorn/Configurator.html
 
 Control Commands
 ----------------

data/ernicorn.gemspec

@@ -1,10 +1,12 @@
+require 'ernicorn/version'
+
 Gem::Specification.new do |s|
   s.specification_version = 2 if s.respond_to? :specification_version=
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.rubygems_version = '1.3.6'
 
   s.name = 'ernicorn'
-  s.version = '1.0.1'
+  s.version = Ernicorn::VERSION
   s.date = '2012-06-23'
 
   s.summary     = "Ernicorn is a BERT-RPC server implementation based on unicorn."

data/examples/start.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 # Start the example ernicorn server on port 9777.
 cd "$(dirname "$0")"
-exec ernicorn -p 9777 config.rb
+exec ernicorn config.rb

data/lib/ernicorn.rb

@@ -1,9 +1,8 @@
 require 'bert'
 require 'logger'
+require 'ernicorn/version'
 
 module Ernicorn
-  VERSION = '1.0.0'
-
   class << self
     attr_accessor :mods, :current_mod, :log
     attr_accessor :count, :virgin_procline

data/lib/ernicorn/version.rb

@@ -0,0 +1,3 @@
+module Ernicorn
+  VERSION = '1.0.2'
+end

data/script/ernicorn

@@ -4,41 +4,58 @@
 #/
 #/ Options
 #/   -h, --host=<host>          Server address to listen on; default: 0.0.0.0
-#/   -p, --port=<portno>        Server port to listen on; default: 8000
+#/   -p, --port=<portno>        Server port to listen on; default: 8149
+#/   -l, --listen=<host>:<port> Listen addresses. Can be specified multiple times
 #/       --log-level=0-4        Set the log level
 #/   -d, --detached             Run as a daemon
 #/   -P, --pidfile=<file>       Location to write pid file
 #/
 #/ See https://github.com/github/ernicorn for more information.
 require 'optparse'
+
+# override unicorn's default port and listen address list
+module Unicorn
+  require 'unicorn/const'
+  module Unicorn::Const
+    remove_const :DEFAULT_PORT
+    remove_const :DEFAULT_LISTEN
+    DEFAULT_PORT = 8149
+    DEFAULT_LISTEN = "#{DEFAULT_HOST}:#{DEFAULT_PORT}"
+  end
+end
+
+# load unicorn server extensions
 require 'ernicorn'
 require 'ernicorn/server'
 require 'ernicorn/adminrpc'
 
-Ernicorn.auto_start = false
-
-host = '0.0.0.0'
-port = 8000
+# command line options
+host = nil
+port = nil
+listeners = []
 daemonize = false
 config = 'config/ernicorn.rb'
 pidfile = nil
 
 parser = OptionParser.new do |opts|
-  opts.on("-c", "--config=val", String)     { |config| }
-  opts.on("-h", "--host=val", Integer)      { |host| }
-  opts.on("-p", "--port=val", Integer)      { |port| }
-  opts.on(      "--log-level=val", Integer) { |val| Ernicorn.loglevel(val) }
-  opts.on("-d", "--detached")               { |daemonize| }
-  opts.on("-P", "--pidfile=val")            { |pidfile| }
-  opts.on_tail("-h", "--help")              { exec "grep ^#/<'#{__FILE__}'|cut -c4-" }
+  opts.on("-c", "--config=val", String)      { |config| }
+  opts.on("-h", "--host=val", String)        { |host| }
+  opts.on("-p", "--port=val", Integer)       { |port| }
+  opts.on("-l", "--listen=val", String)      { |addr| listeners << addr }
+  opts.on(      "--log-level=val", Integer)  { |val| Ernicorn.loglevel(val) }
+  opts.on("-d", "--detached")                { |daemonize| }
+  opts.on("-P", "--pidfile=val")             { |pidfile| }
+  opts.on_tail("-h", "--help")               { exec "grep ^#/<'#{__FILE__}'|cut -c4-" }
   opts.parse!
 end
 
+listeners << "#{host || '0.0.0.0'}:#{port || 8149}" if host || port
+
 config = ARGV[0] || config
 
 options = {
   :pid         => pidfile,
-  :listeners   => ["#{host}:#{port}"],
+  :listeners   => listeners,
   :config_file => File.expand_path(config)
 }
 

data/script/ernicorn-ctrl

@@ -10,7 +10,7 @@
 require 'optparse'
 require 'bertrpc'
 
-port = 8000
+port = 8149
 
 def usage(status=0)
   exec "grep ^#/<'#{__FILE__}'|cut -c4-; exit #{status}"

data/test/helper.rb

@@ -1,4 +1,3 @@
 require 'test/unit'
 require 'shoulda'
 require 'ernicorn'
-Ernicorn.auto_start = false

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -98,6 +98,7 @@ files:
 - lib/ernicorn.rb
 - lib/ernicorn/adminrpc.rb
 - lib/ernicorn/server.rb
+- lib/ernicorn/version.rb
 - script/bootstrap
 - script/cibuild
 - script/ernicorn