From df39cc6506060a5587f14488ed7acab9716c532e Mon Sep 17 00:00:00 2001 From: Konstantin Shabanov Date: Thu, 13 Jan 2011 13:58:20 +0600 Subject: [PATCH] update to use bundler to check dependencies and to use RSpec2 --- Rakefile | 131 +++++++++++++++++--------------------------- spec/spec_helper.rb | 7 +-- test/test_helper.rb | 12 +++- 3 files changed, 65 insertions(+), 85 deletions(-) diff --git a/Rakefile b/Rakefile index e6f8d17..88d34d8 100644 --- a/Rakefile +++ b/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' - Jeweler::Tasks.new do |gem| - gem.name = "aasm" - 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.homepage = "http://rubyist.github.com/aasm/" - gem.authors = ["Scott Barron", "Scott Petersen", "Travis Tilley"] - gem.email = "scott@elitists.net, ttilley@gmail.com" - gem.add_development_dependency "rspec" - gem.add_development_dependency "shoulda" - gem.add_development_dependency 'sdoc' - # 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" +require 'jeweler' +Jeweler::Tasks.new do |gem| + gem.name = "aasm" + 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.homepage = "http://rubyist.github.com/aasm/" + gem.authors = ["Scott Barron", "Scott Petersen", "Travis Tilley"] + gem.email = "scott@elitists.net, ttilley@gmail.com" + gem.add_development_dependency "rspec" + gem.add_development_dependency "shoulda" + gem.add_development_dependency 'sdoc' + # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings 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' - Rcov::RcovTask.new(:rcov_shoulda) 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 'rcov/rcovtask' +Rcov::RcovTask.new(:rcov_shoulda) do |test| + test.libs << 'test' + test.pattern = 'test/**/*_test.rb' + test.verbose = true end -Spec::Rake::SpecTask.new(:spec) do |spec| - spec.libs << 'lib' << 'spec' - spec.spec_files = FileList['spec/**/*_spec.rb'] - spec.spec_opts = ['-cfs'] +RSpec::Core::RakeTask.new(:spec) do |spec| + spec.pattern = 'spec/**/*_spec.rb' + spec.rspec_opts = ['-cfs'] end -Spec::Rake::SpecTask.new(:rcov_rspec) do |spec| - spec.libs << 'lib' << 'spec' +RSpec::Core::RakeTask.new(:rcov_rspec) do |spec| spec.pattern = 'spec/**/*_spec.rb' spec.rcov = true end -task :test => :check_dependencies -task :spec => :check_dependencies - -begin - require 'reek/rake_task' - 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 +require 'reek/rake/task' +Reek::Rake::Task.new do |t| + t.fail_on_error = true + t.verbose = false + t.source_files = 'lib/**/*.rb' end -begin - require 'roodi' - require 'roodi_task' - RoodiTask.new do |t| - 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 +require 'roodi' +require 'roodi_task' +RoodiTask.new do |t| + t.verbose = false end task :default => :test -begin - require 'rake/rdoctask' - require 'sdoc' - Rake::RDocTask.new do |rdoc| - if File.exist?('VERSION') - version = File.read('VERSION') - else - version = "" - end +require 'rake/rdoctask' +require 'sdoc' +Rake::RDocTask.new do |rdoc| + version = File.exist?('VERSION') ? File.read('VERSION') : "" - rdoc.rdoc_dir = 'rdoc' - rdoc.title = "aasm #{version}" - rdoc.rdoc_files.include('README*') - 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.rdoc_dir = 'rdoc' + rdoc.title = "aasm #{version}" + rdoc.rdoc_files.include('README*') + rdoc.rdoc_files.include('lib/**/*.rb') + rdoc.options << '--fmt' << 'shtml' + rdoc.template = 'direct' +end \ No newline at end of file diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 9b9df8e..1379db5 100644 --- a/spec/spec_helper.rb +++ b/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 'spec/autorun' +require 'rspec' +require 'rspec/autorun' -Spec::Runner.configure do |config| +RSpec.configure do |config| end diff --git a/test/test_helper.rb b/test/test_helper.rb index 5dc5fe1..961fcf6 100644 --- a/test/test_helper.rb +++ b/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' \ No newline at end of file