From 62874be71d74380d252c73409dd81da08b021497 Mon Sep 17 00:00:00 2001
From: Mark Percival <m@mdp.im>
Date: Wed, 30 Sep 2020 10:23:32 -0400
Subject: [PATCH] Allow for Ruby 3.0 (#105)

Update to allow for Ruby 3

- Closes #104
- Update gemspec to allow Ruby 3
- Add docker file for 3.0rc
- Update docker-compose to include the new Dockerfile
- Bump to 6.2.0
---
 CHANGELOG.md        |  5 +++++
 Dockerfile-3.0-rc   | 12 ++++++++++++
 docker-compose.yml  |  7 +++++++
 lib/rotp/version.rb |  2 +-
 rotp.gemspec        |  2 +-
 5 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 Dockerfile-3.0-rc

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b8d731..22a152b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ### Changelog
 
+### 6.2.0
+
+- Update to expand compatibility with Ruby 3. This was only a change to the
+  gemspec, no code changes were necessary.
+
 ### 6.1.0
 
 - Fixing URI encoding issues again, breaking out into it's own module
diff --git a/Dockerfile-3.0-rc b/Dockerfile-3.0-rc
new file mode 100644
index 0000000..2d624c5
--- /dev/null
+++ b/Dockerfile-3.0-rc
@@ -0,0 +1,12 @@
+FROM ruby:3.0-rc
+
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
+
+COPY Gemfile /usr/src/app/
+COPY . /usr/src/app
+RUN gem install bundler
+RUN bundle install
+
+CMD ["bundle", "exec", "rspec"]
+
diff --git a/docker-compose.yml b/docker-compose.yml
index 91c74c5..a295cb2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -28,3 +28,10 @@ services:
     volumes:
       - "./lib:/usr/src/app/lib"
       - "./spec:/usr/src/app/spec"
+  ruby_3_0_rc:
+    build:
+      context: .
+      dockerfile: Dockerfile-3.0-rc
+    volumes:
+      - "./lib:/usr/src/app/lib"
+      - "./spec:/usr/src/app/spec"
diff --git a/lib/rotp/version.rb b/lib/rotp/version.rb
index abfe241..cf75068 100644
--- a/lib/rotp/version.rb
+++ b/lib/rotp/version.rb
@@ -1,3 +1,3 @@
 module ROTP
-  VERSION = '6.1.0'.freeze
+  VERSION = '6.2.0'.freeze
 end
diff --git a/rotp.gemspec b/rotp.gemspec
index bc3e278..fdadf44 100644
--- a/rotp.gemspec
+++ b/rotp.gemspec
@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.name        = 'rotp'
   s.version     = ROTP::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.required_ruby_version = '~> 2.3'
+  s.required_ruby_version = '>= 2.3'
   s.license     = 'MIT'
   s.authors     = ['Mark Percival']
   s.email       = ['mark@markpercival.us']