diff options
author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-12-01 07:21:19 -0800 |
---|---|---|
committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-12-01 07:21:19 -0800 |
commit | 20cf897d0e5c6945f7f533be875c34f436b5f056 (patch) | |
tree | 360cf21e86e68db259e214fc7153ffc52b038d5d /railties | |
parent | 18b462b3f9c99b3fcfcb7b83affa931d9c4020bf (diff) | |
parent | 4816fdd385b3187b1eaaa2ec4d0026324d631e45 (diff) | |
download | rails-20cf897d0e5c6945f7f533be875c34f436b5f056.tar.gz rails-20cf897d0e5c6945f7f533be875c34f436b5f056.tar.bz2 rails-20cf897d0e5c6945f7f533be875c34f436b5f056.zip |
Merge pull request #10712 from prathamesh-sonpatki/plugin-railsrc
Use .railsrc while creating new plugin if available. Fixes #10700
Diffstat (limited to 'railties')
-rw-r--r-- | railties/CHANGELOG.md | 5 | ||||
-rw-r--r-- | railties/lib/rails/commands/plugin.rb | 14 |
2 files changed, 19 insertions, 0 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 21ac596ab9..6169f3ebee 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,3 +1,8 @@ +* Uses .railsrc while creating new plugin if it is available. + Fixes #10700. + + *Prathamesh Sonpatki* + * Remove turbolinks when generating a new application based on a template that skips it. Example: diff --git a/railties/lib/rails/commands/plugin.rb b/railties/lib/rails/commands/plugin.rb index 837fe0ec10..f7a0b99005 100644 --- a/railties/lib/rails/commands/plugin.rb +++ b/railties/lib/rails/commands/plugin.rb @@ -2,6 +2,20 @@ if ARGV.first != "new" ARGV[0] = "--help" else ARGV.shift + unless ARGV.delete("--no-rc") + customrc = ARGV.index{ |x| x.include?("--rc=") } + railsrc = if customrc + File.expand_path(ARGV.delete_at(customrc).gsub(/--rc=/, "")) + else + File.join(File.expand_path("~"), '.railsrc') + end + if File.exist?(railsrc) + extra_args_string = File.read(railsrc) + extra_args = extra_args_string.split(/\n+/).map {|l| l.split}.flatten + puts "Using #{extra_args.join(" ")} from #{railsrc}" + ARGV.insert(1, *extra_args) + end + end end require 'rails/generators' |