officer 0.7.4 → 0.8.1

data/.document

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

data/.rspec

@@ -0,0 +1 @@
+--color

data/Gemfile

@@ -0,0 +1,15 @@
+source "http://rubygems.org"
+# Add dependencies required to use your gem here.
+gem "eventmachine"
+gem "json"
+gem "daemons"
+gem "choice"
+
+# Add dependencies to develop your gem here.
+# Include everything needed to run rake, tests, features, etc.
+group :development do
+  gem "rspec", "2.4.0"
+  gem "bundler", "~> 1.0.0"
+  gem "jeweler", "~> 1.5.2"
+  gem "rcov", ">= 0"
+end

data/Gemfile.lock

@@ -0,0 +1,36 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    choice (0.1.4)
+    daemons (1.1.0)
+    diff-lcs (1.1.2)
+    eventmachine (0.12.10)
+    git (1.2.5)
+    jeweler (1.5.2)
+      bundler (~> 1.0.0)
+      git (>= 1.2.5)
+      rake
+    json (1.4.6)
+    rake (0.8.7)
+    rcov (0.9.9)
+    rspec (2.4.0)
+      rspec-core (~> 2.4.0)
+      rspec-expectations (~> 2.4.0)
+      rspec-mocks (~> 2.4.0)
+    rspec-core (2.4.0)
+    rspec-expectations (2.4.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.4.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.0.0)
+  choice
+  daemons
+  eventmachine
+  jeweler (~> 1.5.2)
+  json
+  rcov
+  rspec (= 2.4.0)

data/Rakefile

@@ -1,49 +1,47 @@
 require 'rubygems'
-require 'rake'
-
+require 'bundler'
 begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "officer"
-    gem.summary = %Q{Distributed lock server and client}
-    gem.description = %Q{Distributed lock server and client written in Ruby and EventMachine}
-    gem.email = "chad@remesch.com"
-    gem.homepage = "http://github.com/chadrem/officer"
-    gem.authors = ["Chad Remesch"]
-    gem.add_dependency "eventmachine", ">= 0"
-    gem.add_dependency "json", ">= 0"
-    gem.add_dependency "daemons", ">= 0"
-    gem.add_dependency "choice", ">= 0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
 end
+require 'rake'
+
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+  gem.name = "officer"
+  gem.homepage = "http://github.com/chadrem/officer"
+  gem.license = "MIT"
+  gem.summary = %Q{Distributed lock server and client}
+  gem.description = %Q{Distributed lock server and client written in Ruby and EventMachine}
+  gem.email = "chad@remesch.com"
+  gem.authors = ["Chad Remesch"]
+  # Include your dependencies below. Runtime dependencies are required when using your gem,
+  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
+  gem.add_development_dependency 'rspec', '2.4.0'
+  gem.add_dependency "eventmachine", ">= 0"
+  gem.add_dependency "json", ">= 0"
+  gem.add_dependency "daemons", ">= 0"
+  gem.add_dependency "choice", ">= 0"
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
 end
+Jeweler::RubygemsDotOrgTasks.new
 
-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
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-task :test => :check_dependencies
+RSpec::Core::RakeTask.new(:rcov) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
 
-task :default => :test
+task :default => :spec
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|

data/VERSION

@@ -1 +1 @@
-0.7.4
+0.8.1

data/lib/officer/client.rb

@@ -113,4 +113,4 @@ module Officer
     end
   end
 
-end
+end

data/lib/officer/lock_store.rb

@@ -77,7 +77,9 @@ module Officer
     end
 
     def release name, connection, options={}
-      options[:callback] ||= true
+      if options[:callback].nil?
+        options[:callback] = true
+      end
 
       lock = @locks[name]
       names = @connections[connection]
@@ -160,4 +162,4 @@ module Officer
     end
   end
 
-end
+end

data/lib/officer.rb

@@ -10,6 +10,7 @@ require 'eventmachine'
 require 'json'
 require 'daemons'
 require 'choice'
+# require 'ruby-debug'
 
 # Application.
 require 'officer/log'

data/officer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{officer}
-  s.version = "0.7.4"
+  s.version = "0.8.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chad Remesch"]
-  s.date = %q{2011-01-20}
+  s.date = %q{2011-01-22}
   s.default_executable = %q{officer}
   s.description = %q{Distributed lock server and client written in Ruby and EventMachine}
   s.email = %q{chad@remesch.com}
@@ -20,6 +20,9 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
     "LICENSE",
     "README.markdown",
     "Rakefile",
@@ -33,16 +36,17 @@ Gem::Specification.new do |s|
     "lib/officer/log.rb",
     "lib/officer/server.rb",
     "officer.gemspec",
