sunspot_solr 2.1.0 → 2.1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 53b055ef533243d56a2f670eb7643bbb82f3f033
+  data.tar.gz: c20d9eed7d364db48933405efa47dc4e9a334e95
+SHA512:
+  metadata.gz: fed1ab3dd72542db53fbfbc415ecd7094e9ba0ab3bb1b77fe43cdb6226780e2fe0457c6b6f70ebd632442fcd79e340e2f03deb4a9e0bcb8510066636b7f191fb
+  data.tar.gz: 70b905ed0bc45b5f2d9e6b23280563c1d18e9d6b47301e8ac69333f727c8cb33a80a9d7179074fd0846a92f10c54dfbb9a7f99480da22152b510762254df888a

data/lib/sunspot/solr/server.rb

@@ -30,7 +30,7 @@ module Sunspot
 
       #
       # Bootstrap a new solr_home by creating all required
-      # directories. 
+      # directories.
       #
       # ==== Returns
       #
@@ -99,6 +99,7 @@ module Sunspot
         command << "-Dsolr.data.dir=#{solr_data_dir}" if solr_data_dir
         command << "-Dsolr.solr.home=#{solr_home}" if solr_home
         command << "-Djava.util.logging.config.file=#{logging_config_path}" if logging_config_path
+        command << "-Djava.awt.headless=true"
         command << '-jar' << File.basename(solr_jar)
         FileUtils.cd(File.dirname(solr_jar)) do
           exec(*command)
@@ -180,7 +181,7 @@ module Sunspot
         end
       end
 
-      # 
+      #
       # Create new solr_home, config, log and pid directories
       #
       # ==== Returns

data/lib/sunspot/solr/tasks.rb

@@ -1,33 +1,32 @@
 namespace :sunspot do
   namespace :solr do
     desc 'Start the Solr instance'
-    task :start => :environment do
-      case RUBY_PLATFORM
-      when /w(in)?32$/, /java$/
-        abort("This command is not supported on #{RUBY_PLATFORM}. " +
-              "Use rake sunspot:solr:run to run Solr in the foreground.")
-      end
-
-      if defined?(Sunspot::Rails::Server)
-        Sunspot::Rails::Server.new.start
-      else
-        Sunspot::Solr::Server.new.start
-      end
-
-      puts "Successfully started Solr ..."
+    task start: :environment do
+      server.start
+      puts 'Successfully started Solr ...'
     end
 
     desc 'Run the Solr instance in the foreground'
-    task :run => :environment do
-      if defined?(Sunspot::Rails::Server)
-        Sunspot::Rails::Server.new.run
-      else
-        Sunspot::Solr::Server.new.run
-      end
+    task run: :environment do
+      server.run
     end
 
     desc 'Stop the Solr instance'
-    task :stop => :environment do
+    task stop: :environment do
+      server.stop
+      puts 'Successfully stopped Solr ...'
+    end
+
+    desc 'Restart the Solr instance'
+    task restart: :environment do
+      Rake::Task['sunspot:solr:stop'].invoke if File.exist?(server.pid_path)
+      Rake::Task['sunspot:solr:start'].invoke
+    end
+
+    # for backwards compatibility
+    task reindex: :"sunspot:reindex"
+
+    def server
       case RUBY_PLATFORM
       when /w(in)?32$/, /java$/
         abort("This command is not supported on #{RUBY_PLATFORM}. " +
@@ -35,15 +34,10 @@ namespace :sunspot do
       end
 
       if defined?(Sunspot::Rails::Server)
-        Sunspot::Rails::Server.new.stop
+        Sunspot::Rails::Server.new
       else
-        Sunspot::Solr::Server.new.stop
+        Sunspot::Solr::Server.new
       end
-
-      puts "Successfully stopped Solr ..."
     end
-
-    # for backwards compatibility
-    task :reindex => :"sunspot:reindex"
   end
 end

data/solr/contexts/solr.xml

@@ -4,5 +4,4 @@
   <Set name="contextPath"><SystemProperty name="hostContext" default="/solr"/></Set>
   <Set name="war"><SystemProperty name="jetty.home"/>/webapps/solr.war</Set>
   <Set name="defaultsDescriptor"><SystemProperty name="jetty.home"/>/etc/webdefault.xml</Set>
-  <Set name="tempDirectory"><Property name="jetty.home" default="."/>/solr-webapp</Set>
 </Configure>

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunspot_solr
 version: !ruby/object:Gem::Version
-  version: 2.1.0
-  prerelease: 
+  version: 2.1.1
 platform: ruby
 authors:
 - Mat Brown
@@ -27,38 +26,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-25 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: hanna
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: |2
@@ -130,32 +125,31 @@ files:
 homepage: https://github.com/outoftime/sunspot/tree/master/sunspot_solr
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --webcvs=http://github.com/outoftime/sunspot/tree/master/%s
-- --title
+- "--webcvs=http://github.com/outoftime/sunspot/tree/master/%s"
+- "--title"
 - Sunspot-Solr - Bundled Solr distribution for Sunspot - API Documentation
-- --main
+- "--main"
 - README.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: sunspot
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Bundled Solr distribution for Sunspot
 test_files:
 - spec/server_spec.rb