einhorn 0.4.7 → 0.4.8

data/bin/einhorn

@@ -187,6 +187,7 @@ if true # $0 == __FILE__
   Einhorn::TransientState.script_name = $0
   Einhorn::TransientState.argv = ARGV.dup
   Einhorn::TransientState.environ = ENV.to_hash
+  Einhorn.initialize_plugins
 
   optparse = OptionParser.new do |opts|
     opts.on('-b ADDR', '--bind ADDR', 'Bind an address and add the corresponding FD via the environment') do |addr|
@@ -274,6 +275,8 @@ if true # $0 == __FILE__
       Einhorn::Command.louder(false)
     end
 
+    Einhorn.plugins_send(:optparse, opts)
+
     opts.on('--nice MASTER[:WORKER=0][:RENICE_CMD=/usr/bin/renice]', 'Unix nice level at which to run the einhorn processes. If not running as root, make sure to ulimit -e as appopriate.') do |nice|
       master, worker, renice_cmd = nice.split(':')
       master = Integer(master) if master
@@ -306,6 +309,8 @@ if true # $0 == __FILE__
     exit(1)
   end
 
+  Einhorn.plugins_send(:post_optparse)
+
   ret = Einhorn.run
   begin
     exit(ret)

data/einhorn.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_development_dependency('rake')
-  gem.add_development_dependency('shoulda', '~> 3.4.0')
-  gem.add_development_dependency('mocha')
+  gem.add_development_dependency('minitest', '< 5.0')
+  gem.add_development_dependency('mocha', '~> 0.13')
   gem.version       = Einhorn::VERSION
 end

data/example/plugin.rb

@@ -0,0 +1,40 @@
+#
+# plugin.rb - An example Einhorn plugin.
+#
+# Including this file in [yourgemhere]/lib/einhorn/plugins/ will cause Einhorn
+# to load it.  This example plugin defines all the methods that Einhorn
+# recognizes and will invoke, although none of these methods is required.
+#
+
+module Einhorn::Plugins
+  module ExamplePlugin
+    def self.initialize_example_plugin
+      # The initializer method must be named `initialize_##[plugin_name]',
+      # where [plugin_name] is the name of the plugin module or class in
+      # lower_case_with_underscores.
+      puts 'I will be called before einhorn does any work.'
+    end
+
+    def self.optparse(opts)
+      @options = {}
+      opts.on("--my-option X", "Patch einhorn with additional options!") do |x|
+        @options[:yay] = x
+      end
+    end
+
+    def self.post_optparse
+      # Called after all options native to einhorn or patched by any plugins
+      # are parsed.
+      @required_x = @options.fetch(:yay)
+    end
+
+    def self.event_loop
+      # Called each time einhorn enters its event loop, in which it cleans up
+      # any terminated children and respawns them.
+    end
+
+    def self.exit
+      # Called after the event loop terminates, just before einhorn exits.
+    end
+  end
+end

data/lib/einhorn.rb

@@ -6,7 +6,18 @@ require 'socket'
 require 'tmpdir'
 require 'yaml'
 
+require 'einhorn/third/little-plugger'
+
 module Einhorn
+  extend Third::LittlePlugger
+  module Plugins; end
+
+  def self.plugins_send(sym, *args)
+    plugins.values.each do |plugin|
+      plugin.send(sym, *args) if plugin.respond_to? sym
+    end
+  end
+
   module AbstractState
     def default_state; raise NotImplementedError.new('Override in extended modules'); end
     def state; @state ||= default_state; end
@@ -321,6 +332,8 @@ module Einhorn
 
     while Einhorn::State.respawn || Einhorn::State.children.size > 0
       log_debug("Entering event loop")
+      Einhorn.plugins_send(:event_loop)
+
       # All of these are non-blocking
       Einhorn::Command.reap
       Einhorn::Command.replenish
@@ -329,6 +342,8 @@ module Einhorn
       # Make sure to do this last, as it's blocking.
       Einhorn::Event.loop_once
     end
+
+    Einhorn.plugins_send(:exit)
   end
 end
 

data/lib/einhorn/third.rb

@@ -0,0 +1 @@
+module Einhorn; module Third; end; end

data/lib/einhorn/third/little-plugger.rb

