diff options
| author | Felipe Rodrigues <felipero@gmail.com> | 2010-04-12 23:38:43 -0300 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-04-12 19:56:38 -0700 |
| commit | a64bfc3c8e2a62b39f3cf8497c2a5a82272bd27a (patch) | |
| tree | ef99ef08d35b66530562d9b817890056e0cf8793 | |
| parent | 3c456a869abeb0a639518180214db5ead428aedf (diff) | |
| download | rails-a64bfc3c8e2a62b39f3cf8497c2a5a82272bd27a.tar.gz rails-a64bfc3c8e2a62b39f3cf8497c2a5a82272bd27a.tar.bz2 rails-a64bfc3c8e2a62b39f3cf8497c2a5a82272bd27a.zip | |
moved rails binary to rails gem, so rubygems can find specific versions of rails [#4382 state:resolved]
Signed-off-by: wycats <wycats@gmail.com>
| -rwxr-xr-x | bin/rails | 1 | ||||
| -rw-r--r-- | rails.gemspec | 5 | ||||
| -rw-r--r--[-rwxr-xr-x] | railties/lib/rails/cli.rb (renamed from railties/bin/rails) | 0 | ||||
| -rw-r--r-- | railties/railties.gemspec | 3 | ||||
| -rw-r--r-- | railties/test/isolation/abstract_unit.rb | 2 |
5 files changed, 5 insertions, 6 deletions
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 index 173f122445..173f122445 100755..100644 --- a/railties/bin/rails +++ b/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" |