diff options
author | Andrew White <andyw@pixeltrix.co.uk> | 2015-02-03 22:47:59 +0000 |
---|---|---|
committer | Andrew White <andyw@pixeltrix.co.uk> | 2015-02-03 22:53:23 +0000 |
commit | 1c59ffca5c8e998aa5cfc0abb594981de23e64c8 (patch) | |
tree | db3386412e4ce4c6a917f64e01bc9f129c69a53a /railties/lib | |
parent | 158c7eb1d61a28452e0aafd1e05314352eea2749 (diff) | |
download | rails-1c59ffca5c8e998aa5cfc0abb594981de23e64c8.tar.gz rails-1c59ffca5c8e998aa5cfc0abb594981de23e64c8.tar.bz2 rails-1c59ffca5c8e998aa5cfc0abb594981de23e64c8.zip |
Don't remove all line endings from routes.rb
When there is a single scaffold in the routes.rb with no other lines
then revoking/destroying it will create a routes.rb file with a syntax
error. This is because the sentinel for the Thor `route` action didn't
include the newline but the logged route code did.
The fix is to add the newline to the sentinel and remove it from the
the logged route code.
Fixes #15913.
Diffstat (limited to 'railties/lib')
-rw-r--r-- | railties/lib/rails/generators/actions.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb index e35015f630..e39a45f4c9 100644 --- a/railties/lib/rails/generators/actions.rb +++ b/railties/lib/rails/generators/actions.rb @@ -218,10 +218,10 @@ module Rails # route "root 'welcome#index'" def route(routing_code) log :route, routing_code - sentinel = /\.routes\.draw do\s*$/ + sentinel = /\.routes\.draw do\s*\n/m in_root do - inject_into_file 'config/routes.rb', "\n #{routing_code}", { after: sentinel, verbose: false } + inject_into_file 'config/routes.rb', " #{routing_code}", { after: sentinel, verbose: false } end end |