solr_wrapper 2.2.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 765b18a31b677209a0661be1447d607905a643b6f92f35b8ca1676d1a818ef68
-  data.tar.gz: d5aad9d544ef2cb4195b086c5a0f7c6f8f2c3065f24e664e215c92ce05707a74
+  metadata.gz: 375a30420891aefb1b28895bdea108a53af69c668514c3157cd3fb150b7f616a
+  data.tar.gz: 7980d452b1f499809904c844dfcc1000e0e15b30d80cb223af08c329052a57ef
 SHA512:
-  metadata.gz: c031863efbf8794077b2126db2120ab8b284855d0e0cc9dce3656d7d18b42ef9ac016deca68a899c000cbfecef38b3ff8b3e2c37e1028933772703f9c6cfe43d
-  data.tar.gz: c02222dcdc846d125d12cc929348e2fa25737c62ba9e92113c9bfc65755de7945431effd779ee4c659ca726a0651ef480057be548fec8c47c3f0c8b36ddd419d
+  metadata.gz: d7ebfeaa76e02a58df27d460a2dc8375c3e66d4d4e4ab92e9ce9cb11954a4926bf349187d2434d1a324b6f95a0f8f4407b17645dc3fbadbbca10e34b83fd1bde
+  data.tar.gz: a8cbb45b871e3dc18b842f24a97a9f0335f1a31f52dcfedbeb5bb9303d97416f61697a069face9a85d2646413a3fde560a25517feb185904312cff6456e7d9f5

data/.github/workflows/ci.yml

@@ -0,0 +1,29 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby:
+          - 2.7
+          - 3.0
+          - jruby-9.2.14.0
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: bundle install
+    - name: Run tests
+      run: bundle exec rake
+      env:
+        ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'

data/lib/solr_wrapper/client.rb

@@ -1,4 +1,4 @@
-require 'faraday'
+require 'http'
 require 'json'
 
 module SolrWrapper
@@ -18,19 +18,16 @@ module SolrWrapper
     private
 
     def collection?(name)
-      response = conn.get('admin/collections?action=LIST&wt=json')
+      response = HTTP.get("#{url}admin/collections?action=LIST&wt=json")
       data = JSON.parse(response.body)
       return if data['error'] && data['error']['msg'] == 'Solr instance is not running in SolrCloud mode.'
+
       data['collections'].include? name
     end
 
     def core?(name)
-      response = conn.get('admin/cores?action=STATUS&wt=json&core=' + name)
+      response = HTTP.get("#{url}admin/cores?action=STATUS&wt=json&core=#{name}")
       !JSON.parse(response.body)['status'][name].empty?
     end
-
-    def conn
-      @conn ||= Faraday.new(url: url)
-    end
   end
 end

data/lib/solr_wrapper/configuration.rb

@@ -1,4 +1,4 @@
-require 'faraday'
+require 'http'
 
 module SolrWrapper
   class Configuration
@@ -102,19 +102,18 @@ module SolrWrapper
         options[:mirror_url] + "lucene/solr/#{version}/solr-#{version}.zip"
       else
         begin
-          json = open(closest_mirror_url).read
+          json = HTTP.get(closest_mirror_url).body
           doc = JSON.parse(json)
           url = doc['preferred'] + doc['path_info']
 
-          response = Faraday.head(url)
+          response = HTTP.head(url)
 
-          if response.success?
+          if response.status.success?
             url
           else
             archive_download_url
           end
-
-        rescue Errno::ECONNRESET, SocketError, Faraday::Error
+        rescue Errno::ECONNRESET, SocketError, HTTP::Error
           archive_download_url
         end
       end
@@ -187,8 +186,8 @@ module SolrWrapper
       end
 
       def fetch_latest_version
-        response = Faraday.get(options.fetch(:latest_version_url, 'https://lucene.apache.org/solr/downloads.html'))
-        response.body[/Solr \d+\.\d+\.\d+/][/\d+\.\d+\.\d+/]
+        response = HTTP.get(options.fetch(:latest_version_url, 'https://lucene.apache.org/solr/downloads.html'))
+        response.body.to_s[/Solr \d+\.\d+\.\d+/][/\d+\.\d+\.\d+/]
       end
   end
 end

data/lib/solr_wrapper/downloader.rb

@@ -1,24 +1,34 @@
 require 'ruby-progressbar'
