From 30fef1d15d76a14159e4d99310bd9a8b7b0c19d7 Mon Sep 17 00:00:00 2001 From: Ian Lesperance Date: Sat, 23 Nov 2024 11:31:54 -0500 Subject: [PATCH 1/8] Parameterize test job --- .circleci/config.yml | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 23fcf9e1..6d73f8d7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,35 +1,26 @@ -version: 2 +version: 2.1 jobs: - "Test against Ruby 2.4": + test: + parameters: + ruby_version: + type: string docker: - - image: circleci/ruby:2.4.9 + - image: circleci/ruby:<< parameters.ruby_version >> working_directory: ~/intercom-ruby steps: - checkout - run: bundle install - run: bundle exec rake - "Test against Ruby 2.5": - docker: - - image: circleci/ruby:2.5.7 - working_directory: ~/intercom-ruby - steps: - - checkout - - run: bundle install - - run: bundle exec rake - "Test against Ruby 2.6": - docker: - - image: circleci/ruby:2.6.5 - working_directory: ~/intercom-ruby - steps: - - checkout - - run: bundle install - - run: bundle exec rake - workflows: - version: 2 build_and_test: jobs: - - "Test against Ruby 2.4" - - "Test against Ruby 2.5" - - "Test against Ruby 2.6" + - test: + name: "Test against Ruby 2.4" + ruby_version: "2.4.9" + - test: + name: "Test against Ruby 2.5" + ruby_version: "2.5.7" + - test: + name: "Test against Ruby 2.6" + ruby_version: "2.6.5" From b5281a21168a3e3aec120f54614f52a2d5b76b78 Mon Sep 17 00:00:00 2001 From: Ian Lesperance Date: Sat, 23 Nov 2024 11:32:39 -0500 Subject: [PATCH 2/8] Remove unnecessary working directory option --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6d73f8d7..564a0ec4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,6 @@ jobs: type: string docker: - image: circleci/ruby:<< parameters.ruby_version >> - working_directory: ~/intercom-ruby steps: - checkout - run: bundle install From 64d7ebaaca7d041543345c6fb1a00b86eda3c1ac Mon Sep 17 00:00:00 2001 From: Ian Lesperance Date: Sat, 23 Nov 2024 11:33:02 -0500 Subject: [PATCH 3/8] Update Docker image to cimg/ruby --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 564a0ec4..41c41f5e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,7 @@ jobs: ruby_version: type: string docker: - - image: circleci/ruby:<< parameters.ruby_version >> + - image: cimg/ruby:<< parameters.ruby_version >> steps: - checkout - run: bundle install From 1940b5b0e2caef154961382ef5b8de25b85bafeb Mon Sep 17 00:00:00 2001 From: Ian Lesperance Date: Sat, 23 Nov 2024 12:41:24 -0500 Subject: [PATCH 4/8] Use latest patch version --- .circleci/config.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 41c41f5e..1200feaf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,11 +15,10 @@ workflows: jobs: - test: name: "Test against Ruby 2.4" - ruby_version: "2.4.9" + ruby_version: "2.4" - test: name: "Test against Ruby 2.5" - ruby_version: "2.5.7" + ruby_version: "2.5" - test: name: "Test against Ruby 2.6" - ruby_version: "2.6.5" - + ruby_version: "2.6" From e0156169e99bc5127d17587d4c420a3b362a0230 Mon Sep 17 00:00:00 2001 From: Ian Lesperance Date: Sat, 23 Nov 2024 12:42:01 -0500 Subject: [PATCH 5/8] Test against latest supported versions of Ruby --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1200feaf..fcfbc059 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,11 +14,11 @@ workflows: build_and_test: jobs: - test: - name: "Test against Ruby 2.4" - ruby_version: "2.4" + name: "Test against Ruby 3.1" + ruby_version: "3.1" - test: - name: "Test against Ruby 2.5" - ruby_version: "2.5" + name: "Test against Ruby 3.2" + ruby_version: "3.2" - test: - name: "Test against Ruby 2.6" - ruby_version: "2.6" + name: "Test against Ruby 3.3" + ruby_version: "3.3" From b1fd15cfd7488416f04176ad83b741761fc78d75 Mon Sep 17 00:00:00 2001 From: Ian Lesperance Date: Sat, 23 Nov 2024 12:55:31 -0500 Subject: [PATCH 6/8] Limit version of minitest for mocha compatibility --- intercom.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intercom.gemspec b/intercom.gemspec index a6878d55..607ccbe8 100644 --- a/intercom.gemspec +++ b/intercom.gemspec @@ -18,7 +18,7 @@ Gem::Specification.new do |spec| spec.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) } spec.require_paths = ["lib"] - spec.add_development_dependency 'minitest', '~> 5.4' + spec.add_development_dependency 'minitest', '~> 5.4', '< 5.19' spec.add_development_dependency "m", "~> 1.5.0" spec.add_development_dependency 'rake', '~> 10.3' spec.add_development_dependency 'mocha', '~> 1.0' From ef0e1499dbbbc078bc079f54c7eb87e103eab61f Mon Sep 17 00:00:00 2001 From: Ian Lesperance Date: Sat, 23 Nov 2024 12:59:26 -0500 Subject: [PATCH 7/8] Pass arguments as keywords to set_timeouts --- lib/intercom/client.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/intercom/client.rb b/lib/intercom/client.rb index 5b3f607f..a72b1248 100644 --- a/lib/intercom/client.rb +++ b/lib/intercom/client.rb @@ -23,7 +23,7 @@ def set_timeouts(open_timeout: nil, read_timeout: nil) timeouts[:open_timeout] = open_timeout if open_timeout timeouts[:read_timeout] = read_timeout if read_timeout o.send(:timeouts=, timeouts) - proc { |_obj| set_timeouts(old_timeouts).call(o) } + proc { |_obj| set_timeouts(**old_timeouts).call(o) } end end end From ed55a07d4b802e00fae55479a28cd4bc8d4cebdc Mon Sep 17 00:00:00 2001 From: Ian Lesperance Date: Sat, 23 Nov 2024 13:28:19 -0500 Subject: [PATCH 8/8] Bump rake --- intercom.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intercom.gemspec b/intercom.gemspec index 607ccbe8..584f530d 100644 --- a/intercom.gemspec +++ b/intercom.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'minitest', '~> 5.4', '< 5.19' spec.add_development_dependency "m", "~> 1.5.0" - spec.add_development_dependency 'rake', '~> 10.3' + spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'mocha', '~> 1.0' spec.add_development_dependency "fakeweb", ["~> 1.3"] spec.add_development_dependency "pry"