solr_wrapper 3.1.0 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 215848180bd8aaa7ba6b0817f682d6ba2c0debda6bbaec6945ecd4573dd2bba1
-  data.tar.gz: 3c253198a29f2623d579e9299c68ff31f8895567cf569db35b9c01771386bdd8
+  metadata.gz: e135734d52040fa5877fd21ad5149afc55ba8ffbc282a900ba448a9b2b230c28
+  data.tar.gz: 5363eb0bcad04e78b36267dbf35aa03a1fec56ee1487023622d3219a54501f87
 SHA512:
-  metadata.gz: 7b1e4948fd49eb9ec0d069c71d60057a3ad1636d9eae592707266403b73e4f9bd2f2d3e76e88267f9e8be9a136fa10da529faef256ef846c4847977a11422f4a
-  data.tar.gz: ef378700ce2e1fbafa6bcf88fec33f0cf11799a89105bede4372660543cce5d82dd20976bc9e231381dc73c36f1f8ede6a4a2712bd5bc02e4146d2d68076dbe2
+  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/configuration.rb

@@ -94,7 +94,7 @@ module SolrWrapper
     end
 
     def closest_mirror_url
-      "http://www.apache.org/dyn/closer.lua/lucene/solr/#{version}/solr-#{version}.zip?asjson=true"
+      "https://www.apache.org/dyn/closer.lua/lucene/solr/#{version}/solr-#{version}.zip?asjson=true"
     end
 
     def mirror_url
@@ -102,7 +102,7 @@ module SolrWrapper
         options[:mirror_url] + "lucene/solr/#{version}/solr-#{version}.zip"
       else
         begin
-          json = HTTP.get(closest_mirror_url).body
+          json = HTTP.follow.get(closest_mirror_url).body
           doc = JSON.parse(json)
           url = doc['preferred'] + doc['path_info']
 
@@ -186,7 +186,7 @@ module SolrWrapper
       end
 
       def fetch_latest_version
-        response = HTTP.follow.get(options.fetch(:latest_version_url, 'https://solr.apache.org/solr/downloads.html'))
+        response = HTTP.follow.get(options.fetch(:latest_version_url, 'https://solr.apache.org/downloads.html'))
         response.body.to_s[/Solr \d+\.\d+\.\d+/][/\d+\.\d+\.\d+/]
       end
   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.0'
+  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

data/spec/lib/solr_wrapper/configuration_spec.rb

@@ -75,7 +75,7 @@ describe SolrWrapper::Configuration do
       let(:options) { { version: 'latest'} }
 
       before do
-        stub_request(:get, 'https://solr.apache.org/solr/downloads.html').to_return(body: 'Solr 1.2.3 is the latest version')
+        stub_request(:get, 'https://solr.apache.org/downloads.html').to_return(body: 'Solr 1.2.3 is the latest version')
       end
 
       it 'fetches the latest version number from apache' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solr_wrapper
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.3
 platform: ruby
 authors:
 - Chris Beer
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-03 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