+require 'http'
 
 module SolrWrapper
   class Downloader
     def self.fetch_with_progressbar(url, output)
       pbar = SafeProgressBar.new(title: File.basename(url), total: nil, format: '%t: |%B| %p%% (%e )')
-      open(url, content_length_proc: ->(bytes) { pbar.total = bytes }, progress_proc: ->(bytes) { pbar.progress = bytes }) do |io|
-        IO.copy_stream(io, output)
+
+      response = HTTP.follow.get(url)
+      pbar.total = response.headers['content-length'].to_i
+
+      File.open(output, 'w') do |f|
+        response.body.each do |chunk|
+          f.write(chunk)
+          pbar.progress += chunk.length
+        end
+
+        nil
       end
-    rescue OpenURI::HTTPError => e
-      raise SolrWrapperError, "Unable to download solr from #{url}\n#{e.message}: #{e.io.read}"
+    rescue HTTP::Error => e
+      raise SolrWrapperError, "Unable to download solr from #{url}\n#{e}"
     end
 
     class SafeProgressBar < ProgressBar::Base
       def progress=(new_progress)
-        self.total = new_progress if total <= new_progress
+        self.total = new_progress if total.to_i <= new_progress
         super
       end
 
       def total=(new_total)
-        super if new_total && new_total > 0
+        super if new_total && new_total >= 0
       end
     end
   end

data/lib/solr_wrapper/settings.rb

@@ -1,5 +1,4 @@
 require 'delegate'
-require 'faraday'
 
 module SolrWrapper
   # Configuraton that comes from static and dynamic sources.

data/lib/solr_wrapper/version.rb

@@ -1,3 +1,3 @@
 module SolrWrapper
-  VERSION = '2.2.0'
+  VERSION = '3.0.0'
 end

data/solr_wrapper.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = SolrWrapper::VERSION
   spec.authors       = ["Chris Beer"]
   spec.email         = ["chris@cbeer.info"]
-  spec.summary       = %q{Solr 5 service wrapper}
+  spec.summary       = %q{Solr service wrapper}
   spec.homepage      = "https://github.com/cbeer/solr_wrapper"
   spec.license       = "MIT"
 
@@ -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 "http"
   spec.add_dependency "rubyzip"
   spec.add_dependency "ruby-progressbar"
   spec.add_dependency "retriable"

data/spec/lib/solr_wrapper/instance_spec.rb

@@ -1,6 +1,15 @@
 require 'spec_helper'
 
 describe SolrWrapper::Instance do
+  # WebMock messes with HTTP.rbs ability to stream responses
+  before(:all) do
+    WebMock.disable!
+  end
+
+  after(:all) do
+    WebMock.enable!
+  end
+
   let(:options) { {} }
   let(:solr_instance) { SolrWrapper::Instance.new(options) }
   subject { solr_instance }

data/spec/lib/solr_wrapper_spec.rb

@@ -1,6 +1,15 @@
 require 'spec_helper'
 
 describe SolrWrapper do
+  # WebMock messes with HTTP.rbs ability to stream responses
+  before(:all) do
+    WebMock.disable!
+  end
+
+  after(:all) do
+    WebMock.enable!
+  end
+
   describe ".wrap" do
     it "should launch solr" do
       SolrWrapper.wrap do |solr|

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: solr_wrapper
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Chris Beer
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-02-18 00:00:00.000000000 Z
+date: 2021-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -162,7 +162,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - chris@cbeer.info
 executables:
@@ -170,17 +170,16 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- coveralls.yml
 - exe/solr_wrapper
 - lib/solr_wrapper.rb
 - lib/solr_wrapper/checksum_validator.rb
@@ -215,7 +214,7 @@ homepage: https://github.com/cbeer/solr_wrapper
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -230,10 +229,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
-summary: Solr 5 service wrapper
+summary: Solr service wrapper
 test_files:
 - spec/fixtures/another_sample_config.yml
 - spec/fixtures/basic_configs/_rest_managed.json

data/.travis.yml

@@ -1,13 +0,0 @@
-language: ruby
-
-rvm:
-  - 2.6.3
-  - 2.5.3
-  - jruby-9.2.7.0
-
-jdk:
-  - openjdk8
-
-env:
-  global:
-    JRUBY_OPTS=-J-Xmx2g

data/coveralls.yml

@@ -1 +0,0 @@
-service_name: travis-ci