From 14dc6495da9126d7c4ce8005c68bbdba98aa303f Mon Sep 17 00:00:00 2001 From: RobertDober Date: Mon, 9 Nov 2020 15:11:47 +0100 Subject: [PATCH 1/3] This should fix Travis' procedure --- Gemfile.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d7d290d..0e2a416 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,7 @@ PATH remote: . specs: locomotivecms_coal (1.6.0) - activesupport (>= 5.1.5, <= 6.0) + activesupport (>= 5.1.5, < 6.1) faraday (~> 0.15.4) faraday_middleware (~> 0.13.1) httpclient (~> 2.8.3) @@ -11,19 +11,19 @@ PATH GEM remote: https://rubygems.org/ specs: - activesupport (6.0.0) + activesupport (6.0.3.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - zeitwerk (~> 2.1, >= 2.1.8) + zeitwerk (~> 2.2, >= 2.2.2) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) byebug (9.0.6) codeclimate-test-reporter (1.0.7) simplecov coderay (1.1.2) - concurrent-ruby (1.1.5) + concurrent-ruby (1.1.7) coveralls (0.8.21) json (>= 1.8, < 3) simplecov (~> 0.14.1) @@ -44,7 +44,7 @@ GEM http-cookie (1.0.3) domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.7.0) + i18n (1.8.5) concurrent-ruby (~> 1.0) json (2.1.0) json_spec (1.1.5) @@ -54,7 +54,7 @@ GEM mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) - minitest (5.13.0) + minitest (5.14.2) multi_json (1.13.1) multipart-post (2.1.1) netrc (0.11.0) @@ -94,7 +94,7 @@ GEM thor (0.19.4) thread_safe (0.3.6) tins (1.16.3) - tzinfo (1.2.5) + tzinfo (1.2.8) thread_safe (~> 0.1) unf (0.1.4) unf_ext @@ -104,7 +104,7 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - zeitwerk (2.2.1) + zeitwerk (2.4.1) PLATFORMS ruby From 4f7f305ce424483937a8b1dfa08327389078218e Mon Sep 17 00:00:00 2001 From: RobertDober Date: Mon, 9 Nov 2020 17:53:10 +0100 Subject: [PATCH 2/3] Faraday Version Bump avoids warnings in Ruby 2.7 --- .travis.yml | 1 + Gemfile.lock | 68 +++++++++++++++++++------------------- locomotivecms_coal.gemspec | 4 +-- 3 files changed, 37 insertions(+), 36 deletions(-) diff --git a/.travis.yml b/.travis.yml index c604408..b2d6da2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: ruby rvm: - 2.6.5 + - 2.7.2 env: - CODECLIMATE_REPO_TOKEN=8d9c25de4eff1cd06d3accdc09775397e1a81be67e2a159453ba4e4408acae16 addons: diff --git a/Gemfile.lock b/Gemfile.lock index 0e2a416..725738c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,10 +3,10 @@ PATH specs: locomotivecms_coal (1.6.0) activesupport (>= 5.1.5, < 6.1) - faraday (~> 0.15.4) + faraday (~> 0.17) faraday_middleware (~> 0.13.1) httpclient (~> 2.8.3) - mime-types (~> 3.1.0) + mime-types (~> 3.3.0) GEM remote: https://rubygems.org/ @@ -17,54 +17,53 @@ GEM minitest (~> 5.1) tzinfo (~> 1.1) zeitwerk (~> 2.2, >= 2.2.2) - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) byebug (9.0.6) codeclimate-test-reporter (1.0.7) simplecov - coderay (1.1.2) + coderay (1.1.3) concurrent-ruby (1.1.7) - coveralls (0.8.21) + coveralls (0.8.23) json (>= 1.8, < 3) - simplecov (~> 0.14.1) + simplecov (~> 0.16.1) term-ansicolor (~> 1.3) - thor (~> 0.19.4) + thor (>= 0.19.4, < 2.0) tins (~> 1.6) - crack (0.4.3) - safe_yaml (~> 1.0.0) - diff-lcs (1.3) - docile (1.1.5) - domain_name (0.5.20170404) + crack (0.4.4) + diff-lcs (1.4.4) + docile (1.3.2) + domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - faraday (0.15.4) + faraday (0.17.3) multipart-post (>= 1.2, < 3) faraday_middleware (0.13.1) faraday (>= 0.7.4, < 1.0) - hashdiff (0.3.7) + hashdiff (1.0.1) http-cookie (1.0.3) domain_name (~> 0.5) httpclient (2.8.3) i18n (1.8.5) concurrent-ruby (~> 1.0) - json (2.1.0) + json (2.3.1) json_spec (1.1.5) multi_json (~> 1.0) rspec (>= 2.0, < 4.0) - method_source (0.9.0) - mime-types (3.1) + method_source (1.0.0) + mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) + mime-types-data (3.2020.1104) minitest (5.14.2) - multi_json (1.13.1) + multi_json (1.15.0) multipart-post (2.1.1) netrc (0.11.0) - pry (0.11.3) - coderay (~> 1.1.0) - method_source (~> 0.9.0) + pry (0.13.1) + coderay (~> 1.1) + method_source (~> 1.0) pry-byebug (3.4.3) byebug (>= 9.0, < 9.1) pry (~> 0.10) - public_suffix (3.0.2) + public_suffix (4.0.6) rake (13.0.1) rest-client (2.0.2) http-cookie (>= 1.0.2, < 2.0) @@ -83,27 +82,28 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.5.0) rspec-support (3.5.0) - safe_yaml (1.0.4) - simplecov (0.14.1) - docile (~> 1.1.0) + simplecov (0.16.1) + docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - term-ansicolor (1.6.0) + sync (0.5.0) + term-ansicolor (1.7.1) tins (~> 1.0) - thor (0.19.4) + thor (1.0.1) thread_safe (0.3.6) - tins (1.16.3) + tins (1.26.0) + sync tzinfo (1.2.8) thread_safe (~> 0.1) unf (0.1.4) unf_ext - unf_ext (0.0.7.5) - vcr (4.0.0) - webmock (3.3.0) + unf_ext (0.0.7.7) + vcr (6.0.0) + webmock (3.9.5) addressable (>= 2.3.6) crack (>= 0.3.2) - hashdiff + hashdiff (>= 0.4.0, < 2.0.0) zeitwerk (2.4.1) PLATFORMS diff --git a/locomotivecms_coal.gemspec b/locomotivecms_coal.gemspec index 6d377fe..46e21fd 100644 --- a/locomotivecms_coal.gemspec +++ b/locomotivecms_coal.gemspec @@ -18,10 +18,10 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'rake', '~> 13.0.1' spec.add_dependency 'httpclient', '~> 2.8.3' - spec.add_dependency 'faraday', '~> 0.15.4' + spec.add_dependency 'faraday', '~> 0.17' spec.add_dependency 'faraday_middleware', '~> 0.13.1' spec.add_dependency 'activesupport', '>= 5.1.5', '< 6.1' - spec.add_dependency 'mime-types', '~> 3.1.0' + spec.add_dependency 'mime-types', '~> 3.3.0' spec.required_ruby_version = '>= 2.0' end From 71f4c3a9611ee1f06007fbba5d6dbd5845e8c726 Mon Sep 17 00:00:00 2001 From: RobertDober Date: Mon, 9 Nov 2020 18:02:13 +0100 Subject: [PATCH 3/3] Updating pry version to avoid exception in rspec Easy to fix, just did what @did did here https://github.com/locomotivecms/wagon/commit/91d1724bf355b3606b9f4b4dc9d8f87faeb1bf75 These puns are just too easy --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index ab39940..1d1d6d7 100644 --- a/Gemfile +++ b/Gemfile @@ -11,7 +11,7 @@ group :test do gem 'rspec', '~> 3.5.0' gem 'json_spec', '~> 1.1.4' - gem 'pry-byebug', '~> 3.4.2' + gem 'pry-byebug', '~> 3.9.0' gem 'webmock' gem 'vcr' diff --git a/Gemfile.lock b/Gemfile.lock index 725738c..6d61a78 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -19,7 +19,7 @@ GEM zeitwerk (~> 2.2, >= 2.2.2) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) - byebug (9.0.6) + byebug (11.1.3) codeclimate-test-reporter (1.0.7) simplecov coderay (1.1.3) @@ -60,9 +60,9 @@ GEM pry (0.13.1) coderay (~> 1.1) method_source (~> 1.0) - pry-byebug (3.4.3) - byebug (>= 9.0, < 9.1) - pry (~> 0.10) + pry-byebug (3.9.0) + byebug (~> 11.0) + pry (~> 0.13.0) public_suffix (4.0.6) rake (13.0.1) rest-client (2.0.2) @@ -114,7 +114,7 @@ DEPENDENCIES coveralls (~> 0.8.19) json_spec (~> 1.1.4) locomotivecms_coal! - pry-byebug (~> 3.4.2) + pry-byebug (~> 3.9.0) rake (~> 13.0.1) rest-client (~> 2.0.2) rspec (~> 3.5.0)