update to use bundler to check dependencies and to use RSpec2

Rakefile

@@ -1,108 +1,79 @@
 require 'rubygems'
+require 'bundler'
+begin
+  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'
 
-begin
+require 'jeweler'
-  require 'jeweler'
+Jeweler::Tasks.new do |gem|
-  Jeweler::Tasks.new do |gem|
+  gem.name = "aasm"
-    gem.name = "aasm"
+  gem.summary = %Q{State machine mixin for Ruby objects}
-    gem.summary = %Q{State machine mixin for Ruby objects}
+  gem.description = %Q{AASM is a continuation of the acts as state machine rails plugin, built for plain Ruby objects.}
-    gem.description = %Q{AASM is a continuation of the acts as state machine rails plugin, built for plain Ruby objects.}
+  gem.homepage = "http://rubyist.github.com/aasm/"
-    gem.homepage = "http://rubyist.github.com/aasm/"
+  gem.authors = ["Scott Barron", "Scott Petersen", "Travis Tilley"]
-    gem.authors = ["Scott Barron", "Scott Petersen", "Travis Tilley"]
+  gem.email = "scott@elitists.net, ttilley@gmail.com"
-    gem.email = "scott@elitists.net, ttilley@gmail.com"
+  gem.add_development_dependency "rspec"
-    gem.add_development_dependency "rspec"
+  gem.add_development_dependency "shoulda"
-    gem.add_development_dependency "shoulda"
+  gem.add_development_dependency 'sdoc'
-    gem.add_development_dependency 'sdoc'
+  # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-    # 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: sudo gem install jeweler"
 end
+Jeweler::RubygemsDotOrgTasks.new
 
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 require 'rake/testtask'
-
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
   test.pattern = 'test/**/*_test.rb'
   test.verbose = true
 end
 
-begin
+require 'rcov/rcovtask'
-  require 'rcov/rcovtask'
+Rcov::RcovTask.new(:rcov_shoulda) do |test|
-  Rcov::RcovTask.new(:rcov_shoulda) do |test|
+  test.libs << 'test'
-    test.libs << 'test'
+  test.pattern = 'test/**/*_test.rb'
-    test.pattern = 'test/**/*_test.rb'
+  test.verbose = true
-    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
 end
 
-Spec::Rake::SpecTask.new(:spec) do |spec|
+RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+  spec.rspec_opts = ['-cfs']
-  spec.spec_opts = ['-cfs']
 end
 
-Spec::Rake::SpecTask.new(:rcov_rspec) do |spec|
+RSpec::Core::RakeTask.new(:rcov_rspec) do |spec|
-  spec.libs << 'lib' << 'spec'
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
 end
 
-task :test => :check_dependencies
+require 'reek/rake/task'
-task :spec => :check_dependencies
+Reek::Rake::Task.new do |t|
-
+  t.fail_on_error = true
-begin
+  t.verbose = false
-  require 'reek/rake_task'
+  t.source_files = 'lib/**/*.rb'
-  Reek::RakeTask.new do |t|
-    t.fail_on_error = true
-    t.verbose = false
-    t.source_files = 'lib/**/*.rb'
-  end
-rescue LoadError
-  task :reek do
-    abort "Reek is not available. In order to run reek, you must: sudo gem install reek"
-  end
 end
 
-begin
+require 'roodi'
-  require 'roodi'
+require 'roodi_task'
-  require 'roodi_task'
+RoodiTask.new do |t|
-  RoodiTask.new do |t|
+  t.verbose = false
-    t.verbose = false
-  end
-rescue LoadError
-  task :roodi do
-    abort "Roodi is not available. In order to run roodi, you must: sudo gem install roodi"
-  end
 end
 
 task :default => :test
 
-begin
+require 'rake/rdoctask'
-  require 'rake/rdoctask'
+require 'sdoc'
-  require 'sdoc'
+Rake::RDocTask.new do |rdoc|
-  Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-    if File.exist?('VERSION')
-      version = File.read('VERSION')
-    else
-      version = ""
-    end
 
-    rdoc.rdoc_dir = 'rdoc'
+  rdoc.rdoc_dir = 'rdoc'
-    rdoc.title = "aasm #{version}"
+  rdoc.title = "aasm #{version}"
-    rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('README*')
-    rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.rdoc_files.include('lib/**/*.rb')
-
-    rdoc.options << '--fmt' << 'shtml'
-    rdoc.template = 'direct'
-  end
-rescue LoadError
-  puts "aasm makes use of the sdoc gem. Install it with: sudo gem install sdoc"
-end
 
+  rdoc.options << '--fmt' << 'shtml'
+  rdoc.template = 'direct'
+end

spec/spec_helper.rb

@@ -1,11 +1,10 @@
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
 $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib')))
-
 require 'aasm'
 
-require 'spec'
+require 'rspec'
-require 'spec/autorun'
+require 'rspec/autorun'
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   
 end

test/test_helper.rb

@@ -1,3 +1,13 @@
+require 'rubygems'
+require 'bundler'
+begin
+  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 'ostruct'
 require 'rubygems'
 
@@ -30,4 +40,4 @@ end
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'aasm'
+require 'aasm'