mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

method_source needs to be a hard dependency on railties

This commit is contained in:
Arthur Neves 2015-03-05 09:58:17 -05:00
parent 9959e9525b
commit 9afd9d232c
5 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Gemfile
View File

@ -60,7 +60,6 @@ instance_eval File.read local_gemfile if File.exist? local_gemfile
group :test do group :test do
# FIX: Our test suite isn't ready to run in random order yet # FIX: Our test suite isn't ready to run in random order yet
gem 'minitest', '< 5.3.4' gem 'minitest', '< 5.3.4'
gem 'method_source'
platforms :mri_19 do platforms :mri_19 do
gem 'ruby-prof', '~> 0.11.2' gem 'ruby-prof', '~> 0.11.2'

2
Gemfile.lock
View File

@ -87,6 +87,7 @@ PATH
railties (5.0.0.alpha) railties (5.0.0.alpha)
actionpack (= 5.0.0.alpha) actionpack (= 5.0.0.alpha)
activesupport (= 5.0.0.alpha) activesupport (= 5.0.0.alpha)
method_source
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
@ -261,7 +262,6 @@ DEPENDENCIES
json json
kindlerb (= 0.1.1) kindlerb (= 0.1.1)
mail! mail!
method_source
minitest (< 5.3.4) minitest (< 5.3.4)
mocha (~> 0.14) mocha (~> 0.14)
mysql (>= 2.9.0) mysql (>= 2.9.0)

4
railties/lib/rails/generators/rails/app/templates/Gemfile
View File

@ -36,10 +36,6 @@ group :development, :test do
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring' gem 'spring'
<% end -%> <% end -%>
# Adds `Method#source` and `Method#comment` to get the source code of a
# method from the console
gem 'method_source'
<% end -%> <% end -%>
end end
<% if RUBY_PLATFORM.match(/bccwin|cygwin|emx|mingw|mswin|wince|java/) -%> <% if RUBY_PLATFORM.match(/bccwin|cygwin|emx|mingw|mswin|wince|java/) -%>

1
railties/railties.gemspec
View File

@ -28,6 +28,7 @@ Gem::Specification.new do |s|
s.add_dependency 'rake', '>= 0.8.7' s.add_dependency 'rake', '>= 0.8.7'
s.add_dependency 'thor', '>= 0.18.1', '< 2.0' s.add_dependency 'thor', '>= 0.18.1', '< 2.0'
s.add_dependency 'method_source'
s.add_development_dependency 'actionview', version s.add_development_dependency 'actionview', version
end end

7
railties/test/generators/app_generator_test.rb
View File

@ -443,13 +443,6 @@ class AppGeneratorTest < Rails::Generators::TestCase
end end
end end
def test_inclusion_of_method_source
run_generator
assert_file "Gemfile" do |content|
assert_gem 'method_source'
end
end
def test_template_from_dir_pwd def test_template_from_dir_pwd
FileUtils.cd(Rails.root) FileUtils.cd(Rails.root)
assert_match(/It works from file!/, run_generator([destination_root, "-m", "lib/template.rb"])) assert_match(/It works from file!/, run_generator([destination_root, "-m", "lib/template.rb"]))