@@ -120,6 +120,7 @@ module Kernel # :api: public # @deprecated def dependency(name, *opts, &blk) + warn("DEPRECATED: Use bundler to setup and load dependency #{name}.") immediate = opts.last.delete(:immediate) if opts.last.is_a?(Hash) if immediate || Merb::BootLoader.finished?(Merb::BootLoader::Dependencies) load_dependency(name, caller, *opts, &blk) @@ -265,4 +266,4 @@ module Kernel Merb.logger.warn!("The #{template_engine_plugin} gem was not found. You may need to install it.") raise e end -end \ No newline at end of file +end merb-core/lib/merb-core/core_ext/dependencies.rb @@ -19,4 +19,17 @@ describe "Kernel#extract_options_from_args!" do Kernel.extract_options_from_args!(args).should == {:baz => :bar} args.should == ["foo", "bar"] end -end \ No newline at end of file +end + +describe "Kernel#dependencies" do + it "should warn that dependency() is deprecated" do + warning = 'DEPRECATED: Use bundler to setup and load dependency hpricot.' + Kernel.should_receive(:warn).with(warning) + Kernel.dependency("hpricot") + end + + it "should warn that dependency() is deprecated" do + Kernel.should_receive(:warn).twice + Kernel.dependencies("hpricot", "rspec") + end +end merb-core/spec/private/core_ext/kernel_spec.rb 0f087f6a269b6b5fe39404ab4c5938bd56d859f8 Pavel Kunc pavel.kunc@gmail.com http://github.com/wycats/merb/commit/e5b8f886a2ab8804ca2863d4e146ed28da0debe4 e5b8f886a2ab8804ca2863d4e146ed28da0debe4 2009-10-14T02:34:46-07:00 2009-10-13T17:51:58-07:00 [merb-core] Keep deprecation warning for dependency(). ed5f823513d4c5e10e7244d9dbf8f5fc4f645e2e Pavel Kunc pavel.kunc@gmail.com