From 564df94a2e9c53f62b1380ce50d5f38031fe548f Mon Sep 17 00:00:00 2001 From: VAILLANT Jeremy Date: Thu, 23 Sep 2021 15:58:48 +0200 Subject: [PATCH 1/2] Update gems --- Gemfile.lock | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6a1ab07..1166a6c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,42 +1,43 @@ PATH remote: . specs: - validates_timeliness-mongoid (5.0.0) + validates_timeliness-mongoid (5.0.1) mongoid (~> 7.2, >= 7.2.2) validates_timeliness (~> 5.0) GEM remote: https://rubygems.org/ specs: - activemodel (6.1.3.1) - activesupport (= 6.1.3.1) - activesupport (6.1.3.1) + activemodel (6.1.4.1) + activesupport (= 6.1.4.1) + activesupport (6.1.4.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) ast (2.4.2) - bson (4.12.0) + bson (4.12.1) byebug (11.1.3) coderay (1.1.3) - concurrent-ruby (1.1.8) + concurrent-ruby (1.1.9) diff-lcs (1.4.4) - docile (1.3.5) - faker (2.17.0) + docile (1.4.0) + faker (2.19.0) i18n (>= 1.6, < 2) i18n (1.8.10) concurrent-ruby (~> 1.0) kwalify (0.7.2) method_source (1.0.0) minitest (5.14.4) - mongo (2.14.0) + mongo (2.15.1) bson (>= 4.8.2, < 5.0.0) - mongoid (7.2.2) + mongoid (7.3.3) activemodel (>= 5.1, < 6.2) mongo (>= 2.10.5, < 3.0.0) - parallel (1.20.1) - parser (3.0.1.1) + ruby2_keywords (~> 0.0.5) + parallel (1.21.0) + parser (3.0.2.0) ast (~> 2.4.1) pry (0.13.1) coderay (~> 1.1) @@ -44,13 +45,11 @@ GEM pry-byebug (3.9.0) byebug (~> 11.0) pry (~> 0.13.0) - psych (3.3.1) rainbow (3.0.0) - rake (13.0.3) - reek (6.0.4) + rake (13.0.6) + reek (6.0.6) kwalify (~> 0.7.0) parser (~> 3.0.0) - psych (~> 3.1) rainbow (>= 2.0, < 4.0) regexp_parser (2.1.1) rexml (3.2.5) @@ -76,18 +75,19 @@ GEM rubocop-ast (>= 1.2.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.5.0) + rubocop-ast (1.11.0) parser (>= 3.0.1.1) rubocop-faker (1.1.0) faker (>= 2.12.0) rubocop (>= 0.82.0) - rubocop-performance (1.11.2) + rubocop-performance (1.11.5) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rspec (2.3.0) + rubocop-rspec (2.4.0) rubocop (~> 1.0) rubocop-ast (>= 1.1.0) ruby-progressbar (1.11.0) + ruby2_keywords (0.0.5) simplecov (0.21.2) docile (~> 1.1) simplecov-html (~> 0.11) @@ -97,7 +97,7 @@ GEM timeliness (0.4.4) tzinfo (2.0.4) concurrent-ruby (~> 1.0) - unicode-display_width (2.0.0) + unicode-display_width (2.1.0) validates_timeliness (5.0.0) timeliness (>= 0.3.10, < 1) zeitwerk (2.4.2) From 934e90c9892cda8bf80a321470e4edd9eb062c20 Mon Sep 17 00:00:00 2001 From: VAILLANT Jeremy Date: Thu, 23 Sep 2021 15:58:55 +0200 Subject: [PATCH 2/2] Change version --- lib/validates_timeliness/mongoid/info.rb | 2 +- validates_timeliness-mongoid.gemspec | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/validates_timeliness/mongoid/info.rb b/lib/validates_timeliness/mongoid/info.rb index 1d9b5df..9a88b7f 100644 --- a/lib/validates_timeliness/mongoid/info.rb +++ b/lib/validates_timeliness/mongoid/info.rb @@ -2,7 +2,7 @@ module ValidatesTimeliness module Mongoid - VERSION = '5.0.0' + VERSION = '5.0.1' # Name to gem GEM_NAME = 'validates_timeliness-mongoid' diff --git a/validates_timeliness-mongoid.gemspec b/validates_timeliness-mongoid.gemspec index 2e4dc5a..c00044d 100644 --- a/validates_timeliness-mongoid.gemspec +++ b/validates_timeliness-mongoid.gemspec @@ -6,10 +6,12 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) require 'validates_timeliness/mongoid/info' Gem::Specification.new do |spec| - spec.version = if ENV['GITHUB_REF'].eql?('refs/heads/develop') - "#{ValidatesTimeliness::Mongoid::VERSION}.pre.#{ENV['GITHUB_RUN_ID']}" + version = ValidatesTimeliness::Mongoid::VERSION + spec.version = if ENV.key?('GITHUB_RUN_ID') && + !ENV['GITHUB_REF'].eql?('refs/heads/master') + "#{version}.pre.#{ENV['GITHUB_RUN_ID']}" else - ValidatesTimeliness::Mongoid::VERSION + version end spec.name = ValidatesTimeliness::Mongoid::GEM_NAME