From bcad02a38297bb69935460d3d8666b0c3cf912f6 Mon Sep 17 00:00:00 2001 From: Chris Beer Date: Tue, 8 Nov 2016 10:51:56 -0800 Subject: [PATCH 1/2] Update dependencies --- Gemfile.lock | 27 +++++++++++++-------------- VERSION | 2 +- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 47033069d..b020f3b52 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -61,14 +61,15 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.4.0) + addressable (2.5.0) + public_suffix (~> 2.0, >= 2.0.2) airbrussh (1.1.1) sshkit (>= 1.6.1, != 1.7.0) arel (6.0.3) ast (2.3.0) - autoprefixer-rails (6.5.1.1) + autoprefixer-rails (6.5.2) execjs - bagit (0.3.2) + bagit (0.3.4) docopt (~> 0.5.0) validatable (~> 1.6) barby (0.6.4) @@ -152,8 +153,7 @@ GEM ffi (~> 1.0, >= 1.0.11) chronic (0.10.2) cliver (0.3.2) - codeclimate-test-reporter (0.6.0) - simplecov (>= 0.7.1, < 1.0.0) + codeclimate-test-reporter (1.0.2) coderay (1.1.1) coffee-rails (4.2.1) coffee-script (>= 2.2.0) @@ -194,11 +194,11 @@ GEM capistrano-shared_configs docile (1.1.5) docopt (0.5.0) - domain_name (0.5.20160826) + domain_name (0.5.20161021) unf (>= 0.0.5, < 1.0.0) - dor-rights-auth (1.2.0) + dor-rights-auth (1.3.0) nokogiri - dor-services (5.14.0) + dor-services (5.14.1) active-fedora (>= 6.0, < 9.a) activesupport (>= 3.2.18) confstruct (~> 0.2.7) @@ -289,9 +289,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (5.0.5) railties (>= 3.2.16) - jquery-validation-rails (1.13.1) - railties (>= 3.2, < 5.0) - thor (~> 0.14) + jquery-validation-rails (1.15.0.0) json (1.8.3) json-ld (1.99.2) multi_json (~> 1.11) @@ -386,7 +384,7 @@ GEM capybara (~> 2.1) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) - posix-spawn (0.3.11) + posix-spawn (0.3.12) powerpack (0.1.1) prawn (1.3.0) pdf-core (~> 0.4.0) @@ -408,6 +406,7 @@ GEM pry-remote (0.1.8) pry (~> 0.9) slop (~> 3.0) + public_suffix (2.0.4) rack (1.6.4) rack-mini-profiler (0.10.1) rack (>= 1.2.0) @@ -522,7 +521,7 @@ GEM rspec-mocks (~> 3.4.0) rspec-support (~> 3.4.0) rspec-support (3.4.1) - rubocop (0.44.1) + rubocop (0.45.0) parser (>= 2.3.1.1, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) @@ -584,7 +583,7 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.12) - sshkit (1.11.3) + sshkit (1.11.4) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) stanford-mods (2.3.1) diff --git a/VERSION b/VERSION index 19811903a..f28071967 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.8.0 +3.8.1 From a9f31d6b32cf2a39d37a37069bdf011ef4ee6cb0 Mon Sep 17 00:00:00 2001 From: Chris Beer Date: Tue, 8 Nov 2016 11:04:51 -0800 Subject: [PATCH 2/2] Update code climate to new reporting style --- .travis.yml | 2 ++ spec/spec_helper.rb | 5 +---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index d52ad3c30..3c00a8d19 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,5 +8,7 @@ email: false before_script: - if [[ -r /etc/hosts ]]; then cat /etc/hosts ; fi script: bundle exec rake ci +after_script: +- bundle exec codeclimate-test-reporter sudo: false cache: bundler diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index f601e0e5b..c2dd2ac4f 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -10,16 +10,13 @@ require 'simplecov' require 'coveralls' -require 'codeclimate-test-reporter' -CodeClimate::TestReporter.start SimpleCov.profiles.define 'argo' do add_filter 'spec' add_filter 'vendor' end SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([ SimpleCov::Formatter::HTMLFormatter, - Coveralls::SimpleCov::Formatter, - CodeClimate::TestReporter::Formatter + Coveralls::SimpleCov::Formatter ]) SimpleCov.start 'argo'