Merge pull request #67 from mocktools/develop

Ruby SmtpMock v1.3.3

.circleci/config.yml

@@ -98,6 +98,10 @@ jobs:
           name: Running code documentation linters
           command: lefthook run code-documentation-linters
 
+      - run:
+          name: Running release linters
+          command: lefthook run release-linters
+
   tests-ruby:
     parameters:
       ruby-version:
@@ -183,15 +187,15 @@ workflows:
       - linters-ruby:
           matrix:
             parameters:
-              ruby-version: ["3.1-node"]
+              ruby-version: ["3.2-node"]
       - tests-ruby:
           matrix:
             parameters:
-              ruby-version: ["3.1"]
+              ruby-version: ["3.2"]
       - compatibility-ruby:
           matrix:
             parameters:
-              ruby-version: ["2.5", "2.6", "2.7", "3.0"]
+              ruby-version: ["2.5", "2.6", "2.7", "3.0", "3.1"]
       - releasing-gem-from-ruby:
           requires:
             - linters-ruby

.circleci/gemspecs/compatible

@@ -12,7 +12,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/mocktools/ruby-smtp-mock'
   spec.license       = 'MIT'
 
-  dry_struct_version = ::Gem::Version.new(::RUBY_VERSION) >= ::Gem::Version.new('2.7.0') ? '~> 1.6' : '~> 1.4'
+  current_ruby_version = ::Gem::Version.new(::RUBY_VERSION)
+  dry_struct_version = current_ruby_version >= ::Gem::Version.new('2.7.0') ? '~> 1.6' : '~> 1.4'
 
   spec.required_ruby_version = '>= 2.5.0'
   spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
@@ -22,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'dry-struct', dry_struct_version
 
   spec.add_development_dependency 'ffaker'
+  spec.add_development_dependency 'net-smtp' if current_ruby_version >= ::Gem::Version.new('3.1.0')
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
 end

.circleci/gemspecs/latest

@@ -25,10 +25,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'net-smtp', '~> 0.3.3'
   spec.add_development_dependency 'pry-byebug', '~> 3.10', '>= 3.10.1'
   spec.add_development_dependency 'rake', '~> 13.0', '>= 13.0.6'
-  spec.add_development_dependency 'reek', '~> 6.1', '>= 6.1.1'
+  spec.add_development_dependency 'reek', '~> 6.1', '>= 6.1.3'
   spec.add_development_dependency 'rspec', '~> 3.12'
-  spec.add_development_dependency 'rubocop', '~> 1.40'
-  spec.add_development_dependency 'rubocop-performance', '~> 1.15', '>= 1.15.1'
-  spec.add_development_dependency 'rubocop-rspec', '~> 2.15'
-  spec.add_development_dependency 'simplecov', '~> 0.21.2'
+  spec.add_development_dependency 'rubocop', '~> 1.42'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.15', '>= 1.15.2'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.16'
+  spec.add_development_dependency 'simplecov', '~> 0.22.0'
 end

.circleci/linter_configs/.lefthook.yml

@@ -1,5 +1,6 @@
 ---
 
+no_tty: true
 skip_output:
   - meta
 
@@ -31,3 +32,8 @@ code-documentation-linters:
       run: cspell-cli lint -c '.circleci/linter_configs/.cspell.yml' '**/*.{txt,md}'
     markdownlint:
       run: markdownlint -c '.circleci/linter_configs/.markdownlint.yml' '**/*.md'
+
+release-linters:
+  commands:
+    changeloglint:
+      run: .circleci/scripts/changeloglint.sh

.circleci/scripts/changeloglint.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+set -e
+
+changelog=$(if [ "$1" = "" ]; then echo "CHANGELOG.md"; else echo "$1"; fi)
+
+get_current_gem_version() {
+  ruby -r rubygems -e "puts Gem::Specification::load('$(ls -- *.gemspec)').version"
+}
+
+latest_changelog_tag() {
+  grep -Po "(?<=\#\# \[)[0-9]+\.[0-9]+\.[0-9]+?(?=\])" "$changelog" | head -n 1
+}
+
+current_gem_version="$(get_current_gem_version)"
+
+if [ "$current_gem_version" = "$(latest_changelog_tag)" ]
+then
+  echo "SUCCESS: Current gem version ($current_gem_version) has been found on the top of project changelog."
+else
+  echo "FAILURE: Following to \"Keep a Changelog\" convention current gem version ($current_gem_version) must be mentioned on the top of project changelog."
+  exit 1
+fi

