solr_wrapper 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21a2a6e484329fe66c2531342783d9ac4007a1a3
-  data.tar.gz: 25cd86f3084f418c6a88192986b0ba6d6a2013b5
+  metadata.gz: 7916cf546d675d2a3f008f4a271aa4fc2cf7b8ae
+  data.tar.gz: 3d2e1456ff74edb606a60cef2fa1731ae5a74351
 SHA512:
-  metadata.gz: 08b856eb075be3bb9521531f700ba0dd367f18917a787cda40537419707c16a69abc6c6ad27c1a64459a6642a73c7e0aa705d41e5fcc1a13d212dc5708b020fe
-  data.tar.gz: 9ee588f5119ad0806f84178b2969e7b06f26d3a0407913e5f0a99ae5d80585249a6b360e64e032795d778b3bc04173ab8419ad1b6ef4616a6eb2ea38a7e97481
+  metadata.gz: ff2b8b312c13c8b68c233f0799c68f36761109beea56fe2648485a89be28980b53d16d5646479ce58c0575cdde11025ff9ed74b81c923eb923953dcfbcf862cf
+  data.tar.gz: 58a248017fd9ec7330af89ca300d686710a6c71c36d96d9af5cd1967e8c1a703be7618835d30d3f5f7066958e1046fef686f3fa2b0d2d308e3c8f4990c3963fe

data/.rubocop.yml

@@ -10,4 +10,7 @@ Metrics/LineLength:
 
 # Offense count: 61
 Metrics/AbcSize:
-  Max: 59
+  Max: 59
+
+Style/RescueModifier:
+  Enabled: false

data/exe/solr_wrapper

@@ -74,9 +74,7 @@ instance.wrap do |conn|
   conn.with_collection(collection_options) do
     $stderr.puts "http://#{instance.host}:#{instance.port}/solr/"
     begin
-      while conn.status
-        sleep 1
-      end
+      conn.wait
     rescue Interrupt
       $stderr.puts "Solr is shutting down."
     end

data/lib/solr_wrapper/configuration.rb

@@ -55,7 +55,7 @@ module SolrWrapper
     end
 
     def default_download_dir
-      if defined? Rails
+      if defined?(Rails) && Rails.root
         File.join(Rails.root, 'tmp')
       else
         Dir.tmpdir
@@ -99,6 +99,15 @@ module SolrWrapper
       Configuration.slice(convert_keys(hash), :name, :dir)
     end
 
+    def configsets
+      configsets = options[:configsets] || []
+      configsets.map { |x| convert_keys(x) }
+    end
+
+    def poll_interval
+      options.fetch(:poll_interval, 1)
+    end
+
     private
 
       def self.slice(source, *keys)

data/lib/solr_wrapper/instance.rb

@@ -12,7 +12,7 @@ require 'yaml'
 
 module SolrWrapper
   class Instance
-    attr_reader :config, :md5, :pid
+    attr_reader :config, :md5
 
     ##
     # @param [Hash] options
@@ -75,8 +75,10 @@ module SolrWrapper
 
         # Wait for solr to start
         unless status
-          sleep 1
+          sleep config.poll_interval
         end
+
+        after_start
       end
     end
 
@@ -84,15 +86,9 @@ module SolrWrapper
     # Stop Solr and wait for it to finish exiting
     def stop
       if config.managed? && started?
-
         exec('stop', p: port)
-        # Wait for solr to stop
-        while status
-          sleep 1
-        end
+        wait
       end
-
-      @pid = nil
     end
 
     ##
@@ -114,12 +110,31 @@ module SolrWrapper
       false
     end
 
