solr_wrapper 3.1.2 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c1284ffe589ddc60ddddb23b70fe7daf57ca017efa1630f80787bb28f5f5c66
-  data.tar.gz: 0be582a13adedabd32636247b0554cfe0705d21990ae1221b34d83cac0882754
+  metadata.gz: e135734d52040fa5877fd21ad5149afc55ba8ffbc282a900ba448a9b2b230c28
+  data.tar.gz: 5363eb0bcad04e78b36267dbf35aa03a1fec56ee1487023622d3219a54501f87
 SHA512:
-  metadata.gz: 2b5323d1a0d5d02fb6dab1e22dc100007863de09f458cd4259cf69ef3eda7882b9d23c89bc821aa478b4f529554d38cd771dc3fa7b37115bb61c478e89f9239b
-  data.tar.gz: 1298a39b87f6608efc35669d8214f3cd034f42cae956b83d369ae0b5eb1553304ba59c53882a870dac69f8f69267f155c6e99eab36c6eb5d8f4eeaa5a3a5e187
+  metadata.gz: e0c3fca3bc208c4f9d71c6c14fcb0e99094d737e705ac12620c9ba725cc925b004a2dfa9bdb5210b05863df6ff94f4a3282a23b3e8f6aa4e2ef5de60a78eea2a
+  data.tar.gz: 3cd79dcfa0e2b3fd26bb1ce499712e09d019ade55799d9fbbdbdc6e832748df4f0bbc54689a5ba73f7e7d122db55751eff6a75bac37f6c41d19e6df55396b760

data/.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
         ruby:
           - 2.7
           - 3.0
-          - jruby-9.2.14.0
+          - jruby-9.2.20.0
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby

data/exe/solr_wrapper

@@ -100,7 +100,7 @@ instance = SolrWrapper.instance(options)
 
 case command
 when 'clean'
-  if instance.started?
+  if instance.managed? && instance.started?
     $stderr.puts "Please stop solr before cleaning"
     exit 1
   end

data/lib/solr_wrapper/instance.rb

@@ -70,7 +70,7 @@ module SolrWrapper
     # Start Solr and wait for it to become available
     def start
       extract_and_configure
-      if config.managed?
+      if managed?
         exec('start', p: port, c: config.cloud)
 
         # Wait for solr to start
@@ -85,7 +85,7 @@ module SolrWrapper
     ##
     # Stop Solr and wait for it to finish exiting
     def stop
-      if config.managed? && started?
+      if managed? && started?
         exec('stop', p: port)
         wait
       end
@@ -94,7 +94,7 @@ module SolrWrapper
     ##
     # Stop Solr and wait for it to finish exiting
     def restart
-      if config.managed? && started?
+      if managed? && started?
         exec('restart', p: port, c: config.cloud)
       end
     end
@@ -102,7 +102,7 @@ module SolrWrapper
     ##
     # Check the status of a managed Solr service
     def status
-      return true unless config.managed?
+      return true unless managed?
 
       out = exec('status').read
       out =~ /running on port #{port}/
@@ -111,7 +111,7 @@ module SolrWrapper
     end
 
     def pid
-      return unless config.managed?
+      return unless managed?
 
       @pid ||= begin
         out = exec('status').read
@@ -286,6 +286,10 @@ module SolrWrapper
     end
     # rubocop:enable Lint/RescueException
 
+    def managed?
+      config.managed?
+    end
+
     protected
 
     def extracted?

data/lib/solr_wrapper/version.rb

@@ -1,3 +1,3 @@
 module SolrWrapper
-  VERSION = '3.1.2'
+  VERSION = '3.1.3'
 end

data/lib/solr_wrapper.rb

@@ -40,7 +40,7 @@ module SolrWrapper
   ##
   # Ensures a Solr service is running before executing the block
   def self.wrap(options = {}, &block)
-    instance(options).wrap &block
+    instance(options).wrap(&block)
   end
 
   class SolrWrapperError < StandardError; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solr_wrapper
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.3
 platform: ruby
 authors:
 - Chris Beer
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-07 00:00:00.000000000 Z
+date: 2022-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -229,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Solr service wrapper