sunspot 0.10.0 → 0.10.1

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 10
-:patch: 0
+:patch: 1
 :major: 0

data/bin/sunspot-solr

@@ -17,11 +17,11 @@ rescue LoadError => e
 end
 
 working_directory = FileUtils.pwd
-solr_home = File.expand_path(File.join(File.dirname(__FILE__), '..', 'solr'))
+solr_install = File.expand_path(File.join(File.dirname(__FILE__), '..', 'solr'))
 
 port      = '8983'
 data_dir  = File.expand_path(File.join(Dir.tmpdir, 'solr_data'))
-home      = nil
+solr_home = File.join(solr_install, 'solr')
 pid_dir   = working_directory
 log_file  = nil
 log_level = 'OFF'
@@ -70,13 +70,13 @@ PROPERTIES
 end
 
 Daemons.run_proc('sunspot-solr', options) do
-  FileUtils.cd(solr_home) do
+  FileUtils.cd(solr_install) do
     args = ['java']
     args << "-Djetty.port=#{port}" if port
     args << "-Dsolr.data.dir=#{data_dir}" if data_dir
-    args << "-Dsolr.solr.home=#{home}" if home
+    args << "-Dsolr.solr.home=#{solr_home}" if solr_home
     args << "-Djava.util.logging.config.file=#{logging_properties(log_file, log_level)}" if log_file and log_level != 'OFF'
-    args << '-jar' << 'start.jar'
+    args << '-jar' << File.join(solr_install, 'start.jar')
     STDERR.puts(args * ' ')
     Kernel.exec(*args)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sunspot
 version: !ruby/object:Gem::Version 
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors: 
 - Mat Brown