search_solr_tools 5.1.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a961c7f8cdb3a126f31ba685db351337dda8816f64de94b82aad774f53b49a0c
-  data.tar.gz: bcadb76963b19f66567c3e5a233dd599a66d642073eb5c043b3fc5653ce2502f
+  metadata.gz: ab316e3a683c1fc5d532a32c6325757777bde4afb817c2790c58df9d839216f5
+  data.tar.gz: e87963292111c382f1e4fae6d26cf629e328d8bd15cad8c373f87ed35cc68712
 SHA512:
-  metadata.gz: 1a238ac9143e968252c4f37474c99ed38a6920160f9f3d8ba8753b72848dbf7152ba0bc0b142298141eae6693102481a34f20d7c461e869b1a1606b7a3fcb471
-  data.tar.gz: 0ca3f51c62c0683d58652928ea2bf8a09987cee68d8af691ee523186e1d3ce7dc0f4bec0e294cdb82206eb8ebb5d2b6ad6085bed651b6f0944f979cecb0875bb
+  metadata.gz: b63f30bdecebf58e9f9d95400166740a04d3fe6dd738c652960a5de9e9dab0bfa34a4dfe897ce843cdee2f3c21b48a8258c544320446091960fb05ddf4259248
+  data.tar.gz: 9cd7b65d29ceb21fc4e5f0940f856a26ad08fb04e4fbdd421460f1f0518d19b9c15192657bae61549f393e30b0c924776f22e3cceee37ab04a29996491a59ab8

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## v6.0.0 (2022-07-13)
+
+  - Updated Ruby to 3.2.2, updated gem dependencies to more recent versions.
+
+## v5.2.0 (2022-08-31)
+
+  - Updated the call for identifiers for the json harvester to use the 
+    proper "metadataPrefix" parameter, and request the dif identifiers
+    instead of iso.
+
 ## v5.1.0 (2020-07-23)
 
   - Added a CLI method to "ping" the Solr and Source servers for a given 

data/README.md

