solr_wrapper 4.1.0 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dea9ffb20f5c86f84c5f55ac9ccd393ebdb4ac3eccc321bec26327727626b882
-  data.tar.gz: d9f85c0414b81491599cc76ba88540e8ba894c47205debb0b6699ccec00b5905
+  metadata.gz: 07d7b2ed9fd98d7f04448618c862adb8a9294786df58e7568136f398c43ee038
+  data.tar.gz: c402ce362a1866da951f32e5666595615bc3c70d38477641c8719c4e57a6ccac
 SHA512:
-  metadata.gz: 86d8223ecd9df368ede9c624f3d150f65f06e6644b060ad3c2628b3338145aeaf1c82c72818b9867ff7b428480663a3da65694185641998f5d5cfade3830b2ef
-  data.tar.gz: '08585c280ca1884815c42d4d585eef463bb3cc878376a6fbb33a77e4e1add615e5effc72d76d6ac4b0a7eee8b36719f8c34b930277956e179f07660912b99bbe'
+  metadata.gz: e210f27b0838010cc3c230d97c16ad75c63a282da2e5ebc8bfe00bb455fb9379dc6e54a6ead9a790a6cea71672cb4b3b9cd25cb98dd75da6f309fe42e6882de2
+  data.tar.gz: 69a5ba5d412d4369ba3b13dd20e1e81dc6b6bea0324bb639f1f1139387d4631b72e4cf97d0667ed4bde1c4eaeaf620a5b021e6d6d73fd37831ae04238b9e3321

data/lib/solr_wrapper/downloader.rb

@@ -15,7 +15,13 @@ module SolrWrapper
       File.open(output, 'wb') do |f|
         client.get do |req|
           req.options.on_data = Proc.new do |chunk, overall_received_bytes, env|
-            pbar.total = env.response_headers['content-length'].to_i
+            if env
+              pbar.total = env.response_headers['content-length'].to_i
+              pbar.progress = overall_received_bytes
+            else
+              pbar.increment
+            end
+
             pbar.progress = overall_received_bytes
             f.write(chunk)
           end

data/lib/solr_wrapper/instance.rb

@@ -201,11 +201,11 @@ module SolrWrapper
       options[:name] ||= SecureRandom.hex
       options[:zkhost] ||= zkhost
 
-      upconfig_options = { upconfig: true, n: options[:name] }
+      upconfig_options = { n: options[:name] }
       upconfig_options[:d] = options[:dir] if options[:dir]
       upconfig_options[:z] = options[:zkhost] if options[:zkhost]
 
-      exec 'zk', upconfig_options
+      exec ['zk', 'upconfig'], upconfig_options
 
       options[:name]
     end
@@ -219,11 +219,11 @@ module SolrWrapper
       options[:name] ||= SecureRandom.hex
       options[:zkhost] ||= zkhost
 
-      downconfig_options = { downconfig: true, n: options[:name] }
+      downconfig_options = { n: options[:name] }
       downconfig_options[:d] = options[:dir] if options[:dir]
       downconfig_options[:z] = options[:zkhost] if options[:zkhost]
 
-      exec 'zk', downconfig_options
+      exec ['zk', 'downconfig'], downconfig_options
 
       options[:name]
     end

data/lib/solr_wrapper/runner.rb

@@ -17,7 +17,7 @@ module SolrWrapper
     private
 
     def argument_list
-      [config.solr_binary, cmd] + config.solr_options.merge(options).map do |k, v|
+      [config.solr_binary] + Array(cmd) + config.solr_options.merge(options).map do |k, v|
         case v
         when true
           "-#{k}"

data/lib/solr_wrapper/version.rb

@@ -1,3 +1,3 @@
 module SolrWrapper
-  VERSION = '4.1.0'
+  VERSION = '4.1.2'
 end

data/solr_wrapper.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "faraday"
+  spec.add_dependency "faraday", ">= 1.0", "< 3"
   spec.add_dependency "faraday-follow_redirects"
   spec.add_dependency "minitar"
   spec.add_dependency "ruby-progressbar"

data/spec/lib/solr_wrapper/instance_spec.rb

@@ -135,7 +135,7 @@ describe SolrWrapper::Instance do
       let(:cmd) { 'healthcheck' }
       let(:options) { { z: 'localhost:5098' } }
       it 'raises an error with the output from the shell command' do
-        expect { subject }.to raise_error(RuntimeError, /Failed to execute solr healthcheck: collection parameter is required!/)
+        expect { subject }.to raise_error(RuntimeError, Regexp.union(/Failed to execute solr healthcheck: collection parameter is required!/, /Failed to parse command-line arguments due to: Missing required option: c/))
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solr_wrapper
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.2
 platform: ruby
 authors:
 - Chris Beer
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-27 00:00:00.000000000 Z
+date: 2025-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: faraday-follow_redirects
   requirement: !ruby/object:Gem::Requirement