diff --git a/.circleci/config.yml b/.circleci/config.yml index 7666c6c..717d8d1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,10 +1,11 @@ version: 2.1 orbs: - docker: circleci/docker@1.5.0 + docker: circleci/docker@2.2.0 jobs: checkout_code: docker: - - image: circleci/ruby:2.5 + - image: cimg/ruby:2.5.8 + resource_class: large working_directory: ~/app steps: - restore_cache: @@ -24,7 +25,8 @@ jobs: - app/**/* bundle: docker: - - image: circleci/ruby:2.5-stretch + - image: cimg/ruby:2.5.8 + resource_class: large environment: BUNDLE_PATH: vendor/bundle working_directory: ~/app @@ -34,7 +36,9 @@ jobs: - run: name: Update Debian Packages for Building command: | - sudo apt-get install -y software-properties-common build-essential make apt-utils cmake nodejs default-libmysqlclient-dev + sudo apt-get update -qq + sudo apt-get upgrade -qq + sudo apt-get install -y software-properties-common build-essential make apt-utils cmake nodejs default-libmysqlclient-dev libsqlite3-dev pkg-config - restore_cache: name: Restore bundle from cache keys: @@ -62,16 +66,17 @@ jobs: - app/**/* test: docker: - - image: circleci/ruby:2.5-stretch + - image: cimg/ruby:2.5.8 environment: HONEYCOMB_DEBUG: 'true' RAILS_ENV: test - - image: circleci/mysql:5.7.22 + - image: cimg/mysql:5.7.36 environment: MYSQL_ROOT_PASSWORD: monkeys MYSQL_USER: monkeys MYSQL_PASSWORD: monkeys MYSQL_DATABASE: cvm_test + resource_class: large working_directory: ~/app steps: - attach_workspace: @@ -81,7 +86,7 @@ jobs: command: | sudo apt-get update -qq sudo apt-get upgrade -qq - sudo apt-get install -y -f software-properties-common build-essential default-libmysqlclient-dev nodejs make apt-utils nodejs cmake apt-utils openjdk-8-jre-headless ca-certificates-java openjdk-8-jre openjdk-8-jdk openjdk-8-jdk-headless + sudo apt-get install -y -f software-properties-common build-essential default-libmysqlclient-dev nodejs make cmake apt-utils openjdk-8-jre-headless ca-certificates-java openjdk-8-jre openjdk-8-jdk openjdk-8-jdk-headless - run: name: phantomjs command: | diff --git a/Gemfile b/Gemfile index 0d5cc4a..1fa7652 100644 --- a/Gemfile +++ b/Gemfile @@ -33,7 +33,9 @@ gem 'turbolinks' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder gem 'jbuilder', '~> 2.0' # bundle exec rake doc:rails generates the API under doc/api. -gem 'sdoc', group: :doc +gem 'sdoc', '~> 2.2.0', group: :doc +gem 'rdoc', '~> 6.3.3' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring', group: :development diff --git a/Gemfile.lock b/Gemfile.lock index be3ceec..5b63478 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -20,27 +20,27 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (5.2.6) - actionpack (= 5.2.6) + actioncable (5.2.8.1) + actionpack (= 5.2.8.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.6) - actionpack (= 5.2.6) - actionview (= 5.2.6) - activejob (= 5.2.6) + actionmailer (5.2.8.1) + actionpack (= 5.2.8.1) + actionview (= 5.2.8.1) + activejob (= 5.2.8.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.6) - actionview (= 5.2.6) - activesupport (= 5.2.6) + actionpack (5.2.8.1) + actionview (= 5.2.8.1) + activesupport (= 5.2.8.1) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) actionpack-page_caching (1.2.4) actionpack (>= 4.0.0) - actionview (5.2.6) - activesupport (= 5.2.6) + actionview (5.2.8.1) + activesupport (= 5.2.8.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -51,59 +51,59 @@ GEM deprecation (~> 0.1) linkeddata (~> 1.1) rdf (~> 1.1) - activejob (5.2.6) - activesupport (= 5.2.6) + activejob (5.2.8.1) + activesupport (= 5.2.8.1) globalid (>= 0.3.6) - activemodel (5.2.6) - activesupport (= 5.2.6) - activerecord (5.2.6) - activemodel (= 5.2.6) - activesupport (= 5.2.6) + activemodel (5.2.8.1) + activesupport (= 5.2.8.1) + activerecord (5.2.8.1) + activemodel (= 5.2.8.1) + activesupport (= 5.2.8.1) arel (>= 9.0) - activestorage (5.2.6) - actionpack (= 5.2.6) - activerecord (= 5.2.6) + activestorage (5.2.8.1) + actionpack (= 5.2.8.1) + activerecord (= 5.2.8.1) marcel (~> 1.0.0) - activesupport (5.2.6) + activesupport (5.2.8.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) - airbrussh (1.4.0) + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) + airbrussh (1.4.2) sshkit (>= 1.6.1, != 1.7.0) arel (9.0.0) ast (2.4.2) - attr_extras (6.2.5) - autoprefixer-rails (10.3.3.0) + attr_extras (7.1.0) + autoprefixer-rails (10.4.13.0) execjs (~> 2) awesome_print (1.9.2) bcp47 (0.3.3) i18n - bcrypt (3.1.16) + bcrypt (3.1.19) bindex (0.8.1) - bootsnap (1.9.3) - msgpack (~> 1.0) + bootsnap (1.13.0) + msgpack (~> 1.2) bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) bootstrap-will_paginate (1.0.0) will_paginate - brakeman (5.1.2) + brakeman (5.4.1) builder (3.2.4) byebug (11.1.3) cancan (1.6.10) - capistrano (3.16.0) + capistrano (3.17.3) airbrussh (>= 1.0.0) i18n rake (>= 10.0.0) sshkit (>= 1.9.0) - capistrano-bundler (2.0.1) + capistrano-bundler (2.1.0) capistrano (~> 3.1) capistrano-passenger (0.2.1) capistrano (~> 3.0) - capistrano-rails (1.6.1) + capistrano-rails (1.6.3) capistrano (~> 3.1) capistrano-bundler (>= 1.1, < 3) capistrano-rbenv (2.2.0) @@ -117,7 +117,7 @@ GEM rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) - capybara-screenshot (1.0.25) + capybara-screenshot (1.0.26) capybara (>= 1.0, < 4) launchy cliver (0.3.2) @@ -129,8 +129,8 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.9) - config (3.1.0) + concurrent-ruby (1.2.2) + config (3.1.1) deep_merge (~> 1.2, >= 1.2.1) dry-validation (~> 1.0, >= 1.0.0) coveralls (0.7.1) @@ -142,29 +142,30 @@ GEM crack (0.4.5) rexml crass (1.0.6) - database_cleaner (2.0.1) - database_cleaner-active_record (~> 2.0.0) - database_cleaner-active_record (2.0.1) + database_cleaner (2.0.2) + database_cleaner-active_record (>= 2, < 3) + database_cleaner-active_record (2.1.0) activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) - deep_merge (1.2.1) + deep_merge (1.2.2) deprecation (0.99.0) activesupport - devise (4.8.0) + devise (4.9.2) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) responders warden (~> 1.2.3) - diff-lcs (1.4.4) + diff-lcs (1.5.0) diffy (3.4.2) + digest (3.1.1) docile (1.4.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - dotenv (2.7.6) - dotenv-rails (2.7.6) - dotenv (= 2.7.6) + dotenv (2.8.1) + dotenv-rails (2.8.1) + dotenv (= 2.8.1) railties (>= 3.2) dry-configurable (0.12.1) concurrent-ruby (~> 1.0) @@ -205,45 +206,49 @@ GEM sxp (~> 0.1, >= 0.1.3) equivalent-xml (0.6.0) nokogiri (>= 1.4.3) - erubi (1.10.0) + erubi (1.12.0) etc (1.0.0) - excon (0.88.0) + excon (0.102.0) execjs (2.8.1) - factory_bot (6.2.0) + factory_bot (6.2.1) activesupport (>= 5.0.0) factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) - faraday (1.8.0) + faraday (1.10.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.1) + faraday-net_http_persistent (~> 1.0) faraday-patron (~> 1.0) faraday-rack (~> 1.0) - multipart-post (>= 1.2, < 3) + faraday-retry (~> 1.0) ruby2_keywords (>= 0.0.4) faraday-em_http (1.0.0) faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) faraday-net_http (1.0.1) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) - ffi (1.15.4) + faraday-retry (1.0.3) + ffi (1.15.5) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake - font-awesome-rails (4.7.0.7) - railties (>= 3.2, < 7) + font-awesome-rails (4.7.0.8) + railties (>= 3.2, < 8.0) formulaic (0.4.1) activesupport capybara i18n - globalid (1.0.0) + globalid (1.1.0) activesupport (>= 5.0) grit (2.0.0) diff-lcs (>= 1.1.2) @@ -252,8 +257,8 @@ GEM temple (>= 0.8.0) tilt hashdiff (1.0.1) - honeycomb-beeline (2.7.1) - libhoney (~> 1.14, >= 1.14.2) + honeycomb-beeline (3.0.0) + libhoney (>= 1.14.2) htmlentities (4.3.4) http (5.0.4) addressable (~> 2.8) @@ -261,15 +266,17 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.4.0) http-accept (1.7.0) - http-cookie (1.0.4) + http-cookie (1.0.5) domain_name (~> 0.5) http-form_data (2.3.0) - i18n (1.8.11) + i18n (1.14.1) concurrent-ruby (~> 1.0) - iso-639 (0.3.5) - jbuilder (2.11.3) + io-wait (0.3.0) + iso-639 (0.3.6) + jbuilder (2.11.5) + actionview (>= 5.0.0) activesupport (>= 5.0.0) - jquery-rails (4.4.0) + jquery-rails (4.6.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -280,9 +287,9 @@ GEM multi_json (~> 1.11) rdf (~> 1.99) kgio (2.11.4) - launchy (2.5.0) - addressable (~> 2.7) - libhoney (1.21.0) + launchy (2.5.2) + addressable (~> 2.8) + libhoney (2.2.0) addressable (~> 2.0) excon http (>= 2.0, < 6.0) @@ -309,48 +316,65 @@ GEM rdf-xsd (~> 1.1, >= 1.1.5) sparql (~> 1.99) sparql-client (~> 1.99) - listen (3.7.0) + listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) llhttp-ffi (0.4.0) ffi-compiler (~> 1.0) rake (~> 13.0) - loofah (2.12.0) + loofah (2.21.3) crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) + nokogiri (>= 1.12.0) + mail (2.8.1) mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp marcel (1.0.2) method_source (1.0.0) - mime-types (3.4.1) + mime-types (3.5.1) mime-types-data (~> 3.2015) - mime-types-data (3.2021.1115) + mime-types-data (3.2023.0808) mini_mime (1.1.2) mini_portile2 (2.6.1) mini_racer (0.4.0) libv8-node (~> 15.14.0.0) - minitest (5.14.4) - msgpack (1.4.2) + minitest (5.15.0) + msgpack (1.7.2) multi_json (1.15.0) - multipart-post (2.1.1) + multipart-post (2.3.0) mysql2 (0.4.10) net-http-persistent (2.9.4) - net-scp (3.0.0) - net-ssh (>= 2.6.5, < 7.0.0) + net-imap (0.2.2) + digest + net-protocol + strscan + net-pop (0.1.2) + net-protocol + net-protocol (0.1.2) + io-wait + timeout + net-scp (4.0.0) + net-ssh (>= 2.6.5, < 8.0.0) + net-smtp (0.3.0) + digest + net-protocol + timeout net-ssh (6.1.0) netrc (0.11.0) - nio4r (2.5.8) + nio4r (2.5.9) nokogiri (1.12.5) mini_portile2 (~> 2.6.1) racc (~> 1.4) - octokit (4.21.0) - faraday (>= 0.9) - sawyer (~> 0.8.0, >= 0.5.3) + octokit (4.25.1) + faraday (>= 1, < 3) + sawyer (~> 0.9) orm_adapter (0.5.0) - parallel (1.21.0) - parser (3.0.3.1) + parallel (1.23.0) + parser (3.2.2.3) ast (~> 2.4.1) - passenger (6.0.12) + racc + passenger (6.0.18) rack rake (>= 0.8.1) poltergeist (1.18.1) @@ -358,7 +382,7 @@ GEM cliver (~> 0.3.1) websocket-driver (>= 0.2.0) pr_geohash (1.0.0) - pry (0.14.1) + pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) pry-byebug (3.8.0) @@ -373,45 +397,46 @@ GEM pry-remote (0.1.8) pry (~> 0.9) slop (~> 3.0) - public_suffix (4.0.6) + public_suffix (4.0.7) puma (5.3.2) nio4r (~> 2.0) - racc (1.6.0) - rack (2.2.6.3) - rack-test (1.1.0) - rack (>= 1.0, < 3) - rails (5.2.6) - actioncable (= 5.2.6) - actionmailer (= 5.2.6) - actionpack (= 5.2.6) - actionview (= 5.2.6) - activejob (= 5.2.6) - activemodel (= 5.2.6) - activerecord (= 5.2.6) - activestorage (= 5.2.6) - activesupport (= 5.2.6) + racc (1.7.1) + rack (2.2.8) + rack-test (2.1.0) + rack (>= 1.3) + rails (5.2.8.1) + actioncable (= 5.2.8.1) + actionmailer (= 5.2.8.1) + actionpack (= 5.2.8.1) + actionview (= 5.2.8.1) + activejob (= 5.2.8.1) + activemodel (= 5.2.8.1) + activerecord (= 5.2.8.1) + activestorage (= 5.2.8.1) + activesupport (= 5.2.8.1) bundler (>= 1.3.0) - railties (= 5.2.6) + railties (= 5.2.8.1) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) activesupport (>= 5.0.1.rc1) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.4.2) - loofah (~> 2.3) - railties (5.2.6) - actionpack (= 5.2.6) - activesupport (= 5.2.6) + rails-html-sanitizer (1.5.0) + loofah (~> 2.19, >= 2.19.1) + railties (5.2.8.1) + actionpack (= 5.2.8.1) + activesupport (= 5.2.8.1) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) - rainbow (3.0.0) - raindrops (0.19.2) + rainbow (3.1.1) + raindrops (0.20.1) rake (13.0.6) - rb-fsevent (0.11.0) + rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) rdf (1.99.1) @@ -469,7 +494,7 @@ GEM rdf-xsd (1.99.0) rdf (~> 1.99) rdoc (6.3.3) - regexp_parser (2.1.1) + regexp_parser (2.8.1) responders (2.4.1) actionpack (>= 4.2.0, < 6.0) railties (>= 4.2.0, < 6.0) @@ -478,19 +503,19 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.5) - rsolr (2.3.0) + rexml (3.2.6) + rsolr (2.5.0) builder (>= 2.1.2) - faraday (>= 0.9.0) - rspec-core (3.10.1) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.1) + faraday (>= 0.9, < 3, != 2.0.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.2) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-rails (5.0.2) + rspec-support (~> 3.12.0) + rspec-rails (5.1.2) actionpack (>= 5.2) activesupport (>= 5.2) railties (>= 5.2) @@ -498,27 +523,27 @@ GEM rspec-expectations (~> 3.10) rspec-mocks (~> 3.10) rspec-support (~> 3.10) - rspec-support (3.10.3) - rubocop (1.23.0) + rspec-support (3.12.1) + rubocop (1.28.2) parallel (~> 1.10) - parser (>= 3.0.0.0) + parser (>= 3.1.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 1.12.0, < 2.0) + rubocop-ast (>= 1.17.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.14.0) - parser (>= 3.0.1.1) - rubocop-rails (2.12.4) + rubocop-ast (1.17.0) + parser (>= 3.1.1.0) + rubocop-rails (2.14.2) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.7.0, < 2.0) - rubocop-rspec (2.6.0) + rubocop-rspec (2.10.0) rubocop (~> 1.19) - ruby-progressbar (1.11.0) + ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) - rugged (1.2.0) + rugged (1.6.3) sass-rails (6.0.0) sassc-rails (~> 2.1, >= 2.1.1) sassc (2.4.0) @@ -529,22 +554,22 @@ GEM sprockets (> 3.0) sprockets-rails tilt - sawyer (0.8.2) + sawyer (0.9.2) addressable (>= 2.3.5) - faraday (> 0.8, < 2.0) + faraday (>= 0.17.3, < 3) sdoc (2.2.0) rdoc (>= 5.0) shoulda-matchers (4.5.1) activesupport (>= 4.2.0) - simple_form (5.1.0) + simple_form (5.2.0) actionpack (>= 5.2) activemodel (>= 5.2) - 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_json_formatter (0.1.3) + simplecov_json_formatter (0.1.4) slop (3.6.0) sparql (1.99.1) builder (~> 3.2) @@ -562,42 +587,44 @@ GEM spring (3.1.1) spring-commands-rspec (1.0.4) spring (>= 0.9.1) - sprockets (4.0.2) + sprockets (4.2.0) concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.4.1) + rack (>= 2.2.4, < 4) + sprockets-rails (3.4.2) actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) sqlite3 (1.3.13) - sshkit (1.21.2) + sshkit (1.21.5) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) - sunspot (2.5.0) + strscan (3.0.6) + sunspot (2.6.0) pr_geohash (~> 1.0) rsolr (>= 1.1.1, < 3) - sunspot_solr (2.5.0) + sunspot_solr (2.6.0) sxp (0.1.5) - temple (0.8.2) + temple (0.10.2) term-ansicolor (1.7.1) tins (~> 1.0) - thor (1.1.0) + thor (1.2.2) thread_safe (0.3.6) - tilt (2.0.10) - timecop (0.9.4) + tilt (2.2.0) + timecop (0.9.8) + timeout (0.4.0) tins (1.6.0) turbolinks (5.2.1) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) - tzinfo (1.2.10) + tzinfo (1.2.11) thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext - unf_ext (0.0.8) - unicode-display_width (2.1.0) - unicorn (6.0.0) + unf_ext (0.0.8.2) + unicode-display_width (2.4.2) + unicorn (6.1.0) kgio (~> 2.6) raindrops (~> 0.7) warden (1.2.9) @@ -614,11 +641,11 @@ GEM activemodel (>= 5.0) bindex (>= 0.4.0) railties (>= 5.0) - webmock (3.14.0) + webmock (3.19.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - websocket-driver (0.7.5) + websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) will_paginate (3.1.8) @@ -678,6 +705,7 @@ DEPENDENCIES rails-controller-testing rake (>= 13.0.1) rdf-vocab + rdoc (~> 6.3.3) responders (~> 2.0) rest-client rspec-rails @@ -686,7 +714,7 @@ DEPENDENCIES rubocop-rspec rugged sass-rails - sdoc + sdoc (~> 2.2.0) shoulda-matchers simple_form simplecov @@ -708,4 +736,4 @@ DEPENDENCIES will_paginate (~> 3.1.0) BUNDLED WITH - 1.17.3 + 2.0.2