-    "test/helper.rb",
-    "test/test_officer.rb"
+    "spec/integration/officer_spec.rb",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/chadrem/officer}
+  s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Distributed lock server and client}
   s.test_files = [
-    "test/helper.rb",
-    "test/test_officer.rb"
+    "spec/integration/officer_spec.rb",
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -54,17 +58,44 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<daemons>, [">= 0"])
       s.add_runtime_dependency(%q<choice>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["= 2.4.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["= 2.4.0"])
+      s.add_runtime_dependency(%q<eventmachine>, [">= 0"])
+      s.add_runtime_dependency(%q<json>, [">= 0"])
+      s.add_runtime_dependency(%q<daemons>, [">= 0"])
+      s.add_runtime_dependency(%q<choice>, [">= 0"])
     else
       s.add_dependency(%q<eventmachine>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<daemons>, [">= 0"])
       s.add_dependency(%q<choice>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["= 2.4.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["= 2.4.0"])
+      s.add_dependency(%q<eventmachine>, [">= 0"])
+      s.add_dependency(%q<json>, [">= 0"])
+      s.add_dependency(%q<daemons>, [">= 0"])
+      s.add_dependency(%q<choice>, [">= 0"])
     end
   else
     s.add_dependency(%q<eventmachine>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<daemons>, [">= 0"])
     s.add_dependency(%q<choice>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["= 2.4.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["= 2.4.0"])
+    s.add_dependency(%q<eventmachine>, [">= 0"])
+    s.add_dependency(%q<json>, [">= 0"])
+    s.add_dependency(%q<daemons>, [">= 0"])
+    s.add_dependency(%q<choice>, [">= 0"])
   end
 end
 

data/spec/integration/officer_spec.rb

@@ -0,0 +1,71 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Officer do
+  before do
+    @server_thread = Thread.new do
+      Officer::Server.new.run
+    end
+  end
+
+  after do
+    @server_thread.terminate
+  end
+
+  context "single client tests" do
+    before do
+      @client = Officer::Client.new
+    end
+
+    after do
+      @client.send("disconnect")
+      @client = nil
+    end
+
+    it "should allow a client to request its locks" do
+      @client.my_locks.should eq({"value"=>[], "result"=>"locks"})
+    end
+
+    it "should allow a client to request and release a lock using non-block syntax" do
+      @client.lock("testlock")
+      @client.my_locks.should eq({"value"=>["testlock"], "result"=>"locks"})
+      @client.unlock("testlock")
+      @client.my_locks.should eq({"value"=>[], "result"=>"locks"})
+    end
+
+    it "should allow a client to request and release a lock using block syntax" do
+      @client.with_lock("testlock") do
+        @client.my_locks.should eq({"value"=>["testlock"], "result"=>"locks"})
+      end
+    end
+
+    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"=>"locks"})
+      @client.reset
+      @client.my_locks.should eq({"value"=>[], "result"=>"locks"})
+    end
+  end
+
+  context "multi-client tests" do
+    before do
+      @client1 = Officer::Client.new
+      @client2 = Officer::Client.new
+    end
+
+    after do
+      @client1.send("disconnect")
+      @client1 = nil
+      @client2.send("disconnect")
+      @client2 = nil
+    end
+
+    it "should allow a client to see all the locks on a server (including those owned by other clients)" do
+      @client1.lock("client1_testlock1")
+      @client1.lock("client1_testlock2")
+      @client2.lock("client2_testlock1")
+      @client2.lock("client2_testlock2")
+      # @client2.locks.should eq(false)
+    end
+  end
+end

data/spec/spec_helper.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: officer
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 61
   prerelease: false
   segments: 
   - 0
-  - 7
-  - 4
-  version: 0.7.4
+  - 8
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - Chad Remesch
@@ -15,13 +15,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-20 00:00:00 -05:00
+date: 2011-01-22 00:00:00 -05:00
 default_executable: officer
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: eventmachine
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  name: eventmachine
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -30,12 +31,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
   name: json
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  name: daemons
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -44,12 +59,74 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :runtime
-  version_requirements: *id002
+  name: choice
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  name: rspec
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 2
+        - 4
+        - 0
+        version: 2.4.0
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: daemons
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  name: bundler
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  name: jeweler
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 5
+        - 2
+        version: 1.5.2
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  name: rcov
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -58,12 +135,42 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  name: rspec
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 2
+        - 4
+        - 0
+        version: 2.4.0
+  requirement: *id009
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :runtime
-  version_requirements: *id003
+  name: eventmachine
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
-  name: choice
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :runtime
+  name: json
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -72,8 +179,35 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id011
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :runtime
-  version_requirements: *id004
+  name: daemons
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id012
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
+  name: choice
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id013
 description: Distributed lock server and client written in Ruby and EventMachine
 email: chad@remesch.com
 executables: 
@@ -85,6 +219,9 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - .document
+- .rspec
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.markdown
 - Rakefile
@@ -98,12 +235,12 @@ files:
 - lib/officer/log.rb
 - lib/officer/server.rb
 - officer.gemspec
-- test/helper.rb
-- test/test_officer.rb
+- 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: []
 
@@ -135,5 +272,5 @@ signing_key:
 specification_version: 3
 summary: Distributed lock server and client
 test_files: 
-- test/helper.rb
-- test/test_officer.rb
+- spec/integration/officer_spec.rb
+- spec/spec_helper.rb

data/test/helper.rb

@@ -1,10 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'officer'
-
-class Test::Unit::TestCase
-end

data/test/test_officer.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestOfficer < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end