solr_wrapper 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d57530a891dcb0e5a17da665b949b8b941dd59ba
-  data.tar.gz: c572a382099a877b347e2646a5c768a1cdf60c76
+  metadata.gz: 355fb4da1493c8acef5c50b5592fbe773c220bf2
+  data.tar.gz: 028aaa504c0253da58d78ad498bdfe45849c0795
 SHA512:
-  metadata.gz: 247b9f2dfd93ec8518b9a6d38310c6019cbe4f1e524d75078b0c116d661b4783954e0962f89d930b7686e2e6be29dc7f6f26a658a81635425240cdf4b94cefb2
-  data.tar.gz: 47c717d155ba07b715bd888ac3f20ee19f93c4d4fb4886857fecb73e530916323f1759a4b3da63f4cef7ec2f7dcf600dddb8c42f2e98f6cc56a97b958caca6a1
+  metadata.gz: 5852f71aa91dca84cc24c4587a0300c3cafc218e621d6400a1a21eeab070a659dfa2f81a88417f347af032a9606ad850633548a1079a42cf113244fefcf185be
+  data.tar.gz: 78bc51949c8bf5c2a1dfa107a01144f748e4a3b834b9602fad88ad01785c20e5e74fcf1ea0ce48ef1081681baf79e9ca12d73e74414484206ee65d0db9177ef2

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

@@ -99,6 +99,10 @@ module SolrWrapper
       Configuration.slice(convert_keys(hash), :name, :dir)
     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,7 +75,7 @@ module SolrWrapper
 
         # Wait for solr to start
         unless status
-          sleep 1
+          sleep config.poll_interval
         end
       end
     end
@@ -84,15 +84,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 +108,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 +318,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 +330,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 +341,6 @@ module SolrWrapper
             IO.copy_stream(io, stringio)
           end
 
-          @pid = io.pid
-
           _, exit_status = Process.wait2(io.pid)
         end
       end

data/lib/solr_wrapper/version.rb

@@ -1,3 +1,3 @@
 module SolrWrapper
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'
 end

metadata

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