Merge pull request #129 from pulibrary/migrate_to_ruby_2

Update to Ruby 2.6
pulibrary · Feb 28, 2020 · 727d331 · 727d331
2 parents 94c736f + 270300d
commit 727d331
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 46 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,7 +7,7 @@ jobs:
       CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
     # Primary command image where all commands run
     docker:
-      - image: circleci/ruby:2.4.4-node-browsers
+      - image: circleci/ruby:2.6-node-browsers
         environment:
           RAILS_ENV: test
           PLANTAIN_DB_HOST: localhost
@@ -77,31 +77,8 @@ jobs:
           path: /tmp/circleci-artifacts
       - store_artifacts:
           path: /tmp/circleci-test-results
-  test_2_6:
-    working_directory: ~/plantain
-    environment:
-      CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
-      CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
-    # Primary command image where all commands run
-    docker:
-      - image: circleci/ruby:2.6-node-browsers
-        environment:
-          RAILS_ENV: test
-          PLANTAIN_DB_HOST: localhost
-          PLANTAIN_DB_USERNAME: plantain
-          PLANTAIN_DB_PASSWORD: ""
-      - image: postgres:10
-        environment:
-          POSTGRES_USER: plantain
-          POSTGRES_DB: plantain_test
-          # POSTGRES_PASSWORD: ""
-          POSTGRES_HOST_AUTH_METHOD: trust
-      - image: solr:7.1-alpine
-        command: bin/solr -cloud -noprompt -f -p 8984
-    steps: *test_steps
 workflows:
   version: 2
   build_accept_deploy:
     jobs:
       - test
-      - test_2_6
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -3,7 +3,7 @@ inherit_gem:
   bixby: bixby_default.yml
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.6
   Exclude:
     - 'bin/*'
     - 'config/deploy.rb'

diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-ruby-2.4.4
+ruby-2.6.5
diff --git a/.tool-versions b/.tool-versions
@@ -1 +1,2 @@
+ruby 2.6.5
 nodejs 10.16.3
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -64,9 +64,9 @@ GEM
       execjs
     bcrypt (3.1.13)
     bindex (0.5.0)
-    bixby (1.0.0)
-      rubocop (~> 0.50, <= 0.52.1)
-      rubocop-rspec (~> 1.22, <= 1.22.2)
+    bixby (2.0.0)
+      rubocop (= 0.63.1)
+      rubocop-rspec (= 1.31.0)
     blacklight (7.2.0)
       deprecation
       globalid
@@ -160,6 +160,7 @@ GEM
     httpclient (2.8.3)
     i18n (1.7.0)
       concurrent-ruby (~> 1.0)
+    jaro_winkler (1.5.4)
     jbuilder (2.9.1)
       activesupport (>= 4.2.0)
     jquery-rails (4.3.3)
@@ -224,8 +225,8 @@ GEM
       nokogiri (~> 1.5)
       omniauth (~> 1.2)
     orm_adapter (0.5.0)
-    parallel (1.18.0)
-    parser (2.6.5.0)
+    parallel (1.19.1)
+    parser (2.7.0.3)
       ast (~> 2.4.0)
     pg (1.1.4)
     popper_js (1.14.5)
@@ -307,15 +308,16 @@ GEM
       rspec-mocks (~> 3.9.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.0)
-    rubocop (0.52.1)
+    rubocop (0.63.1)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.4.0.2, < 3.0)
+      parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    rubocop-rspec (1.22.2)
-      rubocop (>= 0.52.1)
+      unicode-display_width (~> 1.4.0)
+    rubocop-rspec (1.31.0)
+      rubocop (>= 0.60.0)
     ruby-progressbar (1.10.0)
     ruby_dep (1.5.0)
     rubyzip (1.3.0)
@@ -412,7 +414,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.6)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.4.1)
     warden (1.2.8)
       rack (>= 2.0.6)
     web-console (3.7.0)
@@ -482,4 +484,4 @@ DEPENDENCIES
   webpacker (~> 4.0)
 
 BUNDLED WITH
-   2.0.2
+   2.1.4
diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb
@@ -157,29 +157,29 @@ class CatalogController < ApplicationController
     config.add_search_field "name", label: "Name" do |field|
       field.qt = "search"
       field.solr_parameters = {
-        qf:  "${qf_name}",
-        pf:  "${pf_name}"
+        qf: "${qf_name}",
+        pf: "${pf_name}"
       }
     end
     config.add_search_field "place", label: "Place" do |field|
       field.qt = "search"
       field.solr_parameters = {
-        qf:  "${qf_place}",
-        pf:  "${pf_place}"
+        qf: "${qf_place}",
+        pf: "${pf_place}"
       }
     end
     config.add_search_field "subject", label: "Subject" do |field|
       field.qt = "search"
       field.solr_parameters = {
-        qf:  "${qf_subject}",
-        pf:  "${pf_subject}"
+        qf: "${qf_subject}",
+        pf: "${pf_subject}"
       }
     end
     config.add_search_field "title", label: "Title" do |field|
       field.qt = "search"
       field.solr_parameters = {
-        qf:  "${qf_title}",
-        pf:  "${pf_title}"
+        qf: "${qf_title}",
+        pf: "${pf_title}"
       }
     end