Revert more Rails.version changes

Related with ed8df3ff01
This commit is contained in:
Rafael Mendonça França 2013-04-01 17:23:18 -03:00
parent 264001d64b
commit 0eec487abc
4 changed files with 5 additions and 5 deletions

View File

@ -1,7 +1,7 @@
require 'rails/version' require 'rails/version'
if ['--version', '-v'].include?(ARGV.first) if ['--version', '-v'].include?(ARGV.first)
puts "Rails #{Rails.version}" puts "Rails #{Rails::VERSION::STRING}"
exit(0) exit(0)
end end

View File

@ -1,7 +1,7 @@
require 'digest/md5' require 'digest/md5'
require 'securerandom' require 'securerandom'
require 'active_support/core_ext/string/strip' require 'active_support/core_ext/string/strip'
require 'rails/version' unless defined?(Rails.version) require 'rails/version' unless defined?(Rails::VERSION)
require 'rbconfig' require 'rbconfig'
require 'open-uri' require 'open-uri'
require 'uri' require 'uri'
@ -142,7 +142,7 @@ module Rails
else else
<<-GEMFILE.strip_heredoc <<-GEMFILE.strip_heredoc
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '#{Rails.version}' gem 'rails', '#{Rails::VERSION::STRING}'
GEMFILE GEMFILE
end end
end end

View File

@ -18,7 +18,7 @@ Gem::Specification.new do |s|
s.test_files = Dir["test/**/*"] s.test_files = Dir["test/**/*"]
<% end -%> <% end -%>
<%= '# ' if options.dev? || options.edge? -%>s.add_dependency "rails", "~> <%= Rails.version %>" <%= '# ' if options.dev? || options.edge? -%>s.add_dependency "rails", "~> <%= Rails::VERSION::STRING %>"
<% unless options[:skip_active_record] -%> <% unless options[:skip_active_record] -%>
s.add_development_dependency "<%= gem_for_database %>" s.add_development_dependency "<%= gem_for_database %>"

View File

@ -1,7 +1,7 @@
source "https://rubygems.org" source "https://rubygems.org"
<% if options[:skip_gemspec] -%> <% if options[:skip_gemspec] -%>
<%= '# ' if options.dev? || options.edge? -%>gem "rails", "~> <%= Rails.version %>" <%= '# ' if options.dev? || options.edge? -%>gem "rails", "~> <%= Rails::VERSION::STRING %>"
<% else -%> <% else -%>
# Declare your gem's dependencies in <%= name %>.gemspec. # Declare your gem's dependencies in <%= name %>.gemspec.
# Bundler will treat runtime dependencies like base dependencies, and # Bundler will treat runtime dependencies like base dependencies, and