solr_wrapper 2.1.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 58da2cf39d47b880c7b1b3adbf446cb9e5d3dece
-  data.tar.gz: c1603b745a74afc2ab39a9ac8fd48954a17c51e3
+SHA256:
+  metadata.gz: 215848180bd8aaa7ba6b0817f682d6ba2c0debda6bbaec6945ecd4573dd2bba1
+  data.tar.gz: 3c253198a29f2623d579e9299c68ff31f8895567cf569db35b9c01771386bdd8
 SHA512:
-  metadata.gz: 15233b1419a26bb1914d1826e4f5dcf46044c50a48a0d5693b05af257e7163bca147253ee4c9ee7565afbeec9b65a7d5e22790fddd41e1d01b09f00e8673c8a3
-  data.tar.gz: 9bd88c7b5fffb1f84ef5024cab91be4daf30732e30345fbec3eb7597f2048e233bcac6d5933c7122923b79020890b9f6f81ba59db2b0d2d76a862816f28fa7b3
+  metadata.gz: 7b1e4948fd49eb9ec0d069c71d60057a3ad1636d9eae592707266403b73e4f9bd2f2d3e76e88267f9e8be9a136fa10da529faef256ef846c4847977a11422f4a
+  data.tar.gz: ef378700ce2e1fbafa6bcf88fec33f0cf11799a89105bede4372660543cce5d82dd20976bc9e231381dc73c36f1f8ede6a4a2712bd5bc02e4146d2d68076dbe2

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/README.md

@@ -67,7 +67,7 @@ By default, it looks for configuration files at `.solr_wrapper` and `~/.solr_wra
 
 You can also specify a configuration file when launching from the command line as follows:
 ```
-$ solr_wrapper -config <path_to_config_file>
+$ solr_wrapper --config <path_to_config_file>
 ```
 
 ### Cleaning your repository from the command line

data/lib/solr_wrapper/checksum_validator.rb

@@ -28,7 +28,7 @@ module SolrWrapper
         if config.default_download_url == config.static_config.archive_download_url
           "#{config.default_download_url}.#{suffix}"
         else
-          "http://www.us.apache.org/dist/lucene/solr/#{config.static_config.version}/solr-#{config.static_config.version}.zip.#{suffix}"
+          "https://archive.apache.org/dist/lucene/solr/#{config.static_config.version}/solr-#{config.static_config.version}.zip.#{suffix}"
         end
       end
 

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('https://lucene.apache.org/latestversion.html')
-        response.body[/Apache Solr \d+\.\d+\.\d+/][/\d+\.\d+\.\d+/]
+        response = HTTP.follow.get(options.fetch(:latest_version_url, 'https://solr.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, 'wb') 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/instance.rb

@@ -318,7 +318,7 @@ module SolrWrapper
       exit_status = runner.run(stringio)
 
       if exit_status != 0 && cmd != 'status'
-        raise "Failed to execute solr #{cmd}: #{stringio.read}. Further information may be available in #{instance_dir}/logs"
+        raise "Failed to execute solr #{cmd}: #{stringio.read}. Further information may be available in #{instance_dir}/server/logs"
       end
 
       stringio

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.1.0'
+  VERSION = '3.1.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,16 +18,16 @@ 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"
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", ">= 1.7", "< 3"
+  spec.add_development_dependency "rake", "~> 10.0", "< 13"
 
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "simple_solr_client"
+  spec.add_development_dependency "simple_solr_client", "= 0.2.0" # 0.2.1 removed support for schema retrieval
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "webmock"
 end

data/spec/lib/solr_wrapper/configuration_spec.rb

@@ -75,13 +75,25 @@ describe SolrWrapper::Configuration do
       let(:options) { { version: 'latest'} }
 
       before do
-        stub_request(:get, 'https://lucene.apache.org/latestversion.html').to_return(body: 'Apache Solr 1.2.3')
+        stub_request(:get, 'https://solr.apache.org/solr/downloads.html').to_return(body: 'Solr 1.2.3 is the latest version')
       end
 
       it 'fetches the latest version number from apache' do
         expect(config.version).to eq '1.2.3'
       end
     end
+
+    context 'when it is "latest" and the latest url is configured' do
+      let(:options) { { version: 'latest', latest_version_url: 'https://example.com/latest.html'} }
+
+      before do
+        stub_request(:get, 'https://example.com/latest.html').to_return(body: 'Solr 1.2.1')
+      end
+
+      it 'fetches the latest version number from apache' do
+        expect(config.version).to eq '1.2.1'
+      end
+    end
   end
 
   describe '#mirror_url' do

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.1.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Chris Beer
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-12-14 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -70,16 +70,22 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -87,6 +93,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -94,6 +103,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -112,16 +124,16 @@ dependencies:
   name: simple_solr_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -150,7 +162,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - chris@cbeer.info
 executables:
@@ -158,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
@@ -203,7 +214,7 @@ homepage: https://github.com/cbeer/solr_wrapper
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -218,11 +229,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-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,14 +0,0 @@
-language: ruby
-sudo: false
-rvm:
-  - 2.5.0
-  - 2.4.2
-  - 2.3.6
-  - jruby-9.1.16.0
-
-jdk:
-  - oraclejdk8
-
-env:
-  global:
-    JRUBY_OPTS=-J-Xmx2g

data/coveralls.yml

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