From d3c40242a58a8863cd216f6639f93df5fdb0c075 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sat, 23 Jan 2010 23:02:43 +0100
Subject: Move console stuff to its own directory.

---
 railties/lib/rails/console/app.rb | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 railties/lib/rails/console/app.rb

(limited to 'railties/lib/rails/console/app.rb')

diff --git a/railties/lib/rails/console/app.rb b/railties/lib/rails/console/app.rb
new file mode 100644
index 0000000000..98f7f774a9
--- /dev/null
+++ b/railties/lib/rails/console/app.rb
@@ -0,0 +1,31 @@
+require 'active_support/all'
+require 'active_support/test_case'
+require 'action_controller'
+
+# work around the at_exit hook in test/unit, which kills IRB
+Test::Unit.run = true if Test::Unit.respond_to?(:run=)
+
+# reference the global "app" instance, created on demand. To recreate the
+# instance, pass a non-false value as the parameter.
+def app(create=false)
+  @app_integration_instance = nil if create
+  @app_integration_instance ||= new_session do |sess|
+    sess.host! "www.example.com"
+  end
+end
+
+# create a new session. If a block is given, the new session will be yielded
+# to the block before being returned.
+def new_session
+  app = ActionController::Dispatcher.new
+  session = ActionController::Integration::Session.new(app)
+  yield session if block_given?
+  session
+end
+
+#reloads the environment
+def reload!
+  puts "Reloading..."
+  ActionDispatch::Callbacks.new(lambda {}, true).call({})
+  true
+end
-- 
cgit v1.2.3


From 6e57b88c60fa3ad1ecfa740b8cd3173c4fe72680 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sun, 24 Jan 2010 21:21:37 +0100
Subject: Fix a couple failures on 1.9.1.

---
 railties/lib/rails/console/app.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'railties/lib/rails/console/app.rb')

diff --git a/railties/lib/rails/console/app.rb b/railties/lib/rails/console/app.rb
index 98f7f774a9..7e8fd027e6 100644
--- a/railties/lib/rails/console/app.rb
+++ b/railties/lib/rails/console/app.rb
@@ -23,9 +23,11 @@ def new_session
   session
 end
 
-#reloads the environment
-def reload!
-  puts "Reloading..."
-  ActionDispatch::Callbacks.new(lambda {}, true).call({})
+# reloads the environment
+def reload!(print=true)
+  puts "Reloading..." if print
+  ActionDispatch::Callbacks.new(lambda {}, false)
   true
 end
+
+reload!(false)
-- 
cgit v1.2.3