Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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.
  • Loading branch information...
commit 21c5a0a104bf04e3e7b63aa5f0104f1c666655c3 1 parent 9364043
Daniel Dyba dyba authored tenderlove committed

Showing 1 changed file with 3 additions and 3 deletions. Show diff stats Hide diff stats

  1. +3 3 railties/lib/rails/commands/plugin.rb
6 railties/lib/rails/commands/plugin.rb
@@ -274,7 +274,7 @@ def rails_env
274 274
275 275 # load default environment and parse arguments
276 276 require 'optparse'
277   -module Commands
  277 +module RailsCommands
278 278 class Plugin
279 279 attr_reader :environment, :script_name
280 280 def initialize
@@ -327,7 +327,7 @@ def parse!(args=ARGV)
327 327
328 328 command = general.shift
329 329 if command =~ /^(install|remove)$/
330   - command = Commands.const_get(command.capitalize).new(self)
  330 + command = RailsCommands.const_get(command.capitalize).new(self)
331 331 command.parse!(sub)
332 332 else
333 333 puts "Unknown command: #{command}" unless command.blank?
@@ -539,4 +539,4 @@ def fetch_dir(url)
539 539 end
540 540 end
541 541
542   -Commands::Plugin.parse!
  542 +RailsCommands::Plugin.parse!

0 comments on commit 21c5a0a

Please sign in to comment.
Something went wrong with that request. Please try again.