From 0eb8a82230d3474446478c783717c7516f6505f1 Mon Sep 17 00:00:00 2001
From: Oleh Fedorenko <ofedoren@redhat.com>
Date: Thu, 5 Dec 2024 13:38:21 +0000
Subject: [PATCH 1/4] Use GHA instead of Travis

---
 .github/workflows/ci.yml | 16 ++++++++++++++++
 .travis.yml              | 18 ------------------
 2 files changed, 16 insertions(+), 18 deletions(-)
 create mode 100644 .github/workflows/ci.yml
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..2b02469
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,16 @@
+name: CI
+
+on:
+  - push
+  - pull_request
+
+concurrency:
+  group: ${{ github.ref_name }}-${{ github.workflow }}
+  cancel-in-progress: true
+
+jobs:
+  test:
+    name: Tests
+    uses: theforeman/actions/.github/workflows/test-gem.yml@v0
+    with:
+      command: bundle exec rake test
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 4dc7191..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.0.0
-  - 2.2.2
-  - 2.3.4
-  - 2.4.1
-  - 2.5.0
-  - 2.6.5
-  - 2.7.0
-#  - ruby-head
-  - jruby-19mode
-# - jruby-head
-env:
-  - REST_CLIENT_VERSION=1.6.0
-  - REST_CLIENT_VERSION=1.7.0
-  - REST_CLIENT_VERSION=1.8.0
-  - REST_CLIENT_VERSION=2.0.2

From 21fa94dd45be5a2a3f415360db719883fa31a0a8 Mon Sep 17 00:00:00 2001
From: Oleh Fedorenko <ofedoren@redhat.com>
Date: Thu, 5 Dec 2024 13:38:55 +0000
Subject: [PATCH 2/4] Update dependencies

---
 Gemfile                 | 18 ------------------
 Rakefile                |  1 -
 apipie-bindings.gemspec |  9 +++------
 3 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/Gemfile b/Gemfile
index f01c85a..dbb623a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,24 +2,6 @@ source "http://rubygems.org"
 
 gemspec
 
-rest_client = if ENV.key?('REST_CLIENT_VERSION')
-                ["~> #{ENV['REST_CLIENT_VERSION']}"]
-              else
-                ['< 3.0']
-              end
-
-if RUBY_VERSION < "1.9"
-  rest_client << '< 1.7'
-  gem 'mime-types', '~> 1.0'
-end
-
-if RUBY_VERSION < "2.0"
-  gem 'json', '< 2.0.0'
-  gem 'oauth', '< 0.5.2'
-end
-
-gem 'rest-client', rest_client
-
 # load local gemfile
 local_gemfile = File.join(File.dirname(__FILE__), 'Gemfile.local')
 self.instance_eval(Bundler.read_file(local_gemfile)) if File.exist?(local_gemfile)
diff --git a/Rakefile b/Rakefile
index 8701297..3b6e69b 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,6 +1,5 @@
 require 'rake/testtask'
 require 'bundler/gem_tasks'
-require 'ci/reporter/rake/minitest'
 
 task :default => :test
 
diff --git a/apipie-bindings.gemspec b/apipie-bindings.gemspec
index 5299eba..aceeb1a 100644
--- a/apipie-bindings.gemspec
+++ b/apipie-bindings.gemspec
@@ -22,17 +22,14 @@ EOF
   s.extra_rdoc_files = `git ls-files -- {doc,config}/* README*`.split("\n")
   s.require_paths    = ["lib"]
 
-  s.add_dependency 'json', '>= 1.2.1'
-  s.add_dependency 'rest-client', '>= 1.6.5', '< 3.0.0'      # lower versions don't allow setting infinite timeouts, higher versions have different api
-  s.add_dependency 'oauth'
+  s.add_dependency 'rest-client', '~> 2.0'
+  s.add_dependency 'oauth', '>= 0.5.5'
   s.add_dependency 'gssapi'
   s.add_development_dependency 'rake', '>= 12.3.3'
-  s.add_development_dependency 'thor'
   s.add_development_dependency 'minitest', '4.7.4'
   s.add_development_dependency 'minitest-spec-context'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'mocha'
-  s.add_development_dependency 'ci_reporter', '>= 1.6.3', "< 2.0.0"
 
-  s.required_ruby_version = '>= 2.0.0'
+  s.required_ruby_version = '>= 2.7.0'
 end

From 9059b56714783081c8f2309357ca242b92266077 Mon Sep 17 00:00:00 2001
From: Oleh Fedorenko <ofedoren@redhat.com>
Date: Thu, 5 Dec 2024 13:41:07 +0000
Subject: [PATCH 3/4] Disable Ruby warnings in tests

---
 Rakefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Rakefile b/Rakefile
index 3b6e69b..b0528f7 100644
--- a/Rakefile
+++ b/Rakefile
@@ -7,6 +7,7 @@ Rake::TestTask.new do |t|
   t.libs.push "lib"
   t.test_files = Dir.glob('test/**/*_test.rb')
   t.verbose = true
+  t.warning = ENV.key?('RUBY_WARNINGS')
 end
 
 def inside_dummy_app(&block)

From 867b0c8106f5604a30c8749a4784263817e5a378 Mon Sep 17 00:00:00 2001
From: Oleh Fedorenko <ofedoren@redhat.com>
Date: Tue, 10 Dec 2024 12:08:14 +0000
Subject: [PATCH 4/4] Make dependencies stricter

---
 apipie-bindings.gemspec | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/apipie-bindings.gemspec b/apipie-bindings.gemspec
index aceeb1a..d98260a 100644
--- a/apipie-bindings.gemspec
+++ b/apipie-bindings.gemspec
@@ -23,13 +23,13 @@ EOF
   s.require_paths    = ["lib"]
 
   s.add_dependency 'rest-client', '~> 2.0'
-  s.add_dependency 'oauth', '>= 0.5.5'
-  s.add_dependency 'gssapi'
-  s.add_development_dependency 'rake', '>= 12.3.3'
-  s.add_development_dependency 'minitest', '4.7.4'
-  s.add_development_dependency 'minitest-spec-context'
-  s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'mocha'
+  s.add_dependency 'oauth', '~> 1.1'
+  s.add_dependency 'gssapi', '~> 1.3'
+  s.add_development_dependency 'rake', '~> 13.0'
+  s.add_development_dependency 'minitest', '~> 4.7'
+  s.add_development_dependency 'minitest-spec-context', '~> 0.0.5'
+  s.add_development_dependency 'simplecov', '~> 0.22'
+  s.add_development_dependency 'mocha', '~> 2.7'
 
   s.required_ruby_version = '>= 2.7.0'
 end