Switching to bundler to manage dependencies, along with latest RSpec …

…and Cucumber

.gitignore

@@ -21,3 +21,5 @@ pkg
 ## PROJECT::SPECIFIC
 features/thinking_sphinx/database.yml
 tmp
+.bundle
+Gemfile.lock

Gemfile

@@ -0,0 +1,16 @@
+source 'http://rubygems.org'
+
+gem 'thinking-sphinx', '>= 1.3.6'
+gem 'delayed_job',     '>= 2.0.4'
+
+group :development do
+  gem 'mysql',              '2.8.1'
+  gem 'jeweler',            '1.5.1'
+  gem 'yard',               '0.6.1'
+  gem 'rspec',              '2.5.0'
+  gem 'rspec-core',         '2.5.0'
+  gem 'rspec-expectations', '2.5.0'
+  gem 'rspec-mocks',        '2.5.0'
+  gem 'rcov',               '0.9.8'
+  gem 'cucumber',           '0.10.0'
+end

Rakefile

@@ -1,6 +1,9 @@
 require 'rubygems'
+require 'bundler'
 
-require 'tasks/distribution'
-require 'tasks/testing'
+Bundler.require :default, :development
+
+require "#{File.dirname(__FILE__)}/tasks/distribution"
+require "#{File.dirname(__FILE__)}/tasks/testing"
 
 task :default => :spec

features/support/env.rb

@@ -1,13 +1,22 @@
 require 'rubygems'
-require 'cucumber'
-require 'spec/expectations'
 require 'fileutils'
+require 'bundler'
+
+Bundler.require :default, :development
+
 require 'active_record'
 
+ActiveRecord::Base.send(:include, ThinkingSphinx::ActiveRecord)
+Delayed::Worker.backend = :active_record
+
 $:.unshift File.dirname(__FILE__) + '/../../lib'
 
 require 'cucumber/thinking_sphinx/internal_world'
 
+# Time.zone_default = Time.__send__(:get_zone, 'Melbourne')
+# ActiveRecord::Base.time_zone_aware_attributes = true
+# ActiveRecord::Base.default_timezone = :utc
+# 
 world = Cucumber::ThinkingSphinx::InternalWorld.new
 world.configure_database
 

spec/spec_helper.rb

@@ -1,14 +1,15 @@
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'rubygems'
-require 'spec'
-require 'spec/autorun'
+require 'bundler'
+
+Bundler.require :default, :development
 
 require 'thinking_sphinx'
 require 'thinking_sphinx/deltas/delayed_delta'
 
 Delayed::Worker.backend = :active_record
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   #
 end

tasks/distribution.rb

@@ -1,6 +1,3 @@
-require 'jeweler'
-require 'yard'
-
 YARD::Rake::YardocTask.new
 
 Jeweler::Tasks.new do |gem|
@@ -11,13 +8,6 @@
   gem.homepage    = "http://github.com/freelancing-god/ts-delayed-delta"
   gem.authors     = ["Pat Allan"]
 
-  gem.add_dependency 'thinking-sphinx', '>= 1.3.6'
-  gem.add_dependency 'delayed_job',     '>= 2.1.0'
-
-  gem.add_development_dependency "rspec",    ">= 1.2.9"
-  gem.add_development_dependency "yard",     ">= 0"
-  gem.add_development_dependency "cucumber", ">= 0"
-
   gem.files = FileList[
     'lib/**/*.rb',
     'LICENSE',

tasks/testing.rb

@@ -1,20 +1,19 @@
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 require 'cucumber/rake/task'
 
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs      << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs   << 'lib' << 'spec'
+RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov    = true
+  spec.rcov_opts = [
+    '--exclude spec',
+    '--exclude gems'
+  ]
 end
 
 Cucumber::Rake::Task.new do |task|
   task.cucumber_opts = '--exclude features/thinking_sphinx'
 end
-
-task :spec      => :check_dependencies
-task :cucumber  => :check_dependencies