solr_wrapper 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e14fa14a9312c6c712b005ec75a66ec5e03a403
-  data.tar.gz: d3c1df1a8fe6020270d0292a332ac604cfd23375
+  metadata.gz: afbb108d004d57c73e68e21e9c4352d0249ec561
+  data.tar.gz: 3d11fa951e19ff35da4e686b047eafb270f2288a
 SHA512:
-  metadata.gz: 29912c73b25928c7fbd87a64186a943d4a085e5ca1869e90677dcee225fe470df52264fe95570da6593165d25a6f1184d9fd51422ed21a31c4207a1cc7277a7b
-  data.tar.gz: 398139305bf2facd9f5417b28ad6623f8480751c369270edf76f322967fea177a2a8e5d34b1cdc55a901d07cefe10e49aeced7c125a35954dc2de7b96344ea51
+  metadata.gz: fd9cbb7c32124dd36dd4f49e33a8f6248b42851022cc7981125dedb92334c1930570d9efe58d4a2b8327defa0359e0cdd1106f5cd11e14d7be1b8a09b835bd5a
+  data.tar.gz: dfff06a0df7ee5a7f550b6bbb0e956256d772624dcdae694865899394da99ae7c38038e7c2308d9e863fbc3081177725ce1c92857210dc121cd7f68e78ae7dcc

data/lib/solr_wrapper/instance.rb

@@ -31,13 +31,17 @@ module SolrWrapper
         else
           IO.copy_stream(io, stringio)
         end
-        _, status = Process.wait2(io.pid)
-        if status != 0
+        _, exit_status = Process.wait2(io.pid)
+        if exit_status != 0
           stringio.rewind
           raise "Unable to start solr: #{stringio.read}"
         end
       end if managed?
 
+      # Wait for solr to start
+      unless status
+        sleep 1
+      end
       started!
     end
 
@@ -51,12 +55,17 @@ module SolrWrapper
         else
           IO.copy_stream(io, stringio)
         end
-        _, status = Process.wait2(io.pid)
+        _, exit_status = Process.wait2(io.pid)
 
-        if status != 0
+        if exit_status != 0
           stringio.rewind
           raise "Unable to start solr: #{stringio.read}"
         end
+
+        # Wait for solr to stop
+        while status
+          sleep 1
+        end
       end if managed?
     end
 
@@ -68,17 +77,16 @@ module SolrWrapper
       IO.popen([solr_binary, "status", "-p", port, err: [:child, :out]]) do |io|
         IO.copy_stream(io, stringio)
 
-        _, status = Process.wait2(io.pid)
+        _, exit_status = Process.wait2(io.pid)
 
         stringio.rewind
 
-        if status != 0
+        if exit_status != 0
           raise "Unable to query solr status: #{stringio.read}"
         end
       end
 
       out = stringio.read
-
       out =~ /running on port #{port}/
     end
 
@@ -87,6 +95,8 @@ module SolrWrapper
     end
 
     def extract
+      return solr_dir if File.exists?(solr_binary) and extracted_version == version
+
       zip_path = download
 
       begin
@@ -106,6 +116,7 @@ module SolrWrapper
       begin  
         FileUtils.remove_dir(solr_dir,true)
         FileUtils.cp_r File.join(tmp_save_dir, File.basename(default_url, ".zip")), solr_dir
+        self.extracted_version = version
         FileUtils.chmod 0755, solr_binary
       rescue Exception => e
         abort "Unable to copy #{tmp_save_dir} to #{solr_dir}: #{e.message}"
@@ -113,7 +124,7 @@ module SolrWrapper
 
       solr_dir
     ensure
-      FileUtils.remove_entry tmp_save_dir
+      FileUtils.remove_entry tmp_save_dir if File.exists? tmp_save_dir
     end
 
     def download
@@ -249,5 +260,19 @@ module SolrWrapper
     def managed?
       !!options.fetch(:managed, true)
     end
+
+    def version_file
+      options.fetch(:version_file, File.join(solr_dir, "VERSION"))
+    end
+
+    def extracted_version
+      File.read(version_file).strip if File.exists? version_file
+    end
+
+    def extracted_version= version
+      File.open(version_file, "w") do |f|
+        f.puts version
+      end
+    end
   end
 end

data/lib/solr_wrapper/version.rb

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

data/spec/lib/solr_wrapper_spec.rb

@@ -3,16 +3,12 @@ require 'spec_helper'
 describe SolrWrapper do
   describe ".wrap" do
     it "should launch solr" do
-      SolrWrapper.wrap(download_path: './tmp') do |solr|
-        expect(Timeout::timeout(15) do
-          begin
-            s = TCPSocket.new('127.0.0.1', solr.port)
-            s.close
-            true
-          rescue
-            false
+      SolrWrapper.wrap do |solr|
+        expect {
+          Timeout::timeout(15) do
+            TCPSocket.new('127.0.0.1', solr.port).close
           end
-        end).to eq true
+        }.not_to raise_exception
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solr_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Chris Beer