diff options
| author | rick <technoweenie@gmail.com> | 2008-05-31 15:58:08 -0700 |
|---|---|---|
| committer | rick <technoweenie@gmail.com> | 2008-05-31 15:58:08 -0700 |
| commit | 9c4f00350a61987afad50ebb8d319d7e889b6cfd (patch) | |
| tree | 68ccbb7aa2c685faa3b31a99501cfb9a463605e3 | |
| parent | fb89d7fa6d21a4b0faab753ff3a7c934d9d59883 (diff) | |
| download | rails-9c4f00350a61987afad50ebb8d319d7e889b6cfd.tar.gz rails-9c4f00350a61987afad50ebb8d319d7e889b6cfd.tar.bz2 rails-9c4f00350a61987afad50ebb8d319d7e889b6cfd.zip | |
fix Gem installation command with versions
| -rw-r--r-- | railties/CHANGELOG | 4 | ||||
| -rw-r--r-- | railties/lib/rails/gem_dependency.rb | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 11d2926f31..c765dedae5 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,3 +1,7 @@ +*SVN* + +* Use a system command to install gems, since GemRunner exits the ruby process. #210 [Tim Morgan] + *2.1.0 RC1 (May 11th, 2008)* * script/dbconsole fires up the command-line database client. #102 [Steve Purcell] diff --git a/railties/lib/rails/gem_dependency.rb b/railties/lib/rails/gem_dependency.rb index 582861abf4..22ee0e3601 100644 --- a/railties/lib/rails/gem_dependency.rb +++ b/railties/lib/rails/gem_dependency.rb @@ -73,7 +73,9 @@ module Rails end def install - puts `#{gem_command} #{install_command.join(' ')}` + cmd = "#{gem_command} #{install_command.join(' ')}" + puts cmd + puts %x(#{cmd}) end def unpack_to(directory) @@ -107,7 +109,7 @@ private ################################################################### def install_command cmd = %w(install) << @name - cmd << "--version" << "#{@requirement.to_s}" if @requirement + cmd << "--version" << %("#{@requirement.to_s}") if @requirement cmd << "--source" << @source if @source cmd end |