From f86e9fdf2229a23011bae5700f2e09bf428b0740 Mon Sep 17 00:00:00 2001 From: Dan Kerchner Date: Wed, 24 Apr 2019 15:32:54 -0400 Subject: [PATCH 1/3] Fixes #210. Fixes #215 --- README.md | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 1aa8daf4..0b5ec646 100644 --- a/README.md +++ b/README.md @@ -27,20 +27,12 @@ These instructions have been updated for Ubuntu 16.04. ``` % sudo apt-get install openjdk-8* ``` - - For Ubuntu 14: - ``` - % sudo add-apt-repository ppa:webupd8team/java - % sudo apt-get update - % sudo apt-get install oracle-java8-installer - ``` Verify that Java has been installed and is running Java 8: ``` % java -version ``` This should return Java version 1.8. - Optionally, you can remove the installer using ```sudo add-apt-repository -r ppa:webupd8team/java``` - * Install necessary Ubuntu packages: ``` % sudo apt-get install git postgresql libpq-dev unzip clamav-daemon curl tomcat7 libcurl4-openssl-dev libapr1-dev libaprutil1-dev @@ -65,7 +57,7 @@ These instructions have been updated for Ubuntu 16.04. * Install Solr (may require `sudo`): -NOTE: While GW ScholarSpace has not been tested with Solr 7.7.1, a plain Hyrax 2.4.1 instance works with Solr 7.7.1, so it is likely to work with a new instance of GW ScholarSpace. Current (as of GW ScholarSpace v1.2.0) prod and test instances are running Solr 6.4.1 and should be upgraded at a later date. +NOTE: While GW ScholarSpace has not been tested with Solr 7.7.1, a plain Hyrax 2.5.0 instance works with Solr 7.7.1, so it is likely to work with a new instance of GW ScholarSpace. Current (as of GW ScholarSpace v1.2.0) prod and test instances are running Solr 6.4.1 and should be upgraded at a later date. ``` % cd /opt/install % wget http://archive.apache.org/dist/lucene/solr/6.4.1/solr-6.4.1.tgz @@ -85,7 +77,7 @@ NOTE: While GW ScholarSpace has not been tested with Solr 7.7.1, a plain Hyrax 2 ``` % sudo mv /var/solr/data/scholarspace/conf/managed-schema /var/solr/data/scholarspace/conf/managed-schema.bak ``` -* Copy the `solr/config/` contents from the [samvera/hyrax repo](https://github.com/samvera/hyrax/tree/v1.0.5/solr/config) to `/var/solr/data/scholarspace/conf/` (this can be accomplished by git clone-ing the hyrax repo, making sure to check out the appropriate tag) +* Copy the `solr/config/` contents from the [samvera/hyrax repo](https://github.com/samvera/hyrax/tree/v2.0.3/solr/config) to `/var/solr/data/scholarspace/conf/` (this can be accomplished by git clone-ing the hyrax repo, making sure to check out the appropriate tag) * Restart Solr: ``` @@ -235,11 +227,11 @@ These instructions are for redirecting port 8080 traffic on Tomcat to port 8443 * Install Ruby: ``` - % rvm install ruby-2.3.3 + % rvm install ruby-2.5.5 ``` * Install Rails: ``` - % gem install rails -v 5.0.4 -N + % gem install rails -v 5.1.7 -N ``` Also, add `export rvmsudo_secure_path=1` to your user's `.bashrc` file. This will avoid a warning when running `rvmsudo`. @@ -264,7 +256,7 @@ These instructions are for redirecting port 8080 traffic on Tomcat to port 8443 % cd /opt/scholarspace % git clone https://github.com/gwu-libraries/scholarspace-hyrax.git ``` - Check out the desired tag, where `TAGNUMBER` might be, for example, `1.0`: + Check out the desired tag, where `TAGNUMBER` might be, for example, `1.2.0`: ``` % cd scholarspace-hyrax % git checkout TAGNUMBER @@ -272,9 +264,10 @@ These instructions are for redirecting port 8080 traffic on Tomcat to port 8443 * Install gems ``` + % gem install bundler % bundle install --without development --deployment ``` - More information on the meaning of these bundle install options can be found at http://bundler.io/v1.15/man/bundle-install.1.html . For a development environment, to install development gems as well, omit the `--without development` option. + More information on the meaning of these bundle install options can be found at https://bundler.io/v2.0/man/bundle-install.1.html . For a development environment, to install development gems as well, omit the `--without development` option. Return to your user account: ``` @@ -347,7 +340,7 @@ These instructions are for redirecting port 8080 traffic on Tomcat to port 8443 ``` If you get an error about rake versions, this can be resolved with: ``` - % gem install rake -v 12.0.0 # or other desired version + % gem install rake -v 12.3.2 # or other desired version ``` * Install `fits.sh` version 1.0.5 (check [FITS](http://projects.iq.harvard.edu/fits/downloads) for the latest 1.0.5 download). Also check the [Hyrax repo](https://github.com/samvera/hyrax/#prerequisites) to verify the latest recommended version of FITS for use with Hyrax. @@ -431,16 +424,16 @@ These instructions are for redirecting port 8080 traffic on Tomcat to port 8443 * Set up Passenger, and create Passenger config for Apache ``` - % gem install passenger -v 5.1.7 --no-rdoc --no-ri + % gem install passenger -v 5.3.7 % rvmsudo passenger-install-apache2-module ``` Select Ruby from the list of languages. The install script will direct you to copy several lines for the Apache configuration. They will look something similar to: ``` - LoadModule passenger_module /usr/local/rvm/gems/ruby-2.3.3/gems/passenger-5.1.7/buildout/apache2/mod_passenger.so - - PassengerRoot /usr/local/rvm/gems/ruby-2.3.3/gems/passenger-5.1.7 - PassengerDefaultRuby /usr/local/rvm/gems/ruby-2.3.3/wrappers/ruby - +LoadModule passenger_module /usr/local/rvm/gems/ruby-2.5.5/gems/passenger-5.3.7/buildout/apache2/mod_passenger.so + + PassengerRoot /usr/local/rvm/gems/ruby-2.5.5/gems/passenger-5.3.7 + PassengerDefaultRuby /usr/local/rvm/gems/ruby-2.5.5/wrappers/ruby + ``` Create `/etc/apache2/conf-available/passenger.conf` using the lines pasted from the Passenger install script. From 82faf3b31ec2c5fa21d7910635029a794ee31fe0 Mon Sep 17 00:00:00 2001 From: Dan Kerchner Date: Wed, 24 Apr 2019 15:34:00 -0400 Subject: [PATCH 2/3] Fixes #214 --- Gemfile | 21 +++-- Gemfile.lock | 211 +++++++++++++++++++++++++++++---------------------- 2 files changed, 135 insertions(+), 97 deletions(-) diff --git a/Gemfile b/Gemfile index aee91762..e493ca0a 100644 --- a/Gemfile +++ b/Gemfile @@ -7,13 +7,13 @@ end # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 5.0.7' +gem 'rails', '~> 5.1.7' # Use sqlite3 as the dev/test database for Active Record -gem 'sqlite3' +gem 'sqlite3', '~> 1.3.0' # Use pg as the production database for Active Record gem 'pg' # Use Puma as the app server -gem 'puma', '~> 3.0' +gem 'puma', '~> 3.7' # Use SCSS for stylesheets gem 'sass-rails', '~> 5.0' # Use Uglifier as compressor for JavaScript assets @@ -40,12 +40,15 @@ gem 'jbuilder', '~> 2.5' group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug', platform: :mri + # Adds support for Capybara system testing and selenium driver + gem 'capybara', '>= 2.15' + gem 'selenium-webdriver' end group :development do # Access an IRB console on exception pages or by using <%= console %> anywhere in the code. gem 'web-console', '>= 3.3.0' - gem 'listen', '~> 3.0.5' + gem 'listen', '~> 3.0.5', '< 3.2' # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' gem 'spring-watcher-listen', '~> 2.0.0' @@ -54,7 +57,7 @@ end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] -gem 'hyrax', '2.4.1' +gem 'hyrax', '2.5.0' gem 'hydra-role-management' @@ -62,13 +65,17 @@ group :development, :test do gem 'solr_wrapper', '>= 0.3' end -gem 'rsolr', '~> 1.0' +gem 'rsolr', '>= 1.0' +gem 'bootstrap-sass', '~> 3.0' +gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript' gem 'devise' -gem 'devise-guests', '~> 0.5' +gem 'devise-guests', '~> 0.6' group :development, :test do gem 'fcrepo_wrapper' gem 'rspec-rails' end +gem 'riiif', '~> 2.0' + # See https://github.com/viseztrance/rails-sitemap gem 'sitemap' diff --git a/Gemfile.lock b/Gemfile.lock index 7d1351f1..f4f8fd6f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,27 +1,27 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.0.7.2) - actionpack (= 5.0.7.2) - nio4r (>= 1.2, < 3.0) + actioncable (5.1.7) + actionpack (= 5.1.7) + nio4r (~> 2.0) websocket-driver (~> 0.6.1) - actionmailer (5.0.7.2) - actionpack (= 5.0.7.2) - actionview (= 5.0.7.2) - activejob (= 5.0.7.2) + actionmailer (5.1.7) + actionpack (= 5.1.7) + actionview (= 5.1.7) + activejob (= 5.1.7) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.7.2) - actionview (= 5.0.7.2) - activesupport (= 5.0.7.2) + actionpack (5.1.7) + actionview (= 5.1.7) + activesupport (= 5.1.7) rack (~> 2.0) - rack-test (~> 0.6.3) + rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.7.2) - activesupport (= 5.0.7.2) + actionview (5.1.7) + activesupport (= 5.1.7) builder (~> 3.1) - erubis (~> 2.7.0) + erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) active-fedora (11.5.4) @@ -42,18 +42,18 @@ GEM rdf-vocab (>= 2.0, < 4.0) active_encode (0.5.0) rails - activejob (5.0.7.2) - activesupport (= 5.0.7.2) + activejob (5.1.7) + activesupport (= 5.1.7) globalid (>= 0.3.6) - activemodel (5.0.7.2) - activesupport (= 5.0.7.2) - activerecord (5.0.7.2) - activemodel (= 5.0.7.2) - activesupport (= 5.0.7.2) - arel (~> 7.0) + activemodel (5.1.7) + activesupport (= 5.1.7) + activerecord (5.1.7) + activemodel (= 5.1.7) + activesupport (= 5.1.7) + arel (~> 8.0) activerecord-import (1.0.1) activerecord (>= 3.2) - activesupport (5.0.7.2) + activesupport (5.1.7) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -62,26 +62,27 @@ GEM public_suffix (>= 2.0.2, < 4.0) almond-rails (0.1.0) rails (>= 4.2, < 6) - arel (7.1.4) - autoprefixer-rails (9.4.10.2) + arel (8.0.0) + autoprefixer-rails (9.5.1) execjs awesome_nested_set (3.1.4) activerecord (>= 4.0.0, < 5.3) aws-eventstream (1.0.2) - aws-partitions (1.144.0) - aws-sdk-core (3.46.2) - aws-eventstream (~> 1.0) + aws-partitions (1.151.0) + aws-sdk-core (3.48.4) + aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1.0) - aws-sigv4 (~> 1.0) + aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.13.0) - aws-sdk-core (~> 3, >= 3.39.0) - aws-sigv4 (~> 1.0) - aws-sdk-s3 (1.31.0) - aws-sdk-core (~> 3, >= 3.39.0) + aws-sdk-kms (1.17.0) + aws-sdk-core (~> 3, >= 3.48.2) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.36.1) + aws-sdk-core (~> 3, >= 3.48.2) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.0) - aws-sigv4 (1.0.3) + aws-sigv4 (1.1.0) + aws-eventstream (~> 1.0, >= 1.0.2) babel-source (5.8.35) babel-transpiler (0.7.0) babel-source (>= 4.0, < 6) @@ -89,7 +90,7 @@ GEM bcp47 (0.3.3) i18n bcrypt (3.1.12) - bindex (0.5.0) + bindex (0.7.0) blacklight (6.20.0) bootstrap-sass (~> 3.2) deprecation @@ -130,12 +131,22 @@ GEM sass-rails signet builder (3.2.3) - byebug (11.0.0) + byebug (11.0.1) cancancan (1.17.0) + capybara (3.18.0) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.2) + xpath (~> 3.2) carrierwave (1.3.1) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) + childprocess (1.0.1) + rake (< 13.0) clipboard-rails (1.7.1) coffee-rails (4.2.2) coffee-script (>= 2.2.0) @@ -151,7 +162,7 @@ GEM declarative-option (0.1.0) deprecation (1.0.0) activesupport - devise (4.6.1) + devise (4.6.2) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 6.0) @@ -172,13 +183,13 @@ GEM dry-core (0.4.7) concurrent-ruby (~> 1.0) dry-equalizer (0.2.2) - dry-events (0.1.0) + dry-events (0.1.1) concurrent-ruby (~> 1.0) dry-core (~> 0.4) dry-equalizer (~> 0.2) dry-inflector (0.1.2) - dry-logic (0.5.0) - dry-container (~> 0.2, >= 0.2.6) + dry-logic (0.6.1) + concurrent-ruby (~> 1.0) dry-core (~> 0.2) dry-equalizer (~> 0.2) dry-matcher (0.7.0) @@ -196,26 +207,26 @@ GEM dry-events (>= 0.1.0) dry-matcher (>= 0.7.0) dry-monads (>= 0.4.0) - dry-types (0.14.0) + dry-types (0.14.1) concurrent-ruby (~> 1.0) dry-container (~> 0.3) dry-core (~> 0.4, >= 0.4.4) dry-equalizer (~> 0.2) dry-inflector (~> 0.1, >= 0.1.2) dry-logic (~> 0.5, >= 0.5) - dry-validation (0.13.0) + dry-validation (0.13.1) concurrent-ruby (~> 1.0) dry-configurable (~> 0.1, >= 0.1.3) dry-core (~> 0.2, >= 0.2.1) dry-equalizer (~> 0.2) dry-logic (~> 0.5, >= 0.5.0) - dry-types (~> 0.14, >= 0.14) + dry-types (~> 0.14.0) ebnf (1.1.3) rdf (~> 3.0) sxp (~> 1.0) equivalent-xml (0.6.0) nokogiri (>= 1.4.3) - erubis (2.7.0) + erubi (1.8.0) execjs (2.7.0) faraday (0.12.2) multipart-post (>= 1.2, < 3) @@ -224,15 +235,15 @@ GEM fcrepo_wrapper (0.9.0) ruby-progressbar ffi (1.10.0) - flipflop (2.4.0) + flipflop (2.5.0) activesupport (>= 4.0) flot-rails (0.0.7) jquery-rails - font-awesome-rails (4.7.0.4) - railties (>= 3.2, < 6.0) + font-awesome-rails (4.7.0.5) + railties (>= 3.2, < 6.1) globalid (0.4.2) activesupport (>= 4.2.0) - google-api-client (0.28.4) + google-api-client (0.28.7) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.5, < 0.10.0) httpclient (>= 2.8.1, < 3.0) @@ -244,7 +255,7 @@ GEM google-api-client (>= 0.11.0, < 0.29.0) googleauth (>= 0.5.0, < 1.0.0) nokogiri (>= 1.5.3, < 2.0.0) - googleauth (0.8.0) + googleauth (0.8.1) faraday (~> 0.12) jwt (>= 1.4, < 3.0) memoist (~> 0.16) @@ -259,7 +270,7 @@ GEM hiredis (0.6.3) htmlentities (4.3.4) http_logger (0.5.1) - httparty (0.16.4) + httparty (0.17.0) mime-types (~> 3.0) multi_xml (>= 0.5.2) httpclient (2.8.3) @@ -306,7 +317,7 @@ GEM hydra-derivatives (~> 3.0) hydra-file_characterization (~> 0.3, >= 0.3.3) hydra-pcdm (>= 0.9) - hyrax (2.4.1) + hyrax (2.5.0) active-fedora (~> 11.5, >= 11.5.2) almond-rails (~> 0.1) awesome_nested_set (~> 3.1) @@ -325,7 +336,7 @@ GEM font-awesome-rails (~> 4.2) hydra-derivatives (~> 3.3) hydra-editor (>= 3.3, < 5.0) - hydra-head (>= 10.5.0) + hydra-head (>= 10.6.1) hydra-works (>= 0.16, < 2.0) iiif_manifest (>= 0.3, < 0.6) jquery-datatables-rails (~> 3.4) @@ -357,6 +368,8 @@ GEM i18n (1.6.0) concurrent-ruby (~> 1.0) ice_nine (0.11.2) + iiif-image-api (0.1.0) + activesupport (<= 6) iiif_manifest (0.5.0) activesupport (>= 4) jbuilder (2.8.0) @@ -459,7 +472,7 @@ GEM method_source (0.9.2) mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2018.0812) + mime-types-data (3.2019.0331) mini_magick (4.9.3) mini_mime (1.0.1) mini_portile2 (2.4.0) @@ -476,7 +489,7 @@ GEM noid-rails (3.0.1) actionpack (>= 5.0.0, < 6) noid (~> 0.9) - nokogiri (1.10.1) + nokogiri (1.10.3) mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri @@ -496,7 +509,7 @@ GEM power_converter (0.1.2) public_suffix (3.0.3) pul_uv_rails (2.0.1) - puma (3.12.0) + puma (3.12.1) qa (2.2.0) activerecord-import deprecation @@ -504,20 +517,20 @@ GEM nokogiri (~> 1.6) rails (~> 5.0) rdf - rack (2.0.6) - rack-test (0.6.3) - rack (>= 1.0) - rails (5.0.7.2) - actioncable (= 5.0.7.2) - actionmailer (= 5.0.7.2) - actionpack (= 5.0.7.2) - actionview (= 5.0.7.2) - activejob (= 5.0.7.2) - activemodel (= 5.0.7.2) - activerecord (= 5.0.7.2) - activesupport (= 5.0.7.2) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.1.7) + actioncable (= 5.1.7) + actionmailer (= 5.1.7) + actionpack (= 5.1.7) + actionview (= 5.1.7) + activejob (= 5.1.7) + activemodel (= 5.1.7) + activerecord (= 5.1.7) + activesupport (= 5.1.7) bundler (>= 1.3.0) - railties (= 5.0.7.2) + railties (= 5.1.7) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) @@ -526,9 +539,9 @@ GEM loofah (~> 2.2, >= 2.2.2) rails_autolink (1.1.6) rails (> 3.1) - railties (5.0.7.2) - actionpack (= 5.0.7.2) - activesupport (= 5.0.7.2) + railties (5.1.7) + actionpack (= 5.1.7) + activesupport (= 5.1.7) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) @@ -536,7 +549,7 @@ GEM rb-fsevent (0.10.3) rb-inotify (0.10.0) ffi (~> 1.0) - rdf (3.0.10) + rdf (3.0.12) hamster (~> 3.0) link_header (~> 0.0, >= 0.0.8) rdf-aggregate-repo (2.2.1) @@ -550,8 +563,10 @@ GEM nokogiri (~> 1.8) rdf (>= 2.2.8, < 4.0) rdf-xsd (>= 2.2, < 4.0) - rdf-n3 (3.0.1) + rdf-n3 (3.1.0) rdf (~> 3.0) + sparql (~> 3.0) + sxp (~> 1.0) rdf-normalize (0.3.3) rdf (>= 2.2, < 4.0) rdf-rdfa (3.0.1) @@ -582,11 +597,11 @@ GEM rdf-turtle (~> 3.0, >= 3.0.3) rdf-trix (2.2.1) rdf (>= 2.2, < 4.0) - rdf-turtle (3.0.5) + rdf-turtle (3.0.6) ebnf (~> 1.1) rdf (~> 3.0) - rdf-vocab (3.0.4) - rdf (~> 3.0) + rdf-vocab (3.0.5) + rdf (~> 3.0, >= 3.0.11) rdf-xsd (3.0.1) rdf (~> 3.0) redic (1.5.1) @@ -597,6 +612,7 @@ GEM redlock (1.0.0) redis (>= 3.0.0, < 5.0) ref (2.0.0) + regexp_parser (1.4.0) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) @@ -605,11 +621,16 @@ GEM actionpack (>= 4.2.0, < 6.0) railties (>= 4.2.0, < 6.0) retriable (3.1.2) - rsolr (1.1.2) + riiif (2.0.0) + deprecation (>= 1.0.0) + iiif-image-api (~> 0.1.0) + railties (>= 4.2, < 6) + rsolr (2.2.1) builder (>= 2.1.2) + faraday (>= 0.9.0) rspec-core (3.8.0) rspec-support (~> 3.8.0) - rspec-expectations (3.8.2) + rspec-expectations (3.8.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) rspec-mocks (3.8.0) @@ -633,7 +654,7 @@ GEM rubyzip (1.2.2) samvera-nesting_indexer (2.0.0) dry-equalizer - 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) @@ -649,6 +670,9 @@ GEM rake select2-rails (3.5.10) thor (~> 0.14) + selenium-webdriver (3.142.0) + childprocess (>= 0.5, < 2.0) + rubyzip (~> 1.2, >= 1.2.2) shex (0.5.2) ebnf (~> 1.1) json-ld (>= 2.2, < 4.0) @@ -703,7 +727,7 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sqlite3 (1.4.0) + sqlite3 (1.3.13) sxp (1.0.2) rdf (~> 3.0) temple (0.8.1) @@ -713,7 +737,7 @@ GEM thor (0.20.3) thread_safe (0.3.6) tilt (2.0.9) - tinymce-rails (4.9.3) + tinymce-rails (4.9.4) railties (>= 3.1.1) turbolinks (5.2.0) turbolinks-source (~> 5.2) @@ -738,37 +762,44 @@ GEM websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) xml-simple (1.1.5) + xpath (3.2.0) + nokogiri (~> 1.8) PLATFORMS ruby DEPENDENCIES + bootstrap-sass (~> 3.0) byebug + capybara (>= 2.15) coffee-rails (~> 4.2) devise - devise-guests (~> 0.5) + devise-guests (~> 0.6) fcrepo_wrapper hydra-role-management - hyrax (= 2.4.1) + hyrax (= 2.5.0) jbuilder (~> 2.5) jquery-rails - listen (~> 3.0.5) + listen (~> 3.0.5, < 3.2) pg - puma (~> 3.0) - rails (~> 5.0.7) - rsolr (~> 1.0) + puma (~> 3.7) + rails (~> 5.1.7) + riiif (~> 2.0) + rsolr (>= 1.0) rspec-rails sass-rails (~> 5.0) + selenium-webdriver sitemap solr_wrapper (>= 0.3) spring spring-watcher-listen (~> 2.0.0) - sqlite3 + sqlite3 (~> 1.3.0) therubyracer turbolinks (~> 5) + twitter-typeahead-rails (= 0.11.1.pre.corejavascript) tzinfo-data uglifier (>= 1.3.0) web-console (>= 3.3.0) BUNDLED WITH - 1.16.3 + 2.0.1 From 3369d0506d790949505f78dbb2caf0afde30d65e Mon Sep 17 00:00:00 2001 From: Dan Kerchner Date: Wed, 24 Apr 2019 15:50:41 -0400 Subject: [PATCH 3/3] A start on #13 --- .travis.yml | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index ff1502d4..7e93a48b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,44 +1,35 @@ language: ruby -sudo: false +sudo: required dist: trusty +addons: + apt: + packages: + - chromium-chromedriver cache: bundler: true - directories: - - "travis_phantomjs" before_install: - gem update --system - gem install bundler - - "phantomjs --version" - - "export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH" - - "if [ $(phantomjs --version) != '2.1.1' ]; then rm -rf $PWD/travis_phantomjs; mkdir -p $PWD/travis_phantomjs; fi" - - "if [ $(phantomjs --version) != '2.1.1' ]; then wget https://assets.membergetmember.co/software/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2; fi" - - "if [ $(phantomjs --version) != '2.1.1' ]; then tar -xvf $PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis_phantomjs; fi" - - "phantomjs --version" + - google-chrome-stable --headless --disable-gpu --no-sandbox --remote-debugging-port=9222 http://localhost & rvm: - - 2.4.1 + - 2.5.5 env: global: - NOKOGIRI_USE_SYSTEM_LIBRARIES=true + - ENGINE_CART_RAILS_OPTIONS='--skip-git --skip-bundle --skip-listen --skip-spring --skip-yarn --skip-keeps --skip-action-cable --skip-coffee --skip-puma --skip-test' # Travis should check every minor version in a range of supported versions, because # rails does not follow sem-ver conventions, see http://guides.rubyonrails.org/maintenance_policy.html # It should be sufficient to test only the latest of the patch versions for a minor version, they # should be compatible across patch versions (only bug fixes are released in patch versions). matrix: - - "RAILS_VERSION=5.0.3" - - "RAILS_VERSION=5.1.1" + - "RAILS_VERSION=5.1.7" services: - redis-server before_script: - jdk_switcher use oraclejdk8 -notifications: - email: - recipients: - - "kerchner@gwu.edu" - on_success: "change" - on_failure: "always" - slack: gwlai:Ll8QuTDbyV9YRIb33bg5RfSD + - ln -s /usr/lib/chromium-browser/chromedriver ~/bin/chromedriver