Merge pull request #55 from TuftsUniversity/ruby-upgrade

Ruby 3 Upgrade

.github/workflows/ci.yml

@@ -27,7 +27,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['2.7.5']
+        ruby-version: ['3.2.2']
         experimental: [false]
         #include:
         #  - ruby-version: 2.6
@@ -45,12 +45,12 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
-        bundler: "2.1.4"
+        bundler: "2.4.19"
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
     - name: Update rubygems
       run: |
         gem update --system
-        gem install bundler:2.1.4
+        gem install bundler:2.4.19
 
     - name: Set up JDK 1.8
       uses: actions/setup-java@v1
@@ -78,9 +78,9 @@ jobs:
       run: |
         RAILS_ENV=test bundle exec rake db:create
         RAILS_ENV=test bundle exec rake db:migrate --trace
-    # - name: Rubbocop
-    #   run: |
-    #     bundle exec rubocop
+    - name: Rubbocop
+      run: |
+        bundle exec rubocop
     - name: Compile assets
       run: |
         bundle exec rails assets:precompile --trace

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.7.5
+FROM ruby:3.2.2
 
 ARG RAILS_ENV
 ARG SECRET_KEY_BASE
@@ -13,17 +13,20 @@ ENV LC_ALL C.UTF-8
 #  echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
 
 # --allow-unauthenticated needed for yarn package
-RUN apt-get update && apt-get upgrade -y && \
-  apt-get install --no-install-recommends -y ca-certificates nodejs \
-  build-essential libpq-dev unzip vim \
-  libqt5webkit5-dev xvfb xauth default-jre-headless --fix-missing --allow-unauthenticated
+RUN apt-get update 
+RUN apt-get upgrade -y
+RUN apt-get install build-essential -y
+RUN apt-get install --no-install-recommends -y ca-certificates nodejs
+# RUN apt-get install vim 
+RUN apt-get install --no-install-recommends -y build-essential libpq-dev unzip vim
+RUN apt-get install --no-install-recommends -y libqt5webkit5-dev xvfb xauth default-jre-headless --fix-missing --allow-unauthenticated
 
 RUN apt-get install chromium -y
 
 # Increase stack size limit to help working with large works
 ENV RUBY_THREAD_MACHINE_STACK_SIZE 8388608
 
-#RUN gem update --system
+RUN gem update --system
 
 RUN mkdir /data
 WORKDIR /data

Gemfile

@@ -1,34 +1,40 @@
 # frozen_string_literal: true
 source 'https://rubygems.org'
 
-ruby '2.7.5'
+ruby '3.2.2'
 
 git_source(:github) do |repo_name|
   repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
   "https://github.com/#{repo_name}.git"
 end
 
-gem 'rails', '5.2.8'
+gem 'rails', '7.0.2'
 
 gem 'jquery-rails'
 gem 'sass-rails'
 gem 'uglifier'
 
-gem 'blacklight', '6.24.0'
-gem 'blacklight_range_limit'
+gem 'blacklight', '7.24.0'
+# pinned to not move to version 8, which breaks our custom javascript
+gem 'blacklight_range_limit', '7.8.0'
 
 # removed pinned verision of '~> 0.4.10'
 gem 'mysql2'
 gem 'okcomputer'
-gem 'rsolr', '>= 1.0'
 
 gem 'qa'
 gem 'riiif'
 
 # Matching MIRA's versions
-gem 'active-fedora', '12.2.4'
+# change active-fedora version
+gem 'active-fedora', '14.0.0'
 gem 'active_fedora-noid'
 
+# previously prepackaged gems in ruby 2
+gem 'http'
+gem 'puma'
+gem 'thin'
+
 group :production do
   gem 'passenger'
 end
@@ -43,8 +49,15 @@ group :development, :test do
   gem 'rspec-rails'
   gem 'simplecov'
   gem 'simplecov-lcov', '~> 0.8.0'
+  gem 'webrick'
 end
 
 group :test do
-  gem 'solr_wrapper', '>= 0.3'
+  gem "solr_wrapper", ">= 0.3"
 end
+
+gem "rsolr", ">= 1.0", "< 3"
+
+gem "bootstrap", "~> 4.0"
+gem "sassc-rails", "~> 2.1"
+gem "twitter-typeahead-rails", "0.11.1.pre.corejavascript"