Merge pull request #108 from idobata/update-linguist

Update linguist to build with Ruby 2.6
idobata · Aug 4, 2020 · 2157f4f · 2157f4f
2 parents 48839eb + 63bfe5a
commit 2157f4f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 31 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,12 @@
+dist: bionic
 language: ruby
-sudo: false
-rvm: 2.3.3
+
+rvm:
+  - 2.5.7
+  - 2.6.6
+
 cache: [bundler, apt]
+
 git:
   depth: 1
 

diff --git a/Gemfile b/Gemfile
@@ -5,6 +5,5 @@ ruby ENV['CUSTOM_RUBY_VERSION'] if ENV['CUSTOM_RUBY_VERSION']
 gemspec
 
 group :test do
-  gem 'github-linguist', '4.2.7'
-  gem 'coveralls', require: false
+  gem 'github-linguist', '~> 4.5.0'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -39,31 +39,24 @@ 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)
     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.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
@@ -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)
@@ -129,18 +121,13 @@ 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)
     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,8 +163,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.6)
-  coveralls
-  github-linguist (= 4.2.7)
+  github-linguist (~> 4.5.0)
   idobata-hooks!
   pry
   rack-test

diff --git 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 }