@@ -0,0 +1,2 @@
+require 'einhorn/third'
+require 'einhorn/third/little-plugger/lib/little-plugger'

data/lib/einhorn/third/little-plugger/.gitignore

@@ -0,0 +1,17 @@
+# The list of files that should be ignored by Mr Bones.
+# Lines that start with '#' are comments.
+#
+# A .gitignore file can be used instead by setting it as the ignore
+# file in your Rakefile:
+#
+#   PROJ.ignore_file = '.gitignore'
+#
+# For a project with a C extension, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
+announcement.txt
+coverage
+doc
+pkg
+.rvmrc

data/lib/einhorn/third/little-plugger/History.txt

@@ -0,0 +1,30 @@
+== 1.1.3 / 2011-11-17
+
+* 1 bug fix
+  * Ensuring gem files are in a sorted order
+
+== 1.1.2 / 2010-02-01
+
+* 1 bug fix
+  * Resovling some circular dependencies
+
+== 1.1.1 / 2009-11-08
+
+* 1 bug fix
+  * Catching script errors and standard errors when loading plugins
+
+== 1.1.0 / 2009-11-04
+
+* 2 minor enhancements
+  * Loading the first plugin found by name (instead of the last)
+  * Plugins can be disregarded so they will not be loaded
+
+== 1.0.1 / 2009-08-14
+
+* 1 bug fix
+  * Using the wrong file extension for the File#basename call
+
+== 1.0.0 / 2009-07-16
+
+* 1 major enhancement
+  * Birthday!

data/lib/einhorn/third/little-plugger/README.rdoc

@@ -0,0 +1,53 @@
+= Little Plugger
+* by Tim Pease
+* http://github.com/TwP/little-plugger/tree/master
+
+=== DESCRIPTION:
+
+LittlePlugger is a module that provides Gem based plugin management.
+By extending your own class or module with LittlePlugger you can easily
+manage the loading and initializing of plugins provided by other gems.
+
+=== FEATURES:
+
+* List of plugins so that some plugins can be excluded while others are
+  loaded by default.
+* Loading and initializing of plugins.
+* Access to the plugin classes and modules.
+
+LittlePlugger is a distallation of the plugin system from Hoe. It has been
+"genericized" and encapsulated into its own easy to use module.
+
+=== REQUIREMENTS:
+
+Since Little Plugger is a Gem based plugin system, Ruby Gems must be
+installed on your system.
+
+=== INSTALL:
+
+  gem install little-plugger
+
+=== LICENSE:
+
+(The MIT License)
+
+Copyright (c) 2009-2011
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/einhorn/third/little-plugger/Rakefile

@@ -0,0 +1,31 @@
+
+begin
+  require 'bones'
+rescue LoadError
+  abort '### please install the "bones" gem ###'
+end
+
+ensure_in_path 'lib'
+require 'little-plugger'
+
+task :default => 'spec:run'
+task 'gem:release' => 'spec:run'
+
+Bones {
+  name 'little-plugger'
+  authors 'Tim Pease'
+  email 'tim.pease@gmail.com'
+  url 'http://gemcutter.org/gems/little-plugger'
+  version LittlePlugger::VERSION
+  readme_file 'README.rdoc'
+
+  spec.opts.concat %w[--color --format documentation]
+  use_gmail
+
+  depend_on 'rspec', :development => true
+}
+
+# depending on bones (even as a development dependency) creates a circular
+# reference that prevents the auto install of little-plugger when instsalling
+# bones
+::Bones.config.gem._spec.dependencies.delete_if {|d| d.name == 'bones'}

data/lib/einhorn/third/little-plugger/lib/little-plugger.rb

