reissue 0.4.5 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbf7f6743d0d3f7d9cc6ae1d2daa7b60debf47a437473a01a23d18e50450b3ed
-  data.tar.gz: 545d45ca3354aa70cba0b3bb01ba5b653d62b26b6c9ee37dd4c398f1384e7fee
+  metadata.gz: 497ea9bf5abf5081d1177217a0083ad682edf5d39ed7c729e8949c31e47e1d53
+  data.tar.gz: 0c4660c3d271b95fcbc0575bf91a0826a91348d6b48ac383a5ab9058887afdf3
 SHA512:
-  metadata.gz: f7f3a5b754e4d9189f1ca8452510129e1b4550dcf9dba385b9d92af1e6dc2e648582d356483648f7e2a9ea766b1efec87e118a9c34def1800e2201f28997ffb9
-  data.tar.gz: dd3518eebf74b5280eca612148cb8782d591f195e4f8d7f31ba314c7e5ec109c2bcd55aecf91128ac9d22802a36f1feb63671c644835a350f041fa1ca16f1b94
+  metadata.gz: 8dcd012366336939860c89e503526a2d46879159ab7e10c9f571d3157142ffe613d2b641da75b67359bd8fa49af8dc2ffd171e09df32794fe230b9da24293910
+  data.tar.gz: e90cd39f283c3bb983c24bb45f7a0c3fe2b6519d650adc411c9c0e69572eba8b59535935aabc9e225cb04f70da7401ed99dd74f151ef513b112bd1f494ea2e03

data/CHANGELOG.md

@@ -5,37 +5,34 @@ 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.5] - 2025-11-21
-
-### Added
-
-- NOTIFY_APP_NAME ENV var for CI runs in 5700751d (e2c75ff)
-- Support for alphanumery patch version tag matching in 5c17ce36 (e2c75ff)
-- Info in the README about adding trailers in development of Reissue (68117e0)
+## [0.4.7] - 2025-12-10
 
 ### Fixed
 
-- Duplicate changelog entries with incorrect release dates. (1e03b68)
+- Git command failures now raise detailed errors with full output (d87ffd3)
+- Bundle install skipped when no Gemfile exists in directory (d87ffd3)
+- Changelog file configuration ignored in reissue task (35b5a30)
+
+### Added
 
-## [0.4.4] - 2025-10-17
+- Error messages include command, exit status, stdout, and stderr (d87ffd3)
 
 ### Changed
 
-- Derive TRAILER_REGEX from VALID_SECTIONS to eliminate duplication (32b963e)
-- Updated example Rakefile to include version trailer configuration (4f2a254)
-- Replace Qlty with native SimpleCov coverage reporting in CI (764d6ba)
+- All critical git operations now use comprehensive error checking (d87ffd3)
+
+## [0.4.6] - 2025-12-05
 
 ### Added
 
-- Version trailer parsing methods to GitFragmentHandler (0434f69)
-- Version bump rake task with idempotency protection (9ff858a)
-- Build task enhancement to process version trailers before finalize (b5a05b7)
-- Release flow integration documentation and verification tests (e038230)
-- Version bumping documentation to README.md (4f2a254)
-- Version trailer examples and usage guide (4f2a254)
-- PR comments showing code coverage percentage and threshold status (bfa4619)
-- ChatNotifier to update slack about CI runs (55dfeb8)
+- NOTIFY_APP_NAME ENV var for CI runs in 5700751d (e2c75ff)
+- Support for alphanumery patch version tag matching in 5c17ce36 (e2c75ff)
+- Info in the README about adding trailers in development of Reissue (68117e0)
 
 ### Fixed
 
-- Namespace loading problem when building a new release with Gem::Version. (c5fffd0)
+- Duplicate changelog entries with incorrect release dates. (1e03b68)
+
+### Changed
+
+- Branch naming convention to use distinct prefixes for finalize vs reissue (d1add14)

data/lib/reissue/fragment_handler/git_fragment_handler.rb

@@ -119,16 +119,29 @@ module Reissue
         commits.each do |commit|
           sha = commit[:sha]
           message = commit[:message]
+          lines = message.lines
 
-          # Split commit message into lines and look for trailers
-          message.lines.each do |line|
-            line = line.strip
-            next if line.empty?
+          i = 0
+          while i < lines.length
+            line = lines[i].rstrip
+            i += 1
+            next if line.strip.empty?
 
             if (match = line.match(TRAILER_REGEX))
               section_name = normalize_section_name(match[1])
               trailer_value = match[2].strip
 
