mojombo-ernie 0.2.0 → 0.3.0

data/README.md

@@ -25,12 +25,26 @@ Installation
 Running
 -------
 
-    Usage: ernie [options] <handler>
+    Usage: ernie [command] [options]
+        -h, --handler HANDLER            Handler file
         -p, --port PORT                  Port
         -n, --number NUMBER              Number of handler instances
         -d, --detached                   Run as a daemon
         -P, --pidfile PIDFILE            Location to write pid file.
-
+    
+    Commands:
+      <none>                Start an Ernie server.
+      reload-handlers       Gracefully reload all of the the ruby handlers
+                            and use the new code for all subsequent requests.
+    
+    Examples:
+      ernie -d -p 9999 -n 10 -h calc.rb
+        Start the ernie server in the background on port 9999 with ten
+        handlers, using the calc.rb handler file.
+    
+      ernie reload-handlers -p 9999
+        Reload the handlers for the ernie server currently running on
+        port 9999.
 
 Example Handler
 ---------------
@@ -60,7 +74,7 @@ You can make BERT-RPC calls from Ruby with the [BERTRPC gem](http://github.com/m
     require 'bertrpc'
     
     svc = BERTRPC::Service.new('localhost', 8000)
-    svc.calc.add.call(1, 2)
+    svc.call.calc.add(1, 2)
     # => 3
 
 

data/Rakefile

@@ -12,6 +12,7 @@ begin
     gem.files.include(["ext"])
     gem.extensions << 'ext/extconf.rb'
     gem.add_dependency('erlectricity', '>= 1.0.1')
+    gem.add_dependency('bertrpc', '>= 0.2.0')
 
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 2
-:patch: 0
 :major: 0
+:minor: 3
+:patch: 0

data/bin/ernie

@@ -4,6 +4,7 @@ $:.unshift(File.join(File.dirname(__FILE__), *%w[.. lib]))
 ERNIE_ROOT = File.join(File.dirname(__FILE__), *%w[..])
 
 DEFAULT_ERLANG_CODEPATHS = %w[ebin]
+DEFAULT_PORT = 8000
 
 def rel(path)
   File.join(ERNIE_ROOT, path)
@@ -29,6 +30,10 @@ options = {}
 OptionParser.new do |opts|
   opts.banner = help
 
+  opts.on("-h HANDLER", "--handler HANDLER", "Handler ruby file") do |x|
+    options[:handler] = x
+  end
+
   opts.on("-p PORT", "--port PORT", "Port") do |x|
     options[:port] = x
   end
@@ -37,6 +42,10 @@ OptionParser.new do |opts|
     options[:number] = x
   end
 
+  opts.on("-l LOGLEVEL", "--log-level LOGLEVEL", "Log level (0-4)") do |x|
+    options[:log_level] = x
+  end
+
   opts.on("-d", "--detached", "Run as a daemon") do
     options[:detached] = true
   end
@@ -46,28 +55,43 @@ OptionParser.new do |opts|
   end
 end.parse!
 
-handler = ARGV[0]
+if command = ARGV[0]
+  if !%w{reload-handlers}.include?(command)
+    puts "Invlalid command. Valid commands are:"
+    puts "  reload-handlers"
+    exit(1)
+  end
 
-unless handler
-  puts "A handler must be specified: ernie /path/to/handler.rb"
-  exit(1)
-end
+  require 'rubygems'
+  require 'bertrpc'
+  port = options[:port] || DEFAULT_PORT
+  svc = BERTRPC::Service.new('localhost', port)
+  puts svc.call.__admin__.send(command.gsub(/-/, '_'))
+else
+  if !options[:handler]
+    puts "A handler must be specified: ernie -h /path/to/handler.rb"
+    exit(1)
+  end
 
-port = options[:port] || 8000
-number = options[:number] || 1
-pidfile = options[:pidfile] ? "-ernie_server_app pidfile \"'#{options[:pidfile]}'\"" : ''
-detached = options[:detached] ? '-detached' : ''
-
-cmd = %Q{erl -boot start_sasl \
-             #{detached} \
-             +Bc \
-             +K true \
-             -smp enable \
-             #{code_paths}
-             #{pidfile} \
-             -ernie_server_app port #{port} \
-             -ernie_server_app handler '"#{handler}"' \
-             -ernie_server_app number #{number} \
-             -run ernie_server_app boot}.squeeze(' ')
-puts cmd
-exec(cmd)
+  handler = options[:handler]
+  port = options[:port] || DEFAULT_PORT
+  number = options[:number] || 1
+  log_level = options[:log_level] || 2
+  pidfile = options[:pidfile] ? "-ernie_server_app pidfile \"'#{options[:pidfile]}'\"" : ''
+  detached = options[:detached] ? '-detached' : ''
+
+  cmd = %Q{erl -boot start_sasl \
+               #{detached} \
+               +Bc \
+               +K true \
+               -smp enable \
+               #{code_paths}
+               #{pidfile} \
+               -ernie_server_app port #{port} \
+               -ernie_server_app handler '"#{handler}"' \
+               -ernie_server_app number #{number} \
+               -ernie_server_app log_level #{log_level} \
+               -run ernie_server_app boot}.squeeze(' ')
+  puts cmd
+  exec(cmd)
+end

data/elib/asset_pool.erl

@@ -2,14 +2,15 @@
 -behaviour(gen_server).
 
 %% api
--export([start_link/1, start/1, lease/0, return/1]).
+-export([start_link/1, start/1, lease/0, return/1, reload_assets/0]).
 
 %% gen_server callbacks
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
          terminate/2, code_change/3]).
 
 -record(state, {assets = undefined,
-                handler = undefined}).
+                handler = undefined,
+                token = undefined}).
 
 %%====================================================================
 %% API
