Merge pull request #101 from hathitrust/update-dependencies

Update dependencies
hathitrust · Feb 3, 2022 · 65eed66 · 65eed66
2 parents 99fa501 + aed8565
commit 65eed66
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 40 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:3.0
+FROM ruby:3.1
 ARG UNAME=app
 ARG UID=1000
 ARG GID=1000

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,27 +1,25 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.3.2)
+    activesupport (7.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     byebug (11.1.3)
     coderay (1.1.3)
     concurrent-ruby (1.1.9)
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
     docile (1.4.0)
-    et-orbi (1.2.4)
+    et-orbi (1.2.6)
       tzinfo
-    fugit (1.5.0)
+    fugit (1.5.2)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.4)
-    i18n (1.8.10)
+    i18n (1.9.1)
       concurrent-ruby (~> 1.0)
-    json (2.5.1)
     method_source (1.0.0)
-    minitest (5.14.4)
+    minitest (5.15.0)
     mono_logger (1.1.1)
     multi_json (1.15.0)
     mustermann (1.1.1)
@@ -35,10 +33,10 @@ GEM
     rack-protection (2.1.0)
       rack
     rake (12.3.3)
-    redis (4.3.1)
+    redis (4.6.0)
     redis-namespace (1.8.1)
       redis (>= 3.0.4)
-    resque (2.0.0)
+    resque (2.2.0)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
       redis-namespace (~> 1.6)
@@ -47,7 +45,7 @@ GEM
     resque-pool (0.7.1)
       rake (>= 10.0, < 14.0)
       resque (>= 1.22, < 3)
-    resque-retry (1.7.4)
+    resque-retry (1.7.6)
       resque (>= 1.25, < 3.0)
       resque-scheduler (~> 4.0)
     resque-scheduler (4.4.0)
@@ -60,38 +58,38 @@ GEM
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
       rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
+    rspec-core (3.10.2)
       rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec-expectations (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+    rspec-mocks (3.10.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    ruby2_keywords (0.0.4)
-    rubyzip (2.3.0)
-    rufus-scheduler (3.7.0)
+    rspec-support (3.10.3)
+    ruby2_keywords (0.0.5)
+    rubyzip (2.3.2)
+    rufus-scheduler (3.8.1)
       fugit (~> 1.1, >= 1.1.6)
-    sequel (5.45.0)
-    simplecov (0.16.1)
+    sequel (5.53.0)
+    simplecov (0.21.2)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.3)
     sinatra (2.1.0)
       mustermann (~> 1.0)
       rack (~> 2.2)
       rack-protection (= 2.1.0)
       tilt (~> 2.0)
-    thor (1.1.0)
+    thor (1.2.1)
     tilt (2.0.10)
     timecop (0.9.4)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     vegas (0.1.11)
       rack (>= 1.0.0)
-    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -114,4 +112,4 @@ DEPENDENCIES
   timecop
 
 BUNDLED WITH
-   2.2.21
+   2.3.3
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -38,7 +38,7 @@ services:
       - mariadb-dev
 
   mariadb-test:
-    image: hathitrust/db-image
+    image: ghcr.io/hathitrust/db-image
     restart: always
     environment:
       MYSQL_ROOT_PASSWORD: mysqlroot
@@ -47,7 +47,7 @@ services:
       MYSQL_PASSWORD: datasets
 
   mariadb-dev:
-    image: hathitrust/db-image
+    image: ghcr.io/hathitrust/db-image
     restart: always
     environment:
       MYSQL_ROOT_PASSWORD: mysqlroot

diff --git a/lib/datasets/configuration.rb b/lib/datasets/configuration.rb
@@ -11,7 +11,7 @@ def initialize(hash = {})
     end
 
     def self.from_yaml(path)
-      new(YAML.load(File.read(path)))
+      new(YAML.unsafe_load(File.read(path)))
     end
 
     private

diff --git a/lib/datasets/report_manager.rb b/lib/datasets/report_manager.rb
@@ -66,7 +66,7 @@ def last_summary_path
     end
 
     def read_summary(path)
-      hash = YAML.load(fs.read(path))
+      hash = YAML.unsafe_load(fs.read(path))
       ReportSummary.new(hash[:saved], hash[:deleted], hash[:start_time]..hash[:end_time], fs)
     end
 

diff --git a/spec/integration/subset_creation_spec.rb b/spec/integration/subset_creation_spec.rb
@@ -65,7 +65,7 @@ module Datasets
                 ]
               expect(File.read(pd_world_open_root + deleted_report))
                 .to be_empty
