kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Factor out AppBase#rails_prerelease?

Browse source
This commit is contained in:
Jonathan Hefner 2020-06-17 02:31:23 -05:00
parent 43b907893d
commit 9dcdeb5c04
4 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
railties/lib/rails/generators/app_base.rb
View file

@ -270,6 +270,10 @@ module Rails
end
end
def rails_prerelease?
options.dev? || options.edge? || options.main?
end
def rails_gemfile_entry
if options.dev?
[

2
railties/lib/rails/generators/rails/plugin/templates/%name%.gemspec.tt
View file

@ -22,5 +22,5 @@ Gem::Specification.new do |spec|
spec.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"]
<%= "# " if options.dev? || options.edge? || options.main? -%>spec.add_dependency "rails", "<%= Array(rails_version_specifier).join('", "') %>"
<%= "# " if rails_prerelease? -%>spec.add_dependency "rails", "<%= Array(rails_version_specifier).join('", "') %>"
end

6
railties/lib/rails/generators/rails/plugin/templates/Gemfile.tt
View file

@ -2,7 +2,7 @@ source "https://rubygems.org"
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
<% if options[:skip_gemspec] -%>
<%= "# " if options.dev? || options.edge? || options.main? -%>gem "rails", "<%= Array(rails_version_specifier).join("', '") %>"
<%= "# " if rails_prerelease? -%>gem "rails", "<%= Array(rails_version_specifier).join("', '") %>"
<% else -%>
# Specify your gem's dependencies in <%= name %>.gemspec.
gemspec
@ -14,8 +14,8 @@ group :development do
end
<% end -%>
<% if options.dev? || options.edge? -%>
# Your gem is dependent on dev or edge Rails. Once you can lock this
<% if rails_prerelease? -%>
# Your gem is dependent on a prerelease version of Rails. Once you can lock this
# dependency down to a specific version, move it to your gemspec.
<% max_width = gemfile_entries.map { |g| g.name.length }.max -%>
<% gemfile_entries.each do |gem| -%>

1
railties/test/generators/generators_test_helper.rb
View file

@ -92,6 +92,7 @@ module GeneratorsTestHelper
private
def gemfile_locals
{
rails_prerelease: false,
skip_active_storage: true,
depend_on_bootsnap: false,
depends_on_system_test: false,