@@ -136,7 +136,7 @@ namespace :spec do end namespace :server do - daemonized_server_pid = File.expand_path("#{RAILS_ROOT}/tmp/spec_server.pid") + daemonized_server_pid = File.expand_path("#{RAILS_ROOT}/tmp/pids/spec_server.pid") desc "start spec_server." task :start do @@ -144,7 +144,7 @@ namespace :spec do $stderr.puts "spec_server is already running." else $stderr.puts %Q{Starting up spec_server ...} - FileUtils.mkdir('tmp') unless test ?d, 'tmp' + FileUtils.mkdir_p('tmp/pids') unless test ?d, 'tmp/pids' system("ruby", "script/spec_server", "--daemon", "--pid", daemonized_server_pid) end end generators/rspec/templates/rspec.rake @@ -1,4 +1,21 @@ #!/usr/bin/env ruby -$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../vendor/plugins/rspec/lib")) -require 'spec' +rails_root = File.expand_path(File.dirname(__FILE__) + "/..") +rspec_gem_dir = nil +Dir["#{rails_root}/vendor/gems/*"].each do |subdir| + rspec_gem_dir = subdir if subdir.gsub("#{rails_root}/vendor/gems/","") =~ /^(\w+-)?rspec-(\d+)/ && File.exist?("#{subdir}/lib/spec/rake/spectask.rb") +end +rspec_plugin_dir = File.expand_path("#{rails_root}/vendor/plugins/rspec") + +if rspec_gem_dir && (test ?d, rspec_plugin_dir) + raise "\n#{'*'*50}\nYou have rspec installed in both vendor/gems and vendor/plugins\nPlease pick one and dispose of the other.\n#{'*'*50}\n\n" +end + +if rspec_gem_dir + $LOAD_PATH.unshift("#{rspec_gem_dir}/lib") +elsif File.exist?(rspec_plugin_dir) + $LOAD_PATH.unshift("#{rspec_plugin_dir}/lib") +end + + +require 'spec/autorun' exit ::Spec::Runner::CommandLine.run generators/rspec/templates/script/spec @@ -1,5 +1,21 @@ #!/usr/bin/env ruby -$LOAD_PATH.unshift File.dirname(__FILE__) + '/../vendor/plugins/rspec-rails/lib' # For rspec installed as plugin +rails_root = File.expand_path(File.dirname(__FILE__) + "/..") +rspec_rails_gem_dir = nil +Dir["#{rails_root}/vendor/gems/*"].each do |subdir| + rspec_rails_gem_dir = subdir if subdir.gsub("#{rails_root}/vendor/gems/","") =~ /^(\w+-)?rspec-rails-(\d+)/ +end +rspec_rails_plugin_dir = File.expand_path("#{rails_root}/vendor/plugins/rspec-rails") + +if rspec_rails_gem_dir && (test ?d, rspec_rails_plugin_dir) + raise "\n#{'*'*50}\nYou have rspec installed in both vendor/gems and vendor/plugins\nPlease pick one and dispose of the other.\n#{'*'*50}\n\n" +end + +if rspec_rails_gem_dir + $LOAD_PATH.unshift("#{rspec_rails_gem_dir}/lib") +elsif File.exist?(rspec_rails_plugin_dir) + $LOAD_PATH.unshift("#{rspec_rails_plugin_dir}/lib") +end + require 'optparse' require 'spec/rails/spec_server' @@ -33,5 +49,3 @@ if options[:daemon] else ::Spec::Rails::SpecServer.run end - -puts "Ready" generators/rspec/templates/script/spec_server 35e6be4f48f5bb590e043ef8844a7f0ec1838540 David Chelimsky dchelimsky@gmail.com http://github.com/dchelimsky/rspec-rails/commit/cd15dd5cbd6ca9cf2cd2f8ae873e0a8901e84662 cd15dd5cbd6ca9cf2cd2f8ae873e0a8901e84662 2009-03-07T08:32:55-08:00 2009-03-07T08:04:03-08:00 Check for rspec/rspec-rails in vendor/gems, then vendor/plugins - raise if installed in both places de88551cebfd735fa92fd5b9b93b65891a949b4c David Chelimsky dchelimsky@gmail.com