From 5ec60dfb55e04d205242b9349fde279eb680ceaf Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Wed, 22 Apr 2020 08:55:27 -0700 Subject: [PATCH 1/6] Fix issue when using --enable-frozen-string-literal Ruby option --- lib/rotp/base32.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/rotp/base32.rb b/lib/rotp/base32.rb index 1688bdb..2c09592 100644 --- a/lib/rotp/base32.rb +++ b/lib/rotp/base32.rb @@ -28,7 +28,7 @@ def decode(str) def encode(b) data = b.unpack('c*') - out = '' + out = String.new buffer = data[0] idx = 1 bits_left = 8 From 091919602c4987a21a42c430d3d851cdee999836 Mon Sep 17 00:00:00 2001 From: Mark Percival Date: Wed, 22 Apr 2020 17:08:45 +0000 Subject: [PATCH 2/6] Frozen string fix, updated deps, ruby deprecation - Fix issue when using --enable-frozen-string-literal Ruby option #95 (jeremyevans) - Update gems (rake, addressable) - Updated gems removes support for Ruby <2.5. Seeing as 2.3 is now longer getting security patches, this seems like a non-issue --- CHANGELOG.md | 6 ++++++ Dockerfile-2.0 | 11 ----------- lib/rotp/version.rb | 2 +- rotp.gemspec | 5 +++-- 4 files changed, 10 insertions(+), 14 deletions(-) delete mode 100644 Dockerfile-2.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index a9ef64f..f31ce64 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ ### Changelog +### 5.1.1 + +- Fix issue when using --enable-frozen-string-literal Ruby option #95 (jeremyevans) +- Update gems (rake, addressable) + - Updated gems removes support for Ruby <2.5. Seeing as 2.3 is now longer getting security patches, this seems like a non-issue + ### 5.1.0 - Create `random_base32` to perform `random` to avoid breaking changes diff --git a/Dockerfile-2.0 b/Dockerfile-2.0 deleted file mode 100644 index 3af3083..0000000 --- a/Dockerfile-2.0 +++ /dev/null @@ -1,11 +0,0 @@ -FROM ruby:2.0 - -RUN mkdir -p /usr/src/app -WORKDIR /usr/src/app - -COPY Gemfile /usr/src/app/ -COPY . /usr/src/app -RUN bundle install - -CMD ["bundle", "exec", "rspec"] - diff --git a/lib/rotp/version.rb b/lib/rotp/version.rb index 25a33f1..ada531f 100644 --- a/lib/rotp/version.rb +++ b/lib/rotp/version.rb @@ -1,3 +1,3 @@ module ROTP - VERSION = '5.1.0'.freeze + VERSION = '5.1.1'.freeze end diff --git a/rotp.gemspec b/rotp.gemspec index e320466..d38c624 100644 --- a/rotp.gemspec +++ b/rotp.gemspec @@ -4,6 +4,7 @@ Gem::Specification.new do |s| s.name = 'rotp' s.version = ROTP::VERSION s.platform = Gem::Platform::RUBY + s.required_ruby_version = '~> 2.5' s.license = 'MIT' s.authors = ['Mark Percival'] s.email = ['mark@markpercival.us'] @@ -16,9 +17,9 @@ Gem::Specification.new do |s| s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) } s.require_paths = ['lib'] - s.add_runtime_dependency 'addressable', '~> 2.5' + s.add_runtime_dependency 'addressable', '~> 2.7' - s.add_development_dependency 'rake', '~> 10.5' + s.add_development_dependency "rake", "~> 13.0" s.add_development_dependency 'rspec', '~> 3.5' s.add_development_dependency 'simplecov', '~> 0.12' s.add_development_dependency 'timecop', '~> 0.8' From bafe8bfaafb3bca4ac50deddbe7317ee65f017a1 Mon Sep 17 00:00:00 2001 From: Mark Percival Date: Wed, 22 Apr 2020 17:12:59 +0000 Subject: [PATCH 3/6] Remove Travis ruby test for 2.0 --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1e55bbe..10a2fdb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,5 @@ before_install: gem install bundler -v '<2' rvm: - 2.6 - 2.5 - - 2.0 script: - bundle exec rspec From 191ef0352e5977978128a5fcac3d3ccdffb7ae70 Mon Sep 17 00:00:00 2001 From: Mark Percival Date: Wed, 22 Apr 2020 17:35:50 +0000 Subject: [PATCH 4/6] Add back in 2.3 2.3 has been EOL'd, but it still compatible with this gems dependencies --- .travis.yml | 2 ++ CHANGELOG.md | 2 +- Dockerfile-2.3 | 10 ++++++++++ Dockerfile-2.7 | 11 +++++++++++ rotp.gemspec | 2 +- 5 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 Dockerfile-2.3 create mode 100644 Dockerfile-2.7 diff --git a/.travis.yml b/.travis.yml index 10a2fdb..062f3cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,9 @@ language: ruby before_install: gem install bundler -v '<2' rvm: + - 2.7 - 2.6 - 2.5 + - 2.3 script: - bundle exec rspec diff --git a/CHANGELOG.md b/CHANGELOG.md index f31ce64..6554150 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ - Fix issue when using --enable-frozen-string-literal Ruby option #95 (jeremyevans) - Update gems (rake, addressable) - - Updated gems removes support for Ruby <2.5. Seeing as 2.3 is now longer getting security patches, this seems like a non-issue + - Updated gems removes support for Ruby <2.3 ### 5.1.0 diff --git a/Dockerfile-2.3 b/Dockerfile-2.3 new file mode 100644 index 0000000..10a3a52 --- /dev/null +++ b/Dockerfile-2.3 @@ -0,0 +1,10 @@ +FROM ruby:2.3 + +RUN mkdir -p /usr/src/app +WORKDIR /usr/src/app + +COPY Gemfile /usr/src/app/ +COPY . /usr/src/app +RUN bundle install + +CMD ["bundle", "exec", "rspec"] diff --git a/Dockerfile-2.7 b/Dockerfile-2.7 new file mode 100644 index 0000000..3f53cf6 --- /dev/null +++ b/Dockerfile-2.7 @@ -0,0 +1,11 @@ +FROM ruby:2.7 + +RUN mkdir -p /usr/src/app +WORKDIR /usr/src/app + +COPY Gemfile /usr/src/app/ +COPY . /usr/src/app +RUN bundle install + +CMD ["bundle", "exec", "rspec"] + diff --git a/rotp.gemspec b/rotp.gemspec index d38c624..050fedf 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.5' + s.required_ruby_version = '~> 2.3' s.license = 'MIT' s.authors = ['Mark Percival'] s.email = ['mark@markpercival.us'] From f252777138dc0e8e9f70a822c5f438466a6ca24e Mon Sep 17 00:00:00 2001 From: Mark Percival Date: Wed, 22 Apr 2020 17:47:03 +0000 Subject: [PATCH 5/6] Major bump --- CHANGELOG.md | 4 ++-- lib/rotp/version.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6554150..edd23a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,10 @@ ### Changelog -### 5.1.1 +### 6.0.0 +- Dropping support for Ruby <2.3 (Major version bump) - Fix issue when using --enable-frozen-string-literal Ruby option #95 (jeremyevans) - Update gems (rake, addressable) - - Updated gems removes support for Ruby <2.3 ### 5.1.0 diff --git a/lib/rotp/version.rb b/lib/rotp/version.rb index ada531f..b79f7ff 100644 --- a/lib/rotp/version.rb +++ b/lib/rotp/version.rb @@ -1,3 +1,3 @@ module ROTP - VERSION = '5.1.1'.freeze + VERSION = '6.0.0'.freeze end From 95e4873e8e26d33932185836c67ecda183ba0f11 Mon Sep 17 00:00:00 2001 From: Mark Percival Date: Thu, 23 Apr 2020 15:35:15 +0000 Subject: [PATCH 6/6] Update Changelog about travis ruby addition --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index edd23a6..1c7a5de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Dropping support for Ruby <2.3 (Major version bump) - Fix issue when using --enable-frozen-string-literal Ruby option #95 (jeremyevans) - Update gems (rake, addressable) +- Update Travis tests to include Ruby 2.7 ### 5.1.0