Merge pull request #3509 from amatsuda/console_extend_command_bundle

move Rails console top level methods to IRB context

3 files changed, 37 insertions, 27 deletions

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 95c74baae2..23d57379ba 100644
--- a/railties/lib/rails/console/app.rb
+++ b/railties/lib/rails/console/app.rb
@@ -5,28 +5,32 @@ 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
+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)
+      @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 = Rails.application
-  session = ActionDispatch::Integration::Session.new(app)
-  yield session if block_given?
-  session
-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 = Rails.application
+      session = ActionDispatch::Integration::Session.new(app)
+      yield session if block_given?
+      session
+    end
 
-# reloads the environment
-def reload!(print=true)
-  puts "Reloading..." if print
-  ActionDispatch::Reloader.cleanup!
-  ActionDispatch::Reloader.prepare!
-  true
+    # reloads the environment
+    def reload!(print=true)
+      puts "Reloading..." if print
+      ActionDispatch::Reloader.cleanup!
+      ActionDispatch::Reloader.prepare!
+      true
+    end
+  end
 end
diff --git a/railties/lib/rails/console/helpers.rb b/railties/lib/rails/console/helpers.rb
index 212fc6125a..230d3d9d04 100644
--- a/railties/lib/rails/console/helpers.rb
+++ b/railties/lib/rails/console/helpers.rb
@@ -1,7 +1,11 @@
-def helper
-  @helper ||= ApplicationController.helpers
-end
+module Rails
+  module ConsoleMethods
+    def helper
+      @helper ||= ApplicationController.helpers
+    end
 
-def controller
-  @controller ||= ApplicationController.new
+    def controller
+      @controller ||= ApplicationController.new
+    end
+  end
 end