voxpupuli-release 5.3.1 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1244ba6e84fa215bf717b5487f42b27f19c77c6769fec26ca8a7208a8c69f072
-  data.tar.gz: 3781b7d2bc948aecc761c0284c66e0acdf48a2454bd7abbf3748670039d392f3
+  metadata.gz: 55384d90f8f7d6baf31bc72ee1c566471ff7de53402e7f9e9a630aeabb8844f0
+  data.tar.gz: 6ca315a5e87d092612bbef8fd20d7fd88199996059469d76c4b071bde840bc29
 SHA512:
-  metadata.gz: 62e89ef9908ef57ee06d70835ee29340117c71bcf1c415a721fc5e202776980d085e2ed5acca43d68bd5af70fd4e30045804dc5fa42bc02125ca7b904d240506
-  data.tar.gz: 808b1ca80954157c45d5dcb78a6e53098acc90b19e87ea1df43aa544538d4f085a127f8a6e8dd06846d711772cf7fe2e441a58b17cdc39c560d1047c7b1ce811
+  metadata.gz: fe09c7284a57a111505195e38c58a88340d419f0036fcb5f2b77ad629fc01c626322d9f2b205831bb01b227762e3f4aac7c119e7afab3f47ac2c2ce5497e67b8
+  data.tar.gz: c2417ebda3e4f6b0431b1ad08131c86bea7ef3b5721dbe66bf1cb7ea6289276720f6295c8fb4c7b5c214202d20aaeb79c342fbf2e95132672d58ad0ab2461758

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --no-auto-gen-timestamp`
-# using RuboCop version 1.81.7.
+# using RuboCop version 1.85.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -24,7 +24,7 @@ Style/EmptyElse:
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
+# Configuration parameters: AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
   Max: 128

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file.
 
+## [v5.4.0](https://github.com/voxpupuli/voxpupuli-release/tree/v5.4.0) (2026-03-27)
+
+[Full Changelog](https://github.com/voxpupuli/voxpupuli-release/compare/v5.3.1...v5.4.0)
+
+**Implemented enhancements:**
+
+- Add release task without version bump: `release:tag_and_push` [\#120](https://github.com/voxpupuli/voxpupuli-release/pull/120) ([bastelfreak](https://github.com/bastelfreak))
+
 ## [v5.3.1](https://github.com/voxpupuli/voxpupuli-release/tree/v5.3.1) (2026-03-15)
 
 [Full Changelog](https://github.com/voxpupuli/voxpupuli-release/compare/v5.3.0...v5.3.1)

data/README.md

@@ -28,13 +28,20 @@ To cut a new release of your module, ensure the `metadata.json` reflects the exp
 bundle exec rake release:prepare
 ```
 
-Commit these changes (likely in a new branch, open a Pull-Request and wait for it to be reviewed and merged).  When ready to ship the new release, ensure you are on the main branch, it is up-to-date, and run:
+Commit these changes (likely in a new branch, open a Pull-Request and wait for it to be reviewed and merged).
+When ready to ship the new release, ensure you are on the main branch, it is up-to-date, and run:
 
 ```plain
 bundle exec rake release
 ```
 
-This will perform some sanity checks, tag the current commit with the version number, and bump the version number to ensure no conflict will happen by mistake.
+This will perform some sanity checks, tag the current commit with the version number, and bump the version number to ensure no conflict will happen by mistake and then run `git push && git push --tags`.
+
+It's also possible to not bump the version to the next rc:
+
+```plain
+bundle exec rake release:tag_and_push
+```
 
 ## License
 

data/lib/voxpupuli/release/rake_tasks.rb

@@ -46,29 +46,9 @@ end
 
 desc 'Release via GitHub Actions'
 task :release do
-  Blacksmith::RakeTask.new do |t|
-    t.build = false # do not build the module nor push it to the Forge
-    t.tag_sign = true # sign release with gpg
-    t.tag_message_pattern = 'Version %s' # required tag message for gpg-signed tags
-    # just do the tagging [:clean, :tag, :bump_commit]
-  end
-
-  m = Blacksmith::Modulefile.new
-  v = m.version
-  unless v.match?(/^\d+\.\d+\.\d+$/)
-    raise "Refusing to release an RC or build-release (#{v}).\n" \
-          'Please set a semver *release* version.'
-  end
-
-  # validate that the REFERENCE.md is up2date, if it exists
-  Rake::Task['strings:validate:reference'].invoke if File.exist?('REFERENCE.md')
-  Rake::Task[:check_changelog].invoke
-  # do a "manual" module:release (clean, tag, bump, commit, push tags)
-  Rake::Task['module:clean'].invoke
+  Rake::Task['release:validate'].invoke
 
-  # idempotently create tags
-  g = Blacksmith::Git.new
-  Rake::Task['module:tag'].invoke unless g.has_version_tag?(v)
+  Rake::Task['release:tag_and_push'].invoke
 
   v_inc = m.increase_version(v)
   v_new = "#{v_inc}-rc0"
@@ -94,6 +74,39 @@ task :check_changelog do
 end
 
 namespace :release do
+  desc 'prepare puppet-blacksmith'
+  task :prepare_blacksmith do
+    Blacksmith::RakeTask.new do |t|
+      t.build = false # do not build the module nor push it to the Forge
+      t.tag_sign = true # sign release with gpg
+      t.tag_message_pattern = 'Version %s' # required tag message for gpg-signed tags
+    end
+  end
+
+  # checks if we have a clean git checkout and REFERENCE.md/CHANGELOG.md are correct
+  desc 'validate module'
+  task :validate do
+    version = Blacksmith::Modulefile.new.version
+    unless version.match?(/^\d+\.\d+\.\d+$/)
+      raise "Refusing to release an RC or build-release (#{version}).\n" \
+            'Please set a semver *release* version.'
+    end
+
+    # validate that the REFERENCE.md is up2date, if it exists
+    Rake::Task['strings:validate:reference'].invoke if File.exist?('REFERENCE.md')
+    Rake::Task[:check_changelog].invoke
+    Rake::Task['module:clean'].invoke # just deletes old artifacts in pkg/
+  end
+
+  desc 'tag module and push it'
+  task tag_and_push: %w[validate prepare_blacksmith] do
+    # idempotently create tags
+    git = Blacksmith::Git.new
+    version = Blacksmith::Modulefile.new.version
+    Rake::Task['module:tag'].invoke unless git.has_version_tag?(version)
+    git.push!
+  end
+
   desc 'Prepare a release'
   task prepare: ['release:porcelain:changelog'] do
     v = Blacksmith::Modulefile.new.version

data/lib/voxpupuli/release/version.rb

@@ -2,6 +2,6 @@
 
 module Voxpupuli
   module Release
-    VERSION = '5.3.1'
+    VERSION = '5.4.0'
   end
 end

data/voxpupuli-release.gemspec

@@ -29,5 +29,5 @@ Gem::Specification.new do |s|
   # https://github.com/OpenVoxProject/puppet/issues/90
   s.add_dependency 'syslog', '>= 0.3.0', '< 0.5'
 
-  s.add_development_dependency 'voxpupuli-rubocop', '~> 5.1.0'
+  s.add_development_dependency 'voxpupuli-rubocop', '~> 5.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: voxpupuli-release
 version: !ruby/object:Gem::Version
-  version: 5.3.1
+  version: 5.4.0
 platform: ruby
 authors:
 - Vox Pupuli
@@ -137,14 +137,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.2.0
 email:
 - voxpupuli@groups.io
 executables: []
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Helpers for deploying Vox Pupuli modules
 test_files: []