@@ -9,6 +9,7 @@ task :spec => :test Rake::TestTask.new(:test) do |t| t.test_files = FileList['test/*_test.rb'] + t.ruby_opts = ['-rubygems'] if defined? Gem end desc 'Run compatibility specs (requires test/spec)' Rakefile @@ -1,5 +1,13 @@ -require 'rubygems' # required so that sinatra/base can require rack -$:.unshift File.dirname(File.dirname(__FILE__)) + '/lib' +begin + require 'rack' +rescue LoadError + require 'rubygems' + require 'rack' +end + +libdir = File.dirname(File.dirname(__FILE__)) + '/lib' +$LOAD_PATH.unshift libdir unless $LOAD_PATH.include?(libdir) + require 'sinatra/base' require 'sinatra/test/unit' test/helper.rb 045f93be9171ce1542183cffcecf2a6fc253a2f2 Ryan Tomayko rtomayko@gmail.com http://github.com/bmizerany/sinatra/commit/9d329651b4f8644f2ffd5eab7393191a6d7f25bb 9d329651b4f8644f2ffd5eab7393191a6d7f25bb 2009-01-20T12:24:36-08:00 2009-01-20T12:24:36-08:00 Don't require rubygems in tests; do fall back if necessary 7ad02f6626f340caf09b802dc39ee6958e9e3b05 Ryan Tomayko rtomayko@gmail.com