Browse files

Added better documentation for generator overwrite options (closes #9842

) [wincet]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7837 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 21b51ed commit c8d9a07a0029e2bf897db8e976fd203808b519c4 @dhh dhh committed Oct 11, 2007
Showing with 17 additions and 7 deletions.
  1. +17 −7 railties/lib/rails_generator/commands.rb
View
24 railties/lib/rails_generator/commands.rb
@@ -93,24 +93,34 @@ def gsub_file(relative_destination, regexp, *args, &block)
private
# Ask the user interactively whether to force collision.
def force_file_collision?(destination, src, dst, file_options = {}, &block)
- $stdout.print "overwrite #{destination}? [Ynaqd] "
- case $stdin.gets
- when /d/i
+ $stdout.print "overwrite #{destination}? (enter \"h\" for help) [Ynaqdh] "
+ case $stdin.gets.chomp
+ when /\Ad\z/i
Tempfile.open(File.basename(destination), File.dirname(dst)) do |temp|
temp.write render_file(src, file_options, &block)
temp.rewind
$stdout.puts `#{diff_cmd} #{dst} #{temp.path}`
end
puts "retrying"
raise 'retry diff'
- when /a/i
+ when /\Aa\z/i
$stdout.puts "forcing #{spec.name}"
options[:collision] = :force
- when /q/i
+ when /\Aq\z/i
$stdout.puts "aborting #{spec.name}"
raise SystemExit
- when /n/i then :skip
- else :force
+ when /\An\z/i then :skip
+ when /\Ay\z/i then :force
+ else
+ $stdout.puts <<-HELP
+Y - yes, overwrite
+n - no, do not overwrite
+a - all, overwrite this and all others
+q - quit, abort
+d - diff, show the differences between the old and the new
+h - help, show this help
+HELP
+ raise 'retry'
end
rescue
retry

0 comments on commit c8d9a07

Please sign in to comment.