diff options
| author | Michael Koziarski <michael@koziarski.com> | 2008-09-24 18:45:53 +0200 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2008-09-24 18:46:45 +0200 |
| commit | a78ec93036644c41f936128a2b6d52f3136ad64c (patch) | |
| tree | 1743d5f71049e112f0a5643b3955e9f9dc6cde47 /railties | |
| parent | 025736de8eb3a4be1514f10123ce1569fa2d5427 (diff) | |
| download | rails-a78ec93036644c41f936128a2b6d52f3136ad64c.tar.gz rails-a78ec93036644c41f936128a2b6d52f3136ad64c.tar.bz2 rails-a78ec93036644c41f936128a2b6d52f3136ad64c.zip | |
Partially revert 185fe2e9cce737d69d3b47a656f3651ce152c0c1
We shouldn't quote the unpack command's requirement as it's passed through GemRunner which takes care of it for us.
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/gem_dependency.rb | 4 | ||||
| -rw-r--r-- | railties/test/gem_dependency_test.rb | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/railties/lib/rails/gem_dependency.rb b/railties/lib/rails/gem_dependency.rb index 471e03fa5f..d58ae450eb 100644 --- a/railties/lib/rails/gem_dependency.rb +++ b/railties/lib/rails/gem_dependency.rb @@ -120,7 +120,9 @@ module Rails def unpack_command cmd = %w(unpack) << @name - cmd << "--version" << %("#{@requirement.to_s}") if @requirement + # We don't quote this requirement as it's run through GemRunner instead + # of shelling out to gem + cmd << "--version" << @requirement.to_s if @requirement cmd end end diff --git a/railties/test/gem_dependency_test.rb b/railties/test/gem_dependency_test.rb index 964ca50992..c94c950455 100644 --- a/railties/test/gem_dependency_test.rb +++ b/railties/test/gem_dependency_test.rb @@ -37,7 +37,7 @@ uses_mocha "Plugin Tests" do end def test_gem_with_version_unpack_install_command - assert_equal ["unpack", "hpricot", "--version", '"= 0.6"'], @gem_with_version.unpack_command + assert_equal ["unpack", "hpricot", "--version", '= 0.6'], @gem_with_version.unpack_command end def test_gem_adds_load_paths |