From 2b813433595858b41e6a2170d2c99972c725d1a4 Mon Sep 17 00:00:00 2001 From: Rob Murray Date: Tue, 27 Dec 2016 13:14:35 +0000 Subject: [PATCH] Update to Ruby 2.4 --- .ruby-version | 2 +- .travis.yml | 2 +- Gemfile | 2 +- Gemfile.lock | 34 ++++++++++++++++------------------ spec/spec_helper.rb | 4 ++-- 5 files changed, 21 insertions(+), 23 deletions(-) diff --git a/.ruby-version b/.ruby-version index 2bf1c1c..197c4d5 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.3.1 +2.4.0 diff --git a/.travis.yml b/.travis.yml index 591b38a..4976cfd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,4 +2,4 @@ language: ruby cache: bundler sudo: false rvm: - - 2.3.1 + - 2.4.0 diff --git a/Gemfile b/Gemfile index de317bb..80e54a8 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ # frozen_string_literal: true source "https://rubygems.org" -ruby "2.3.1" +ruby "2.4.0" gem "rake", "~> 10.1" gem "tilt", "~> 1.3" diff --git a/Gemfile.lock b/Gemfile.lock index 6bd477a..051aa8d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,17 +8,17 @@ GEM thread_safe (~> 0.3, >= 0.3.1) backports (3.6.8) byebug (9.0.6) - codeclimate-test-reporter (0.6.0) - simplecov (>= 0.7.1, < 1.0.0) + codeclimate-test-reporter (1.0.3) + simplecov coderay (1.1.1) coercible (1.0.0) descendants_tracker (~> 0.0.1) - coveralls (0.8.15) + coveralls (0.8.17) json (>= 1.8, < 3) simplecov (~> 0.12.0) term-ansicolor (~> 1.3) thor (~> 0.19.1) - tins (>= 1.6.0, < 2) + tins (~> 1.6) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) diff-lcs (1.2.5) @@ -31,22 +31,20 @@ GEM method_source (0.8.2) mini_portile2 (2.1.0) multi_json (1.12.1) - nokogiri (1.6.8) + nokogiri (1.7.0) mini_portile2 (~> 2.1.0) - pkg-config (~> 1.1.7) - parser (2.3.1.2) + parser (2.3.3.1) ast (~> 2.2) - pkg-config (1.1.7) powerpack (0.1.1) pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - pry-byebug (3.4.0) + pry-byebug (3.4.2) byebug (~> 9.0) pry (~> 0.10) - puma (3.6.0) - rack (1.6.4) + puma (3.6.2) + rack (1.6.5) rack-protection (1.5.3) rack rack-test (0.6.3) @@ -62,14 +60,14 @@ GEM rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.5.0) - rspec-html-matchers (0.8.1) + rspec-html-matchers (0.8.2) nokogiri (~> 1) rspec (>= 3.0.0.a, < 4) rspec-mocks (3.5.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.5.0) rspec-support (3.5.0) - rubocop (0.42.0) + rubocop (0.46.0) parser (>= 2.3.1.1, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) @@ -95,11 +93,11 @@ GEM slop (3.6.0) term-ansicolor (1.4.0) tins (~> 1.0) - thor (0.19.1) + thor (0.19.4) thread_safe (0.3.5) tilt (1.4.1) - tins (1.12.0) - unicode-display_width (1.1.0) + tins (1.13.0) + unicode-display_width (1.1.2) virtus (1.0.5) axiom-types (~> 0.1) coercible (~> 1.0) @@ -127,7 +125,7 @@ DEPENDENCIES virtus RUBY VERSION - ruby 2.3.1p112 + ruby 2.4.0p0 BUNDLED WITH - 1.12.5 + 1.13.7 diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index e6d8c41..1297a43 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,13 +1,13 @@ # frozen_string_literal: true require "rubygems" require "coveralls" -require "codeclimate-test-reporter" +require "simplecov" require "byebug" # force the environment to 'test' ENV["RACK_ENV"] = "test" -CodeClimate::TestReporter.start +SimpleCov.start Coveralls.wear! Dir.glob("./spec/support/{helpers}/*.rb").each { |file| require file }