Permalink
Browse files

moved rails binary to rails gem, so rubygems can find specific versio…

…ns of rails [#4382 state:resolved]

Signed-off-by: wycats <wycats@gmail.com>
  • Loading branch information...
1 parent 3c456a8 commit a64bfc3c8e2a62b39f3cf8497c2a5a82272bd27a @felipero felipero committed with wycats Apr 13, 2010
View
@@ -0,0 +1 @@
+require 'rails/cli'
View
@@ -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)
View
File renamed without changes.
@@ -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
@@ -213,7 +213,7 @@ class Test::Unit::TestCase
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"

0 comments on commit a64bfc3

Please sign in to comment.