Merge pull request #1695 from archivesspace/upgrade-gems

Upgrade gems

_yard/Gemfile.lock

@@ -12,4 +12,4 @@ DEPENDENCIES
   yard (>= 0.9.20)
 
 BUNDLED WITH
-   1.16.1
+   1.17.3

backend/Gemfile

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 
 gem 'atomic', '= 1.0.1'
 gem 'bcrypt', '3.1.7'
-gem 'childprocess', '~> 1.0', '>= 1.0.1'
+gem 'childprocess', '~> 2.0'
 gem 'i18n', '0.9.1'
 gem 'jdbc-derby', '10.12.1.1'
 gem 'jdbc-mysql', '5.1.13', group: :development
@@ -13,7 +13,7 @@ gem 'json', '1.8.6'
 gem 'json-schema', '1.0.10'
 gem 'mizuno', '0.6.11'
 gem 'net-ldap', '~> 0.16.0'
-gem 'nokogiri', '1.8.5'
+gem 'nokogiri', '>= 1.10.4'
 gem 'rack-session-sequel', '0.0.1'
 gem 'rufus-lru', '1.0.5'
 gem 'rufus-scheduler', '~> 2.0.24'

backend/Gemfile.lock

@@ -11,7 +11,7 @@ GEM
     backports (3.15.0)
     bcrypt (3.1.7-java)
     builder (3.2.3)
-    childprocess (1.0.1)
+    childprocess (2.0.0)
       rake (< 13.0)
     choice (0.2.0)
     coderay (1.1.2)
@@ -23,7 +23,7 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.13.1)
       faraday (>= 0.7.4, < 1.0)
-    fastimage (2.1.5)
+    fastimage (2.1.7)
     ffi (1.11.1-java)
     i18n (0.9.1)
       concurrent-ruby (~> 1.0)
@@ -36,7 +36,7 @@ GEM
     json-schema (1.0.10)
     ladle (0.2.0-java)
     method_source (0.9.2)
-    minitest (5.11.3)
+    minitest (5.12.0)
     mizuno (0.6.11)
       childprocess (>= 0.2.6)
       choice (>= 0.1.0)
@@ -46,13 +46,13 @@ GEM
     multipart-post (1.2.0)
     net-http-persistent (2.8)
     net-ldap (0.16.1)
-    nokogiri (1.8.5-java)
+    nokogiri (1.10.4-java)
     oai (0.4.0)
       builder (>= 3.1.0)
       faraday
       faraday_middleware
     parallel (1.17.0)
-    parser (2.6.3.0)
+    parser (2.6.4.1)
       ast (~> 2.4.0)
     pry (0.11.3-java)
       coderay (~> 1.1.0)
@@ -100,13 +100,13 @@ GEM
       unicode-display_width (>= 1.4.0, < 1.7)
     ruby-debug-base (0.10.6-java)
     ruby-progressbar (1.10.1)
-    rubyzip (1.2.3)
+    rubyzip (1.2.4)
     rufus-lru (1.0.5)
     rufus-scheduler (2.0.24)
       tzinfo (>= 0.3.22)
     saxerator (0.9.2)
       nokogiri (>= 1.4.0)
-    saxon-xslt (0.8.2.1-java)
+    saxon-xslt (0.8.2.2-java)
     sequel (4.20.0)
     simplecov (0.7.1)
       multi_json (~> 1.0)
@@ -127,10 +127,10 @@ GEM
       ffi
     thread_safe (0.3.6-java)
     tidy (1.1.2)
-    tilt (2.0.9)
+    tilt (2.0.10)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2019.2)
+    tzinfo-data (1.2019.3)
       tzinfo (>= 1.0.0)
     unicode-display_width (1.6.0)
     warbler (2.0.4)
@@ -148,7 +148,7 @@ DEPENDENCIES
   activesupport (= 5.0.7.2)
   atomic (= 1.0.1)
   bcrypt (= 3.1.7)
