officer 0.8.6 → 0.9.0

data/CONTRIBUTORS

@@ -0,0 +1,2 @@
+In order of contribution:
+Nelson Pascoal (nelsondcp@gmail.com)

data/README.markdown

@@ -2,6 +2,8 @@
 
 Officer is designed to help you coordinate distributed processes and avoid race conditions.  Inspiration comes from [elock](http://github.com/dustin/elock).
 
+Read more in my blog post: [http://remesch.com/officer-the-ruby-lock-server-and-client](http://remesch.com/officer-the-ruby-lock-server-and-client)
+
 ## Installation
 
     gem install officer
@@ -9,23 +11,37 @@ Officer is designed to help you coordinate distributed processes and avoid race
 ## Usage
 
 Officer uses the 'daemons' gem to simplify creating long lived background processes.
-Here are some simple examples in case you aren't familiar with it.
 
-'daemons' help information:
-    sudo officer --help
+Help information:
+    officer --help
+
+    Usage: officer [-hofplsd]
+        -h, --host=HOST                  The hostname or IP to bind to (default: 0.0.0.0)
+        -o, --socket-type=OPTION         TCP or UNIX (default: TCP)
+        -f, --socket-file=FILE           Full path and name to the UNIX socket file (only used if --socket-type=UNIX, default: /tmp/officer.sock)
+        -p, --port=PORT                  The port to listen on (default: 11500)
+        -l, --log-level                  Set the log level to debug, info, or error (default: error)
+        -s, --stats                      Log stats every 5 seconds (default: off, required log level: info)
+        -d, --pid-dir                    Set directory where pid file will be saved (default: operating system's run directory)
+            --help
 
-Officer's help information:
-    sudo officer run -- --help
 
 Run Officer in the foreground with full logging and statistics:
-    sudo officer run -- -l debug -s
+
+    officer run -- -l debug -s -d /tmp
 
 Run Officer in the background (production mode) and listen on a specific IP and port:
-    sudo officer start -- -h 127.0.0.1 -p 9999
+
+    officer start -- -h 127.0.0.1 -p 9999 -d /tmp
+
+### Other notes:
 
 - The server listens on 0.0.0.0:11500 by default.
 - All debugging and error output goes to stdout for now.
-- The daemons gem will create a pid file in /var/run and redirect stdout to /var/log/officer.output when using the 'start' option for background mode.
+- By default, a pid file is created in /var/run and stdout is written to /var/log/officer.output.  This will require root permissions which is normally a bad idea.  You can avoid this by picking a different directory (example: officer start -- -d /tmp).
+- I personally run Officer in production using Ruby Enterprise Edition (REE) which is based on Ruby 1.8.7.
+- RVM and JRuby users should check the [Known Issues](https://github.com/chadrem/officer/wiki/Known-Issues) wiki page.
+- UNIX domain sockets are supported (example: officer start -- -o UNIX -p /tmp)
 
 ## Ruby Client
 
@@ -40,6 +56,8 @@ Options:
 
 - :host => Hostname or IP address of the server to bind to (default: 0.0.0.0).
 - :port => TCP Port to listen on (default: 11500).
+- :socket_type => TCP or UNIX (default: TCP).
+- :socket_file => Full path to the server's UNIX domain socket file (default: /tmp/officer.sock).  This option is only used when the socket type is UNIX.
 
 
 ### Lock
@@ -81,6 +99,13 @@ Options:
 - Useful if you use Officer with Phusion Passenger and smart spawning.  See [Passenger's documentation](http://www.modrails.com/documentation/Users%20guide%20Apache.html#_smart_spawning_gotcha_1_unintential_file_descriptor_sharing) for more information.
 
 
+### Disconnect
+
+    client.disconnect
+
+- Close the connection to the server.
+
+
 ### Show locks
 
     client.locks
@@ -100,6 +125,17 @@ Options:
     client.my_locks
 
 
+## Contributing to Officer
+
+1. Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
+2. Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
+3. Fork the project.
+4. Start a feature/bugfix branch.
+5. Commit and push until you are happy with your contribution.
+6. Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
+7. Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+
+
 ## Copyright
 
-Copyright (c) 2010 Chad Remesch. See LICENSE for details.
+Copyright (c) 2010 - 2012 Chad Remesch. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.8.6
+0.9.0

data/bin/officer

@@ -3,51 +3,4 @@
 require 'rubygems'
 require 'officer'
 
-daemon_options = {
-  :dir_mode   => :system,
-  :multiple   => false,
-  :monitor    => true,
-  :log_output => true
-}
-
-def parse_command_line
-  if ARGV.include? '--'
-    ARGV.slice! 0..ARGV.index('--')
-  end
-
-  Choice.options do
-    option :host do
-      short '-h'
-      long '--host=HOST'
-      desc 'The hostname or IP to bind to (default: 0.0.0.0)'
-    end
-
-    option :port do
-      short '-p'
-      long '--port=PORT'
-      desc 'The port to listen on (default: 11500)'
-      cast Integer
-    end
-
-    option :log_level do
-      short '-l'
-      long '--log-level'
-      desc 'Set the log level to debug, info, or error (default: error)'
-    end
-
-    option :stats do
-      short '-s'
-      long '--stats'
-      desc 'Log stats every 5 seconds (default: off, required log level: info)'
-    end
-
-    option :help do
-      long '--help'
-    end
-  end
-end
-
-Daemons.run_proc('officer', daemon_options) do
-  parse_command_line
-  Officer::Server.new(Choice.choices).run
-end
+Officer::Runner.new.run

data/lib/officer/client.rb

@@ -15,6 +15,8 @@ module Officer
 
   class Client
     def initialize options={}
+      @socket_type = options[:socket_type] || 'TCP'
+      @socket_file = options[:socket_file] || '/tmp/officer.sock'
       @host = options[:host] || 'localhost'
       @port = options[:port] || 11500
       @namespace = options[:namespace]
@@ -27,6 +29,11 @@ module Officer
       connect
     end
 
+    def disconnect
+      @socket.close if @socket
+      @socket = nil
+    end
+
     def lock name, options={}
       result = execute :command => 'lock', :name => name_with_ns(name),
         :timeout => options[:timeout], :queue_max => options[:queue_max]
@@ -42,7 +49,7 @@ module Officer
       response = lock name, options
       result = response['result']
       queue = (response['queue'] || []).join ','
-      
+
       raise LockTimeoutError.new("queue=#{queue}") if result == 'timed_out'
       raise LockQueuedMaxError.new("queue=#{queue}") if result == 'queue_maxed'
       raise LockError unless %w(acquired already_acquired).include?(result)
@@ -80,13 +87,16 @@ module Officer
     def connect
       raise AlreadyConnectedError if @socket
 
-      @socket = TCPSocket.new @host, @port.to_i
-      @socket.fcntl Fcntl::F_SETFD, Fcntl::FD_CLOEXEC
-    end
+      case @socket_type
+      when 'TCP'
+        @socket = TCPSocket.new @host, @port.to_i
+      when 'UNIX'
+        @socket = UNIXSocket.new @socket_file
+      else
+        raise "Invalid socket type: #{@socket_type}"
+      end
 
-    def disconnect
-      @socket.close if @socket
-      @socket = nil
+      @socket.fcntl Fcntl::F_SETFD, Fcntl::FD_CLOEXEC
     end
 
     def execute command

data/lib/officer/connection.rb

@@ -92,7 +92,12 @@ module Officer
       include LockStoreCallbacks
 
       def to_host_s
-        @to_host_s ||= non_cached_to_host_s
+        begin
+          @to_host_s ||= non_cached_to_host_s
+        rescue ArgumentError
+          # we assume unix socket, so no ip/port info
+          @to_host_s ||= 'UNIX socket client'
+        end
       end
 
     private
@@ -118,4 +123,4 @@ module Officer
     end
 
   end
-end
+end

data/lib/officer/runner.rb

@@ -0,0 +1,101 @@
+module Officer
+
+  class Runner
+    def run
+      hack_argv
+      set_choices
+      unhack_argv
+      set_daemon_options
+      run_daemon
+    end
+
+    # HACK: Both the Choice and Daemons gems will parse ARGV so I
+    # modify ARGV for Choice and then restore it for Daemons.
+    def hack_argv
+      if ARGV.include? '--'
+        @saved_args = ARGV.slice! 0..ARGV.index('--')
+      end
+    end
+
+    def unhack_argv
+      ARGV.unshift(*@saved_args) if @saved_args
+    end
+
+    def set_choices
+
+      Choice.options do
+        option :host do
+          short '-h'
+          long '--host=HOST'
+          desc 'The hostname or IP to bind to (default: 0.0.0.0)'
+        end
+
+        option :socket_type do
+          short '-o'
+          long '--socket-type=OPTION'
+          desc 'TCP or UNIX (default: TCP)'
+          default 'TCP'
+          validate /^(TCP|UNIX)$/
+        end
+
+        option :socket_file do
+          short '-f'
+          long '--socket-file=FILE'
+          desc "Full path and name to the UNIX domain socket file (only used with '-o UNIX', default: /tmp/officer.sock)"
+        end
+
+        option :port do
+          short '-p'
+          long '--port=PORT'
+          desc 'The port to listen on (default: 11500)'
+          cast Integer
+        end
+
+        option :log_level do
+          short '-l'
+          long '--log-level'
+          desc 'Set the log level to debug, info, or error (default: error)'
+        end
+
+        option :stats do
+          short '-s'
+          long '--stats'
+          desc 'Log stats every 5 seconds (default: off, required log level: info)'
+        end
+
+        option :pid_dir do
+          short '-d'
+          long '--pid-dir'
+          desc "Set directory where pid file will be saved (default: operating system's run directory)"
+        end
+
+        option :help do
+          long '--help'
+        end
+      end
+
+      @choices = Choice.choices
+    end
+
+    def set_daemon_options
+      @daemon_options = {
+        :dir_mode   => :system,
+        :multiple   => false,
+        :monitor    => true,
+        :log_output => true
+      }
+
+      if @choices[:pid_dir]
+        @daemon_options[:dir_mode] = :normal
+        @daemon_options[:dir] = @choices[:pid_dir]
+      end
+    end
+
+    def run_daemon
+      Daemons.run_proc('officer', @daemon_options) do
+        Officer::Server.new(@choices).run
+      end
+    end
+  end
+
+end

data/lib/officer/server.rb

@@ -1,11 +1,22 @@
 module Officer
 
   class Server
+    class ShutdownConnection < EventMachine::Connection
+      def unbind
+        EM::stop_event_loop
+      end
+    end
+
     def initialize params={}
+      @semaphore = Mutex.new
+      set_running(false)
+
       @params = params
 
+      params[:socket_type] ||= 'TCP'
       params[:port] ||= 11500
       params[:host] ||= '0.0.0.0'
+      params[:socket_file] ||= '/tmp/officer.sock'
       params[:stats] ||= false
       params[:log_level] ||= 'error'
 
@@ -15,14 +26,39 @@ module Officer
     def run
       EM.error_handler {|e| Officer::Log.error e}
 
+      EM.kqueue = true if EM.kqueue?
+      EM.epoll = true if EM.epoll?
+
       EM::run do
         if @params[:stats]
           EM::PeriodicTimer.new(5) {Officer::LockStore.instance.log_state}
         end
 
-        EM::start_server @params[:host], @params[:port], Connection::Connection
+        if @enable_shutdown_port
+          EM::start_server '127.0.0.1', 11501, ShutdownConnection
+        end
+
+        if @params[:socket_type] == 'TCP'
+          EM::start_server @params[:host], @params[:port], Connection::Connection
+        else
+          EM::start_unix_domain_server @params[:socket_file], Connection::Connection
+        end
+
+        set_running(true)
       end
+
+      set_running(false)
+    end
+
+    def running?
+      @semaphore.synchronize {@running}
+    end
+
+  private
+
+    def set_running value
+      @semaphore.synchronize {@running = value}
     end
   end
 
-end
+end

data/lib/officer.rb

@@ -3,6 +3,7 @@ require 'singleton'
 require 'set'
 require 'logger'
 require 'delegate'
+require 'thread'
 
 # Gems.
 require 'rubygems'
@@ -17,5 +18,6 @@ require 'officer/log'
 require 'officer/commands'
 require 'officer/connection'
 require 'officer/lock_store'
+require 'officer/runner'
 require 'officer/server'
 require 'officer/client'

data/officer.gemspec

@@ -4,15 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{officer}
-  s.version = "0.8.6"
+  s.name = "officer"
+  s.version = "0.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chad Remesch"]
-  s.date = %q{2011-01-22}
-  s.default_executable = %q{officer}
-  s.description = %q{Officer is designed to help you coordinate distributed processes and avoid race conditions.}
-  s.email = %q{chad@remesch.com}
+  s.date = "2012-03-16"
+  s.description = "Officer is designed to help you coordinate distributed processes and avoid race conditions."
+  s.email = "chad@remesch.com"
   s.executables = ["officer"]
   s.extra_rdoc_files = [
     "LICENSE",
@@ -22,6 +21,7 @@ Gem::Specification.new do |s|
     ".autotest",
     ".document",
     ".rspec",
+    "CONTRIBUTORS",
     "LICENSE",
     "README.markdown",
     "Rakefile",
@@ -33,23 +33,19 @@ Gem::Specification.new do |s|
     "lib/officer/connection.rb",
     "lib/officer/lock_store.rb",
     "lib/officer/log.rb",
+    "lib/officer/runner.rb",
     "lib/officer/server.rb",
     "officer.gemspec",
     "spec/integration/officer_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/chadrem/officer}
+  s.homepage = "http://github.com/chadrem/officer"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Ruby lock server and client built on EventMachine.}
-  s.test_files = [
-    "spec/integration/officer_spec.rb",
-    "spec/spec_helper.rb"
-  ]
+  s.rubygems_version = "1.8.17"
+  s.summary = "Ruby lock server and client built on EventMachine."
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/spec/integration/officer_spec.rb

@@ -1,15 +1,17 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require "benchmark"
 
 describe Officer do
   before do
-    @server_thread = Thread.new do
-      Officer::Server.new.run
-    end
+    @server = Officer::Server.new :stats => true # :log_level => "debug"
+    @server.instance_variable_set("@enable_shutdown_port", true)
+    @server_thread = Thread.new {@server.run}
+    while !@server.running?; end
   end
 
   after do
-    @server_thread.terminate
+    shutdown_socket = TCPSocket.new("127.0.0.1", 11501)
+    shutdown_socket.close
+    while @server.running?; end
   end
 
   describe "COMMAND: with_lock" do
@@ -42,7 +44,11 @@ describe Officer do
     it "should allow a client to reset all of its locks (release them all)" do
       @client.lock("testlock1")
       @client.lock("testlock2")
-      @client.my_locks.should eq({"value"=>["testlock1", "testlock2"], "result"=>"my_locks"})
+      actual = @client.my_locks
+      expected = {"value"=>["testlock1", "testlock2"], "result"=>"my_locks"}
+      actual.class.should eq(Hash)
+      actual["value"].sort.should eq(expected["value"].sort)
+      actual["result"].should eq(expected["result"])
       @client.reset
       @client.my_locks.should eq({"value"=>[], "result"=>"my_locks"})
     end
@@ -90,8 +96,8 @@ describe Officer do
     it "should allow a client to see all the connections to a server" do
       connections = @client2.connections
 
-      connections["value"]["127.0.0.1:#{@client1_src_port}"].should eq(["client1_testlock1", "client1_testlock2"])
-      connections["value"]["127.0.0.1:#{@client2_src_port}"].should eq(["client2_testlock1", "client2_testlock2"])
+      connections["value"]["127.0.0.1:#{@client1_src_port}"].sort.should eq(["client1_testlock1", "client1_testlock2"].sort)
+      connections["value"]["127.0.0.1:#{@client2_src_port}"].sort.should eq(["client2_testlock1", "client2_testlock2"].sort)
       connections["value"].keys.length.should eq(2)
       connections["result"].should eq("connections")
     end
@@ -163,6 +169,15 @@ describe Officer do
         @client.unlock("testlock")
         @client.my_locks.should eq({"value"=>[], "result"=>"my_locks"})
       end
+
+      it "should inform the client they already have a lock if they previously locked it" do
+        @client.lock("testlock")
+        @client.lock("testlock").should eq({"result" => "already_acquired", "name" => "testlock"})
+      end
+
+      it "should inform the client they don't have a lock if they try to unlock a lock that they don't have" do
+        @client.unlock("testlock").should eq({"result" => "release_failed", "name" => "testlock"})
+      end
     end
 
     describe "locking options" do
@@ -190,6 +205,12 @@ describe Officer do
           )
         end
 
+        it "should allow a client to set an instant timeout when obtaining a lock (block syntax)" do
+          lambda {
+            @client2.with_lock("testlock", :timeout => 0){}
+          }.should raise_error(Officer::LockTimeoutError, "queue=127.0.0.1:#{@client1_src_port}")
+        end
+
         it "should allow a client to set a positive integer timeout when obtaining a lock" do
           time = Benchmark.realtime do
             @client2.lock("testlock", :timeout => 1).should eq(
@@ -203,43 +224,47 @@ describe Officer do
 
       describe "OPTION: queue_max" do
         before do
-        end
-
-        after do
-          @thread1.terminate
-          @thread2.terminate
-        end
-
-        it "should allow a client to abort when obtaining a lock if too many other clients are waiting for the same lock" do
           @client1 = Officer::Client.new
           @client1.lock("testlock")
 
           @thread1 = Thread.new {
             @client2 = Officer::Client.new
             @client2.lock("testlock")
-            raise "This should never execute since the lock request should block"
           }
 
           @thread2 = Thread.new {
             @client3 = Officer::Client.new
             @client3.lock("testlock")
-            raise "This should never execute since the lock request should block"
           }
 
-          sleep(0.25)  # Allow thread 1 & 2 time to run.
+          @client4 = Officer::Client.new
+          while @client4.locks["value"]["testlock"].count != 3; end
 
-          @thread1.status.should eq("sleep")
-          @thread2.status.should eq("sleep")
+          @client1_src_port = @client1.instance_variable_get('@socket').addr[1]
+          @client2_src_port = @client2.instance_variable_get('@socket').addr[1]
+          @client3_src_port = @client3.instance_variable_get('@socket').addr[1]
+        end
 
-          client1_src_port = @client1.instance_variable_get('@socket').addr[1]
-          client2_src_port = @client2.instance_variable_get('@socket').addr[1]
-          client3_src_port = @client3.instance_variable_get('@socket').addr[1]
+        after do
+        end
 
-          @client4 = Officer::Client.new
-          @client4.lock("testlock", :queue_max => 3).should eq(
-            {"result" => "queue_maxed", "name" => "testlock", "queue" =>
-              ["127.0.0.1:#{client1_src_port}", "127.0.0.1:#{client2_src_port}", "127.0.0.1:#{client3_src_port}"]}
-          )
+        it "should allow a client to abort lock acquisition if the wait queue is too long" do
+          actual = @client4.lock("testlock", :queue_max => 3)
+          expected = {
+            "result" => "queue_maxed",
+            "name" => "testlock",
+            "queue" => ["127.0.0.1:#{@client1_src_port}", "127.0.0.1:#{@client2_src_port}", "127.0.0.1:#{@client3_src_port}"]
+          }
+          actual.class.should eq(Hash)
+          actual["result"].should eq(expected["result"])
+          actual["name"].should eq(expected["name"])
+          actual["queue"].sort.should eq(expected["queue"].sort)
+        end
+
+        it "should allow a client to abort lock acquisition if the wait queue is too long (block syntax)" do
+          lambda {
+            @client4.with_lock("testlock", :queue_max => 3) {}
+          }.should raise_error(Officer::LockQueuedMaxError)
         end
       end
 
@@ -260,5 +285,29 @@ describe Officer do
         end
       end
     end
+
+    describe "EXPERIMENTAL: server support for non-blocking clients attempting to release a queued lock request" do
+      before do
+        @client = Officer::Client.new
+
+        @socket = TCPSocket.new "127.0.0.1", 11500
+        @socket = TCPSocket.new "127.0.0.1", 11500
+      end
+
+      after do
+        @client.send("disconnect")
+        @client = nil
+
+        @socket.close
+        @socket = nil
+      end
+
+      it "should inform the client that their request has been de-queued" do
+        @client.lock("testlock")
+        @socket.write("{\"command\":\"lock\",\"name\":\"testlock\"}\n")
+        @socket.write("{\"command\":\"unlock\",\"name\":\"testlock\"}\n")
+        JSON.parse(@socket.gets("\n").chomp).should eq({"result" => "released", "name" => "testlock"})
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
+require "benchmark"
+require "json"
 require 'officer'
 
 # Requires supporting files with custom matchers and macros, etc,
@@ -8,5 +10,4 @@ require 'officer'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-  
 end

metadata

@@ -1,108 +1,85 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: officer
-version: !ruby/object:Gem::Version 
-  hash: 51
-  prerelease: false
-  segments: 
-  - 0
-  - 8
-  - 6
-  version: 0.8.6
+version: !ruby/object:Gem::Version
+  version: 0.9.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Chad Remesch
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-22 00:00:00 -05:00
-default_executable: officer
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70245430020780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 2
-        - 4
-        - 0
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 2.4.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: eventmachine
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70245430020780
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: &70245430020300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70245430020300
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70245430019820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: daemons
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70245430019820
+- !ruby/object:Gem::Dependency
+  name: daemons
+  requirement: &70245430019320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: choice
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70245430019320
+- !ruby/object:Gem::Dependency
+  name: choice
+  requirement: &70245430018760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-description: Officer is designed to help you coordinate distributed processes and avoid race conditions.
+  prerelease: false
+  version_requirements: *70245430018760
+description: Officer is designed to help you coordinate distributed processes and
+  avoid race conditions.
 email: chad@remesch.com
-executables: 
+executables:
 - officer
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.markdown
-files: 
+files:
 - .autotest
 - .document
 - .rspec
+- CONTRIBUTORS
 - LICENSE
 - README.markdown
 - Rakefile
@@ -114,44 +91,34 @@ files:
 - lib/officer/connection.rb
 - lib/officer/lock_store.rb
 - lib/officer/log.rb
+- lib/officer/runner.rb
 - lib/officer/server.rb
 - officer.gemspec
 - spec/integration/officer_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/chadrem/officer
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+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 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Ruby lock server and client built on EventMachine.
-test_files: 
-- spec/integration/officer_spec.rb
-- spec/spec_helper.rb
+test_files: []