@@ -1,7 +1,3 @@ -lib_dir = File.expand_path(File.join(File.dirname(__FILE__), "lib")) -$:.unshift(lib_dir) -$:.uniq! - require 'rubygems' require 'rake' require 'rake/testtask' @@ -10,7 +6,7 @@ require 'rake/packagetask' require 'rake/gempackagetask' require 'spec/rake/spectask' -require File.join(File.dirname(__FILE__), 'lib/addressable', 'version') +require File.join(File.dirname(__FILE__), 'lib', 'addressable', 'version') PKG_DISPLAY_NAME = 'Addressable' PKG_NAME = PKG_DISPLAY_NAME.downcase Rakefile @@ -22,10 +22,6 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #++ -$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), '/..'))) -$:.uniq! - -require "addressable/version" require "addressable/uri" module Addressable lib/addressable/template.rb @@ -22,10 +22,6 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #++ -$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), '/..'))) -$:.uniq! - -require "addressable/version" require "addressable/idna" module Addressable lib/addressable/uri.rb @@ -22,9 +22,6 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #++ -$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../../lib')) -$:.uniq! - require "addressable/idna" describe Addressable::IDNA, "when converting from unicode to ASCII" do spec/addressable/idna_spec.rb @@ -22,10 +22,6 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #++ -$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../../lib')) -$:.uniq! - -require "addressable/uri" require "addressable/template" if !"".respond_to?("force_encoding") spec/addressable/template_spec.rb @@ -22,9 +22,6 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #++ -$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../../lib')) -$:.uniq! - require "addressable/uri" if !"".respond_to?("force_encoding") spec/addressable/uri_spec.rb @@ -1,12 +1,10 @@ namespace :spec do Spec::Rake::SpecTask.new(:rcov) do |t| + t.libs = %w[lib spec] t.spec_files = FileList['spec/**/*_spec.rb'] t.spec_opts = ['--color', '--format', 'specdoc'] - if RCOV_ENABLED - t.rcov = true - else - t.rcov = false - end + + t.rcov = RCOV_ENABLED t.rcov_opts = [ '--exclude', 'spec', '--exclude', '1\\.8\\/gems', @@ -16,6 +14,7 @@ namespace :spec do end Spec::Rake::SpecTask.new(:normal) do |t| + t.libs = %w[lib spec] t.spec_files = FileList['spec/**/*_spec.rb'] t.spec_opts = ['--color', '--format', 'specdoc'] t.rcov = false @@ -23,11 +22,11 @@ namespace :spec do desc "Generate HTML Specdocs for all specs" Spec::Rake::SpecTask.new(:specdoc) do |t| - specdoc_path = File.expand_path( - File.join(File.dirname(__FILE__), '../specdoc/')) + specdoc_path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'specdoc')) Dir.mkdir(specdoc_path) if !File.exist?(specdoc_path) output_file = File.join(specdoc_path, 'index.html') + t.libs = %w[lib spec] t.spec_files = FileList['spec/**/*_spec.rb'] t.spec_opts = ["--format", "\"html:#{output_file}\"", "--diff"] t.fail_on_error = false tasks/spec.rake 70945464da109a25d33813aac96b038a43cb6404 Mislav Marohnić mislav.marohnic@gmail.com http://github.com/sporkmonger/addressable/commit/625964b7880ec569f6f3143435145a596b524164 625964b7880ec569f6f3143435145a596b524164 2009-10-31T18:27:09-07:00 2009-10-20T14:34:28-07:00 no need to manage the LOAD_PATH, really 2a7dbe6d2da94fd22adaee595c66eb68dd9d3d54 Bob Aman bob@sporkmonger.com