From bc66691cce26bf868d030e054d11636dcb9d3abb Mon Sep 17 00:00:00 2001 From: Niklas van Schrick Date: Mon, 27 Oct 2025 20:22:39 +0100 Subject: [PATCH 1/2] Update ruby to 3.4.7 --- .github/workflows/main.yml | 1 + .github/workflows/release.yml | 2 +- .tool-versions | 2 +- Gemfile.lock | 2 ++ code0-license.gemspec | 2 ++ 5 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 26682dc..2ca509e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,6 +18,7 @@ jobs: - '3.1.6' - '3.2.2' - '3.3.6' + - '3.4.7' steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 797364f..ea00cf2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: '3.2.2' + ruby-version: '3.4.7' - name: Install gems run: bundle install - name: Set version diff --git a/.tool-versions b/.tool-versions index f2a971a..3f03c7a 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -ruby 3.2.2 +ruby 3.4.7 diff --git a/Gemfile.lock b/Gemfile.lock index acd36d5..26a0fab 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,11 +2,13 @@ PATH remote: . specs: code0-license (0.0.0) + base64 (~> 0.3.0) GEM remote: https://rubygems.org/ specs: ast (2.4.2) + base64 (0.3.0) diff-lcs (1.5.1) json (2.7.2) language_server-protocol (3.17.0.3) diff --git a/code0-license.gemspec b/code0-license.gemspec index 8f7b4ef..7637e07 100644 --- a/code0-license.gemspec +++ b/code0-license.gemspec @@ -28,6 +28,8 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) } spec.require_paths = ["lib"] + spec.add_dependency "base64", "~> 0.3.0" + spec.add_development_dependency "rake", "~> 13.0" spec.add_development_dependency "rspec", "~> 3.0" spec.add_development_dependency "rubocop", "~> 1.21" From e8a97be6cd9f19ea6542e444a7390aad041ab4fc Mon Sep 17 00:00:00 2001 From: Niklas van Schrick Date: Mon, 27 Oct 2025 20:39:06 +0100 Subject: [PATCH 2/2] Fix date dependent spec --- .rubocop.yml | 3 +++ spec/code0/license_spec.rb | 11 +++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index bbe53c7..06e34be 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -34,3 +34,6 @@ Layout/LineLength: RSpec/ExampleLength: Enabled: false + +RSpec/MultipleMemoizedHelpers: + Enabled: false diff --git a/spec/code0/license_spec.rb b/spec/code0/license_spec.rb index 70fbc76..07fdde1 100644 --- a/spec/code0/license_spec.rb +++ b/spec/code0/license_spec.rb @@ -3,13 +3,16 @@ RSpec.describe Code0::License do described_class.encryption_key = OpenSSL::PKey::RSA.generate(2048) + let(:start_date) { Date.today.prev_day } + let(:end_date) { Date.today.next_day } + let(:license_data) { default_license_data } let(:license) { described_class.new(license_data) } let(:default_license_data) do { licensee: { company: "Code0" }, - start_date: "2024-05-01", - end_date: "2025-05-01", + start_date: start_date.strftime("%Y-%m-%d"), + end_date: end_date.strftime("%Y-%m-%d"), restrictions: { users: 1 }, options: {} } @@ -25,8 +28,8 @@ expect(license.data).to match( { licensee: { company: "Code0" }, - start_date: Date.new(2024, 5, 1), - end_date: Date.new(2025, 5, 1), + start_date: start_date, + end_date: end_date, restrictions: { users: 1 }, options: {} }