.circleci/scripts/release.sh

@@ -8,7 +8,7 @@ DELIMETER="_"
 PACKAGE_FILE="$FILE_NAME$DELIMETER$BUILD_ARCHITECTURE"
 
 gh_cli_latest_release() {
-  curl -sL -o /dev/null -w '%{url_effective}' "$GH_CLI_RELEASES_URL/latest" | rev | cut -f1 -d'/'| rev
+  curl -sL -o /dev/null -w '%{url_effective}' "$GH_CLI_RELEASES_URL/latest" | rev | cut -f 1 -d '/'| rev
 }
 
 download_gh_cli() {
@@ -42,7 +42,6 @@ release_to_rubygems() {
   git config --global user.email "${PUBLISHER_EMAIL}"
   git config --global user.name "${PUBLISHER_NAME}"
   git stash
-  git checkout develop
   gem install yard gem-ctags
   bundle install
   echo "Publishing new gem release to RubyGems..."

.codeclimate.yml

@@ -9,7 +9,7 @@ checks:
 plugins:
   rubocop:
     enabled: true
-    channel: rubocop-1-39
+    channel: rubocop-1-42
     config:
       file: .circleci/linter_configs/.rubocop.yml
 

CHANGELOG.md

@@ -2,6 +2,20 @@
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.3.3] - 2023-01-10
+
+### Added
+
+- Added and tested Ruby 3.2.x support
+- Added `changeloglint`
+
+### Updated
+
+- Updated `CircleCI` config
+- Updated `lefthook`/`codeclimate`/`simplecov`/`pry` configs
+- Updated gem deploy flow (tagging new release on master merge commit)
+- Updated gem version, license
+
 ## [1.3.2] - 2022-12-12
 
 ### Added

LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2022 Vladislav Trotsenko
+Copyright (c) 2022-2023 Vladislav Trotsenko
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

lib/smtp_mock/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SmtpMock
-  VERSION = '1.3.2'
+  VERSION = '1.3.3'
 end

smtp_mock.gemspec

@@ -22,8 +22,7 @@ Gem::Specification.new do |spec|
     'bug_tracker_uri' => 'https://github.com/mocktools/ruby-smtp-mock/issues'
   }
 
-  current_ruby_version = ::Gem::Version.new(::RUBY_VERSION)
-  dry_struct_version = current_ruby_version >= ::Gem::Version.new('2.7.0') ? '~> 1.6' : '~> 1.4'
+  dry_struct_version = ::Gem::Version.new(::RUBY_VERSION) >= ::Gem::Version.new('2.7.0') ? '~> 1.6' : '~> 1.4'
 
   spec.required_ruby_version = '>= 2.5.0'
   spec.files = `git ls-files -z`.split("\x0").select { |f| f.match(%r{^(bin|lib|tmp)/|.ruby-version|smtp_mock.gemspec|LICENSE}) }
@@ -34,7 +33,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'dry-struct', dry_struct_version
 
   spec.add_development_dependency 'ffaker', '~> 2.21'
-  spec.add_development_dependency 'net-smtp', '~> 0.3.3' if current_ruby_version >= ::Gem::Version.new('3.1.0')
   spec.add_development_dependency 'rake', '~> 13.0', '>= 13.0.6'
   spec.add_development_dependency 'rspec', '~> 3.12'
 end

spec/support/config/pry.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require 'pry' if ::RUBY_VERSION[/\A3\.1.+\z/]
+require 'pry' if ::RUBY_VERSION[/\A3\.2.+\z/]

spec/support/config/simplecov.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-if ::RUBY_VERSION[/\A3\.1.+\z/]
+if ::RUBY_VERSION[/\A3\.2.+\z/]
   require 'simplecov'
 
   SimpleCov.minimum_coverage(100)