@@ -153,6 +153,9 @@ module Merb Merb::Config.parse_args(argv) end + # Keep information that we run inside IRB to guard it against overriding in init.rb + @running_irb = Merb::Config[:adapter] == 'irb' + Merb::Config[:log_stream] = STDOUT Merb.environment = Merb::Config[:environment] @@ -785,6 +788,11 @@ module Merb def run_later(&blk) Merb::Dispatcher.work_queue << blk end + + # :api: private + def running_irb? + @running_irb + end end end merb-core/lib/merb-core.rb @@ -1323,6 +1323,8 @@ class Merb::BootLoader::ChooseAdapter < Merb::BootLoader # # :api: plugin def self.run + # Check if we running in IRB if so run IRB adapter + Merb::Config[:adapter] = 'irb' if Merb.running_irb? Merb.adapter = Merb::Rack::Adapter.get(Merb::Config[:adapter]) end end merb-core/lib/merb-core/bootloader.rb @@ -31,4 +31,11 @@ describe "The BootLoader" do Merb::BootLoader.subclasses.index("Merb::BootLoader::BeforeTest").should == idx - 1 end -end \ No newline at end of file + describe Merb::BootLoader::ChooseAdapter do + it "should check if we're running irb and if so set irb as adapter" do + Merb.stub!(:running_irb?).and_return(true) + Merb::BootLoader::ChooseAdapter.run + Merb::Config[:adapter].should eql 'irb' + end + end +end merb-core/spec/public/boot_loader/boot_loader_spec.rb @@ -1,46 +1,62 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_helper")) -startup_merb -describe "Merb.env helpers" do - before(:all) do - @orig_env = Merb.environment - end - after(:all) do - Merb.environment = @orig_env - end - - it "should pickup the environment from env" do - %w(development test production staging demo).each do |e| - Merb.environment = e - Merb.env.should == e +describe "Merb" do + + describe "Merb.environment, Merb.env helpers" do + before(:all) do + startup_merb + @orig_env = Merb.environment end - end - - it "should correctly answer the question about which env it's in with symbol or string" do - %w(development test production staging demo custom).each do |e| - Merb.environment = e - Merb.env?(e).should be true - Merb.env?(e.to_sym).should be_true + after(:all) do + Merb.environment = @orig_env end - end - - it "should answer false if asked for an environment that is not current" do - %w(development test production staging demo custom).each do |e| - Merb.environment = e - Merb.env?(:not_it).should be_false + + it "should pickup the environment from env" do + %w(development test production staging demo).each do |e| + Merb.environment = e + Merb.env.should == e + end + end + + it "should correctly answer the question about which env it's in with symbol or string" do + %w(development test production staging demo custom).each do |e| + Merb.environment = e + Merb.env?(e).should be true + Merb.env?(e.to_sym).should be_true + end + end + + it "should answer false if asked for an environment that is not current" do + %w(development test production staging demo custom).each do |e| + Merb.environment = e + Merb.env?(:not_it).should be_false + end + end + + it "should allow an environment to merge another environments settings" do + %w(development test production staging demo custom).each do |e| + + Merb.environment = e + Merb.start_environment + Merb.merge_env "some_other_env" + Merb.environment_info.nil?.should be_false + Merb.environment_info[:merged_envs].first.should == "some_other_env" + end end end - - it "should allow an environment to merge another environments settings" do - %w(development test production staging demo custom).each do |e| - Merb.environment = e - Merb.start_environment - Merb.merge_env "some_other_env" - Merb.environment_info.nil?.should be_false - Merb.environment_info[:merged_envs].first.should == "some_other_env" + describe "#runnig_irb?" do + it "should be false if running different adapter than irb" do + startup_merb + Merb.running_irb?.should be_false + end + + %w{-i --irb-console}.each do |option| + it "should be true if merb is run with CLI option #{option}" do + Merb::Server.stub!(:start) + Merb.start([option]) + Merb.running_irb?.should be_true + end end end - - -end \ No newline at end of file +end merb-core/spec/public/core/merb_core_spec.rb 95aed998c937a59e017349d5b2eb9f4e3075605d Pavel Kunc pavel.kunc@gmail.com http://github.com/wycats/merb/commit/a6014acc93fc68d9687ad7151976129332bbab09 a6014acc93fc68d9687ad7151976129332bbab09 2009-10-24T08:25:24-07:00 2009-10-23T15:39:33-07:00 [merb-core] Make CLI -i, --irb-console to take precedence over config in init.rb. This change allows you to have default adapter set in the init.rb and still if you want to run Merb in IRB you can do it. Currently you can't because setting adapter in init.rb override the config value from ARGV parsing. [#1262 state:resolved] 0a212e2a1098d5014099044fedf7f5dba1defcb0 Pavel Kunc pavel.kunc@gmail.com