diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-11-01 08:10:48 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-11-01 08:10:48 -0700 |
| commit | fe64edec3df2010d185db4178d542de82b939cba (patch) | |
| tree | c06e0d7a5632986995d1132707318f9edcf79aa5 /railties/lib/rails/generators/rails | |
| parent | 09ce1df7aa2845b86a98a392cb6691566f533d9b (diff) | |
| parent | dbdb25463c257a9efd0771c6876756263fd071f1 (diff) | |
| download | rails-fe64edec3df2010d185db4178d542de82b939cba.tar.gz rails-fe64edec3df2010d185db4178d542de82b939cba.tar.bz2 rails-fe64edec3df2010d185db4178d542de82b939cba.zip | |
Merge pull request #12728 from arunagw/aa-warnings-removed-ruby-trunk
More Warnings removed for ruby trunk
Diffstat (limited to 'railties/lib/rails/generators/rails')
4 files changed, 5 insertions, 5 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index 04ef2ee071..3c62e7a4d2 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -349,7 +349,7 @@ module Rails if argv.find { |arg| arg == '--no-rc' } argv.reject { |arg| arg == '--no-rc' } else - railsrc(argv) { |argv, rc| insert_railsrc_into_argv!(argv, rc) } + railsrc(argv) { |rc_argv, rc| insert_railsrc_into_argv!(rc_argv, rc) } end end @@ -369,7 +369,7 @@ module Rails end def insert_railsrc_into_argv!(argv, railsrc) - return argv unless File.exists?(railsrc) + return argv unless File.exist?(railsrc) extra_args = read_rc_file railsrc argv.take(1) + extra_args + argv.drop(1) end diff --git a/railties/lib/rails/generators/rails/app/templates/config/boot.rb b/railties/lib/rails/generators/rails/app/templates/config/boot.rb index 3596736667..5e5f0c1fac 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/boot.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/boot.rb @@ -1,4 +1,4 @@ # Set up gems listed in the Gemfile. ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) -require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE']) +require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) diff --git a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb index 97ff6d1b8b..813006bf7b 100644 --- a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb +++ b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb @@ -319,7 +319,7 @@ task default: :test @application_definition ||= begin dummy_application_path = File.expand_path("#{dummy_path}/config/application.rb", destination_root) - unless options[:pretend] || !File.exists?(dummy_application_path) + unless options[:pretend] || !File.exist?(dummy_application_path) contents = File.read(dummy_application_path) contents[(contents.index(/module ([\w]+)\n(.*)class Application/m))..-1] end diff --git a/railties/lib/rails/generators/rails/plugin/templates/rails/boot.rb b/railties/lib/rails/generators/rails/plugin/templates/rails/boot.rb index ef360470a3..6266cfc509 100644 --- a/railties/lib/rails/generators/rails/plugin/templates/rails/boot.rb +++ b/railties/lib/rails/generators/rails/plugin/templates/rails/boot.rb @@ -1,5 +1,5 @@ # Set up gems listed in the Gemfile. ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__) -require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE']) +require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) $LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__) |