From 1238ff7cc16eebc8c6d48ffc0e7f75e5a4ee271e Mon Sep 17 00:00:00 2001 From: Keita Urashima Date: Tue, 28 Jul 2020 10:41:11 +0900 Subject: [PATCH 1/4] Update linguist to build with Ruby 2.6 --- Gemfile | 2 +- Gemfile.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index 8686ce6..59ac911 100644 --- a/Gemfile +++ b/Gemfile @@ -5,6 +5,6 @@ ruby ENV['CUSTOM_RUBY_VERSION'] if ENV['CUSTOM_RUBY_VERSION'] gemspec group :test do - gem 'github-linguist', '4.2.7' + gem 'github-linguist', '~> 4.5.0' gem 'coveralls', require: false end diff --git a/Gemfile.lock b/Gemfile.lock index e064456..5033b12 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -39,7 +39,7 @@ GEM public_suffix (>= 2.0.2, < 4.0) backports (3.11.4) builder (3.2.3) - charlock_holmes (0.7.6) + charlock_holmes (0.7.7) coderay (1.1.2) commonmarker (0.20.1) ruby-enum (~> 0.5) @@ -56,14 +56,14 @@ GEM diff-lcs (1.3) docile (1.3.1) erubi (1.9.0) - escape_utils (1.0.1) + escape_utils (1.1.1) ffi (1.11.1) gemoji (3.0.1) - github-linguist (4.2.7) + github-linguist (4.5.15) charlock_holmes (~> 0.7.3) - escape_utils (~> 1.0.1) + escape_utils (~> 1.1.0) mime-types (>= 1.19) - rugged (~> 0.22.0b4) + rugged (>= 0.23.0b) haml (5.1.2) temple (>= 0.8.0) tilt @@ -129,7 +129,7 @@ GEM rspec-support (3.8.0) ruby-enum (0.7.2) i18n - rugged (0.22.2) + rugged (1.0.1) safe_yaml (1.0.4) sass (3.7.4) sass-listen (~> 4.0.0) @@ -180,7 +180,7 @@ PLATFORMS DEPENDENCIES bundler (~> 1.6) coveralls - github-linguist (= 4.2.7) + github-linguist (~> 4.5.0) idobata-hooks! pry rack-test From 71348ce78733c52f85b49ac2d9053b9c4ff79b32 Mon Sep 17 00:00:00 2001 From: Keita Urashima Date: Tue, 28 Jul 2020 10:54:08 +0900 Subject: [PATCH 2/4] Use newer Ruby on CI --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ce47e13..7db4c77 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: ruby sudo: false -rvm: 2.3.3 +rvm: 2.6.6 cache: [bundler, apt] git: depth: 1 From 4c978617a55fc488a8a47dfa31bdd49aab45cd2b Mon Sep 17 00:00:00 2001 From: Keita Urashima Date: Tue, 28 Jul 2020 11:03:16 +0900 Subject: [PATCH 3/4] Configure build matrix --- .travis.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7db4c77..9441766 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,12 @@ +dist: bionic language: ruby -sudo: false -rvm: 2.6.6 + +rvm: + - 2.5.7 + - 2.6.6 + cache: [bundler, apt] + git: depth: 1 From 63bfe5a5145d003212dd6bf29a79afbd064f613b Mon Sep 17 00:00:00 2001 From: Keita Urashima Date: Tue, 28 Jul 2020 11:16:46 +0900 Subject: [PATCH 4/4] Undress coveralls --- Gemfile | 1 - Gemfile.lock | 17 ----------------- spec/spec_helper.rb | 3 --- 3 files changed, 21 deletions(-) diff --git a/Gemfile b/Gemfile index 59ac911..f7c0609 100644 --- a/Gemfile +++ b/Gemfile @@ -6,5 +6,4 @@ gemspec group :test do gem 'github-linguist', '~> 4.5.0' - gem 'coveralls', require: false end diff --git a/Gemfile.lock b/Gemfile.lock index 5033b12..2dcebb3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -44,17 +44,10 @@ GEM commonmarker (0.20.1) ruby-enum (~> 0.5) concurrent-ruby (1.1.3) - coveralls (0.8.22) - json (>= 1.8, < 3) - simplecov (~> 0.16.1) - term-ansicolor (~> 1.3) - thor (~> 0.19.4) - tins (~> 1.6) crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.4) diff-lcs (1.3) - docile (1.3.1) erubi (1.9.0) escape_utils (1.1.1) ffi (1.11.1) @@ -78,7 +71,6 @@ GEM rouge (>= 2.0.0, < 4) i18n (1.1.1) concurrent-ruby (~> 1.0) - json (2.1.0) loofah (2.3.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) @@ -136,11 +128,6 @@ GEM sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - simplecov (0.16.1) - docile (~> 1.1) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.2) sinatra (2.0.4) mustermann (~> 1.0) rack (~> 2.0) @@ -160,12 +147,9 @@ GEM tapp (1.5.1) thor temple (0.8.2) - term-ansicolor (1.7.0) - tins (~> 1.0) thor (0.19.4) thread_safe (0.3.6) tilt (2.0.8) - tins (1.20.2) tzinfo (1.2.5) thread_safe (~> 0.1) vcr (4.0.0) @@ -179,7 +163,6 @@ PLATFORMS DEPENDENCIES bundler (~> 1.6) - coveralls github-linguist (~> 4.5.0) idobata-hooks! pry diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 03f4044..d312faa 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -5,9 +5,6 @@ require 'tapp' require 'pry' -require 'coveralls' -Coveralls.wear! - require 'idobata/hooks' Dir[Idobata::Hook.root.join('../spec/support/**/*.rb')].each { |f| require f }