+    def pid
+      return unless config.managed?
+
+      @pid ||= begin
+        out = exec('status').read
+        out.match(/process (?<pid>\d+) running on port #{port}/) do |m|
+          m[:pid].to_i
+        end
+      end
+    rescue
+      nil
+    end
+
     ##
     # Is Solr running?
     def started?
       !!status
     end
 
+    def wait
+      while (Process.getpgid(pid) rescue status)
+        sleep config.poll_interval
+      end
+    end
+
     ##
     # Create a new collection in solr
     # @param [Hash] options
@@ -305,7 +320,6 @@ module SolrWrapper
         # JRuby
         env_str = config.env.map { |k, v| "#{Shellwords.escape(k)}=#{Shellwords.escape(v)}" }.join(" ")
         pid, input, output, error = IO.popen4(env_str + " " + args.join(" "))
-        @pid = pid
         stringio = StringIO.new
         if config.verbose? && !silence_output
           IO.copy_stream(output, $stderr)
@@ -318,7 +332,7 @@ module SolrWrapper
         input.close
         output.close
         error.close
-        exit_status = Process.waitpid2(@pid).last
+        exit_status = Process.waitpid2(pid).last
       else
         IO.popen(config.env, args + [err: [:child, :out]]) do |io|
           stringio = StringIO.new
@@ -329,8 +343,6 @@ module SolrWrapper
             IO.copy_stream(io, stringio)
           end
 
-          @pid = io.pid
-
           _, exit_status = Process.wait2(io.pid)
         end
       end
@@ -345,6 +357,16 @@ module SolrWrapper
 
     private
 
+    def after_start
+      create_configsets if config.cloud
+    end
+
+    def create_configsets
+      config.configsets.each do |configset|
+        upconfig(configset)
+      end
+    end
+
     def extracted_version
       File.read(config.version_file).strip if File.exists? config.version_file
     end

data/lib/solr_wrapper/version.rb

@@ -1,3 +1,3 @@
 module SolrWrapper
-  VERSION = '0.9.0'
+  VERSION = '0.10.0'
 end

data/lib/solr_wrapper.rb

@@ -29,7 +29,7 @@ module SolrWrapper
     @default_instance ||= instance(default_instance_options)
   end
 
-  def self.instance(options)
+  def self.instance(options = {})
     SolrWrapper::Instance.new(options)
   end
 

data/spec/fixtures/sample_config.yml

@@ -2,3 +2,6 @@ port: 9999
 collection:
   dir: solr/config/
   name: project-development
+configsets:
+  - dir: solr/config/
+    name: project-development-configset

data/spec/lib/solr_wrapper/configuration_spec.rb

@@ -41,4 +41,15 @@ describe SolrWrapper::Configuration do
       expect(config.collection_options).to eq(name: 'project-development', dir: 'solr/config/')
     end
   end
+
+  describe '#configsets' do
+    before do
+      allow(config).to receive(:default_configuration_paths).and_return([])
+    end
+    let(:options) { { config: 'spec/fixtures/sample_config.yml' } }
+
+    it 'uses values from the config file' do
+      expect(config.configsets).to include(name: 'project-development-configset', dir: 'solr/config/')
+    end
+  end
 end

data/spec/lib/solr_wrapper/instance_spec.rb

@@ -7,6 +7,7 @@ describe SolrWrapper::Instance do
   let(:client) { SimpleSolrClient::Client.new(subject.url) }
 
   describe "#with_collection" do
+    let(:options) { { cloud: false } }
     context "without a name" do
       it "creates a new anonymous collection" do
         subject.wrap do |solr|
@@ -51,6 +52,22 @@ describe SolrWrapper::Instance do
         end
       end
     end
+
+    context 'with a config file' do
+      before do
+        allow(solr_instance.config).to receive(:configsets)
+          .and_return([name: 'project-development', dir: 'solr/config/'])
+      end
+
+      it 'creates a new configsets with options from the config' do
+        expect(subject).to receive(:upconfig).with(
+          hash_including(name: 'project-development', dir: anything))
+
+        subject.wrap do
+          # no-op
+        end
+      end
+    end
   end
 
   describe 'exec' do

data/spec/lib/solr_wrapper_spec.rb

@@ -13,6 +13,14 @@ describe SolrWrapper do
     end
   end
 
+  describe '.instance' do
+    context 'without arguments' do
+      it 'inherits the defaults' do
+        expect(SolrWrapper.instance.port).to eq '8983'
+      end
+    end
+  end
+
   describe ".default_instance_options=" do
     it "sets default options" do
       SolrWrapper.default_instance_options = { port: '1234' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solr_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-13 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip