ernie 2.4.0 → 2.5.0

data/History.txt

@@ -1,3 +1,10 @@
+= 2.5.0 / 2010-11-19
+  * Major Enhancements
+    * Enable multi-node mode (#11)
+  * Bug Fixes
+    * Properly determine whether function or module is missing.
+    * Spawn a process for receive_term to keep acceptor non-blocking.
+
 = 2.4.0 / 2010-05-21
   * Minor Additions
     * Add -E cli option for setting extra Erlang VM options

data/README.md

@@ -59,6 +59,8 @@ Running
         -a, --access-log LOGFILE         Access log file.
         -d, --detached                   Run as a daemon.
         -P, --pidfile PIDFILE            Location to write pid file.
+        --name NAME                      Erlang process name.
+        --sname SNAME                    Erlang short process name.
         -E, --erlang ERLANG_OPTIONS      Options passed to Erlang VM.
 
     Commands:

data/Rakefile

@@ -1,67 +1,155 @@
 require 'rubygems'
 require 'rake'
+require 'date'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "ernie"
-    gem.rubyforge_project = "ernie"
-    gem.summary = %Q{Ernie is a BERT-RPC server implementation.}
-    gem.description = %Q{Ernie is an Erlang/Ruby hybrid BERT-RPC server implementation packaged as a gem.}
-    gem.email = "tom@mojombo.com"
-    gem.homepage = "http://github.com/mojombo/ernie"
-    gem.authors = ["Tom Preston-Werner"]
-    gem.files.include(["ext"])
-    gem.extensions << 'ext/extconf.rb'
-    gem.add_dependency('bert', '>= 1.1.0')
-    gem.add_dependency('bertrpc', '>= 1.0.0')
-
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+#############################################################################
+#
+# Helper functions
+#
+#############################################################################
+
+def name
+  @name ||= Dir['*.gemspec'].first.split('.').first
+end
+
+def version
+  line = File.read("lib/#{name}.rb")[/^\s*VERSION\s*=\s*.*/]
+  line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
+end
+
+def date
+  Date.today.to_s
+end
+
+def rubyforge_project
+  name
+end
+
+def gemspec_file
+  "#{name}.gemspec"
 end
 
+def gem_file
+  "#{name}-#{version}.gem"
+end
+
+def replace_header(head, header_name)
+  head.sub!(/(\.#{header_name}\s*= ').*'/) { "#{$1}#{send(header_name)}'"}
+end
+
+#############################################################################
+#
+# Standard tasks
+#
+#############################################################################
+
+task :default => :test
+
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/*_test.rb'
+  test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/*_test.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
+desc "Generate RCov test coverage and open in your browser"
+task :coverage do
+  require 'rcov'
+  sh "rm -fr coverage"
+  sh "rcov test/test_*.rb"
+  sh "open coverage/index.html"
 end
 
-task :default => :test
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "#{name} #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+desc "Open an irb session preloaded with this library"
+task :console do
+  sh "irb -rubygems -r ./lib/#{name}.rb"
+end
 
-# require 'rake/rdoctask'
-# Rake::RDocTask.new do |rdoc|
-#   if File.exist?('VERSION.yml')
-#     config = YAML.load(File.read('VERSION.yml'))
-#     version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
-#   else
-#     version = ""
-#   end
-# 
-#   rdoc.rdoc_dir = 'rdoc'
-#   rdoc.title = "ernie #{version}"
-#   rdoc.rdoc_files.include('README*')
-#   rdoc.rdoc_files.include('lib/**/*.rb')
-# end
+#############################################################################
+#
+# Custom tasks (add your own tasks here)
+#
+#############################################################################
 
 task :ebuild do
   ERLC_TEST_FLAGS = ""
   ERLC_FLAGS = "-o ../ebin"
   cd "elib"
   sh "erlc  #{ERLC_FLAGS} #{ERLC_TEST_FLAGS} #{Dir["**/*.erl"].join(" ")}"
-end
+end
+
+#############################################################################
+#
+# Packaging tasks
+#
+#############################################################################
+
+desc "Create tag v#{version} and build and push #{gem_file} to Rubygems"
+task :release => :build do
+  unless `git branch` =~ /^\* master$/
+    puts "You must be on the master branch to release!"
+    exit!
+  end
+  sh "git commit --allow-empty -a -m 'Release #{version}'"
+  sh "git tag v#{version}"
+  sh "git push origin master"
+  sh "git push origin v#{version}"
+  sh "gem push pkg/#{name}-#{version}.gem"
+end
+
+desc "Build #{gem_file} into the pkg directory"
+task :build => :gemspec do
+  sh "mkdir -p pkg"
+  sh "gem build #{gemspec_file}"
+  sh "mv #{gem_file} pkg"
+end
+
+desc "Generate #{gemspec_file}"
+task :gemspec => :validate do
+  # read spec file and split out manifest section
+  spec = File.read(gemspec_file)
+  head, manifest, tail = spec.split("  # = MANIFEST =\n")
+
+  # replace name version and date
+  replace_header(head, :name)
+  replace_header(head, :version)
+  replace_header(head, :date)
+  #comment this out if your rubyforge_project has a different name
+  replace_header(head, :rubyforge_project)
+
+  # determine file list from git ls-files
+  files = `git ls-files`.
+    split("\n").
+    sort.
+    reject { |file| file =~ /^\./ }.
+    reject { |file| file =~ /^(rdoc|pkg)/ }.
+    map { |file| "    #{file}" }.
+    join("\n")
+
+  # piece file back together and write
+  manifest = "  s.files = %w[\n#{files}\n  ]\n"
+  spec = [head, manifest, tail].join("  # = MANIFEST =\n")
+  File.open(gemspec_file, 'w') { |io| io.write(spec) }
+  puts "Updated #{gemspec_file}"
+end
+
+desc "Validate #{gemspec_file}"
+task :validate do
+  libfiles = Dir['lib/*'] - ["lib/#{name}.rb", "lib/#{name}"]
+  unless libfiles.empty?
+    puts "Directory `lib` should only contain a `#{name}.rb` file and `#{name}` dir."
+    exit!
+  end
+  unless Dir['VERSION*'].empty?
+    puts "A `VERSION` file at root level violates Gem best practices."
+    exit!
+  end
+end

data/bin/ernie

@@ -14,14 +14,10 @@ def code_paths
   DEFAULT_ERLANG_CODEPATHS.map {|n| "-pz #{rel(n)}" }.join(" ") + " \\"
 end
 
-def version
-  yml = YAML.load(File.read(File.join(File.dirname(__FILE__), *%w[.. VERSION.yml])))
-  "#{yml[:major]}.#{yml[:minor]}.#{yml[:patch]}"
-end
-
 require 'optparse'
 require 'pp'
 require 'yaml'
+require 'ernie'
 
 help = <<HELP
 Ernie is an Erlang/Ruby BERT-RPC Server.
@@ -42,7 +38,7 @@ HELP
 options = {}
 OptionParser.new do |opts|
   opts.banner = help
-  opts.version = version
+  opts.version = Ernie::VERSION
 
   opts.on("-c CONFIG", "--config CONFIG", "Config file") do |x|
     options[:config] = x
@@ -64,6 +60,14 @@ OptionParser.new do |opts|
     options[:detached] = true
   end
 
+  opts.on("--name NAME", "Erlang proccess name") do |x|
+    options[:name] = x
+  end
+
+  opts.on("--sname NAME", "Erlang short proccess name") do |x|
+    options[:sname] = x
+  end
+
   opts.on("-P", "--pidfile PIDFILE", "Location to write pid file.") do |x|
     options[:pidfile] = x
   end
@@ -99,9 +103,13 @@ else
   pidfile = options[:pidfile] ? "-ernie_server_app pidfile \"'#{options[:pidfile]}'\"" : ''
   detached = options[:detached] ? '-detached' : ''
   access_log = options[:access_log] ? "-ernie_server_app access_log '\"#{options[:access_log]}\"'" : ''
+  name = options[:name] ? "-name #{options[:name]}" : ''
+  sname = options[:sname] ? "-sname #{options[:sname]}" : ''
   erl_options = options[:erl_options]
 
   cmd = %Q{erl -boot start_sasl \
+               #{name} \
+               #{sname} \
                #{detached} \
                +Bc \
                +K true \
@@ -115,5 +123,6 @@ else
                -run ernie_server_app boot \
                #{erl_options}}.squeeze(' ')  
   puts cmd
+  STDOUT.flush
   exec(cmd)
 end

data/elib/ernie_access_logger.erl

@@ -18,19 +18,19 @@
 %%====================================================================
 
 start_link(Args) ->
-  gen_server:start_link({global, ?MODULE}, ?MODULE, Args, []).
+  gen_server:start_link({local, ?MODULE}, ?MODULE, Args, []).
 
 start(Args) ->
   gen_server:start({global, ?MODULE}, ?MODULE, Args, []).
 
 acc(Request) ->
-  gen_server:cast({global, ?MODULE}, {acc, Request}).
+  gen_server:cast(?MODULE, {acc, Request}).
 
 err(Request, Msg, Args) ->
-  gen_server:cast({global, ?MODULE}, {err, Request, Msg, Args}).
+  gen_server:cast(?MODULE, {err, Request, Msg, Args}).
 
 reopen() ->
-  gen_server:cast({global, ?MODULE}, reopen).
+  gen_server:cast(?MODULE, reopen).
 
 %%====================================================================
 %% gen_server callbacks

data/elib/ernie_server.erl

@@ -3,7 +3,7 @@
 -include_lib("ernie.hrl").
 
 %% api
--export([start_link/1, start/1, process/1, kick/0, fin/0]).
+-export([start_link/1, start/1, process/1, enqueue_request/1, kick/0, fin/0]).
 
 %% gen_server callbacks
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
@@ -14,19 +14,22 @@
 %%====================================================================
 
 start_link(Args) ->
-  gen_server:start_link({global, ?MODULE}, ?MODULE, Args, []).
+  gen_server:start_link({local, ?MODULE}, ?MODULE, Args, []).
 
 start(Args) ->
-  gen_server:start({global, ?MODULE}, ?MODULE, Args, []).
+  gen_server:start({local, ?MODULE}, ?MODULE, Args, []).
 
 process(Sock) ->
-  gen_server:cast({global, ?MODULE}, {process, Sock}).
+  gen_server:cast(?MODULE, {process, Sock}).
+
+enqueue_request(Request) ->
+  gen_server:call(?MODULE, {enqueue_request, Request}).
 
 kick() ->
-  gen_server:cast({global, ?MODULE}, kick).
+  gen_server:cast(?MODULE, kick).
 
 fin() ->
-  gen_server:cast({global, ?MODULE}, fin).
+  gen_server:cast(?MODULE, fin).
 
 %%====================================================================
 %% gen_server callbacks
@@ -57,6 +60,16 @@ init([Port, Configs]) ->
 %%                                      {stop, Reason, State}
 %% Description: Handling call messages
 %%--------------------------------------------------------------------
+handle_call({enqueue_request, Request}, _From, State) ->
+  case Request#request.priority of
+    high ->
+      Hq2 = queue:in(Request, State#state.hq),
+      Lq2 = State#state.lq;
+    low ->
+      Hq2 = State#state.hq,
+      Lq2 = queue:in(Request, State#state.lq)
+  end,
+  {reply, ok, State#state{hq = Hq2, lq = Lq2}};
 handle_call(_Request, _From, State) ->
   {reply, ok, State}.
 
@@ -71,8 +84,9 @@ handle_cast({process, Sock}, State) ->
              lq = queue:len(State#state.lq),
              taccept = erlang:now()},
   Request = #request{sock = Sock, log = Log},
-  State2 = receive_term(Request, State),
-  {noreply, State2};
+  spawn(fun() -> receive_term(Request, State) end),
+  logger:debug("Spawned receiver~n", []),
+  {noreply, State};
 handle_cast(kick, State) ->
   case queue:out(State#state.hq) of
     {{value, Request}, Hq2} ->
@@ -175,20 +189,11 @@ receive_term(Request, State) ->
         _Any ->
           Request2 = Request#request{action = BinaryTerm},
           close_if_cast(Term, Request2),
-          case Request2#request.priority of
-            high ->
-              Hq2 = queue:in(Request2, State#state.hq),
-              Lq2 = State#state.lq;
-            low ->
-              Hq2 = State#state.hq,
-              Lq2 = queue:in(Request2, State#state.lq)
-          end,
-          ernie_server:kick(),
-          State#state{hq = Hq2, lq = Lq2}
+          ernie_server:enqueue_request(Request2),
+          ernie_server:kick()
       end;
     {error, closed} ->
-      ok = gen_tcp:close(Sock),
-      State
+      ok = gen_tcp:close(Sock)
   end.
 
 process_info(Request, priority, [Priority]) ->
@@ -200,16 +205,28 @@ process_request(Request, Priority, Q2, State) ->
   ActionTerm = bert:decode(Request#request.action),
   {_Type, Mod, _Fun, _Args} = ActionTerm,
   Specs = lists:filter(fun({X, _Id}) -> Mod =:= X end, State#state.map),
-  process_module(ActionTerm, Specs, Request, Priority, Q2, State).
+  case Specs of
+    [] -> no_module(Mod, Request, Priority, Q2, State);
+    _Else -> process_module(ActionTerm, Specs, Request, Priority, Q2, State)
+  end.
 
-process_module(ActionTerm, [], Request, Priority, Q2, State) ->
-  {_Type, Mod, _Fun, _Args} = ActionTerm,
+no_module(Mod, Request, Priority, Q2, State) ->
   logger:debug("No such module ~p~n", [Mod]),
   Sock = Request#request.sock,
   Class = <<"ServerError">>,
   Message = list_to_binary(io_lib:format("No such module '~p'", [Mod])),
   gen_tcp:send(Sock, term_to_binary({error, [server, 0, Class, Message, []]})),
   ok = gen_tcp:close(Sock),
+  finish(Priority, Q2, State).
+
+process_module(ActionTerm, [], Request, Priority, Q2, State) ->
+  {_Type, Mod, Fun, _Args} = ActionTerm,
+  logger:debug("No such function ~p:~p~n", [Mod, Fun]),
+  Sock = Request#request.sock,
+  Class = <<"ServerError">>,
+  Message = list_to_binary(io_lib:format("No such function '~p:~p'", [Mod, Fun])),
+  gen_tcp:send(Sock, term_to_binary({error, [server, 0, Class, Message, []]})),
+  ok = gen_tcp:close(Sock),
   finish(Priority, Q2, State);
 process_module(ActionTerm, Specs, Request, Priority, Q2, State) ->
   [{_Mod, Id} | OtherSpecs] = Specs,

data/elib/logger.erl

@@ -15,28 +15,28 @@
 %%====================================================================
 
 start_link(Args) ->
-  gen_server:start_link({global, ?MODULE}, ?MODULE, Args, []).
+  gen_server:start_link({local, ?MODULE}, ?MODULE, Args, []).
 
 start(Args) ->
-  gen_server:start({global, ?MODULE}, ?MODULE, Args, []).
+  gen_server:start({local, ?MODULE}, ?MODULE, Args, []).
 
 set_log_level(Level) ->
-  gen_server:call({global, ?MODULE}, {set_log_level, Level}).
+  gen_server:call(?MODULE, {set_log_level, Level}).
 
 debug(Msg, Args) ->
-  gen_server:cast({global, ?MODULE}, {debug, Msg, Args}).
+  gen_server:cast(?MODULE, {debug, Msg, Args}).
 
 info(Msg, Args) ->
-  gen_server:cast({global, ?MODULE}, {info, Msg, Args}).
+  gen_server:cast(?MODULE, {info, Msg, Args}).
 
 warn(Msg, Args) ->
-  gen_server:cast({global, ?MODULE}, {warn, Msg, Args}).
+  gen_server:cast(?MODULE, {warn, Msg, Args}).
 
 error(Msg, Args) ->
-  gen_server:cast({global, ?MODULE}, {error, Msg, Args}).
+  gen_server:cast(?MODULE, {error, Msg, Args}).
 
 fatal(Msg, Args) ->
-  gen_server:cast({global, ?MODULE}, {fatal, Msg, Args}).
+  gen_server:cast(?MODULE, {fatal, Msg, Args}).
 
 %%====================================================================
 %% gen_server callbacks

data/ernie.gemspec

@@ -1,95 +1,77 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
 Gem::Specification.new do |s|
-  s.name = %q{ernie}
-  s.version = "2.4.0"
-
+  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.authors = ["Tom Preston-Werner"]
-  s.date = %q{2010-05-21}
-  s.default_executable = %q{ernie}
-  s.description = %q{Ernie is an Erlang/Ruby hybrid BERT-RPC server implementation packaged as a gem.}
-  s.email = %q{tom@mojombo.com}
-  s.executables = ["ernie"]
+  s.rubygems_version = '1.3.6'
+
+  s.name              = 'ernie'
+  s.version           = '2.5.0'
+  s.date              = '2010-11-19'
+  s.rubyforge_project = 'ernie'
+
+  s.summary     = "Ernie is a BERT-RPC server implementation."
+  s.description = "Ernie is an Erlang/Ruby hybrid BERT-RPC server implementation packaged as a gem."
+
+  s.authors  = ["Tom Preston-Werner"]
+  s.email    = 'tom@mojombo.com'
+  s.homepage = 'http://github.com/mojombo/ernie'
+
+  s.require_paths = %w[lib]
+
   s.extensions = ["ext/extconf.rb", "ext/extconf.rb"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.md"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "History.txt",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION.yml",
-     "bin/ernie",
-     "contrib/ebench.erl",
-     "ebin/ernie_server_app.app",
-     "elib/asset_pool.erl",
-     "elib/asset_pool_sup.erl",
-     "elib/bert.erl",
-     "elib/ernie.hrl",
-     "elib/ernie_access_logger.erl",
-     "elib/ernie_access_logger_sup.erl",
-     "elib/ernie_admin.erl",
-     "elib/ernie_config.erl",
-     "elib/ernie_native.erl",
-     "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/example.cfg",
-     "examples/example.config",
-     "examples/ext.erl",
-     "examples/ext.rb",
-     "examples/nat.erl",
-     "ext/Makefile",
-     "ext/extconf.rb",
-     "lib/ernie.rb",
-     "test/ernie_server_test.rb",
-     "test/ernie_test.rb",
-     "test/helper.rb",
-     "test/load.rb",
-     "test/sample/ext.rb",
-     "test/sample/sample.cfg"
-  ]
-  s.homepage = %q{http://github.com/mojombo/ernie}
+
+  s.executables = ["ernie"]
+  s.default_executable = 'ernie'
+
   s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{ernie}
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Ernie is a BERT-RPC server implementation.}
-  s.test_files = [
-    "test/ernie_server_test.rb",
-     "test/ernie_test.rb",
-     "test/helper.rb",
-     "test/load.rb",
-     "test/sample/ext.rb",
-     "examples/ext.rb"
-  ]
+  s.extra_rdoc_files = %w[LICENSE README.md]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_dependency('bert', [">= 1.1.0"])
+  s.add_dependency('bertrpc', [">= 1.0.0"])
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<bert>, [">= 1.1.0"])
-      s.add_runtime_dependency(%q<bertrpc>, [">= 1.0.0"])
-    else
-      s.add_dependency(%q<bert>, [">= 1.1.0"])
-      s.add_dependency(%q<bertrpc>, [">= 1.0.0"])
-    end
-  else
-    s.add_dependency(%q<bert>, [">= 1.1.0"])
-    s.add_dependency(%q<bertrpc>, [">= 1.0.0"])
-  end
-end
+  s.add_development_dependency('shoulda', [">= 2.11.3", "< 3.0.0"])
+
+  # = MANIFEST =
+  s.files = %w[
+    History.txt
+    LICENSE
+    README.md
+    Rakefile
+    bin/ernie
+    contrib/ebench.erl
+    ebin/ernie_server_app.app
+    elib/asset_pool.erl
+    elib/asset_pool_sup.erl
+    elib/bert.erl
+    elib/ernie.hrl
+    elib/ernie_access_logger.erl
+    elib/ernie_access_logger_sup.erl
+    elib/ernie_admin.erl
+    elib/ernie_config.erl
+    elib/ernie_native.erl
+    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/example.cfg
+    examples/example.config
+    examples/ext.erl
+    examples/ext.rb
+    examples/nat.erl
+    ext/Makefile
+    ext/extconf.rb
+    lib/ernie.rb
+    test/helper.rb
+    test/load.rb
+    test/sample/ext.rb
+    test/sample/intTest.erl
+    test/sample/sample.cfg
+    test/test_ernie.rb
+    test/test_ernie_server.rb
+  ]
+  # = MANIFEST =
 
+  s.test_files = s.files.select { |path| path =~ /^test\/test_.*\.rb/ }
+end

data/lib/ernie.rb

@@ -3,6 +3,8 @@ require 'bert'
 require 'logger'
 
 class Ernie
+  VERSION = '2.5.0'
+
   class << self
     attr_accessor :mods, :current_mod, :log
     attr_accessor :auto_start
@@ -185,13 +187,8 @@ class Ernie
   end
 
   def self.version
-    yml = YAML.load(File.read(File.join(File.dirname(__FILE__), *%w[.. VERSION.yml])))
-    "#{yml[:major]}.#{yml[:minor]}.#{yml[:patch]}"
-  rescue
-    'unknown'
+    VERSION
   end
-
-  VERSION = self.version
 end
 
 class Ernie::ServerError < StandardError; end

data/test/helper.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'test/unit'
 require 'shoulda'
 
-ERNIE_ROOT = File.join(File.dirname(__FILE__), *%w[..])
+ERNIE_ROOT = File.expand_path(File.join(File.dirname(__FILE__), *%w[..]))
 
 $:.unshift(File.join(ERNIE_ROOT, 'lib'))
 

data/test/sample/intTest.erl

@@ -0,0 +1,60 @@
+-module(intTest).
+
+-export([zeronary/0, unary/1, binary/2, ternary/3, big/1, set_state/1, get_state/0, connect_nodes/0, sleep/1]).
+
+connect_nodes() ->
+	net_adm:ping('ernie0@127.0.0.1').
+
+zeronary() ->
+	foo.
+
+unary(A) ->
+	A.
+	
+binary(A,B) ->
+	A + B.
+
+ternary(A,B,C) ->
+	A + B + C.
+	
+big(A) ->
+	string:copies("a", A).
+
+sleep(Time) ->
+	receive after Time ->
+		ok
+	end.
+
+get_state() ->
+	case catch global:send(test_saved_state, {get_state, self()}) of
+		{'EXIT',{badarg, _}} ->
+			{error, no_record};
+		_ ->
+			receive
+				{ok, State} ->
+					State
+				after 1000 ->
+					{error, timeout}
+			end
+	end.
+	
+set_state(State) ->
+	spawn(fun() -> wrapper(State) end),
+	ok.
+
+wrapper(State) ->
+	case global:register_name(test_saved_state, self()) of
+		no ->
+			global:send(test_saved_state, {set_state, State});
+		yes ->
+			recv(State)
+	end.
+
+recv(State) ->
+	receive
+		{set_state, NewState} ->
+			recv(NewState);
+		{get_state, Pid} ->
+			Pid ! {ok, State},
+			recv(State)
+	end.

data/test/sample/sample.cfg

@@ -1,4 +1,8 @@
 [{module, ext},
  {type, external},
- {command, "ruby /Users/tom/dev/mojombo/ernie/test/sample/ext.rb"},
- {count, 1}].
+ {command, "ruby test/sample/ext.rb"},
+ {count, 1}].
+[{module, intTest},
+ {type, native},
+ {codepaths, ["test/sample"]}
+ ].

data/test/test_ernie_server.rb

@@ -0,0 +1,221 @@
+require File.dirname(__FILE__) + '/helper'
+
+PORT = 27118
+
+class ErnieServerTest < Test::Unit::TestCase
+
+  # global setup
+  def setup
+    @servers ||= []
+    Dir.chdir(ERNIE_ROOT)
+    `erlc -o test/sample #{ERNIE_ROOT}/test/sample/intTest.erl`
+    Signal.trap("INT") do
+      puts "Shutting Down"
+      shutdown_servers
+      teardown
+      exit
+    end
+  end
+  
+  def teardown
+    `rm test/sample/intTest.beam`
+  end
+
+  context "An Ernie Server" do
+    setup do
+      start_server
+    end
+
+    context "call" do
+      should "handle zeronary" do
+        assert_equal :foo, svc.call.ext.zeronary
+        assert_equal :foo, svc.call.intTest.zeronary
+      end
+
+      should "handle unary" do
+        assert_equal 5, svc.call.ext.unary(5)
+        assert_equal 5, svc.call.intTest.unary(5)
+      end
+
+      should "handle binary" do
+        assert_equal 7, svc.call.ext.binary(5, 2)
+        assert_equal 7, svc.call.intTest.binary(5, 2)
+      end
+
+      should "handle ternary" do
+        assert_equal 10, svc.call.ext.ternary(5, 2, 3)
+        assert_equal 10, svc.call.intTest.ternary(5, 2, 3)
+      end
+
+      should "handle massive binaries" do
+        assert_equal 8 * 1024 * 1024, svc.call.ext.big(8 * 1024 * 1024).size
+        assert_equal 8 * 1024 * 1024, svc.call.intTest.big(8 * 1024 * 1024).size
+      end
+      
+      should "not block on internal modules" do
+        time = Time.now
+        svc.call.intTest.sleep(1000)
+        assert(Time.now >= time + 1)
+        
+        time = Time.now
+        svc.cast.intTest.sleep(1000)
+        svc.cast.intTest.sleep(1000)
+        svc.cast.intTest.sleep(1000)
+        svc.call.intTest.zeronary
+        assert(Time.now < time + 1)
+      end
+
+      should "get an error on missing module" do
+        begin
+          svc.call.failboat.mcfail(:fail)
+          fail "Expected a BERTRPC::ServerError"
+        rescue BERTRPC::ServerError => e
+          assert_equal "No such module 'failboat'", e.message
+        else
+          assert false, 'failed to raise on missing module'
+        end
+      end
+
+      should "get an error on missing function" do
+        begin
+          svc.call.ext.mcfail(:fail)
+          fail "Expected a BERTRPC::ServerError"
+        rescue BERTRPC::ServerError => e
+          assert_equal "No such function 'ext:mcfail'", e.message
+        else
+          assert false, 'failed to raise on missing function'
+        end
+
+        begin
+          svc.call.intTest.mcfail(:fail)
+          fail "Expected a BERTRPC::ServerError"
+        rescue BERTRPC::ServerError => e
+          assert_equal "No such function 'intTest:mcfail'", e.message
+        else
+          assert false, 'failed to raise on missing function'
+        end
+      end
+    end
+
+    context "cast" do
+      should "be received and return immediately" do
+        t0 = Time.now
+        assert_equal nil, svc.cast.ext.set_state(7)
+        assert Time.now - t0 < 1
+        assert_equal 7, svc.call.ext.get_state
+
+        t0 = Time.now
+        assert_equal nil, svc.cast.intTest.set_state(7)
+        assert Time.now - t0 < 1
+        sleep 0.25
+        assert_equal 7, svc.call.intTest.get_state
+      end
+    end
+
+    teardown do
+      shutdown_server
+    end
+  end
+  
+  context "Two Ernie Servers" do
+    setup do
+      start_servers(2)
+      @servers.each do |svc|
+        svc.cast.intTest.connect_nodes
+      end
+    end
+    
+    context "call" do
+
+      should "handle zeronary" do
+        @servers.each do |svc|
+          assert_equal :foo, svc.call.ext.zeronary
+          assert_equal :foo, svc.call.intTest.zeronary
+        end
+      end
+
+      should "handle unary" do
+        @servers.each do |svc|
+          assert_equal 5, svc.call.ext.unary(5)
+          assert_equal 5, svc.call.intTest.unary(5)
+        end
+      end
+
+      should "handle binary" do
+        @servers.each do |svc|
+          assert_equal 7, svc.call.ext.binary(5, 2)
+          assert_equal 7, svc.call.intTest.binary(5, 2)
+        end
+      end
+
+      should "handle ternary" do
+        @servers.each do |svc|
+          assert_equal 10, svc.call.ext.ternary(5, 2, 3)
+          assert_equal 10, svc.call.intTest.ternary(5, 2, 3)
+        end
+      end
+
+      should "handle massive binaries" do
+        @servers.each do |svc|
+          assert_equal 8 * 1024 * 1024, svc.call.ext.big(8 * 1024 * 1024).size
+          assert_equal 8 * 1024 * 1024, svc.call.intTest.big(8 * 1024 * 1024).size
+        end
+      end
+
+      should "make joined erlang nodes possible" do
+        assert_equal nil, @servers.first.cast.intTest.set_state(7)
+        sleep 0.25
+        assert_equal 7, @servers.last.call.intTest.get_state
+      end
+
+    end
+
+    teardown do
+      shutdown_servers(2)
+    end
+  end
+  
+  protected
+  
+  def svc
+    @servers[rand(@servers.size-1)]
+  end
+  
+  def start_server
+    start_servers(1)
+  end
+  
+  def shutdown_server
+    shutdown_servers(1)
+  end
+  
+  def start_servers(n = 1)
+    n.times do
+      `#{ERNIE_ROOT}/bin/ernie -c #{ERNIE_ROOT}/test/sample/sample.cfg \
+                              -P /tmp/ernie#{@servers.size}.pid \
+                              -p #{PORT + @servers.size} \
+                              --name ernie#{@servers.size}@127.0.0.1 \
+                              -d`
+    
+      @servers << BERTRPC::Service.new('localhost', PORT + @servers.size)
+      loop do
+        begin
+          @servers.last.call.ext.zeronary
+          break
+        rescue Object => e
+          sleep 0.1
+        end
+      end
+    end
+  end
+  
+  def shutdown_servers(n = nil)
+    start = @servers.size - 1
+    last = start - (n || start)
+    (start).downto(last >= 0 ? last : 0) do |i|
+      pid = File.read("/tmp/ernie#{i}.pid")
+      `kill -9 #{pid}`
+    end
+  end
+  
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ernie
 version: !ruby/object:Gem::Version 
+  hash: 27
   prerelease: false
   segments: 
   - 2
-  - 4
+  - 5
   - 0
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-21 00:00:00 -07:00
+date: 2010-11-19 00:00:00 -06:00
 default_executable: ernie
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bert
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 1
@@ -35,9 +38,11 @@ dependencies:
   name: bertrpc
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
@@ -45,6 +50,30 @@ dependencies:
         version: 1.0.0
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 37
+        segments: 
+        - 2
+        - 11
+        - 3
+        version: 2.11.3
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  type: :development
+  version_requirements: *id003
 description: Ernie is an Erlang/Ruby hybrid BERT-RPC server implementation packaged as a gem.
 email: tom@mojombo.com
 executables: 
@@ -56,13 +85,10 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files: 
-- .document
-- .gitignore
 - History.txt
 - LICENSE
 - README.md
 - Rakefile
-- VERSION.yml
 - bin/ernie
 - contrib/ebench.erl
 - ebin/ernie_server_app.app
@@ -90,12 +116,13 @@ files:
 - ext/Makefile
 - ext/extconf.rb
 - lib/ernie.rb
-- test/ernie_server_test.rb
-- test/ernie_test.rb
 - test/helper.rb
 - test/load.rb
 - test/sample/ext.rb
+- test/sample/intTest.erl
 - test/sample/sample.cfg
+- test/test_ernie.rb
+- test/test_ernie_server.rb
 has_rdoc: true
 homepage: http://github.com/mojombo/ernie
 licenses: []
@@ -106,30 +133,30 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: ernie
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: Ernie is a BERT-RPC server implementation.
 test_files: 
-- test/ernie_server_test.rb
-- test/ernie_test.rb
-- test/helper.rb
-- test/load.rb
-- test/sample/ext.rb
-- examples/ext.rb
+- test/test_ernie.rb
+- test/test_ernie_server.rb

data/.document

@@ -1,5 +0,0 @@
-README.md
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/.gitignore

@@ -1,2 +0,0 @@
-*.beam
-pkg

data/VERSION.yml

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

data/test/ernie_server_test.rb

@@ -1,77 +0,0 @@
-require File.dirname(__FILE__) + '/helper'
-
-PORT = 27118
-
-class ErnieServerTest < Test::Unit::TestCase
-  context "An Ernie Server" do
-    setup do
-      `#{ERNIE_ROOT}/bin/ernie -c #{ERNIE_ROOT}/test/sample/sample.cfg \
-                               -P /tmp/ernie.pid \
-                               -p #{PORT} \
-                               -d`
-      @svc = BERTRPC::Service.new('localhost', PORT)
-      loop do
-        begin
-          @svc.call.ext.zeronary
-          break
-        rescue Object => e
-          sleep 0.1
-        end
-      end
-    end
-
-    context "call" do
-      should "handle zeronary" do
-        assert_equal :foo, @svc.call.ext.zeronary
-      end
-
-      should "handle unary" do
-        assert_equal 5, @svc.call.ext.unary(5)
-      end
-
-      should "handle binary" do
-        assert_equal 7, @svc.call.ext.binary(5, 2)
-      end
-
-      should "handle ternary" do
-        assert_equal 10, @svc.call.ext.ternary(5, 2, 3)
-      end
-
-      should "handle massive binaries" do
-        assert_equal 8 * 1024 * 1024, @svc.call.ext.big(8 * 1024 * 1024).size
-      end
-
-      should "get an error on missing module" do
-        begin
-          @svc.call.failboat.mcfail(:fail)
-          fail "Expected a BERTRPC::ServerError"
-        rescue BERTRPC::ServerError => e
-          assert_equal "No such module 'failboat'", e.message
-        end
-      end
-
-      should "get an error on missing function" do
-        begin
-          @svc.call.ext.mcfail(:fail)
-          fail "Expected a BERTRPC::ServerError"
-        rescue BERTRPC::ServerError => e
-          assert_equal "No such function 'ext:mcfail'", e.message
-        end
-      end
-    end
-
-    context "cast" do
-      should "be received and return immediately" do
-        t0 = Time.now
-        assert_equal nil, @svc.cast.ext.set_state(7)
-        assert Time.now - t0 < 1
-        assert_equal 7, @svc.call.ext.get_state
-      end
-    end
-
-    teardown do
-      pid = File.read('/tmp/ernie.pid')
-      `kill -9 #{pid}`
-    end
-  end
-end