From 6d09f275c6e3224a8ea9a738512c90ee5334e20d Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Wed, 9 Nov 2011 15:42:19 +0900
Subject: Modulize Rails console methods so that other console libraries such
 as Pry can include these methods

---
 railties/lib/rails/application.rb     | 2 ++
 railties/lib/rails/console/app.rb     | 4 ++--
 railties/lib/rails/console/helpers.rb | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 82fffe86bb..e8b160448b 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -205,6 +205,8 @@ module Rails
       require "pp"
       require "rails/console/app"
       require "rails/console/helpers"
+
+      IRB::ExtendCommandBundle.send :include, Rails::ConsoleMethods
     end
   end
 end
diff --git a/railties/lib/rails/console/app.rb b/railties/lib/rails/console/app.rb
index cf081473a3..23d57379ba 100644
--- a/railties/lib/rails/console/app.rb
+++ b/railties/lib/rails/console/app.rb
@@ -5,8 +5,8 @@ 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=)
 
-module IRB
-  module ExtendCommandBundle
+module Rails
+  module ConsoleMethods
     # reference the global "app" instance, created on demand. To recreate the
     # instance, pass a non-false value as the parameter.
     def app(create=false)
diff --git a/railties/lib/rails/console/helpers.rb b/railties/lib/rails/console/helpers.rb
index 070d3c2bbf..230d3d9d04 100644
--- a/railties/lib/rails/console/helpers.rb
+++ b/railties/lib/rails/console/helpers.rb
@@ -1,5 +1,5 @@
-module IRB
-  module ExtendCommandBundle
+module Rails
+  module ConsoleMethods
     def helper
       @helper ||= ApplicationController.helpers
     end
-- 
cgit v1.2.3