solr_wrapper 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 58da2cf39d47b880c7b1b3adbf446cb9e5d3dece
-  data.tar.gz: c1603b745a74afc2ab39a9ac8fd48954a17c51e3
+SHA256:
+  metadata.gz: 765b18a31b677209a0661be1447d607905a643b6f92f35b8ca1676d1a818ef68
+  data.tar.gz: d5aad9d544ef2cb4195b086c5a0f7c6f8f2c3065f24e664e215c92ce05707a74
 SHA512:
-  metadata.gz: 15233b1419a26bb1914d1826e4f5dcf46044c50a48a0d5693b05af257e7163bca147253ee4c9ee7565afbeec9b65a7d5e22790fddd41e1d01b09f00e8673c8a3
-  data.tar.gz: 9bd88c7b5fffb1f84ef5024cab91be4daf30732e30345fbec3eb7597f2048e233bcac6d5933c7122923b79020890b9f6f81ba59db2b0d2d76a862816f28fa7b3
+  metadata.gz: c031863efbf8794077b2126db2120ab8b284855d0e0cc9dce3656d7d18b42ef9ac016deca68a899c000cbfecef38b3ff8b3e2c37e1028933772703f9c6cfe43d
+  data.tar.gz: c02222dcdc846d125d12cc929348e2fa25737c62ba9e92113c9bfc65755de7945431effd779ee4c659ca726a0651ef480057be548fec8c47c3f0c8b36ddd419d

data/.travis.yml

@@ -1,13 +1,12 @@
 language: ruby
-sudo: false
+
 rvm:
-  - 2.5.0
-  - 2.4.2
-  - 2.3.6
-  - jruby-9.1.16.0
+  - 2.6.3
+  - 2.5.3
+  - jruby-9.2.7.0
 
 jdk:
-  - oraclejdk8
+  - openjdk8
 
 env:
   global:

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/configuration.rb

@@ -187,8 +187,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 = Faraday.get(options.fetch(:latest_version_url, 'https://lucene.apache.org/solr/downloads.html'))
+        response.body[/Solr \d+\.\d+\.\d+/][/\d+\.\d+\.\d+/]
       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/version.rb

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

data/solr_wrapper.gemspec

@@ -23,11 +23,11 @@ Gem::Specification.new do |spec|
   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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solr_wrapper
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-14 00:00:00.000000000 Z
+date: 2020-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -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
@@ -218,8 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Solr 5 service wrapper