Merge pull request #117 from hathitrust/pairtree

rpairtree -> pairtree
hathitrust · Mar 31, 2023 · 8006c35 · 8006c35
2 parents 3f08352 + 8b1fe2e
commit 8006c35
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 37 deletions.
diff --git a/Gemfile b/Gemfile
@@ -3,7 +3,7 @@ source "https://rubygems.org"
 gem "activesupport"
 gem "mysql2"
 gem "puma"
-gem "rpairtree"
+gem "pairtree", "~> 0.3"
 gem "sidekiq", "~> 6.0"
 gem "sequel"
 gem "rubyzip"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,90 +1,92 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.4.1)
+    activesupport (7.0.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     ast (2.4.2)
     byebug (11.1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
-    connection_pool (2.3.0)
+    concurrent-ruby (1.2.2)
+    connection_pool (2.4.0)
     diff-lcs (1.5.0)
     docile (1.4.0)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    json (2.6.2)
+    json (2.6.3)
+    language_server-protocol (3.17.0.3)
     method_source (1.0.0)
-    minitest (5.17.0)
-    mysql2 (0.5.4)
+    minitest (5.18.0)
+    mysql2 (0.5.5)
     nio4r (2.5.8)
+    pairtree (0.3.0)
     parallel (1.22.1)
-    parser (3.1.2.1)
+    parser (3.2.1.1)
       ast (~> 2.4.1)
-    pry (0.14.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    puma (6.0.0)
+    puma (6.2.1)
       nio4r (~> 2.0)
-    rack (2.2.6.2)
+    rack (2.2.6.4)
     rainbow (3.1.1)
     rake (12.3.3)
-    redis (4.8.0)
-    regexp_parser (2.6.0)
+    redis (4.8.1)
+    regexp_parser (2.7.0)
     rexml (3.2.5)
-    rpairtree (0.2.0)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
+    rspec-core (3.12.1)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.0)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.35.1)
+    rubocop (1.48.1)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
+      rubocop-ast (>= 1.26.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.23.0)
-      parser (>= 3.1.1.0)
-    rubocop-performance (1.14.3)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.28.0)
+      parser (>= 3.2.1.0)
+    rubocop-performance (1.16.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    ruby-progressbar (1.11.0)
+    ruby-progressbar (1.13.0)
     rubyzip (2.3.2)
-    sequel (5.62.0)
-    sidekiq (6.5.7)
-      connection_pool (>= 2.2.5)
+    sequel (5.66.0)
+    sidekiq (6.5.8)
+      connection_pool (>= 2.2.5, < 3)
       rack (~> 2.0)
       redis (>= 4.5.0, < 5)
-    simplecov (0.21.2)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.4)
-    standard (1.16.1)
-      rubocop (= 1.35.1)
-      rubocop-performance (= 1.14.3)
+    standard (1.25.3)
+      language_server-protocol (~> 3.17.0.2)
+      rubocop (~> 1.48.1)
+      rubocop-performance (~> 1.16.0)
     thor (1.2.1)
-    timecop (0.9.5)
-    tzinfo (2.0.5)
+    timecop (0.9.6)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.3.0)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
   ruby
@@ -93,10 +95,10 @@ DEPENDENCIES
   activesupport
   byebug
   mysql2
+  pairtree (~> 0.3)
   pry
   puma
   rake (~> 12.3)
-  rpairtree
   rspec (~> 3.0)
   rubyzip
   sequel

diff --git a/lib/datasets/cli.rb b/lib/datasets/cli.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "thor"
-require "pp"
 require "sequel"
 require "datasets"
 require_relative "../../config/hathitrust_config"