+              # Collect continuation lines (non-empty lines that don't start a new changelog trailer)
+              while i < lines.length
+                next_line = lines[i].rstrip
+                # Stop at empty line or another changelog trailer
+                break if next_line.strip.empty?
+                break if next_line.match(TRAILER_REGEX)
+
+                trailer_value += " #{next_line.strip}"
+                i += 1
+              end
+
               result[section_name] ||= []
               # Append the short SHA in parentheses
               result[section_name] << "#{trailer_value} (#{sha})"

data/lib/reissue/rake.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "rake/tasklib"
+require "open3"
 require_relative "../reissue"
 
 module Reissue
@@ -114,6 +115,20 @@ module Reissue
     attr_reader :formatter, :tasker
     private :formatter, :tasker
 
+    # Run a shell command and raise an error with details if it fails
+    def run_command(command, error_message)
+      stdout, stderr, status = Open3.capture3(command)
+      unless status.success?
+        error_details = [error_message]
+        error_details << "Command: #{command}"
+        error_details << "Exit status: #{status.exitstatus}"
+        error_details << "STDOUT: #{stdout.strip}" unless stdout.strip.empty?
+        error_details << "STDERR: #{stderr.strip}" unless stderr.strip.empty?
+        raise error_details.join("\n")
+      end
+      stdout
+    end
+
     def finalize_with_branch?
       push_finalize == :branch
     end
@@ -131,7 +146,7 @@ module Reissue
     end
 
     def bundle
-      if defined?(Bundler)
+      if defined?(Bundler) && File.exist?("Gemfile")
         Bundler.with_unbundled_env do
           system("bundle install")
         end
@@ -145,6 +160,7 @@ module Reissue
         new_version = formatter.call(
           segment:,
           version_file:,
+          changelog_file:,
           version_limit:,
           version_redo_proc:,
           fragment: fragment
@@ -153,9 +169,9 @@ module Reissue
 
         tasker["#{name}:clear_fragments"].invoke
 
-        system("git add -u")
+        run_command("git add -u", "Failed to stage updated files")
         if updated_paths&.any?
-          system("git add #{updated_paths.join(" ")}")
+          run_command("git add #{updated_paths.join(" ")}", "Failed to stage additional paths: #{updated_paths.join(", ")}")
         end
 
         bump_message = "Bump version to #{new_version}"
@@ -163,7 +179,7 @@ module Reissue
           if reissue_version_with_branch?
             tasker["#{name}:branch"].invoke("reissue/#{new_version}")
           end
-          system("git commit -m '#{bump_message}'")
+          run_command("git commit -m '#{bump_message}'", "Failed to commit version bump")
           tasker["#{name}:push"].invoke if push_reissue?
         else
           system("echo '#{bump_message}'")
@@ -197,10 +213,11 @@ module Reissue
         finalize_message = "Finalize the changelog for version #{version} on #{date}"
         if commit_finalize
           if finalize_with_branch?
-            tasker["#{name}:branch"].invoke("reissue/#{version}")
+            # Use "finalize/" prefix for the version being released
+            tasker["#{name}:branch"].invoke("finalize/#{version}")
           end
-          system("git add -u")
-          system("git commit -m '#{finalize_message}'")
+          run_command("git add -u", "Failed to stage finalized changelog")
+          run_command("git commit -m '#{finalize_message}'", "Failed to commit finalized changelog")
           tasker["#{name}:push"].invoke if push_finalize?
         else
           system("echo '#{finalize_message}'")
@@ -223,14 +240,14 @@ module Reissue
           # Delete matching tag if it exists
           system("git tag -d v#{version} 2>/dev/null || true")
           # Delete the branch
-          system("git branch -D #{branch_name}")
+          run_command("git branch -D #{branch_name}", "Failed to delete existing branch #{branch_name}")
         end
-        system("git checkout -b #{branch_name}")
+        run_command("git checkout -b #{branch_name}", "Failed to create and checkout branch #{branch_name}")
       end
 
       desc "Push the current branch to the remote repository."
       task "#{name}:push" do
-        system("git push origin HEAD")
+        run_command("git push origin HEAD", "Failed to push to remote repository")
       end
 
       desc "Preview changelog entries that will be added from fragments or git trailers"
@@ -287,8 +304,8 @@ module Reissue
           formatter.clear_fragments(fragment)
           clear_message = "Clear changelog fragments"
           if commit_clear_fragments
-            system("git add #{fragment}")
-            system("git commit -m '#{clear_message}'")
+            run_command("git add #{fragment}", "Failed to stage cleared fragments")
+            run_command("git commit -m '#{clear_message}'", "Failed to commit cleared fragments")
           else
             system("echo '#{clear_message}'")
           end

data/lib/reissue/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Reissue
-  VERSION = "0.4.5"
+  VERSION = "0.4.7"
 end

metadata

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