Merge pull request sunspot#79 from jmileham/java_dep_in_sunspot_solr

Java dependency belongs in sunspot_solr
redox · Sep 9, 2011 · 260ed06 · 260ed06
2 parents f4e2110 + afb5203
commit 260ed06
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/sunspot/lib/sunspot/java.rb b/sunspot/lib/sunspot/java.rb
diff --git a/sunspot_solr/lib/sunspot/solr/java.rb b/sunspot_solr/lib/sunspot/solr/java.rb
@@ -0,0 +1,10 @@
+module Sunspot
+  module Solr
+    module Java
+      def self.installed?
+        `java -version &> /dev/null`
+        $?.success?
+      end
+    end
+  end
+end
diff --git a/sunspot_solr/lib/sunspot/solr/server.rb b/sunspot_solr/lib/sunspot/solr/server.rb
@@ -1,7 +1,7 @@
 require 'escape'
 require 'set'
 require 'tempfile'
-require 'sunspot/java'
+require 'sunspot/solr/java'
 
 module Sunspot
   module Solr
@@ -144,7 +144,7 @@ def solr_jar
 
       def ensure_java_installed
         unless defined?(@java_installed)
-          @java_installed = Sunspot::Java.installed?
+          @java_installed = Sunspot::Solr::Java.installed?
           unless @java_installed
             raise JavaMissing.new("You need a Java Runtime Environment to run the Solr server")
           end

diff --git a/sunspot_solr/spec/server_spec.rb b/sunspot_solr/spec/server_spec.rb
@@ -53,7 +53,7 @@
   end
 
   it 'raises an error if java is missing' do
-    Sunspot::Java.stub(:installed? => false)
+    Sunspot::Solr::Java.stub(:installed? => false)
     expect {
      Sunspot::Solr::Server.new
     }.to raise_error(Sunspot::Solr::Server::JavaMissing)