Use bundler

.gitignore

@@ -1,3 +1,4 @@
 doc
 pkg
 *.gem
+Gemfile.lock

.rspec

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

.rvmrc

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+#
+# The following is cribbed directly from the rvm-site project. It's a more
+# convenient way of ensuring we're using the correct gemset, or initializing it
+# if need be.
+#
+
+ruby_name="ruby-1.9.2"
+gemset_name="em-jack"
+environment_id="$ruby_name@$gemset_name"
+
+#
+# First we attempt to load the desired environment directly from the environment
+# file, this is very fast and efficient compared to running through the entire
+# CLI and selector. If you want feedback on which environment was used then
+# insert the word 'use' after --create as this triggers verbose mode.
+#
+
+if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
+  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]] ; then
+    \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
+else
+  # If the environment file has not yet been created, use the RVM CLI to select.
+  rvm --create use "$environment_id"
+fi

Gemfile

@@ -0,0 +1,3 @@
+source 'http://rubygems.org'
+
+gemspec

Rakefile

@@ -1,28 +1,11 @@
-require 'rake'
-require 'rake/rdoctask'
-require 'rake/gempackagetask'
-require 'spec/rake/spectask'
-
-spec = eval(File.read(File.join(File.dirname(__FILE__), "em-jack.gemspec")))
-
-task :default => :gem
-
-Spec::Rake::SpecTask.new do |t|
-  t.libs << 'lib'
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = ["-colour"]
-end
-
-desc 'Generate RDoc documentation for EMJack'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_files.include('README.rdoc', 'COPYING', 'lib/**/*.rb')
-  rdoc.main = 'README.rdoc'
-  rdoc.title = 'EM Jack Documentation'
-
-  rdoc.rdoc_dir = 'doc'
-  rdoc.options << '--line-numbers'
-end
+require 'bundler'
+require 'bundler/setup'
+require 'bundler/gem_helper'
+
+Bundler::GemHelper.install_tasks
+
+require 'rspec/core/rake_task'
 
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.need_tar = true
+RSpec::Core::RakeTask.new('spec') do |t|
+  t.verbose = false
 end

em-jack.gemspec

@@ -1,28 +1,27 @@
+# -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$:.unshift(lib) unless $:.include?(lib)
+
+require 'em-jack/version'
+
 Gem::Specification.new do |s|
-  s.name = %q{em-jack}
-  s.version = "0.1.2"
-  s.authors = ["dan sinclair"]
-  s.email = %q{dj2@everburning.com}
-  s.homepage = %q{http://github.com/dj2/em-jack/}
+  s.name        = 'em-jack'
+  s.version     = EMJack::VERSION
+  s.authors     = ['Dan Sinclair']
+  s.email       = ['dj2@everburning.com']
+  s.homepage    = 'https://github.com/dj2/em-jack/'
+  s.summary     = 'An evented Beanstalk client'
+  s.description = 'An evented Beanstalk client'
 
-  s.summary = %q{An evented Beanstalk client.}
-  s.description = %q{An evented Beanstalk client.}
+  s.required_rubygems_version = '>= 1.3.6'
 
-  s.add_dependency('eventmachine')
+  s.add_dependency 'eventmachine', ['>= 1.0.0.beta.3']
 
-  s.has_rdoc = true
-  s.extra_rdoc_files = ['README.rdoc']
-  s.rdoc_options << '--title' << 'EM-Jack Documentation' <<
-                    '--main' << 'README.rdoc' <<
-                    '--line-numbers'
+  s.add_development_dependency 'bundler', ['~> 1.0.13']
+  s.add_development_dependency 'rake',    ['~> 0.8.7']
+  s.add_development_dependency 'rspec',   ['~> 2.6']
 
-  s.files = %w(README.rdoc COPYING lib/em-jack.rb lib/em-jack/beanstalk_connection.rb
-    lib/em-jack/connection.rb lib/em-jack/errors.rb lib/em-jack/job.rb
-    lib/em-jack/handlers/buried.rb lib/em-jack/handlers/inserted.rb
-    lib/em-jack/handlers/not_ignored.rb lib/em-jack/handlers/ok.rb
-    lib/em-jack/handlers/released.rb lib/em-jack/handlers/reserved.rb
-    lib/em-jack/handlers/using.rb lib/em-jack/handlers/watching.rb
-    lib/em-jack/handlers/deleted.rb lib/em-jack/handlers/errors.rb
-    lib/em-jack/handlers/paused.rb lib/em-jack/handlers/touched.rb
-    lib/em-jack/handlers/kicked.rb)
+  s.files        = `git ls-files`.split("\n")
+  s.test_files   = `git ls-files -- {spec}/*`.split("\n")
+  s.require_path = ['lib']
 end

lib/em-jack.rb

@@ -4,13 +4,11 @@
 require 'em-jack/errors'
 require 'em-jack/beanstalk_connection'
 require 'em-jack/connection'
+require 'em-jack/version'
 
 Dir["#{File.dirname(__FILE__)}/em-jack/handlers/*.rb"].each do |file|
   require file
 end
 
 module EMJack
-  module VERSION
-    STRING = '0.1.2'
-  end
 end

lib/em-jack/version.rb

@@ -0,0 +1,3 @@
+module EMJack
+  VERSION = '0.1.2'
+end

spec/connection_spec.rb → spec/em-jack/connection_spec.rb

@@ -1,7 +1,4 @@
-require 'rubygems'
-require 'spec'
-
-require 'em-jack'
+require 'spec_helper'
 
 describe EMJack::Connection do
   let(:conn) do

spec/fiber_spec.rb → spec/em-jack/fiber_spec.rb

@@ -1,8 +1,6 @@
-require 'rubygems'
-require 'spec'
+require 'spec_helper'
 
 if RUBY_VERSION > '1.9'
-  require 'em-jack'
   require 'fiber'
 
   describe EMJack::Connection do

spec/job_spec.rb → spec/em-jack/job_spec.rb

@@ -1,6 +1,4 @@
-require 'rubygems'
-require 'spec'
-require 'em-jack'
+require 'spec_helper'
 
 describe EMJack::Job do
   let (:conn ) { mock(:conn) }
@@ -47,4 +45,4 @@
 
     j.bury(1234)
   end
-end
+end

spec/spec_helper.rb

@@ -0,0 +1,6 @@
+require 'rubygems'
+require 'bundler/setup'
+require 'em-jack'
+
+RSpec.configure do |config|
+end