From a64bfc3c8e2a62b39f3cf8497c2a5a82272bd27a Mon Sep 17 00:00:00 2001
From: Felipe Rodrigues <felipero@gmail.com>
Date: Mon, 12 Apr 2010 23:38:43 -0300
Subject: [PATCH] moved rails binary to rails gem, so rubygems can find
 specific versions of rails [#4382 state:resolved]

Signed-off-by: wycats <wycats@gmail.com>
---
 bin/rails                                | 1 +
 rails.gemspec                            | 5 +++--
 railties/{bin/rails => lib/rails/cli.rb} | 0
 railties/railties.gemspec                | 3 ---
 railties/test/isolation/abstract_unit.rb | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)
 create mode 100755 bin/rails
 rename railties/{bin/rails => lib/rails/cli.rb} (100%)
 mode change 100755 => 100644

diff --git a/bin/rails b/bin/rails
new file mode 100755
index 0000000000..853b1d75f9
--- /dev/null
+++ b/bin/rails
@@ -0,0 +1 @@
+require 'rails/cli'
diff --git a/rails.gemspec b/rails.gemspec
index ca0ec36cc5..3b1dfe9456 100644
--- a/rails.gemspec
+++ b/rails.gemspec
@@ -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)
diff --git a/railties/bin/rails b/railties/lib/rails/cli.rb
old mode 100755
new mode 100644
similarity index 100%
rename from railties/bin/rails
rename to railties/lib/rails/cli.rb
diff --git a/railties/railties.gemspec b/railties/railties.gemspec
index aea07efe96..b9278c0399 100644
--- a/railties/railties.gemspec
+++ b/railties/railties.gemspec
@@ -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
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
index e6896a1629..f0c64b92ba 100644
--- a/railties/test/isolation/abstract_unit.rb
+++ b/railties/test/isolation/abstract_unit.rb
@@ -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"