From 026aa9b86497675de81abb13d8a031cea8862399 Mon Sep 17 00:00:00 2001
From: Danny Ben Shitrit <db@dannyben.com>
Date: Sat, 10 Feb 2024 06:17:39 +0000
Subject: [PATCH 1/2] - Updates for Ruby 3.3 and Rack 3

---
 .github/workflows/docker-latest.yml | 28 ++++++++++++++++++++++++++++
 Dockerfile                          |  2 +-
 Gemfile                             |  2 +-
 Runfile                             |  2 +-
 docker-compose.yml                  |  2 --
 lib/secret_hub.rb                   |  2 --
 secret_hub.gemspec                  | 17 +++++++++++------
 spec/mock_api/server.rb             |  2 +-
 8 files changed, 43 insertions(+), 14 deletions(-)
 create mode 100644 .github/workflows/docker-latest.yml

diff --git a/.github/workflows/docker-latest.yml b/.github/workflows/docker-latest.yml
new file mode 100644
index 0000000..77d0406
--- /dev/null
+++ b/.github/workflows/docker-latest.yml
@@ -0,0 +1,28 @@
+name: Docker build (version + latest)
+on:
+  push: { tags: 'v[0-9]+.[0-9]+.[0-9]+' }
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Extract tag
+        run: echo "TAG=${GITHUB_REF#refs/*/v}" >> $GITHUB_ENV
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: dannyben/secrethub,dannyben/secrethub:${{ env.TAG }}
diff --git a/Dockerfile b/Dockerfile
index 0bf8e18..bae5d84 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM dannyben/alpine-ruby
+FROM dannyben/alpine-ruby:3.2.2
 
 RUN apk add --no-cache libsodium-dev
 RUN gem install secret_hub --version 0.2.1
diff --git a/Gemfile b/Gemfile
index 7d6daf3..13a06f6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'byebug'
+gem 'debug'
 gem 'lp'
 gem 'pretty_trace'
 gem 'puma', require: false
diff --git a/Runfile b/Runfile
index da20cd4..f19b8f3 100644
--- a/Runfile
+++ b/Runfile
@@ -1,4 +1,4 @@
-require "byebug"
+require 'debug'
 require 'secret_hub'
 require 'secret_hub/version'
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 7fb85d6..3a92690 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   secrethub:
     build: .
diff --git a/lib/secret_hub.rb b/lib/secret_hub.rb
index 362dab2..fb0d429 100644
--- a/lib/secret_hub.rb
+++ b/lib/secret_hub.rb
@@ -2,5 +2,3 @@
 require 'secret_hub/exceptions'
 require 'secret_hub/github_client'
 require 'secret_hub/config'
-
-require 'byebug' if ENV['BYEBUG']
diff --git a/secret_hub.gemspec b/secret_hub.gemspec
index e1ad0f1..76f0d7d 100644
--- a/secret_hub.gemspec
+++ b/secret_hub.gemspec
@@ -15,12 +15,17 @@ Gem::Specification.new do |s|
   s.license     = 'MIT'
   s.required_ruby_version = '>= 3.0'
 
-  s.add_runtime_dependency 'colsole', '>= 0.8.1', '< 2'
-  s.add_runtime_dependency 'httparty', '~> 0.21'
-  s.add_runtime_dependency 'lp', '~> 0.2'
-  s.add_runtime_dependency 'mister_bin', '~> 0.7.3'
-  s.add_runtime_dependency 'rbnacl', '~> 7.1'
-  s.add_runtime_dependency 'string-obfuscator', '~> 0.1'
+  s.add_dependency 'colsole', '>= 0.8.1', '< 2'
+  s.add_dependency 'httparty', '~> 0.21'
+  s.add_dependency 'lp', '~> 0.2'
+  s.add_dependency 'mister_bin', '~> 0.7.3'
+  s.add_dependency 'rackup', '~> 2.1'
+  s.add_dependency 'rbnacl', '~> 7.1'
+  s.add_dependency 'string-obfuscator', '~> 0.1'
+
+  # REMOVE ME
+  s.add_dependency 'bigdecimal', '>= 0'  # to address ruby warning by multi_xml
+  s.add_dependency 'csv', '>= 0'         # to address ruby warning by httparty
 
   s.metadata['rubygems_mfa_required'] = 'true'
 end
diff --git a/spec/mock_api/server.rb b/spec/mock_api/server.rb
index ad5474b..be989d7 100644
--- a/spec/mock_api/server.rb
+++ b/spec/mock_api/server.rb
@@ -1,5 +1,5 @@
 require 'sinatra'
-require 'byebug'
+require 'debug'
 require 'yaml'
 require_relative '../fake_public_key'
 

From 98de3b7eee391bcfc795caa43b20c49dfb9b303b Mon Sep 17 00:00:00 2001
From: Danny Ben Shitrit <db@dannyben.com>
Date: Sat, 10 Feb 2024 06:23:23 +0000
Subject: [PATCH 2/2] test on ruby 3.3

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index adbd0b6..b3d25f9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     strategy:
-      matrix: { ruby: ['3.0', '3.1', '3.2', head] }
+      matrix: { ruby: ['3.0', '3.1', '3.2', '3.3'] }
 
     steps:
     - name: Check out code