moved rails binary to rails gem, so rubygems can find specific versions of rails [#4382 state:resolved]

Signed-off-by: wycats <wycats@gmail.com>
This commit is contained in:
Felipe Rodrigues 2010-04-12 23:38:43 -03:00 committed by wycats
parent 3c456a869a
commit a64bfc3c8e
5 changed files with 5 additions and 6 deletions

1
bin/rails Executable file
View File

@ -0,0 +1 @@
require 'rails/cli'

View File

@ -15,8 +15,9 @@ Gem::Specification.new do |s|
s.homepage = 'http://www.rubyonrails.org'
s.rubyforge_project = 'rails'
s.files = []
s.require_path = []
s.bindir = 'bin'
s.executables = ['rails']
s.default_executable = 'rails'
s.add_dependency('activesupport', version)
s.add_dependency('actionpack', version)

0
railties/bin/rails → railties/lib/rails/cli.rb Executable file → Normal file
View File

View File

@ -15,9 +15,6 @@ Gem::Specification.new do |s|
s.files = Dir['CHANGELOG', 'README', 'bin/**/*', 'guides/**/*', 'lib/**/{*,.[a-z]*}']
s.require_path = 'lib'
s.bindir = 'bin'
s.executables = ['rails']
s.default_executable = 'rails'
s.rdoc_options << '--exclude' << '.'
s.has_rdoc = false

View File

@ -213,7 +213,7 @@ Module.new do
require_environment = "-r #{environment}"
end
`#{Gem.ruby} #{require_environment} #{RAILS_FRAMEWORK_ROOT}/railties/bin/rails #{tmp_path('app_template')}`
`#{Gem.ruby} #{require_environment} #{RAILS_FRAMEWORK_ROOT}/bin/rails #{tmp_path('app_template')}`
File.open("#{tmp_path}/app_template/config/boot.rb", 'w') do |f|
if require_environment
f.puts "Dir.chdir('#{File.dirname(environment)}') do"