solr_wrapper 2.0.0 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3991dd503c5902e6012328a4663edff78f669fbf
-  data.tar.gz: 7d17c2fcc21fa1e370a4903c393de8b3ae207f76
+SHA256:
+  metadata.gz: a5473b8362859de2a2eb8a07ef3d6763ea79ffa2ebcb05a415e9b2433c3564f0
+  data.tar.gz: 7708aa3b496183092ddf62cb75e571bfd2b7c7c61f87d7879f03f9682fbc5446
 SHA512:
-  metadata.gz: 650abf178f6f41be0f6a96c01699edbdee09a82d6bcca41223ce0c185524bc0d59ec549c669232abab75e85ce187bdb03acf759f94033b0fb2cdd2071b0e1a99
-  data.tar.gz: 29f4b23edfee5ee869b1626c0f88775468106dff2ae5a2059ef1d805cc3d7f03e76d9c285f9e0822583026190160db0d1ae8a361745b8b45a599e70d01f35e1a
+  metadata.gz: 80a8c8d2fc20ed98f740f4e797e80f83a8a00617c02b6676ae6474003c0a5b5927c4e0c3fddc03caee6d7cfbd116e87c8a15291865958b50e0e5a8f66cc02955
+  data.tar.gz: b709788733088394e43d352b551e5dee97354fec73d6827140823927dbc3c503512333d6411995190a23d396c2cbc5c28cafbd87330933e59da7d3a5a005ca16

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

@@ -2,20 +2,18 @@ module SolrWrapper
   class ChecksumValidator
     attr_reader :config
 
-    ALGORITHM = 'sha1'
-
     def initialize(config)
       @config = config
     end
 
     def clean!
-      path = checksum_path(ALGORITHM)
+      path = checksum_path(algorithm)
       FileUtils.remove_entry(path) if File.exist? path
     end
 
     def validate?(file)
       return true if config.validate == false
-      Digest.const_get(ALGORITHM.upcase).file(file).hexdigest == expected_sum(ALGORITHM)
+      Digest.const_get(algorithm.upcase).file(file).hexdigest == expected_sum(algorithm)
     end
 
     def validate!(file)
@@ -30,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
 
@@ -53,5 +51,12 @@ module SolrWrapper
         end
         path
       end
+
+      def algorithm
+        return config.static_config.algorithm if config.static_config.algorithm
+        return 'sha1' if config.static_config.version =~ /^[1-6]/ || config.static_config.version =~ /^[7]\.[0-4]/
+
+        'sha512'
+      end
   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
@@ -31,6 +31,10 @@ module SolrWrapper
       options[:checksum]
     end
 
+    def algorithm
+      options[:algorithm]
+    end
+
     def url
       options[:url]
     end
@@ -98,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
@@ -183,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.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, '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.0.0'
+  VERSION = '3.0.2'
 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://lucene.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 }
@@ -83,7 +92,8 @@ describe SolrWrapper::Instance do
           solr.downconfig name: config_name, dir: dir
         end
         solr.with_collection(config_name: config_name) do |collection_name|
-          core = client.core(collection_name)
+          core_name = client.cores.select { |x| x =~ /^#{collection_name}/ }.first
+          core = client.core(core_name)
           unless defined? JRUBY_VERSION
             expect(core.all.size).to eq 0
           end

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.0.0
+  version: 3.0.2
 platform: ruby
 authors:
 - Chris Beer
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-06-27 00:00:00.000000000 Z
+date: 2021-02-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