@@ -27,6 +28,9 @@ lease() ->
 return(Asset) ->
   gen_server:call({global, ?MODULE}, {return, Asset}).
 
+reload_assets() ->
+  gen_server:call({global, ?MODULE}, {reload_assets}).
+
 %%====================================================================
 %% gen_server callbacks
 %%====================================================================
@@ -41,8 +45,9 @@ return(Asset) ->
 init([Count, Handler]) ->
   process_flag(trap_exit, true),
   error_logger:info_msg("~p starting~n", [?MODULE]),
-  Assets = start_handlers(Count, Handler),
-  {ok, #state{assets = Assets, handler = Handler}}.
+  Token = make_ref(),
+  Assets = start_handlers(Count, Handler, Token),
+  {ok, #state{assets = Assets, handler = Handler, token = Token}}.
 
 %%--------------------------------------------------------------------
 %% Function: %% handle_call(Request, From, State) -> {reply, Reply, State} |
@@ -54,13 +59,38 @@ init([Count, Handler]) ->
 %% Description: Handling call messages
 %%--------------------------------------------------------------------
 handle_call({lease}, _From, State) ->
+  Token = State#state.token,
   case queue:out(State#state.assets) of
-    {{value, Asset}, Assets2} -> {reply, {ok, Asset}, State#state{assets = Assets2}};
-    {empty, _Assets2} -> {reply, empty, State}
+    {{value, Asset}, Assets2} ->
+      {asset, Port, AssetToken} = Asset,
+      case AssetToken =:= Token of
+        false ->
+          port_wrapper:close(Port),
+          Handler = State#state.handler,
+          NewAsset = create_asset(Handler, Token);
+        true ->
+          NewAsset = Asset
+      end,
+      {reply, {ok, NewAsset}, State#state{assets = Assets2}};
+    {empty, _Assets2} ->
+      {reply, empty, State}
   end;
 handle_call({return, Asset}, _From, State) ->
-  Assets2 = queue:in(Asset, State#state.assets),
+  Token = State#state.token,
+  {asset, Port, AssetToken} = Asset,
+  case AssetToken =:= Token of
+    false ->
+      port_wrapper:close(Port),
+      Handler = State#state.handler,
+      NewAsset = create_asset(Handler, Token);
+    true ->
+      NewAsset = Asset
+  end,
+  Assets2 = queue:in(NewAsset, State#state.assets),
   {reply, ok, State#state{assets = Assets2}};
+handle_call({reload_assets}, _From, State) ->
+  Token = make_ref(),
+  {reply, ok, State#state{token = Token}};
 handle_call(_Request, _From, State) ->
   {reply, ok, State}.
 
@@ -72,11 +102,15 @@ handle_call(_Request, _From, State) ->
 %%--------------------------------------------------------------------
 handle_cast(_Msg, State) -> {noreply, State}.
 
-handle_info({'EXIT', _Pid, _Error}, State) ->
-  error_logger:error_msg("Port closed, restarting port...~n", []),
+handle_info({'EXIT', _Pid, normal}, State) ->
+  {noreply, State};
+handle_info({'EXIT', Pid, Error}, State) ->
+  error_logger:error_msg("Port ~p closed with ~p, restarting port...~n", [Pid, Error]),
+  ValidAssets = queue:filter(fun(Item) -> {asset, A, _T} = Item, A =/= Pid end, State#state.assets),
   Handler = State#state.handler,
-  Asset = port_wrapper:wrap_link("ruby " ++ Handler),
-  Assets = queue:in(Asset, State#state.assets),
+  Token = State#state.token,
+  NewAsset = create_asset(Handler, Token),
+  Assets = queue:in(NewAsset, ValidAssets),
   {noreply, State#state{assets = Assets}};
 handle_info(Msg, State) ->
   error_logger:error_msg("Unexpected message: ~p~n", [Msg]),
@@ -89,12 +123,15 @@ code_change(_OldVersion, State, _Extra) -> {ok, State}.
 %% Internal
 %%====================================================================
 
-start_handlers(Count, Handler) ->
-  start_handlers(queue:new(), Count, Handler).
+start_handlers(Count, Handler, Token) ->
+  start_handlers(queue:new(), Count, Handler, Token).
 
-start_handlers(Assets, 0, _Handler) ->
+start_handlers(Assets, 0, _Handler, _Token) ->
   Assets;
-start_handlers(Assets, Count, Handler) ->
-  Asset = port_wrapper:wrap_link("ruby " ++ Handler),
+start_handlers(Assets, Count, Handler, Token) ->
+  Asset = create_asset(Handler, Token),
   Assets2 = queue:in(Asset, Assets),
-  start_handlers(Assets2, Count - 1, Handler).
+  start_handlers(Assets2, Count - 1, Handler, Token).
+
+create_asset(Handler, Token) ->
+  {asset, port_wrapper:wrap_link("ruby " ++ Handler), Token}.

data/elib/ernie_server.erl

@@ -64,31 +64,38 @@ handle_call(_Request, _From, State) ->
 %% Description: Handling cast messages
 %%--------------------------------------------------------------------
 handle_cast({process, Sock}, State) ->
-  case queue:is_empty(State#state.pending) of
-    false ->
-      Pending2 = queue:in(Sock, State#state.pending),
-      io:format("Q", []),
-      {noreply, State#state{pending = Pending2}};
-    true ->
-      State2 = try_process_now(Sock, State),
-      {noreply, State2}
-    end;
+  case gen_tcp:recv(Sock, 0) of
+    {ok, BinaryTerm} ->
+      logger:debug("Got binary term: ~p~n", [BinaryTerm]),
+      Term = binary_to_term(BinaryTerm),
+      logger:info("Got term: ~p~n", [Term]),
+      case Term of
+        {call, '__admin__', Fun, Args} ->
+          State2 = process_admin(Sock, Fun, Args, State);
+        Any ->
+          State2 = process_normal(BinaryTerm, Sock, State)
+      end,
+      {noreply, State2};
+    {error, closed} ->
+      ok = gen_tcp:close(Sock),
+      {noreply, State}
+  end;
 handle_cast({asset_freed}, State) ->
   case queue:is_empty(State#state.pending) of
     false ->
       case asset_pool:lease() of
         {ok, Asset} ->
-          {{value, Sock}, Pending2} = queue:out(State#state.pending),
-          io:format("d", []),
-          spawn(fun() -> process_now(Sock, Asset) end),
+          {{value, {pending, BinaryTerm, Sock}}, Pending2} = queue:out(State#state.pending),
+          % io:format("d", []),
+          spawn(fun() -> process_now(BinaryTerm, Sock, Asset) end),
           {noreply, State#state{pending = Pending2}};
         empty ->
-          io:format(".", []),
+          % io:format(".", []),
           {noreply, State}
       end;
     true ->
       {noreply, State}
-    end;
+  end;
 handle_cast(_Msg, State) -> {noreply, State}.
 
 handle_info(Msg, State) ->
@@ -106,7 +113,7 @@ try_listen(Port, 0) ->
   error_logger:error_msg("Could not listen on port ~p~n", [Port]),
   {error, "Could not listen on port"};
 try_listen(Port, Times) ->
-  Res = gen_tcp:listen(Port, [binary, {packet, 4}, {active, false}]),
+  Res = gen_tcp:listen(Port, [binary, {packet, 4}, {active, false}, {reuseaddr, true}]),
   case Res of
     {ok, LSock} ->
       error_logger:info_msg("Listening on port ~p~n", [Port]),
@@ -119,35 +126,50 @@ try_listen(Port, Times) ->
 
 loop(LSock) ->
   {ok, Sock} = gen_tcp:accept(LSock),
+  logger:debug("Accepted socket: ~p~n", [Sock]),
   ernie_server:process(Sock),
   loop(LSock).
 
-try_process_now(Sock, State) ->
+process_admin(Sock, reload_handlers, _Args, State) ->
+  asset_pool:reload_assets(),
+  gen_tcp:send(Sock, term_to_binary({reply, <<"Handlers reloaded.">>})),
+  ok = gen_tcp:close(Sock),
+  State;
+process_admin(Sock, Fun, _Args, State) ->
+  gen_tcp:send(Sock, term_to_binary({reply, <<"Admin function not supported.">>})),
+  ok = gen_tcp:close(Sock),
+  State.
+
+process_normal(BinaryTerm, Sock, State) ->
+  case queue:is_empty(State#state.pending) of
+    false ->
+      Pending2 = queue:in({pending, BinaryTerm, Sock}, State#state.pending),
+      % io:format("Q", []),
+      State#state{pending = Pending2};
+    true ->
+      try_process_now(BinaryTerm, Sock, State)
+  end.
+
+try_process_now(BinaryTerm, Sock, State) ->
   case asset_pool:lease() of
     {ok, Asset} ->
-      io:format("i", []),
-      spawn(fun() -> process_now(Sock, Asset) end),
+      % io:format("i", []),
+      spawn(fun() -> process_now(BinaryTerm, Sock, Asset) end),
       State;
     empty ->
-      io:format("q", []),
-      Pending2 = queue:in(Sock, State#state.pending),
+      % io:format("q", []),
+      Pending2 = queue:in({pending, BinaryTerm, Sock}, State#state.pending),
       State#state{pending = Pending2}
   end.
 
-process_now(Sock, Asset) ->
-  case gen_tcp:recv(Sock, 0) of
-    {ok, BinaryTerm} ->
-      % io:format(".", []),
-      % error_logger:info_msg("From Internet: ~p~n", [BinaryTerm]),
-      {ok, Data} = port_wrapper:rpc(Asset, BinaryTerm),
-      % error_logger:info_msg("From Port: ~p~n", [Data]),
-      asset_pool:return(Asset),
-      ernie_server:asset_freed(),
-      gen_tcp:send(Sock, Data),
-      ok = gen_tcp:close(Sock);
-    {error, closed} ->
-      asset_pool:return(Asset),
-      ernie_server:asset_freed(),
-      io:format("c", []),
-      ok = gen_tcp:close(Sock)
-  end.
+process_now(BinaryTerm, Sock, Asset) ->
+  % io:format(".", []),
+  % error_logger:info_msg("From Internet: ~p~n", [BinaryTerm]),
+  {asset, Port, Token} = Asset,
+  logger:debug("Asset: ~p ~p~n", [Port, Token]),
+  {ok, Data} = port_wrapper:rpc(Port, BinaryTerm),
+  % error_logger:info_msg("From Port: ~p~n", [Data]),
+  asset_pool:return(Asset),
+  ernie_server:asset_freed(),
+  gen_tcp:send(Sock, Data),
+  ok = gen_tcp:close(Sock).

data/elib/ernie_server_app.erl

@@ -7,6 +7,7 @@ boot() ->
   application:start(ernie_server_app).
 
 start(_Type, _Args) ->
+  logger_sup:start_link(),
   ernie_server_sup:start_link(),
   asset_pool_sup:start_link().
 

data/elib/logger.erl

@@ -0,0 +1,108 @@
+-module(logger).
+-behaviour(gen_server).
+
+%% api
+-export([start_link/1, start/1, set_log_level/1, debug/2, info/2, warn/2, error/2, fatal/2]).
+
+%% gen_server callbacks
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2,
+         terminate/2, code_change/3]).
+
+-record(state, {log_level = undefined}).
+
+%%====================================================================
+%% API
+%%====================================================================
+
+start_link(Args) ->
+  gen_server:start_link({global, ?MODULE}, ?MODULE, Args, []).
+
+start(Args) ->
+  gen_server:start({global, ?MODULE}, ?MODULE, Args, []).
+
+set_log_level(Level) ->
+  gen_server:call({global, ?MODULE}, {set_log_level, Level}).
+
+debug(Msg, Args) ->
+  gen_server:cast({global, ?MODULE}, {debug, Msg, Args}).
+
+info(Msg, Args) ->
+  gen_server:cast({global, ?MODULE}, {info, Msg, Args}).
+
+warn(Msg, Args) ->
+  gen_server:cast({global, ?MODULE}, {warn, Msg, Args}).
+
+error(Msg, Args) ->
+  gen_server:cast({global, ?MODULE}, {error, Msg, Args}).
+
+fatal(Msg, Args) ->
+  gen_server:cast({global, ?MODULE}, {fatal, Msg, Args}).
+
+%%====================================================================
+%% gen_server callbacks
+%%====================================================================
+
+%%--------------------------------------------------------------------
+%% Function: init(Args) -> {ok, State} |
+%%                         {ok, State, Timeout} |
+%%                         ignore               |
+%%                         {stop, Reason}
+%% Description: Initiates the server
+%%--------------------------------------------------------------------
+init([LogLevel]) ->
+  error_logger:info_msg("~p starting~n", [?MODULE]),
+  {ok, #state{log_level = LogLevel}}.
+
+%%--------------------------------------------------------------------
+%% Function: %% handle_call(Request, From, State) -> {reply, Reply, State} |
+%%                                      {reply, Reply, State, Timeout} |
+%%                                      {noreply, State} |
+%%                                      {noreply, State, Timeout} |
+%%                                      {stop, Reason, Reply, State} |
+%%                                      {stop, Reason, State}
+%% Description: Handling call messages
+%%--------------------------------------------------------------------
+handle_call({set_log_level, Level}, _From, State) ->
+  {reply, ok, State#state{log_level = Level}};
+handle_call(_Request, _From, State) ->
+  {reply, ok, State}.
+
+%%--------------------------------------------------------------------
+%% Function: handle_cast(Msg, State) -> {noreply, State} |
+%%                                      {noreply, State, Timeout} |
+%%                                      {stop, Reason, State}
+%% Description: Handling cast messages
+%%--------------------------------------------------------------------
+handle_cast({debug, Msg, Args}, State) ->
+  log(State#state.log_level, 4, Msg, Args),
+  {noreply, State};
+handle_cast({info, Msg, Args}, State) ->
+  log(State#state.log_level, 3, Msg, Args),
+  {noreply, State};
+handle_cast({warn, Msg, Args}, State) ->
+  log(State#state.log_level, 2, Msg, Args),
+  {noreply, State};
+handle_cast({error, Msg, Args}, State) ->
+  log(State#state.log_level, 1, Msg, Args),
+  {noreply, State};
+handle_cast({fatal, Msg, Args}, State) ->
+  log(State#state.log_level, 0, Msg, Args),
+  {noreply, State};
+handle_cast(_Msg, State) -> {noreply, State}.
+
+handle_info(Msg, State) ->
+  error_logger:error_msg("Unexpected message: ~p~n", [Msg]),
+  {noreply, State}.
+
+terminate(_Reason, _State) -> ok.
+code_change(_OldVersion, State, _Extra) -> {ok, State}.
+
+%%====================================================================
+%% Internal
+%%====================================================================
+
+log(SystemLogLevel, MessageLogLevel, Message, Args) ->
+  case SystemLogLevel >= MessageLogLevel of
+    false -> ok;
+    true -> io:format(Message, Args)
+  end.

data/elib/logger_sup.erl

@@ -0,0 +1,13 @@
+-module(logger_sup).
+-behaviour(supervisor).
+-export([start_link/0, init/1]).
+
+start_link() ->
+  supervisor:start_link({local, ?MODULE}, ?MODULE, []).
+
+init([]) ->
+  {ok, LogLevel} = application:get_env(ernie_server_app, log_level),
+  io:format("Using log level ~p~n", [LogLevel]),
+  {ok, {{one_for_one, 1, 60},
+    [{logger, {logger, start_link, [[LogLevel]]},
+    permanent, brutal_kill, worker, [logger]}]}}.

data/elib/port_wrapper.erl

@@ -1,5 +1,5 @@
 -module(port_wrapper).
--export([wrap/1, wrap/2, wrap_link/1, wrap_link/2, send/2, shutdown/1, rpc/2]).
+-export([wrap/1, wrap/2, wrap_link/1, wrap_link/2, send/2, shutdown/1, close/1, rpc/2]).
 
 wrap(Command) ->
  spawn(fun() -> process_flag(trap_exit, true), Port = create_port(Command), loop(Port, infinity, Command) end).
@@ -27,6 +27,10 @@ shutdown(WrappedPort) ->
   WrappedPort ! shutdown,
   true.
 
+close(WrappedPort) ->
+  WrappedPort ! noose,
+  true.
+
 create_port(Command) ->
   open_port({spawn, Command}, [{packet, 4}, nouse_stdio, exit_status, binary]).
 

data/ernie.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ernie}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Preston-Werner"]
-  s.date = %q{2009-07-09}
+  s.date = %q{2009-08-13}
   s.default_executable = %q{ernie}
   s.email = %q{tom@mojombo.com}
   s.executables = ["ernie"]
@@ -29,6 +29,8 @@ Gem::Specification.new do |s|
      "elib/ernie_server.erl",
      "elib/ernie_server_app.erl",
      "elib/ernie_server_sup.erl",
+     "elib/logger.erl",
+     "elib/logger_sup.erl",
      "elib/port_wrapper.erl",
      "ernie.gemspec",
      "examples/calc.rb",
@@ -36,30 +38,34 @@ Gem::Specification.new do |s|
      "ext/extconf.rb",
      "lib/ernie.rb",
      "test/ernie_test.rb",
+     "test/load.rb",
      "test/test_helper.rb"
   ]
-  s.has_rdoc = true
   s.homepage = %q{http://github.com/mojombo/ernie}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.0}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{TODO}
   s.test_files = [
     "test/ernie_test.rb",
+     "test/load.rb",
      "test/test_helper.rb",
      "examples/calc.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<erlectricity>, [">= 1.0.1"])
+      s.add_runtime_dependency(%q<bertrpc>, [">= 0.2.0"])
     else
       s.add_dependency(%q<erlectricity>, [">= 1.0.1"])
+      s.add_dependency(%q<bertrpc>, [">= 0.2.0"])
     end
   else
     s.add_dependency(%q<erlectricity>, [">= 1.0.1"])
+    s.add_dependency(%q<bertrpc>, [">= 0.2.0"])
   end
 end

data/test/load.rb

@@ -0,0 +1,14 @@
+require 'bertrpc'
+
+threads = []
+svc = BERTRPC::Service.new('localhost', 8000)
+
+5.times do
+  threads << Thread.new do
+    i = 0
+    100.times { i += svc.call.calc.add(1, 2) }
+    print "#{i}\n"
+  end
+end
+
+threads.each { |t| t.join }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mojombo-ernie
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-09 00:00:00 -07:00
+date: 2009-08-13 00:00:00 -07:00
 default_executable: ernie
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.0.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: bertrpc
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.2.0
+    version: 
 description: 
 email: tom@mojombo.com
 executables: 
@@ -45,6 +55,8 @@ files:
 - elib/ernie_server.erl
 - elib/ernie_server_app.erl
 - elib/ernie_server_sup.erl
+- elib/logger.erl
+- elib/logger_sup.erl
 - elib/port_wrapper.erl
 - ernie.gemspec
 - examples/calc.rb
@@ -52,9 +64,11 @@ files:
 - ext/extconf.rb
 - lib/ernie.rb
 - test/ernie_test.rb
+- test/load.rb
 - test/test_helper.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/mojombo/ernie
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -75,11 +89,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: TODO
 test_files: 
 - test/ernie_test.rb
+- test/load.rb
 - test/test_helper.rb
 - examples/calc.rb