aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorDaniel Dyba <daniel.dyba@gmail.com>2011-07-16 16:54:03 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-11-16 10:23:00 -0800
commit21c5a0a104bf04e3e7b63aa5f0104f1c666655c3 (patch)
tree8494776dfe3eec047a7db3249665910b5cd39116 /railties/lib
parent936404399d0bc4b7100b7837676c34f8130d565d (diff)
downloadrails-21c5a0a104bf04e3e7b63aa5f0104f1c666655c3.tar.gz
rails-21c5a0a104bf04e3e7b63aa5f0104f1c666655c3.tar.bz2
rails-21c5a0a104bf04e3e7b63aa5f0104f1c666655c3.zip
Changed Commands module to RailsCommands.
This is to avoid a conflict that occurs when you add Rake to your Gemfile. There is a Commands Object in Rake that conflicts with the Commands module in plugin.rb. See rails issue #1866.
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/commands/plugin.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/commands/plugin.rb b/railties/lib/rails/commands/plugin.rb
index 4df849447d..aa4551c806 100644
--- a/railties/lib/rails/commands/plugin.rb
+++ b/railties/lib/rails/commands/plugin.rb
@@ -274,7 +274,7 @@ end
# load default environment and parse arguments
require 'optparse'
-module Commands
+module RailsCommands
class Plugin
attr_reader :environment, :script_name
def initialize
@@ -327,7 +327,7 @@ module Commands
command = general.shift
if command =~ /^(install|remove)$/
- command = Commands.const_get(command.capitalize).new(self)
+ command = RailsCommands.const_get(command.capitalize).new(self)
command.parse!(sub)
else
puts "Unknown command: #{command}" unless command.blank?
@@ -539,4 +539,4 @@ class RecursiveHTTPFetcher
end
end
-Commands::Plugin.parse!
+RailsCommands::Plugin.parse!