-              expect(YAML.load_file(pd_world_open_root + summary_report))
+              expect(YAML.unsafe_load_file(pd_world_open_root + summary_report))
                 .to eql(
                   { saved: 2, deleted: 0,
                     start_time: Time.at(0), end_time: two_days_ago

diff --git a/spec/integration/subset_deletion_spec.rb b/spec/integration/subset_deletion_spec.rb
@@ -51,7 +51,7 @@ module Datasets
               .to match_array [
                 "#{volume1_rights_tuple[:namespace]}.#{volume1_rights_tuple[:id]}"
               ]
-            expect(YAML.load_file(pd_root + summary_report))
+            expect(YAML.unsafe_load_file(pd_root + summary_report))
               .to eql(
                 { saved: 0, deleted: 1,
                   start_time: Time.at(0), end_time: two_days_ago

diff --git a/spec/integration/superset_creation_spec.rb b/spec/integration/superset_creation_spec.rb
@@ -56,7 +56,7 @@ module Datasets
                 ]
               expect(File.read(full_root + deleted_report))
                 .to be_empty
-              expect(YAML.load_file(full_root + summary_report))
+              expect(YAML.unsafe_load_file(full_root + summary_report))
                 .to eql(
                   { saved: 2, deleted: 0,
                     start_time: Time.at(0), end_time: two_days_ago
@@ -98,7 +98,7 @@ module Datasets
                 ]
               expect(File.read(full_root + deleted_report))
                 .to be_empty
-              expect(YAML.load_file(full_root + summary_report))
+              expect(YAML.unsafe_load_file(full_root + summary_report))
                 .to eql(
                   { saved: 2, deleted: 0,
                     start_time: Time.at(0), end_time: two_days_ago

diff --git a/spec/integration/superset_deletion_spec.rb b/spec/integration/superset_deletion_spec.rb
@@ -51,7 +51,7 @@ module Datasets
               .to match_array [
                 "#{volume1_rights_tuple[:namespace]}.#{volume1_rights_tuple[:id]}"
               ]
-            expect(YAML.load_file(full_root + summary_report))
+            expect(YAML.unsafe_load_file(full_root + summary_report))
               .to eql(
                 { saved: 0, deleted: 1,
                   start_time: Time.at(0), end_time: two_days_ago

diff --git a/spec/repository/rights_feed_volume_repo_spec.rb b/spec/repository/rights_feed_volume_repo_spec.rb
@@ -1,5 +1,4 @@
 require "datasets/repository/rights_feed_volume_repo"
-require "active_support/core_ext/numeric/time"
 
 module Datasets
   RSpec.describe Repository::RightsFeedVolumeRepo do

diff --git a/spec/repository/rights_volume_repo_spec.rb b/spec/repository/rights_volume_repo_spec.rb
@@ -4,9 +4,6 @@
 
 require "set"
 require "sequel"
-require "active_support/core_ext/numeric/time"
-require "active_support/core_ext/hash/slice"
-
 
 module Datasets
   RSpec.describe Repository::RightsVolumeRepo do

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,6 +1,9 @@
 $LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), "../lib/datasets"))
 
 require 'simplecov'
+require "active_support/isolated_execution_state"
+require "active_support/core_ext/numeric/time"
+require "active_support/core_ext/hash/slice"
 SimpleCov.start
 
 Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f}