Permalink
Browse files

Tighten up the verbiage of the illegal task name warning

  • Loading branch information...
1 parent f48fe85 commit d1e5c6636ce98e4202e60b1cedbc7d3ef2cd2775 @njonsson committed Nov 15, 2013
Showing with 8 additions and 8 deletions.
  1. +3 −3 features/dsl/mirror_rake_tasks/unqualified.feature
  2. +5 −5 lib/cape/capistrano.rb
@@ -90,7 +90,7 @@ Feature: The #mirror_rake_tasks DSL method
And the output should not contain "cap load"
And the output should contain:
"""
- *** WARNING: You will need to use Cape's renaming API if you want to mirror Rake task load (defining a task named `load' would shadow an existing method with that name)
+ *** WARNING: You must use Cape's renaming API in order to mirror Rake task load (defining a task named `load' would shadow an existing method with that name)
"""
Scenario: mirror Rake task 'long' with its description
@@ -152,7 +152,7 @@ Feature: The #mirror_rake_tasks DSL method
very, very, very, very, very, very, very, very, very, very, very, very, very,
very, very, very, very long description.
- *** WARNING: You will need to use Cape's renaming API if you want to mirror Rake task load (defining a task named `load' would shadow an existing method with that name)
+ *** WARNING: You must use Cape's renaming API in order to mirror Rake task load (defining a task named `load' would shadow an existing method with that name)
"""
@@ -177,7 +177,7 @@ Feature: The #mirror_rake_tasks DSL method
"""
And the output should contain:
"""
- *** WARNING: You will need to use Cape's renaming API if you want to mirror Rake task load (defining a task named `load' would shadow an existing method with that name)
+ *** WARNING: You must use Cape's renaming API in order to mirror Rake task load (defining a task named `load' would shadow an existing method with that name)
"""
Scenario: mirror Rake task 'with_one_arg' with its description
View
@@ -143,11 +143,11 @@ def implement(task, capistrano_context, &recipe_definition_block)
context.run command
end
rescue => e
- $stderr.puts XTerm.bold_and_foreground_red('*** WARNING:') +
- ' ' +
- XTerm.bold("You will need to use Cape's renaming API " +
- 'if you want to mirror Rake task ') +
- XTerm.bold_and_underlined(task[:name]) +
+ $stderr.puts XTerm.bold_and_foreground_red('*** WARNING:') +
+ ' ' +
+ XTerm.bold("You must use Cape's renaming API in order " +
+ 'to mirror Rake task ') +
+ XTerm.bold_and_underlined(task[:name]) +
XTerm.bold(" (#{e.message})")
end
}

0 comments on commit d1e5c66

Please sign in to comment.