@@ -1,4 +1,4 @@
-[![Gem Version](https://badge.fury.io/rb/search_solr_tools.svg)](http://badge.fury.io/rb/search_solr_tools) [![Build Status](https://travis-ci.org/nsidc/search-solr-tools.svg?branch=master)](https://travis-ci.org/nsidc/search-solr-tools)
+[![Gem Version](https://badge.fury.io/rb/search_solr_tools.svg)](http://badge.fury.io/rb/search_solr_tools)
 
 # NSIDC Search Solr Tools
 
@@ -61,7 +61,7 @@ Once you have the gem built in the project directory, install the utility:
 
 ### Requirements
 
-* Ruby > 2.6.5
+* Ruby > 3.2.2
 * [Bundler](http://bundler.io/)
 * Requirements for nokogiri:
     * [libxml2/libxml2-dev](http://xmlsoft.org/)
@@ -105,7 +105,7 @@ Please be sure to run them in the `bundle exec` context if you're utilizing bund
 
 Requirements:
 
-* Ruby > 2.6.5
+* Ruby > 3.2.2
 * [Bundler](http://bundler.io/)
 * [Gem Release](https://github.com/svenfuchs/gem-release)
 * [Rake](https://github.com/ruby/rake)
@@ -209,6 +209,7 @@ license is included in the file COPYING.
 ### Citation Information
 
 Andy Grauch, Brendan Billingsley, Chris Chalstrom, Danielle Harper, Ian
-Truslove, Jonathan Kovarik, Luis Lopez, Miao Liu, Michael Brandt, Stuart Reed
-(2013): Arctic Data Explorer SOLR Search software tools. The National Snow and
-Ice Data Center. Software. http://ezid.cdlib.org/id/doi:10.7265/N5JQ0XZM
+Truslove, Jonathan Kovarik, Luis Lopez, Miao Liu, Michael Brandt, Stuart Reed,
+Julia Collins, Scott Lewis
+(2023): Arctic Data Explorer SOLR Search software tools. The National Snow and
+Ice Data Center. Software.

data/bin/search_solr_tools

@@ -20,7 +20,7 @@ class SolrHarvestCLI < Thor
     puts 'CODE | DESCRIPTION'
     puts '-----+------------'
     codes.each do |c, text|
-      puts format('%4<code>d | %<text>s', code: c, text: text)
+      puts format('%4<code>d | %<text>s', code: c, text:)
     end
   end
 

data/lib/search_solr_tools/config/environments.yaml

@@ -39,7 +39,7 @@
   # Not using DCS API v2 here because not all retired datasets have their "retired"
   # flag checked. For example, GLA01.033 is retired; GLA01.018 is not, but it
   # should be. GLA01.018 will show up if we use DCS API v2.
-  :nsidc_oai_identifiers_url: oai?verb=ListIdentifiers&metadata_prefix=iso&retired=false
+  :nsidc_oai_identifiers_url: oai?verb=ListIdentifiers&metadataPrefix=dif&retired=false
 
 :local:
   :host: localhost

data/lib/search_solr_tools/harvesters/base.rb

@@ -178,7 +178,7 @@ module SearchSolrTools
 
         begin
           puts "Request: #{request_url}"
-          response = open(request_url, read_timeout: timeout, 'Content-Type' => content_type)
+          response = URI.open(request_url, read_timeout: timeout, 'Content-Type' => content_type)
         rescue OpenURI::HTTPError, Timeout::Error, Errno::ETIMEDOUT => e
           retries_left -= 1
           puts "## REQUEST FAILED ## #{e.class} ## Retrying #{retries_left} more times..."

data/lib/search_solr_tools/version.rb

@@ -1,3 +1,3 @@
 module SearchSolrTools
-  VERSION = '5.2.0'
+  VERSION = '6.0.0'
 end

data/search_solr_tools.gemspec

@@ -23,24 +23,27 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '~> 2.6.5'
+  spec.required_ruby_version = '~> 3.2.2'
 
-  spec.add_runtime_dependency 'ffi-geos', '~> 2.1.0'
-  spec.add_runtime_dependency 'iso8601', '~> 0.12.2'
-  spec.add_runtime_dependency 'multi_json', '~> 1.14.1'
-  spec.add_runtime_dependency 'nokogiri', '~> 1.10.9'
+  spec.add_runtime_dependency 'ffi-geos', '~> 2.4.0'
+  spec.add_runtime_dependency 'iso8601', '~> 0.13.0'
+  spec.add_runtime_dependency 'multi_json', '~> 1.15.0'
+  spec.add_runtime_dependency 'nokogiri', '~> 1.13.10'
   spec.add_runtime_dependency 'rest-client', '~> 2.1.0'
-  spec.add_runtime_dependency 'rgeo', '~> 2.1.1'
+  spec.add_runtime_dependency 'rgeo', '~> 2.4.0'
   spec.add_runtime_dependency 'rgeo-geojson', '~> 2.1.1'
-  spec.add_runtime_dependency 'rsolr', '~> 2.3.0'
-  spec.add_runtime_dependency 'thor', '~> 1.0.1'
-  spec.add_development_dependency 'gem-release', '~> 2.1.1'
-  spec.add_development_dependency 'guard', '~> 2.16.2'
+  spec.add_runtime_dependency 'rsolr', '~> 2.5.0'
+  spec.add_runtime_dependency 'thor', '~> 1.2.2'
+
+  spec.add_development_dependency 'gem-release', '~> 2.2.2'
+  spec.add_development_dependency 'guard', '~> 2.18.0'
   spec.add_development_dependency 'guard-rspec', '~> 4.7.3'
-  spec.add_development_dependency 'guard-rubocop', '~> 1.3'
-  spec.add_development_dependency 'rake', '~> 13.0.1'
-  spec.add_development_dependency 'rspec', '~> 3.9.0'
-  spec.add_development_dependency 'rubocop', '~> 0.86.0'
-  spec.add_development_dependency 'webmock', '~> 3.8.3'
-  spec.add_development_dependency 'listen', '3.2.1'
+  spec.add_development_dependency 'guard-rubocop', '~> 1.5.0'
+  spec.add_development_dependency 'listen', '3.7.1'
+  spec.add_development_dependency 'rake', '~> 13.0.6'
+  spec.add_development_dependency 'rspec', '~> 3.11.0'
+  spec.add_development_dependency 'rubocop', '~> 1.36.0'
+  spec.add_development_dependency 'rubocop-rake', '~> 0.6.0'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.17.1'
+  spec.add_development_dependency 'webmock', '~> 3.18.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: search_solr_tools
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 6.0.0
 platform: ruby
 authors:
 - Chris Chalstrom
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-23 00:00:00.000000000 Z
+date: 2023-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-geos
@@ -22,56 +22,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: iso8601
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.1
+        version: 1.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.1
+        version: 1.15.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.9
+        version: 1.13.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.9
+        version: 1.13.10
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: rgeo-geojson
   requirement: !ruby/object:Gem::Requirement
@@ -120,56 +120,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.16.2
+        version: 2.18.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.16.2
+        version: 2.18.0
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -190,84 +190,112 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.7.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.7.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.11.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.86.0
+        version: 1.36.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.86.0
+        version: 1.36.0
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.3
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.3
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
-  name: listen
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 2.17.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.17.1
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.18.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.18.1
 description: |2
       Ruby translators to transform various metadata feeds into solr documents and
       a command-line utility to access/utilize the gem's translators to harvest
@@ -361,14 +389,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: 2.6.5
+      version: 3.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Tools to harvest and manage various scientific dataset feeds in a Solr instance.