reissue 0.4.20 → 0.4.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ef812dbcea96e962840220c51f6107352672125790ac6583ee09e96508ff331
-  data.tar.gz: e2b18453be73f0111d1033ed007816bed8f7209ecd6bceae54695233730a09c2
+  metadata.gz: a9e4d5dc8c0b04d5c41514285fa8e8f2e7e87cc028b156ab7de97473e1e58276
+  data.tar.gz: e4af6b1a8061ec686f33e852b0abccd0d4e92335b87ad48c286e0645b7932ed7
 SHA512:
-  metadata.gz: 41722aad368f14d32a1590f46d31d70c707c6e295d8d3516d3ab7b3b0f8145b81d3c80e31895b87ce64a553dedce8a9b57e268af671be3cc689ca03778c4e335
-  data.tar.gz: 73f63925f09204f96348a2064901508467d627cf71eb65952b82906cc865aafaf413848c7094a5075bb602c4461b097a5140880756b42538f43aed4d9c38305a
+  metadata.gz: 12fe862113b9d5a765f7efd562ce4555b873e8496068c480f3a0531b873fbbcedc10bf44c1d971e7404ab1236f43125f08c31bac988ba88fb800dd78d5021618
+  data.tar.gz: 2235ef992fdfbda13a06e27bf1df4b582cb3ba9cfa034cdcc6bc1e7c61f8fa33167f553031dc7401eefb29edb59fc5e8ecbe699cdec3f2431796002356115b32

data/CHANGELOG.md

@@ -5,29 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [0.4.20] - 2026-03-10
+## [0.4.22] - 2026-04-09
 
 ### Fixed
 
-- deferred_finalize skipping fragment collection when changelog has versioned entry with Unreleased date (d9d0bd7)
+- changelog sections not following changelog_sections order on release (5f9c475)
 
-## [0.4.19] - 2026-03-09
-
-### Added
-
-- Support parsing changelog version entries without a date field (e.g. ## [Unreleased]) (75c5d6c)
-- Print ## [Unreleased] without trailing date suffix when version is Unreleased (aed6011)
-- ChangelogUpdater handles Unreleased version strings without crashing (d5f4e3e)
-- ChangelogUpdater#finalize accepts resolved_version parameter to replace Unreleased (d5f4e3e)
-- VersionUpdater#set_version for writing arbitrary version strings like Unreleased (33b3d76)
-- Reissue.deferred_call sets VERSION to Unreleased and adds ## [Unreleased] changelog entry (76e3d61)
-- Reissue.deferred_finalize resolves version from segment, explicit version, or git trailers at release time (1bdf36f)
-- deferred_versioning flag for Reissue::Task to defer version bumping until finalize (aac3ade)
-- Rake reissue task sets VERSION to Unreleased in deferred mode (aac3ade)
-- Rake reissue:finalize task accepts version or segment argument in deferred mode (aac3ade)
-- reissue_deferred_versioning attribute in Hoe plugin (e5a78d4)
-- End-to-end integration tests for the deferred versioning workflow (77a313e)
-
-### Changed
-
-- set_version uses RELEASE_VERSION_MATCH paralleling RELEASE_DATE_MATCH pattern (efec0e5)
+## [0.4.21] - 2026-03-11

data/Rakefile

@@ -19,5 +19,3 @@ Reissue::Task.create :reissue do |task|
   task.fragment = :git  # Use git trailers for changelog entries
   task.push_finalize = :branch
 end
-
-Rake.application.options.trace = true

data/lib/reissue/printer.rb

@@ -29,7 +29,7 @@ module Reissue
         else
           "## [#{version}] - #{date}"
         end
-        changes_string = changes.map do |section, section_changes|
+        changes_string = sorted_change_pairs(changes).map do |section, section_changes|
           format_section(section, section_changes)
         end.join("\n\n")
         [version_string, changes_string].reject { |str| str.empty? }.join("\n\n")
@@ -49,5 +49,13 @@ module Reissue
         #{changes.map { |change| "- #{change}" }.join("\n")}
       MARKDOWN
     end
+
+    # Keep section order aligned with rake / Reissue.changelog_sections (same rule as preview task).
+    def sorted_change_pairs(changes)
+      changes.sort_by do |section, _|
+        idx = Reissue.changelog_sections.index(section) || 999
+        [idx, section.to_s]
+      end
+    end
   end
 end

data/lib/reissue/rake.rb

@@ -319,27 +319,11 @@ module Reissue
         end
       end
 
-      desc <<~MSG
-        Create a new branch for the next version.
-
-        If the branch already exists it will be deleted and a new one will be created along with a new tag.
-      MSG
-
+      desc "Create or switch to a branch for the release workflow."
       task "#{name}:branch", [:branch_name] do |task, args|
         raise "No branch name specified" unless args[:branch_name]
         branch_name = args[:branch_name]
-        # Force create branch by deleting if exists, then creating fresh
-        if system("git show-ref --verify --quiet refs/heads/#{branch_name}")
-          # Extract version from branch name (e.g., "reissue/0.4.1" -> "0.4.1")
-          version = branch_name.sub(/^reissue\//, "")
-          # Delete matching tag if it exists
-          system("git tag -d v#{version} 2>/dev/null || true")
-          # Delete the local branch
-          run_command("git branch -D #{branch_name}", "Failed to delete existing branch #{branch_name}")
-          # Delete the remote tracking ref to prevent --force-with-lease from comparing against stale data
-          system("git branch -d -r origin/#{branch_name} 2>/dev/null")
-        end
-        run_command("git checkout -b #{branch_name}", "Failed to create and checkout branch #{branch_name}")
+        run_command("git checkout -B #{branch_name}", "Failed to checkout branch #{branch_name}")
       end
 
       desc "Push the current branch to the remote repository."

data/lib/reissue/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Reissue
-  VERSION = "0.4.20"
-  RELEASE_DATE = "2026-03-10"
+  VERSION = "0.4.22"
+  RELEASE_DATE = "2026-04-09"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reissue
 version: !ruby/object:Gem::Version
-  version: 0.4.20
+  version: 0.4.22
 platform: ruby
 authors:
 - Jim Gay