lib/merb-core/test/tasks/spectasks.rb @@ -216,8 +216,19 @@ module Merb Config end - end + # ==== Returns + # Array:: All Rakefiles for plugins. + def rakefiles + @rakefiles ||= ['merb-core/test/tasks/spectasks'] + end + # ==== Parameters + # *rakefiles:: Rakefiles to add to the list of plugin Rakefiles. + def add_rakefiles(*rakefiles) + @rakefiles ||= ['merb-core/test/tasks/spectasks'] + @rakefiles += rakefiles + end + end end require 'merb-core/autoload' lib/merb-core.rb @@ -138,20 +138,15 @@ module Kernel # # # This will now use the RSpec generator for tests # $ ruby script/generate controller MyController - def use_test(test_framework) - return unless Merb.env == 'test' + def use_test(test_framework, *test_dependencies) + return unless Merb.env == "test" unless Merb.env.nil? raise "use_test only supports :rspec and :test_unit currently" unless [:rspec, :test_unit].include?(test_framework.to_sym) Merb.generator_scope.delete(:rspec) Merb.generator_scope.delete(:test_unit) Merb.generator_scope.push(test_framework.to_sym) - begin - test_plugin = test_framework.to_s.match(/^merb_/) ? test_framework.to_s : "merb_#{test_framework}" - Kernel.dependency(test_plugin) - rescue LoadError => e - Merb.logger.warn("The #{test_plugin} gem was not found. You may need to install it.") - end + dependencies test_dependencies end # ==== Returns lib/merb-core/core_ext/kernel.rb @@ -10,18 +10,16 @@ module Merb @config ||= File.exists?(Merb.root / "config" / "plugins.yml") ? YAML.load(File.read(Merb.root / "config" / "plugins.yml")) || {} : {} end - @rakefiles = [] - # ==== Returns # Array:: All Rakefiles for plugins. def self.rakefiles - @rakefiles + Merb.rakefiles end # ==== Parameters # *rakefiles:: Rakefiles to add to the list of plugin Rakefiles. def self.add_rakefiles(*rakefiles) - @rakefiles += rakefiles + Merb.add_rakefiles *rakefiles end end end \ No newline at end of file lib/merb-core/plugins.rb 758a19603ad276a6e95cbaed00bd6b9b4182f0eb Ben Burkert ben@benburkert.com http://github.com/wycats/merb-core/commit/6a54e6c391aa01a9223d2b85772c539fa078214b 6a54e6c391aa01a9223d2b85772c539fa078214b 2008-03-03T16:03:11-08:00 2008-03-03T16:03:11-08:00 moved rspec rake tasks into core. Added Merb.rakefiles, which is now used by Merb::Plugins.rakefiles. Changed Kernel#use_test to only load dependency arguments when Merb.env is nil or test. b09899c164266d93cbc809c7ea882a519ac3ebf1 Ben Burkert ben@benburkert.com