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: [PATCH] Move console stuff to its own directory.

---
 railties/lib/rails/commands/console.rb                    | 8 ++++----
 railties/lib/rails/{console_app.rb => console/app.rb}     | 0
 .../rails/{console_with_helpers.rb => console/helpers.rb} | 0
 .../lib/rails/{console_sandbox.rb => console/sandbox.rb}  | 0
 railties/test/application/console_test.rb                 | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename railties/lib/rails/{console_app.rb => console/app.rb} (100%)
 rename railties/lib/rails/{console_with_helpers.rb => console/helpers.rb} (100%)
 rename railties/lib/rails/{console_sandbox.rb => console/sandbox.rb} (100%)

diff --git a/railties/lib/rails/commands/console.rb b/railties/lib/rails/commands/console.rb
index 27ac7fd20a31..a984eff6e2ac 100644
--- a/railties/lib/rails/commands/console.rb
+++ b/railties/lib/rails/commands/console.rb
@@ -1,6 +1,6 @@
 require 'optparse'
 require 'irb'
-require "irb/completion"
+require 'irb/completion'
 
 module Rails
   class Console
@@ -24,9 +24,9 @@ def start
       end
 
       @app.initialize!
-      require "rails/console_app"
-      require "rails/console_sandbox" if options[:sandbox]
-      require "rails/console_with_helpers"
+      require "rails/console/app"
+      require "rails/console/sandbox" if options[:sandbox]
+      require "rails/console/helpers"
 
       if options[:debugger]
         begin
diff --git a/railties/lib/rails/console_app.rb b/railties/lib/rails/console/app.rb
similarity index 100%
rename from railties/lib/rails/console_app.rb
rename to railties/lib/rails/console/app.rb
diff --git a/railties/lib/rails/console_with_helpers.rb b/railties/lib/rails/console/helpers.rb
similarity index 100%
rename from railties/lib/rails/console_with_helpers.rb
rename to railties/lib/rails/console/helpers.rb
diff --git a/railties/lib/rails/console_sandbox.rb b/railties/lib/rails/console/sandbox.rb
similarity index 100%
rename from railties/lib/rails/console_sandbox.rb
rename to railties/lib/rails/console/sandbox.rb
diff --git a/railties/test/application/console_test.rb b/railties/test/application/console_test.rb
index e8a4a4e15810..22ab60f4a06b 100644
--- a/railties/test/application/console_test.rb
+++ b/railties/test/application/console_test.rb
@@ -9,8 +9,8 @@ def setup
 
     # Load steps taken from rails/commands/console.rb
     require "#{rails_root}/config/environment"
-    require 'rails/console_app'
-    require 'rails/console_with_helpers'
+    require 'rails/console/app'
+    require 'rails/console/helpers'
   end
 
   def test_app_method_should_return_integration_session