Removes the need for the escape gem by using Shellwords; hopefully fi…

…xes issues with quoting on Windows too
rewardli · Apr 15, 2012 · 94c62e2 · 94c62e2
1 parent 406a988
commit 94c62e2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/sunspot/sunspot.gemspec b/sunspot/sunspot.gemspec
@@ -26,7 +26,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'rsolr', '~>1.0.6'
-  s.add_dependency 'escape', '~>0.0.4'
   s.add_dependency 'pr_geohash', '~>1.0'
 
   s.add_development_dependency 'rspec', '~>2.6.0'

diff --git a/sunspot_solr/lib/sunspot/solr/server.rb b/sunspot_solr/lib/sunspot/solr/server.rb
@@ -1,4 +1,4 @@
-require 'escape'
+require 'shellwords'
 require 'set'
 require 'tempfile'
 require 'sunspot/solr/java'
@@ -101,7 +101,7 @@ def run
         command << "-Djava.util.logging.config.file=#{logging_config_path}" if logging_config_path
         command << '-jar' << File.basename(solr_jar)
         FileUtils.cd(File.dirname(solr_jar)) do
-          exec(Escape.shell_command(command))
+          exec(Shellwords.shelljoin(command))
         end
       end
 

diff --git a/sunspot_solr/sunspot_solr.gemspec b/sunspot_solr/sunspot_solr.gemspec
@@ -28,8 +28,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'escape', '~>0.0.4'
-
   s.add_development_dependency 'rspec', '~> 1.1'
   s.add_development_dependency 'hanna'