solr_wrapper 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 236a1eced6b831ca9b182fb6a69031495567acd7
-  data.tar.gz: e053e51b06aad6e8420675b1b7718c259fa98c64
+  metadata.gz: 4e14fa14a9312c6c712b005ec75a66ec5e03a403
+  data.tar.gz: d3c1df1a8fe6020270d0292a332ac604cfd23375
 SHA512:
-  metadata.gz: 74b2782c628c9fc4903dec66dd405a66cf01212ee126ac768325745f6ee6c5d22b7772facb0c28f7f82d2cfeb24634c3faccdec24d27b76c84d324f1a47de5ed
-  data.tar.gz: b81687cee34cdc5feeffbf3fea6868c08aff80cfd664e9e88b4cf252ae18cb1f435406373b7ae322c57840a0eb3c7d6c637b7211afb5fefe794f8d3cc6a95c86
+  metadata.gz: 29912c73b25928c7fbd87a64186a943d4a085e5ca1869e90677dcee225fe470df52264fe95570da6593165d25a6f1184d9fd51422ed21a31c4207a1cc7277a7b
+  data.tar.gz: 398139305bf2facd9f5417b28ad6623f8480751c369270edf76f322967fea177a2a8e5d34b1cdc55a901d07cefe10e49aeced7c125a35954dc2de7b96344ea51

data/lib/solr_wrapper/instance.rb

@@ -3,6 +3,7 @@ require 'fileutils'
 require 'open-uri'
 require 'ruby-progressbar'
 require 'securerandom'
+require 'stringio'
 require 'tmpdir'
 require 'zip'
 
@@ -24,10 +25,19 @@ module SolrWrapper
     def start
       extract
       IO.popen([solr_binary, "start", "-p", port, err: [:child, :out]]) do |io|
+        stringio = StringIO.new
         if verbose?
           IO.copy_stream(io,$stderr)
+        else
+          IO.copy_stream(io, stringio)
+        end
+        _, status = Process.wait2(io.pid)
+        if status != 0
+          stringio.rewind
+          raise "Unable to start solr: #{stringio.read}"
         end
       end if managed?
+
       started!
     end
 
@@ -35,14 +45,45 @@ module SolrWrapper
       return unless started?
 
       IO.popen([solr_binary, "stop", "-p", port, err: [:child, :out]]) do |io|
+        stringio = StringIO.new
         if verbose?
           IO.copy_stream(io,$stderr)
+        else
+          IO.copy_stream(io, stringio)
+        end
+        _, status = Process.wait2(io.pid)
+
+        if status != 0
+          stringio.rewind
+          raise "Unable to start solr: #{stringio.read}"
         end
       end if managed?
     end
 
+    def status
+      return true unless managed?
+
+      stringio = StringIO.new
+
+      IO.popen([solr_binary, "status", "-p", port, err: [:child, :out]]) do |io|
+        IO.copy_stream(io, stringio)
+
+        _, status = Process.wait2(io.pid)
+
+        stringio.rewind
+
+        if status != 0
+          raise "Unable to query solr status: #{stringio.read}"
+        end
+      end
+
+      out = stringio.read
+
+      out =~ /running on port #{port}/
+    end
+
     def started?
-      !!@started
+      !!status
     end
 
     def extract

data/lib/solr_wrapper/version.rb

@@ -1,3 +1,3 @@
 module SolrWrapper
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solr_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-22 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip