From 4860f67386b6e419ca0bd0e9f56447d9aed2ccb0 Mon Sep 17 00:00:00 2001 From: Matijs van Zuijlen Date: Mon, 7 Jan 2019 11:12:35 +0100 Subject: [PATCH 1/7] Loosen dependency on license_finder --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 1486dbedf..8bcf935d7 100644 --- a/Gemfile +++ b/Gemfile @@ -79,7 +79,7 @@ group :development, :test do if RUBY_VERSION < '2.3' gem 'license_finder', '~> 2.0' else - gem 'license_finder', '~> 5.0.3' + gem 'license_finder', '~> 5.0' end # Force compatible version of httparty for use by license_finder From ec7a30cbc880ad58fc37125eb7ff5aa48fece86a Mon Sep 17 00:00:00 2001 From: Matijs van Zuijlen Date: Mon, 7 Jan 2019 11:14:59 +0100 Subject: [PATCH 2/7] Update pry-doc dependency --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 8bcf935d7..f3b3b0f87 100644 --- a/Gemfile +++ b/Gemfile @@ -24,7 +24,7 @@ group :debug do if RUBY_VERSION < '2' gem 'pry-doc', '~> 0.8.0' else - gem 'pry-doc', '~> 0.13.1' + gem 'pry-doc', '~> 1.0.0' end end From bd0f39eb6ee048c232f7676e01f7b13bbd518722 Mon Sep 17 00:00:00 2001 From: Matijs van Zuijlen Date: Mon, 7 Jan 2019 11:15:38 +0100 Subject: [PATCH 3/7] Update pry dependency --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index f3b3b0f87..009733472 100644 --- a/Gemfile +++ b/Gemfile @@ -38,7 +38,7 @@ end group :development, :test do # we use this to demonstrate interactive debugging within our feature tests if RUBY_VERSION >= '2' - gem 'pry', '~> 0.11.2' + gem 'pry', '~> 0.12.2' else gem 'pry', '~> 0.9.12' end From 017bc3219db52aa73f0840533fb52f3abdd0ac37 Mon Sep 17 00:00:00 2001 From: Matijs van Zuijlen Date: Mon, 7 Jan 2019 21:12:08 +0100 Subject: [PATCH 4/7] Only install license_finder on modern Rubies Reasons: - The latest license_finder requires 2.3 - We don't need to run license_finder on all Rubies, just one is enough for the Travis builds - Running license_finder is not part of the day-to-day development process, so not having it available is not a problem. --- Gemfile | 10 ++-------- Rakefile | 6 +++++- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index 009733472..f6581d317 100644 --- a/Gemfile +++ b/Gemfile @@ -28,6 +28,7 @@ group :debug do end end +# Tools to run during development group :development do # Needed for lint:yard:junk task if RUBY_VERSION >= '2.3.0' @@ -76,17 +77,10 @@ group :development, :test do # gem 'cucumber-pro', '~> 0.0' # License compliance - if RUBY_VERSION < '2.3' - gem 'license_finder', '~> 2.0' - else + if RUBY_VERSION >= '2.3' gem 'license_finder', '~> 5.0' end - # Force compatible version of httparty for use by license_finder - if RUBY_VERSION <= '2.0.0' - gem 'httparty', '0.14.0' - end - # Upload documentation # gem 'relish', '~> 0.7.1' diff --git a/Rakefile b/Rakefile index 29010a123..87c501605 100644 --- a/Rakefile +++ b/Rakefile @@ -57,7 +57,11 @@ namespace :lint do desc 'Check for relevant licenses in project' task :licenses do - sh 'bundle exec license_finder' + if RUBY_VERSION >= '2.3' + sh 'bundle exec license_finder' + else + warn 'Your ruby version is not supported for license checking' + end end begin From a8eb283a8bd81b32ec6610b671c6d919282c5084 Mon Sep 17 00:00:00 2001 From: Matijs van Zuijlen Date: Mon, 7 Jan 2019 22:35:36 +0100 Subject: [PATCH 5/7] Allow development with Bundler 2.0 --- aruba.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aruba.gemspec b/aruba.gemspec index 8bb0ab418..98a19b560 100644 --- a/aruba.gemspec +++ b/aruba.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency 'contracts', '~> 0.13' spec.add_runtime_dependency 'thor', '~> 0.19' - spec.add_development_dependency 'bundler', '~> 1.7' + spec.add_development_dependency 'bundler', ['>= 1.7.0', '< 3.0'] spec.rubygems_version = ">= 1.6.1" spec.required_ruby_version = '>= 1.9.3' From a2be8081883da63fce4ba65e898bdacd92c582b4 Mon Sep 17 00:00:00 2001 From: Matijs van Zuijlen Date: Mon, 7 Jan 2019 22:35:53 +0100 Subject: [PATCH 6/7] Ensure Bundler is available on Travis CI Sometimes builds fail due to Bundler not being installed ... --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 8f5cc18aa..77b536150 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,8 @@ sudo: false language: ruby script: bundle exec rake test +before_install: + - gem install bundler -v '< 2' bundler_args: --without development debug jobs: From a7498926ff1eb3ece568f0b718802370a6d1d54d Mon Sep 17 00:00:00 2001 From: Matijs van Zuijlen Date: Tue, 8 Jan 2019 19:10:11 +0100 Subject: [PATCH 7/7] Bump CRuby point releases and JRuby --- .travis.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 77b536150..8ed50540a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,17 +16,17 @@ jobs: os: linux - rvm: 2.6.0 os: osx - - rvm: 2.5.0 + - rvm: 2.5.3 os: linux - - rvm: 2.5.0 + - rvm: 2.5.3 os: osx - - rvm: 2.4.3 + - rvm: 2.4.5 os: linux - - rvm: 2.4.3 + - rvm: 2.4.4 os: osx - - rvm: 2.3.6 + - rvm: 2.3.8 os: linux - - rvm: 2.3.6 + - rvm: 2.3.8 os: osx - rvm: 2.2 os: linux @@ -48,18 +48,18 @@ jobs: osx_image: xcode8 - rvm: jruby os: linux - - rvm: jruby-9.1.16.0 + - rvm: jruby-9.2.5.0 os: linux - - rvm: jruby-9.1.16.0 + - rvm: jruby-9.2.5.0 os: osx - stage: lint script: bundle exec rake lint - rvm: 2.5.0 + rvm: 2.6.0 os: linux allow_failures: - rvm: ruby-head - rvm: jruby - - rvm: jruby-9.1.16.0 + - rvm: jruby-9.2.5.0 fast_finish: true branches: