aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorZack Hobson <zack@opensourcery.com>2009-03-11 17:53:21 -0700
committerPratik Naik <pratiknaik@gmail.com>2009-03-13 10:14:51 +0000
commit5b751ae0b3f6c10a1053e4a2e04fd92d228d787f (patch)
treeb6ea6c9144b59e7d536ac7c9dbc1067447f6667f /railties
parent9d906707bea997016fd370e33e12dbc21cfcc531 (diff)
downloadrails-5b751ae0b3f6c10a1053e4a2e04fd92d228d787f.tar.gz
rails-5b751ae0b3f6c10a1053e4a2e04fd92d228d787f.tar.bz2
rails-5b751ae0b3f6c10a1053e4a2e04fd92d228d787f.zip
Execute the appropriate gem command when using JRuby [#2215 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/gem_dependency.rb9
1 files changed, 8 insertions, 1 deletions
diff --git a/railties/lib/rails/gem_dependency.rb b/railties/lib/rails/gem_dependency.rb
index 2dd659032f..ea36f69f2f 100644
--- a/railties/lib/rails/gem_dependency.rb
+++ b/railties/lib/rails/gem_dependency.rb
@@ -236,7 +236,14 @@ module Rails
private
def gem_command
- RUBY_PLATFORM =~ /win32/ ? 'gem.bat' : 'gem'
+ case RUBY_PLATFORM
+ when /win32/
+ 'gem.bat'
+ when /java/
+ 'jruby -S gem'
+ else
+ 'gem'
+ end
end
def install_command