From fed830e1b40579ab3fd617afa544a52c4e6b5b0b Mon Sep 17 00:00:00 2001 From: Rick Carlino Date: Thu, 12 Apr 2018 15:02:51 -0500 Subject: [PATCH] Gem upgrades --- .ruby-version | 2 +- .travis.yml | 2 +- Gemfile | 4 +- Gemfile.lock | 102 ++++++++++++++--------------- app/serializers/tool_serializer.rb | 2 + ubuntu_example.sh | 4 +- 6 files changed, 59 insertions(+), 57 deletions(-) diff --git a/.ruby-version b/.ruby-version index 437459cd9..73462a5a1 100755 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.5.0 +2.5.1 diff --git a/.travis.yml b/.travis.yml index 0ba88103b..2ca24d4f6 100755 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ node_js: before_script: - sudo apt-get install curl -y - mv node_modules/.bin/which node_modules/.bin/which.backup -- rvm install 2.5.0 && rvm use 2.5.0 +- rvm install 2.5.1 && rvm use 2.5.1 - mv node_modules/.bin/which.backup node_modules/.bin/which - cp config/database.travis.yml config/database.yml - mkdir -p public/app diff --git a/Gemfile b/Gemfile index c43c16dee..f681d9033 100755 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source "https://rubygems.org" -ruby "2.5.0" +ruby "2.5.1" gem "rails" gem "thin" @@ -27,7 +27,7 @@ gem "request_store" gem "secure_headers" gem "valid_url" gem "font-awesome-rails" -gem "discard", "~> 1.0" +gem "discard" gem "scenic" gem "bullet" diff --git a/Gemfile.lock b/Gemfile.lock index 1b8ea8eba..c5ce15722 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,7 +6,7 @@ GIT GIT remote: https://github.com/fog/fog-google - revision: ee58e2a4d9502f2a4dc102ca6a4b664656551e3f + revision: c1be700a0c9557e8cf58b0eaa5d95bb078ca7fe5 specs: fog-google (1.3.3) fog-core @@ -17,25 +17,25 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (5.1.5) - actionpack (= 5.1.5) + actioncable (5.1.6) + actionpack (= 5.1.6) nio4r (~> 2.0) websocket-driver (~> 0.6.1) - actionmailer (5.1.5) - actionpack (= 5.1.5) - actionview (= 5.1.5) - activejob (= 5.1.5) + actionmailer (5.1.6) + actionpack (= 5.1.6) + actionview (= 5.1.6) + activejob (= 5.1.6) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.1.5) - actionview (= 5.1.5) - activesupport (= 5.1.5) + actionpack (5.1.6) + actionview (= 5.1.6) + activesupport (= 5.1.6) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.5) - activesupport (= 5.1.5) + actionview (5.1.6) + activesupport (= 5.1.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -45,18 +45,18 @@ GEM activemodel (>= 4.1, < 6) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) - activejob (5.1.5) - activesupport (= 5.1.5) + activejob (5.1.6) + activesupport (= 5.1.6) globalid (>= 0.3.6) - activemodel (5.1.5) - activesupport (= 5.1.5) - activerecord (5.1.5) - activemodel (= 5.1.5) - activesupport (= 5.1.5) + activemodel (5.1.6) + activesupport (= 5.1.6) + activerecord (5.1.6) + activemodel (= 5.1.6) + activesupport (= 5.1.6) arel (~> 8.0) - activesupport (5.1.5) + activesupport (5.1.6) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) + i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) addressable (2.5.2) @@ -70,13 +70,13 @@ GEM uniform_notifier (~> 1.11.0) bunny (2.9.2) amq-protocol (~> 2.3.0) - capybara (2.18.0) + capybara (3.0.1) addressable mini_mime (>= 0.1.3) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (>= 2.0, < 4.0) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + xpath (~> 3.0) case_transform (0.2) activesupport childprocess (0.9.0) @@ -89,7 +89,7 @@ GEM url coderay (1.1.2) concurrent-ruby (1.0.5) - crass (1.0.3) + crass (1.0.4) daemons (1.2.6) database_cleaner (1.6.2) declarative (0.0.10) @@ -111,7 +111,7 @@ GEM docile (1.3.0) erubi (1.7.1) eventmachine (1.2.5) - excon (0.61.0) + excon (0.62.0) factory_bot (4.8.2) activesupport (>= 3.0.0) factory_bot_rails (4.8.2) @@ -135,8 +135,8 @@ GEM fog-xml (0.1.3) fog-core nokogiri (>= 1.5.11, < 2.0.0) - font-awesome-rails (4.7.0.3) - railties (>= 3.2, < 5.2) + font-awesome-rails (4.7.0.4) + railties (>= 3.2, < 6.0) foreman (0.84.0) thor (~> 0.19.1) formatador (0.2.5) @@ -159,7 +159,7 @@ GEM signet (~> 0.7) hashdiff (0.3.7) httpclient (2.8.3) - i18n (0.9.5) + i18n (1.0.0) concurrent-ruby (~> 1.0) json (2.1.0) jsonapi-renderer (0.2.0) @@ -215,22 +215,22 @@ GEM pry (>= 0.10.4) public_suffix (3.0.2) rack (2.0.4) - rack-attack (5.1.0) + rack-attack (5.2.0) rack rack-cors (1.0.2) - rack-test (0.8.3) + rack-test (1.0.0) rack (>= 1.0, < 3) - rails (5.1.5) - actioncable (= 5.1.5) - actionmailer (= 5.1.5) - actionpack (= 5.1.5) - actionview (= 5.1.5) - activejob (= 5.1.5) - activemodel (= 5.1.5) - activerecord (= 5.1.5) - activesupport (= 5.1.5) + rails (5.1.6) + actioncable (= 5.1.6) + actionmailer (= 5.1.6) + actionpack (= 5.1.6) + actionview (= 5.1.6) + activejob (= 5.1.6) + activemodel (= 5.1.6) + activerecord (= 5.1.6) + activesupport (= 5.1.6) bundler (>= 1.3.0) - railties (= 5.1.5) + railties (= 5.1.6) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) @@ -240,16 +240,16 @@ GEM activesupport (>= 3.2) choice (~> 0.2.0) ruby-graphviz (~> 1.2) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) rails_12factor (0.0.3) rails_serve_static_assets rails_stdout_logging rails_serve_static_assets (0.0.5) rails_stdout_logging (0.0.5) - railties (5.1.5) - actionpack (= 5.1.5) - activesupport (= 5.1.5) + railties (5.1.6) + actionpack (= 5.1.6) + activesupport (= 5.1.6) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) @@ -307,7 +307,7 @@ GEM json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - skylight (1.6.0) + skylight (1.6.1) activesupport (>= 3.0.0) sprockets (3.7.1) concurrent-ruby (~> 1.0) @@ -356,7 +356,7 @@ DEPENDENCIES delayed_job delayed_job_active_record devise - discard (~> 1.0) + discard factory_bot_rails faker figaro @@ -394,7 +394,7 @@ DEPENDENCIES webpack-rails RUBY VERSION - ruby 2.5.0p0 + ruby 2.5.1p57 BUNDLED WITH 1.16.1 diff --git a/app/serializers/tool_serializer.rb b/app/serializers/tool_serializer.rb index a234fa9b0..7b0f40e58 100644 --- a/app/serializers/tool_serializer.rb +++ b/app/serializers/tool_serializer.rb @@ -2,6 +2,8 @@ class ToolSerializer < ActiveModel::Serializer attributes :id, :name, :status def status + # The attribute `tool_slot_id` is added via a special SQL query. + # SEE: ToolsController::INDEX_QUERY object[:tool_slot_id] ? "active" : "inactive" end end diff --git a/ubuntu_example.sh b/ubuntu_example.sh index 21d0ce439..72a9ec548 100644 --- a/ubuntu_example.sh +++ b/ubuntu_example.sh @@ -15,9 +15,9 @@ sudo docker run hello-world # Should run! command curl -sSL https://rvm.io/mpapis.asc | gpg --import - curl -sSL https://get.rvm.io | bash source /usr/local/rvm/scripts/rvm -rvm install "ruby-2.5.0" +rvm install "ruby-2.5.1" cd . -rvm --default use 2.5.0 +rvm --default use 2.5.1 # LOG OUT AND LOG BACK IN NOW. # Image Magick