@@ -0,0 +1,325 @@
+
+# == Synopsis
+# LittlePlugger is a module that provides Gem based plugin management.
+# By extending your own class or module with LittlePlugger you can easily
+# manage the loading and initializing of plugins provided by other gems.
+#
+# == Details
+# Plugins are great! They allow other developers to add functionality to
+# an application but relieve the application developer of the responsibility
+# for mainting some other developer's plugin code. LittlePlugger aims to
+# make it dead simple to manage external plugins as gems.
+#
+# === Naming
+# Every plugin managed by LittlePlugger will have a name represented as a
+# Symbol. This name is used to register the plugin, load the plugin file,
+# and manage the plugin class/module. Here are the three rules for plugin
+# names:
+#
+# 1) all lowercase with underscores
+# 2) maps to a file of the same name with an '.rb' extension
+# 3) converting the name to camel case yields the plugin class / module
+#
+# These rules are essentially the standard ruby practice of naming files
+# after the class / module the file defines.
+#
+# === Finding & Loading
+# Plugins are found by searching through the lib folders of all installed
+# gems; these gems are not necessarily loaded - just searched. If the lib
+# folder has a subdirectory that matches the +plugin_path+, then all ruby
+# files in the gem's +plugin_path+ are noted for later loading.
+#
+# A file is only loaded if the basename of the file matches one of the
+# registered plugin names. If no plugins are registered, then every file in
+# the +plugin_path+ is loaded.
+#
+# The plugin classes / modules are all expected to live in the same
+# namespace for a particular application. For example, all plugins for the
+# "Foo" application should reside in a "Foo::Plugins" namespace. This allows
+# the plugins to be automatically initialized by LittlePlugger.
+#
+# === Initializing
+# Optionally, plugins can provide an initialization method for running any
+# setup code needed by the plugin. This initialize method should be named as
+# follows: "initializer_#{plugin_name}" where the name of the plugin is
+# appended to the end of the initializer method name.
+#
+# If this method exists, it will be called automatically when plugins are
+# loaded. The order of loading of initialization is not strictly defined, so
+# do not rely on another plugin being initialized for your own plugin
+# successfully initialize.
+#
+# == Usage
+# LittlePlugger is used by extending your own class or module with the
+# LittlePlugger module.
+#
+#    module Logging
+#      extend LittlePlugger
+#    end
+#
+# This defines a +plugin_path+ and a +plugin_module+ for our Logging module.
+# The +plugin_path+ is set to "logging/plugins", and therefore, the
+# +plugin_modlue+ is defined as Logging::Plugins. All plugins for the
+# Logging module should be found underneath this plugin module.
+#
+# The plugins for the Logging module are loaded and initialized by calling
+# the +initialize_plugins+ method.
+#
+#    Logging.initialize_plugins
+#
+# If you only want to load the plugin files but not initialize the plugin
+# classes / modules then you can call the +load_plugins+ method.
+#
+#    Logging.load_plugins
+#
+# Finally, you can get a hash of all the loaded plugins.
+#
+#    Logging.plugins
+#
+# This returns a hash keyed by the plugin names with the plugin class /
+# module as the value.
+#
+# If you only want a certain set of plugins to be loaded, then pass the
+# names to the +plugin+ method.
+#
+#    Logging.plugin :foo, :bar, :baz
+#
+# Now only three plugins for the Logging module will be loaded.
+#
+# === Customizing
+# LittlePlugger allows the use of a custom plugin path and module. These are
+# specified when extending with LilttlePlugger by passing the specific path
+# and module to LittlePlugger.
+#
+#    class Hoe
+#      extend LittlePlugger( :path => 'hoe', :module => Hoe )
+#
+#      plugin(
+#          :clean, :debug, :deps, :flay, :flog, :package,
+#          :publish, :rcov, :signing, :test
+#      )
+#    end
+#
+# All ruby files found under the "hoe" directory will be treated as
+# plugins, and the plugin classes / modules should reside directly under the
+# Hoe namespace.
+#
+# We also specify a list of plugins to be loaded. Only these plugins will be
+# loaded and initialized by the LittlePlugger module. The +plugin+ method
+# can be called multiple times to add more plugins.
+#
+module Einhorn::Third::LittlePlugger
+
+  VERSION = '1.1.3'  # :nodoc:
+
+  # Returns the version string for the library.
+  #
+  def self.version
+    VERSION
+  end
+
+  module ClassMethods
+
+    # Add the _names_ to the list of plugins that will be loaded.
+    #
+    def plugin( *names )
+      plugin_names.concat(names.map! {|n| n.to_sym})
+    end
+
+    # Add the _names_ to the list of plugins that will *not* be loaded. This
+    # list prevents the plugin system from loading unwanted or unneeded
+    # plugins.
+    #
+    # If a plugin name appears in both the 'disregard_plugin' list and the
+    # 'plugin' list, the disregard list takes precedence; that is, the plugin
+    # will not be loaded.
+    #
+    def disregard_plugin( *names )
+      @disregard_plugin ||= []
+      @disregard_plugin.concat(names.map! {|n| n.to_sym})
+      @disregard_plugin
+    end
+    alias :disregard_plugins :disregard_plugin
+
+    # Returns the array of plugin names that will be loaded. If the array is
+    # empty, then any plugin found in the +plugin_path+ will be loaded.
+    #
+    def plugin_names
+      @plugin_names ||= []
+    end
+
+    # Loads the desired plugins and returns a hash. The hash contains all
+    # the plugin classes and modules keyed by the plugin name.
+    #
+    def plugins
+      load_plugins
+      pm = plugin_module
+      names = pm.constants.map { |s| s.to_s }
+      names.reject! { |n| n =~ %r/^[A-Z_]+$/ }
+
+      h = {}
+      names.each do |name|
+        sym = ::Einhorn::Third::LittlePlugger.underscore(name).to_sym
+        next unless plugin_names.empty? or plugin_names.include? sym
+        next if disregard_plugins.include? sym
+        h[sym] = pm.const_get name
+      end
+      h
+    end
+
+    # Iterate over the loaded plugin classes and modules and call the
+    # initialize method for each plugin. The plugin's initialize method is
+    # defeind as +initialize_plugin_name+, where the plugin name is unique
+    # to each plugin.
+    #
+    def initialize_plugins
+      plugins.each do |name, klass|
+        msg = "initialize_#{name}"
+        klass.send msg if klass.respond_to? msg
+      end
+    end
+
+    # Iterate through all installed gems looking for those that have the
+    # +plugin_path+ in their "lib" folder, and load all .rb files found in
+    # the gem's plugin path. Each .rb file should define one class or module
+    # that will be used as a plugin.
+    #
+    def load_plugins
+      @loaded ||= {}
+      found = {}
+
+      Gem.find_files(File.join(plugin_path, '*.rb')).sort!.reverse_each do |path|
+        name = File.basename(path, '.rb').to_sym
+        found[name] = path unless found.key? name
+      end
+
+      :keep_on_truckin while found.map { |name, path|
+        next unless plugin_names.empty? or plugin_names.include? name
+        next if disregard_plugins.include? name
+        next if @loaded[name]
+        begin
+          @loaded[name] = load path
+        rescue ScriptError, StandardError => err
+          warn "Error loading #{path.inspect}: #{err.message}. skipping..."
+        end
+      }.any?
+    end
+
+    # The path to search in a gem's 'lib' folder for plugins.
+    #
+    def plugin_path
+      ::Einhorn::Third::LittlePlugger.default_plugin_path(self)
+    end
+
+    # This module or class where plugins are located.
+    #
+    def plugin_module
+      ::Einhorn::Third::LittlePlugger.default_plugin_module(plugin_path)
+    end
+
+  end  # module ClassMethods
+
+  # :stopdoc:
+
+  # Called when another object extends itself with LittlePlugger.
+  #
+  def self.extended( other )
+    other.extend ClassMethods
+  end
+
+  # Convert the given string from camel case to snake case. Method liberally
+  # stolen from ActiveSupport.
+  #
+  #    underscore( "FooBar" )    #=> "foo_bar"
+  #
+  def self.underscore( string )
+    string.to_s.
+        gsub(%r/::/, '/').
+        gsub(%r/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+        gsub(%r/([a-z\d])([A-Z])/,'\1_\2').
+        tr('-', '_').
+        downcase
+  end
+
+  # For a given object returns a default plugin path. The path is
+  # created by splitting the object's class name on the namespace separator
+  # "::" and converting each part of the namespace into an underscored
+  # string (see the +underscore+ method). The strings are then joined using
+  # the File#join method to give a filesystem path. Appended to this path is
+  # the 'plugins' directory.
+  #
+  #    default_plugin_path( FooBar::Baz )    #=> "foo_bar/baz/plugins"
+  #
+  def self.default_plugin_path( obj )
+    obj = obj.class unless obj.is_a? Module
+    File.join(underscore(obj.name), 'plugins')
+  end
+
+  # For a given path returns the class or module corresponding to the
+  # path. This method assumes a correspondence between directory names and
+  # Ruby namespaces.
+  #
+  #    default_plugin_module( "foo_bar/baz/plugins" )  #=> FooBar::Baz::Plugins
+  #
+  # This method will fail if any of the namespaces have not yet been
+  # defined.
+  #
+  def self.default_plugin_module( path )
+    path.split(File::SEPARATOR).inject(Object) do |mod, const|
+      const = const.split('_').map { |s| s.capitalize }.join
+      mod.const_get const
+    end
+  end
+  # :startdoc:
+
+end  # module Einhorn::Third::LittlePlugger
+
+
+module Kernel
+  module Einhorn::Third
+
+    # call-seq:
+    #    LittlePlugger( opts = {} )
+    #
+    # This method allows the user to override some of LittlePlugger's default
+    # settings when mixed into a module or class.
+    #
+    # See the "Customizing" section of the LittlePlugger documentation for an
+    # example of how this method is used.
+    #
+    # ==== Options
+    #
+    # * :path <String>
+    #    The default plugin path. Defaults to "module_name/plugins".
+    #
+    # * :module <Module>
+    #    The module where plugins will be loaded. Defaults to
+    #    ModuleName::Plugins.
+    #
+    # * :plugins <Array>
+    #    The array of default plugins to load. Only the plugins listed in this
+    #    array will be loaded by LittlePlugger.
+    #
+    def LittlePlugger( opts = {} )
+      return ::Einhorn::LittlePlugger::ClassMethods if opts.empty?
+      Module.new {
+        include ::Einhorn::LittlePlugger::ClassMethods
+
+        if opts.key?(:path)
+          eval %Q{def plugin_path() #{opts[:path].to_s.inspect} end}
+        end
+
+        if opts.key?(:module)
+          eval %Q{def plugin_module() #{opts[:module].name} end}
+        end
+
+        if opts.key?(:plugins)
+          plugins = Array(opts[:plugins]).map {|val| val.to_sym.inspect}.join(',')
+          eval %Q{def plugin_names() @plugin_names ||= [#{plugins}] end}
+        end
+      }
+    end
+  end  # module Einhorn::Third
+end  # module Kernel
+
+# EOF

data/lib/einhorn/third/little-plugger/spec/little-plugger_spec.rb

@@ -0,0 +1,26 @@
+
+require File.join(File.dirname(__FILE__), %w[spec_helper])
+
+describe LittlePlugger do
+
+  it "converts a string from camel-case to underscore" do
+    LittlePlugger.underscore('FooBarBaz').should be == 'foo_bar_baz'
+    LittlePlugger.underscore('CouchDB').should be == 'couch_db'
+    LittlePlugger.underscore('FOOBar').should be == 'foo_bar'
+    LittlePlugger.underscore('Foo::Bar::BazBuz').should be == 'foo/bar/baz_buz'
+  end
+
+  it "generates a default plugin path" do
+    LittlePlugger.default_plugin_path(LittlePlugger).should be == 'little_plugger/plugins'
+    LittlePlugger.default_plugin_path(Process::Status).should be == 'process/status/plugins'
+  end
+
+  it "generates a default plugin module" do
+    LittlePlugger.default_plugin_module('little_plugger').should be == LittlePlugger
+    lambda {LittlePlugger.default_plugin_module('little_plugger/plugins')}.
+        should raise_error(NameError, 'uninitialized constant LittlePlugger::Plugins')
+    LittlePlugger.default_plugin_module('process/status').should be == Process::Status
+  end
+end
+
+# EOF

data/lib/einhorn/third/little-plugger/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+
+require File.expand_path(
+    File.join(File.dirname(__FILE__), %w[.. lib little-plugger]))
+

data/lib/einhorn/version.rb

@@ -1,3 +1,3 @@
 module Einhorn
-  VERSION = '0.4.7'
+  VERSION = '0.4.8'
 end

data/test/_lib.rb

@@ -0,0 +1,12 @@
+require 'rubygems'
+require 'bundler/setup'
+
+require 'minitest/autorun'
+require 'minitest/spec'
+require 'mocha/setup'
+
+class EinhornTestCase < ::MiniTest::Spec
+  def setup
+    # Put global stubs here
+  end
+end

data/test/unit/einhorn.rb

@@ -1,14 +1,14 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '../test_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__), '../_lib'))
 
 require 'einhorn'
 
-class EinhornTest < Test::Unit::TestCase
-  context "when sockifying" do
-    teardown do
+class EinhornTest < EinhornTestCase
+  describe "when sockifying" do
+    after do
       Einhorn::State.sockets = {}
     end
 
-    should "correctly parse srv: arguments" do
+    it "correctly parses srv: arguments" do
       cmd = ['foo', 'srv:1.2.3.4:123,llama,test', 'bar']
       Einhorn.expects(:bind).once.with('1.2.3.4', '123', ['llama', 'test']).returns(4)
 
@@ -17,7 +17,7 @@ class EinhornTest < Test::Unit::TestCase
       assert_equal(['foo', '4', 'bar'], cmd)
     end
 
-    should "correctly parse --opt=srv: arguments" do
+    it "correctly parses --opt=srv: arguments" do
       cmd = ['foo', '--opt=srv:1.2.3.4:456', 'baz']
       Einhorn.expects(:bind).once.with('1.2.3.4', '456', []).returns(5)
 
@@ -26,7 +26,7 @@ class EinhornTest < Test::Unit::TestCase
       assert_equal(['foo', '--opt=5', 'baz'], cmd)
     end
 
-    should "use the same fd number for the same server spec" do
+    it "uses the same fd number for the same server spec" do
       cmd = ['foo', '--opt=srv:1.2.3.4:8910', 'srv:1.2.3.4:8910']
       Einhorn.expects(:bind).once.with('1.2.3.4', '8910', []).returns(10)
 
@@ -36,8 +36,8 @@ class EinhornTest < Test::Unit::TestCase
     end
   end
 
-  context '.update_state' do
-    should 'correctly update keys to match new default state hash' do
+  describe '.update_state' do
+    it 'correctly updates keys to match new default state hash' do
       Einhorn::State.stubs(:default_state).returns(:baz => 23, :foo => 1)
       old_state = {:foo => 2, :bar => 2}
 
@@ -46,7 +46,7 @@ class EinhornTest < Test::Unit::TestCase
       assert_match(/State format has changed/, message)
     end
 
-    should 'not change the state if the format has not changed' do
+    it 'does not change the state if the format has not changed' do
       Einhorn::State.stubs(:default_state).returns(:baz => 23, :foo => 1)
       old_state = {:baz => 14, :foo => 1234}
 

data/test/unit/einhorn/client.rb

@@ -1,8 +1,8 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '../../test_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__), '../../_lib'))
 
 require 'einhorn'
 
-class ClientTest < Test::Unit::TestCase
+class ClientTest < EinhornTestCase
   def unserialized_message
     {:foo => ['%bar', '%baz']}
   end
@@ -15,8 +15,8 @@ class ClientTest < Test::Unit::TestCase
     "---%0A:foo:%0A- ! '%25bar'%0A- ! '%25baz'%0A\n"
   end
 
-  context "when sending a message" do
-    should "write a serialized line" do
+  describe "when sending a message" do
+    it "writes a serialized line" do
       socket = mock
       socket.expects(:write).with do |write|
         write == serialized_1_8 || write == serialized_1_9
@@ -25,15 +25,15 @@ class ClientTest < Test::Unit::TestCase
     end
   end
 
-  context "when receiving a message" do
-    should "deserialize a single 1.8-style line" do
+  describe "when receiving a message" do
+    it "deserializes a single 1.8-style line" do
       socket = mock
       socket.expects(:readline).returns(serialized_1_8)
       result = Einhorn::Client::Transport.receive_message(socket)
       assert_equal(result, unserialized_message)
     end
 
-    should "deserialize a single 1.9-style line" do
+    it "deserializes a single 1.9-style line" do
       socket = mock
       socket.expects(:readline).returns(serialized_1_9)
       result = Einhorn::Client::Transport.receive_message(socket)
@@ -41,23 +41,23 @@ class ClientTest < Test::Unit::TestCase
     end
   end
 
-  context "when {de,}serializing a message" do
-    should "serialize and escape a message as expected" do
+  describe "when {de,}serializing a message" do
+    it "serializes and escape a message as expected" do
       actual = Einhorn::Client::Transport.serialize_message(unserialized_message)
       assert(actual == serialized_1_8 || actual == serialized_1_9, "Actual message is #{actual.inspect}")
     end
 
-    should "deserialize and unescape a 1.8-style message as expected" do
+    it "deserializes and unescape a 1.8-style message as expected" do
       actual = Einhorn::Client::Transport.deserialize_message(serialized_1_8)
       assert_equal(unserialized_message, actual)
     end
 
-    should "deserialize and unescape a 1.9-style message as expected" do
+    it "deserializes and unescape a 1.9-style message as expected" do
       actual = Einhorn::Client::Transport.deserialize_message(serialized_1_9)
       assert_equal(unserialized_message, actual)
     end
 
-    should "raise an error when deserializing invalid YAML" do
+    it "raises an error when deserializing invalid YAML" do
       invalid_serialized = "-%0A\t-"
       expected = [ArgumentError]
       expected << Psych::SyntaxError if defined?(Psych::SyntaxError) # 1.9

data/test/unit/einhorn/command.rb

@@ -1,18 +1,18 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '../../test_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__), '../../_lib'))
 
 require 'einhorn'
 
-class CommandTest < Test::Unit::TestCase
+class CommandTest < EinhornTestCase
   include Einhorn
 
-  context "when running quieter" do
-    should "increase the verbosity threshold" do
+  describe "when running quieter" do
+    it "increases the verbosity threshold" do
       Einhorn::State.stubs(:verbosity => 1)
       Einhorn::State.expects(:verbosity=).once.with(2).returns(2)
       Command.quieter
     end
 
-    should "max out at 2" do
+    it "maxes out at 2" do
       Einhorn::State.stubs(:verbosity => 2)
       Einhorn::State.expects(:verbosity=).never
       Command.quieter

data/test/unit/einhorn/command/interface.rb

@@ -1,12 +1,12 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '../../../test_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__), '../../../_lib'))
 
 require 'einhorn'
 
-class InterfaceTest < Test::Unit::TestCase
+class InterfaceTest < EinhornTestCase
   include Einhorn::Command
 
-  context "when a command is received" do
-    should "call that command" do
+  describe "when a command is received" do
+    it "calls that command" do
       conn = stub(:log_debug => nil)
       conn.expects(:write).once.with do |message|
         # Remove trailing newline
@@ -22,8 +22,8 @@ class InterfaceTest < Test::Unit::TestCase
     end
   end
 
-  context "when an unrecognized command is received" do
-    should "call the unrecognized_command method" do
+  describe "when an unrecognized command is received" do
+    it "calls the unrecognized_command method" do
       conn = stub(:log_debug => nil)
       Interface.expects(:unrecognized_command).once
       request = {
@@ -33,8 +33,8 @@ class InterfaceTest < Test::Unit::TestCase
     end
   end
 
-  context "when a worker ack is received" do
-    should "register ack and close the connection" do
+  describe "when a worker ack is received" do
+    it "registers ack and close the connection" do
       conn = stub(:log_debug => nil)
       conn.expects(:close).once
       conn.expects(:write).never

data/test/unit/einhorn/event.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '../../test_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__), '../../_lib'))
 
 require 'set'
 require 'einhorn'
@@ -13,17 +13,17 @@ module Einhorn::Event
   end
 end
 
-class EventTest < Test::Unit::TestCase
-  context "when running the event loop" do
-    setup do
+class EventTest < EinhornTestCase
+  describe "when running the event loop" do
+    before do
       Einhorn::Event.reset
     end
 
-    teardown do
+    after do
       Einhorn::Event.reset
     end
 
-    should "select on readable descriptors" do
+    it "selects on readable descriptors" do
       sock1 = mock(:fileno => 4)
       sock2 = mock(:fileno => 5)
 
@@ -40,7 +40,7 @@ class EventTest < Test::Unit::TestCase
       Einhorn::Event.loop_once
     end
 
-    should "select on writeable descriptors" do
+    it "selects on writeable descriptors" do
       sock1 = mock(:fileno => 4)
       sock2 = mock(:fileno => 5)
 
@@ -60,7 +60,7 @@ class EventTest < Test::Unit::TestCase
       Einhorn::Event.loop_once
     end
 
-    should "run callbacks for ready selectables" do
+    it "runs callbacks for ready selectables" do
       sock1 = mock(:fileno => 4)
       sock2 = mock(:fileno => 5)
 

data/test/unit/einhorn/worker_pool.rb

@@ -1,8 +1,8 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '../../test_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__), '../../_lib'))
 
 require 'einhorn'
 
-class WorkerPoolTest < Test::Unit::TestCase
+class WorkerPoolTest < EinhornTestCase
   def stub_children
     Einhorn::State.stubs(:children).returns(
       1234 => {:type => :worker, :signaled => Set.new(['INT'])},
@@ -11,12 +11,12 @@ class WorkerPoolTest < Test::Unit::TestCase
       )
   end
 
-  context "#workers_with_state" do
-    setup do
+  describe "#workers_with_state" do
+    before do
       stub_children
     end
 
-    should "select only the workers" do
+    it "selects only the workers" do
       workers_with_state = Einhorn::WorkerPool.workers_with_state
       # Sort only needed for Ruby 1.8
       assert_equal([
@@ -26,12 +26,12 @@ class WorkerPoolTest < Test::Unit::TestCase
     end
   end
 
-  context "#unsignaled_workers" do
-    setup do
+  describe "#unsignaled_workers" do
+    before do
       stub_children
     end
 
-    should "selects unsignaled workers" do
+    it "selects unsignaled workers" do
       unsignaled_workers = Einhorn::WorkerPool.unsignaled_workers
       assert_equal([1236], unsignaled_workers)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: einhorn
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-20 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -28,37 +28,37 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - <
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - <
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.13'
 description: Einhorn makes it easy to run multiple instances of an application server,
   all listening on the same port. You can also seamlessly restart your workers without
   dropping any requests. Einhorn requires minimal application-level support, making
@@ -81,6 +81,7 @@ files:
 - bin/einhorn
 - bin/einhornsh
 - einhorn.gemspec
+- example/plugin.rb
 - example/pool_worker.rb
 - example/thin_example
 - example/time_server
@@ -96,10 +97,19 @@ files:
 - lib/einhorn/event/loop_breaker.rb
 - lib/einhorn/event/persistent.rb
 - lib/einhorn/event/timer.rb
+- lib/einhorn/third.rb
+- lib/einhorn/third/little-plugger.rb
+- lib/einhorn/third/little-plugger/.gitignore
+- lib/einhorn/third/little-plugger/History.txt
+- lib/einhorn/third/little-plugger/README.rdoc
+- lib/einhorn/third/little-plugger/Rakefile
+- lib/einhorn/third/little-plugger/lib/little-plugger.rb
+- lib/einhorn/third/little-plugger/spec/little-plugger_spec.rb
+- lib/einhorn/third/little-plugger/spec/spec_helper.rb
 - lib/einhorn/version.rb
 - lib/einhorn/worker.rb
 - lib/einhorn/worker_pool.rb
-- test/test_helper.rb
+- test/_lib.rb
 - test/unit/einhorn.rb
 - test/unit/einhorn/client.rb
 - test/unit/einhorn/command.rb
@@ -131,11 +141,10 @@ signing_key:
 specification_version: 3
 summary: ! 'Einhorn: the language-independent shared socket manager'
 test_files:
-- test/test_helper.rb
+- test/_lib.rb
 - test/unit/einhorn.rb
 - test/unit/einhorn/client.rb
 - test/unit/einhorn/command.rb
 - test/unit/einhorn/command/interface.rb
 - test/unit/einhorn/event.rb
 - test/unit/einhorn/worker_pool.rb
-has_rdoc: 

data/test/test_helper.rb

@@ -1,8 +0,0 @@
-require 'rubygems'
-require 'bundler/setup'
-
-require 'test/unit'
-require 'mocha'
-require 'shoulda'
-
-$:.unshift(File.join(File.dirname(__FILE__), '../lib'))