-  childprocess (~> 1.0, >= 1.0.1)
+  childprocess (~> 2.0)
   factory_bot (~> 4.11, >= 4.11.1)
   i18n (= 0.9.1)
   jdbc-derby (= 10.12.1.1)
@@ -162,7 +162,7 @@ DEPENDENCIES
   multipart-post (= 1.2.0)
   net-http-persistent (= 2.8)
   net-ldap (~> 0.16.0)
-  nokogiri (= 1.8.5)
+  nokogiri (>= 1.10.4)
   oai (= 0.4.0)
   pry
   pry-debugger-jruby
@@ -189,4 +189,4 @@ DEPENDENCIES
   zip-zip (= 0.3)
 
 BUNDLED WITH
-   1.16.1
+   1.17.3

backend/spec/controller_exports_spec.rb

@@ -190,7 +190,7 @@
   it "lets you export a digital object in METS" do
     dig = create(:json_digital_object)
     get "/repositories/#{$repo_id}/digital_objects/mets/#{dig.id}.xml"
-    expect(last_response.body).to include("<mods:title>#{dig.title}</mods:title>")
+    expect(last_response.body).to match(/<mods:title.*>#{dig.title}<\/mods:title>/)
   end
 
 

backend/spec/model_oai_spec.rb

@@ -94,8 +94,8 @@ def check_oai_request_against_fixture(fixture_name, params)
       result = ArchivesSpaceOaiProvider.new.process_request(:verb => 'ListSets')
       expect(result).to match(/<setSpec>sponsor_set_name<\/setSpec><setName>sponsor_set_name<\/setName>/)
       expect(result).to match(/<setSpec>repo_set_name<\/setSpec><setName>repo_set_name<\/setName>/)
-      expect(result).to match(/<oai_dc:description>bimbaz<\/oai_dc:description>/)
-      expect(result).to match(/<oai_dc:description>foobar<\/oai_dc:description>/)
+      expect(result).to match(/<oai_dc:description.*>bimbaz<\/oai_dc:description>/)
+      expect(result).to match(/<oai_dc:description.*>foobar<\/oai_dc:description>/)
     end
 
     RESOURCE_BASED_FORMATS.each do |prefix|
@@ -359,8 +359,8 @@ def list_identifiers(prefix)
         uri = "/oai?verb=GetRecord&identifier=oai:archivesspace/#{@test_resource_record}&metadataPrefix=oai_dc"
 
         response = get uri
-        expect(response.body).to match(/<dc:rights>conditions governing access note<\/dc:rights>/)
-        expect(response.body).to match(/<dc:rights>conditions governing use note<\/dc:rights>/)
+        expect(response.body).to match(/<dc:rights.*>conditions governing access note<\/dc:rights>/)
+        expect(response.body).to match(/<dc:rights.*>conditions governing use note<\/dc:rights>/)
 
         expect(response.body).not_to match(/<dc:relation>conditions governing access note<\/dc:relation>/)
         expect(response.body).not_to match(/<dc:relation>conditions governing use note<\/dc:relation>/)
@@ -371,9 +371,9 @@ def list_identifiers(prefix)
 
         response = get uri
 
-        expect(response.body).to match(/<dc:format>10 Volumes; Container summary<\/dc:format>/)
-        expect(response.body).to match(/<dc:format>physical description note<\/dc:format>/)
-        expect(response.body).to match(/<dc:format>dimensions note<\/dc:format>/)
+        expect(response.body).to match(/<dc:format.*>10 Volumes; Container summary<\/dc:format>/)
+        expect(response.body).to match(/<dc:format.*>physical description note<\/dc:format>/)
+        expect(response.body).to match(/<dc:format.*>dimensions note<\/dc:format>/)
 
         expect(response.body).not_to match(/<dc:extent>10 Volumes; Container summary<\/dc:extent>/)
         expect(response.body).not_to match(/<dc:extent>physical description note<\/dc:extent>/)
@@ -384,15 +384,15 @@ def list_identifiers(prefix)
         response = get uri
         resource_id = @test_resource_record.split("/")[4]
         ark_url = ArkName.get_ark_url(resource_id.to_i, :resource)
-        expect(response.body).to match(/<dc:identifier>#{ark_url}<\/dc:identifier>/)
+        expect(response.body).to match(/<dc:identifier.*>#{ark_url}<\/dc:identifier>/)
       end
       it "should not output ARK name in identifer tag if ARK output is disabled" do
         AppConfig[:arks_enabled] = false
         uri = "/oai?verb=GetRecord&identifier=oai:archivesspace/#{@test_resource_record}&metadataPrefix=oai_dcterms"
         response = get uri
         resource_id = @test_resource_record.split("/")[4]
         ark_url = ArkName.get_ark_url(resource_id.to_i, :resource)
-        expect(response.body).to_not match(/<dc:identifer><url>#{ark_url}<\/url><\/dc:identifer>/)
+        expect(response.body).to_not match(/<dc:identifer.*>#{ark_url}<\/dc:identifer>/)
         AppConfig[:arks_enabled] = true
       end
     end
@@ -403,15 +403,15 @@ def list_identifiers(prefix)
         response = get uri
         resource_id = @test_resource_record.split("/")[4]
         ark_url = ArkName.get_ark_url(resource_id.to_i, :resource)
-        expect(response.body).to match(/<dcterms:identifer>#{ark_url}<\/dcterms:identifer>/)
+        expect(response.body).to match(/<dcterms:identifer.*>#{ark_url}<\/dcterms:identifer>/)
       end
       it "should not output ARK name in identifer tag if ARK output is disabled" do
         AppConfig[:arks_enabled] = false
         uri = "/oai?verb=GetRecord&identifier=oai:archivesspace/#{@test_resource_record}&metadataPrefix=oai_dcterms"
         response = get uri
         resource_id = @test_resource_record.split("/")[4]
         ark_url = ArkName.get_ark_url(resource_id.to_i, :resource)
-        expect(response.body).to_not match(/<dcterms:identifer>#{ark_url}<\/dcterms:identifer>/)
+        expect(response.body).to_not match(/<dcterms:identifer.*>#{ark_url}<\/dcterms:identifer>/)
         AppConfig[:arks_enabled] = true
       end
     end
@@ -422,7 +422,7 @@ def list_identifiers(prefix)
         response = get uri
         resource_id = @test_resource_record.split("/")[4]
         ark_url = ArkName.get_ark_url(resource_id.to_i, :resource)
-        expect(response.body).to match(/<identifier>#{ark_url}<\/identifier>/)
+        expect(response.body).to match(/<identifier.*>#{ark_url}<\/identifier>/)
       end
     end
   end

build/build.xml

@@ -108,7 +108,7 @@
       <env key="GEM_PATH" value="" />
       <env key="BUNDLE_PATH" value="${gem_home}" />
       <env key="HOME" value="${build.home}" />
-      <arg line="-S gem install bundler -v 1.16.1" />
+      <arg line="-S gem install bundler -v 1.17.3" />
     </java>
 
     <antcall target="bundler">
@@ -1014,12 +1014,13 @@
       <arg line="gems/bin/rubocop --safe-auto-correct ../selenium" />
     </java>
   </target>
+
   <target name="all:cops" description="Run Rubocop on major components">
-    <antcall target="public:cop" />
     <antcall target="indexer:cop" />
     <antcall target="frontend:cop" />
     <antcall target="backend:cop"/>
     <antcall target="selenium:cop"/>
+    <antcall target="public:cop" />
   </target>
 
 

docs/Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
 gem "github-pages"
-gem 'nokogiri', '1.8.5'
+gem 'nokogiri', '>= 1.10.4'
 gem 'rubyzip', '~> 1.2.2'

docs/Gemfile.lock

@@ -1,13 +1,13 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.10)
+    activesupport (4.2.11.1)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
@@ -16,7 +16,7 @@ GEM
     commonmarker (0.17.13)
       ruby-enum (~> 0.5)
     concurrent-ruby (1.1.5)
-    dnsruby (1.61.2)
+    dnsruby (1.61.3)
       addressable (~> 2.5)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
@@ -27,13 +27,13 @@ GEM
     execjs (2.7.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    ffi (1.10.0)
+    ffi (1.11.1)
     forwardable-extended (2.6.0)
-    gemoji (3.0.0)
-    github-pages (197)
-      activesupport (= 4.2.10)
+    gemoji (3.0.1)
+    github-pages (200)
+      activesupport (= 4.2.11.1)
       github-pages-health-check (= 1.16.1)
-      jekyll (= 3.7.4)
+      jekyll (= 3.8.5)
       jekyll-avatar (= 0.6.0)
       jekyll-coffeescript (= 1.1.1)
       jekyll-commonmark-ghpages (= 0.1.5)
@@ -47,7 +47,7 @@ GEM
       jekyll-readme-index (= 0.2.0)
       jekyll-redirect-from (= 0.14.0)
       jekyll-relative-links (= 0.6.0)
-      jekyll-remote-theme (= 0.3.1)
+      jekyll-remote-theme (= 0.4.0)
       jekyll-sass-converter (= 1.5.2)
       jekyll-seo-tag (= 2.5.0)
       jekyll-sitemap (= 1.2.0)
@@ -72,7 +72,7 @@ GEM
       listen (= 3.1.5)
       mercenary (~> 0.3)
       minima (= 2.5.0)
-      nokogiri (>= 1.8.5, < 2.0)
+      nokogiri (>= 1.10.4, < 2.0)
       rouge (= 2.2.1)
       terminal-table (~> 1.4)
     github-pages-health-check (1.16.1)
@@ -81,13 +81,13 @@ GEM
       octokit (~> 4.0)
       public_suffix (~> 3.0)
       typhoeus (~> 1.3)
-    html-pipeline (2.10.0)
+    html-pipeline (2.12.0)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.7.4)
+    jekyll (3.8.5)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -133,7 +133,8 @@ GEM
       jekyll (~> 3.3)
     jekyll-relative-links (0.6.0)
       jekyll (~> 3.3)
-    jekyll-remote-theme (0.3.1)
+    jekyll-remote-theme (0.4.0)
+      addressable (~> 2.0)
       jekyll (~> 3.5)
       rubyzip (>= 1.2.1, < 3.0)
     jekyll-sass-converter (1.5.2)
@@ -198,53 +199,53 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     mercenary (0.3.6)
-    mini_portile2 (2.3.0)
+    mini_portile2 (2.4.0)
     minima (2.5.0)
       jekyll (~> 3.5)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minitest (5.11.3)
-    multipart-post (2.0.0)
-    nokogiri (1.8.5)
-      mini_portile2 (~> 2.3.0)
+    minitest (5.12.0)
+    multipart-post (2.1.1)
+    nokogiri (1.10.4)
+      mini_portile2 (~> 2.4.0)
     octokit (4.14.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (3.0.3)
+    public_suffix (3.1.1)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
     rouge (2.2.1)
     ruby-enum (0.7.2)
       i18n
     ruby_dep (1.5.0)
-    rubyzip (1.2.2)
+    rubyzip (1.2.4)
     safe_yaml (1.0.5)
-    sass (3.7.3)
+    sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sawyer (0.8.1)
-      addressable (>= 2.3.5, < 2.6)
-      faraday (~> 0.8, < 1.0)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
     typhoeus (1.3.1)
       ethon (>= 0.9.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.5.0)
+    unicode-display_width (1.6.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   github-pages
-  nokogiri (= 1.8.5)
+  nokogiri (>= 1.10.4)
   rubyzip (~> 1.2.2)
 
 BUNDLED WITH
-   2.0.1
+   2.0.2