reissue 0.4.2 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58c406237f6e7ef96ad4a4e1ed1aa2ba3e4cb10145edd6d44bff791a8e37d5be
-  data.tar.gz: 26b103713df3d7de9c1f9af49df079a2e9954b9b7e96a58bc8e3e203607e531d
+  metadata.gz: 23f7a25e06899fcdd212e472a07bedf1b9a7b6cfb81530370b8e1426a4a6ebdf
+  data.tar.gz: 2608f7b732e7b994276aac9237f67659bb2e19098c5692a8e2055c614f7e7673
 SHA512:
-  metadata.gz: 01d186d7b5f87e5c3ef2be402eb758971ff4dec3626d2e2aed8d67d5fd6418d064687682176b509b038b39710e8c313279047e807e42d927c902e4b5bbee649e
-  data.tar.gz: 63d5c29928e104484ce0f1c5ce6ef101a8909ed8727ae441c3a5bb81c9aaf6ecbfb46b7f4af69540f6665fc71ea8e9f9a73d1ea928371d3f8fb7a84b7077198c
+  metadata.gz: '048f4d0b836e36e31fa19f11c87dff4945b86a4c0c3265ad15264c47d47d3ff92d00101108b5868fd8faa029c52bcc706253a5254e4a2650ed5f5fa572b78a28'
+  data.tar.gz: 8ab5002c4637f8602177479da24c93a34a89000c4bff672f39b6b61b41a635f8c690d036e36289602f9685abf87684f2d373aaa8d0cfe601a088743318f5cab3

data/CHANGELOG.md

@@ -5,14 +5,48 @@ 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.2] - 2025-09-16
+## [0.4.4] - 2025-10-17
 
 ### Changed
 
-- New version was never created after the last release.
+- 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)
 
-## [0.4.2] - 2025-09-16
+### 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)
+
+### Fixed
+
+- Namespace loading problem when building a new release with Gem::Version. (c5fffd0)
+
+## [0.4.4] - 2025-10-17
 
 ### Changed
 
-- New version was never created after the last release.
+- 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)
+
+### 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)
+
+### Fixed
+
+- Namespace loading problem when building a new release with Gem::Version. (c5fffd0)

data/README.md

@@ -196,6 +196,92 @@ rake release
 
 The changelog will be updated with the entries from your commit trailers.
 
+### Version Bumping with Git Trailers
+
+When using git fragments (`task.fragment = :git`), you can also control version bumping through commit trailers. Add a `Version:` trailer to your commit messages to specify the type of version bump.
+
+#### Configuration
+
+The version bump feature is automatically enabled when using git fragments:
+
+```ruby
+Reissue::Task.create :reissue do |task|
+  task.version_file = "lib/my_gem/version.rb"
+  task.fragment = :git  # Enables both changelog and version trailers
+end
+```
+
+#### Version Trailer Syntax
+
+Add a `Version:` trailer to specify the bump type:
+
+```bash
+git commit -m "Add breaking API changes
+
+Added: New REST API endpoints
+Changed: Authentication now requires API keys
+Version: major"
+```
+
+Supported version bump types:
+- `Version: major` - Increments major version (1.2.3 → 2.0.0)
+- `Version: minor` - Increments minor version (1.2.3 → 1.3.0)
+- `Version: patch` - Increments patch version (1.2.3 → 1.2.4)
+
+#### Precedence Rules
+
+When multiple commits contain `Version:` trailers, the highest precedence bump is applied:
+
+**Precedence:** major > minor > patch
+
+Examples:
+- Commits with `Version: patch` and `Version: minor` → minor bump applied
+- Commits with `Version: minor` and `Version: major` → major bump applied
+- Multiple `Version: major` trailers → only one major bump applied
+
+#### Idempotency
+
+The version bump is idempotent - running `rake build` multiple times before releasing will only bump the version once:
+
+1. **First build:** Version bumped from 1.2.3 → 2.0.0 (based on `Version: major` trailer)
+2. **Second build:** Version bump skipped (already at 2.0.0)
+3. **Third build:** Version bump skipped (already at 2.0.0)
+4. **After release:** Patch bump to 2.0.1 (standard post-release behavior)
+
+This is achieved by comparing the current version in your version file with the last git tag version. If they differ, the version was already bumped and the bump is skipped.
+
+#### Example Workflow
+
+```bash
+# Make changes with a major version bump
+git commit -m "Redesign authentication system
+
+Changed: Complete overhaul of auth architecture
+Removed: Support for legacy OAuth 1.0
+Added: OAuth 2.0 and JWT support
+Version: major"
+
+# Build (version bumps from 1.2.3 → 2.0.0)
+rake build:checksum
+
+# Build again (version bump skipped - already at 2.0.0)
+rake build:checksum
+
+# Release (creates v2.0.0 tag and bumps to 2.0.1)
+rake release
+```
+
+#### Case Insensitivity
+
+Version trailers are case-insensitive:
+- `Version: major`, `version: major`, `VERSION: MAJOR` all work
+
+#### When to Use Version Trailers
+
+- **Breaking changes:** Use `Version: major` for incompatible API changes
+- **New features:** Use `Version: minor` for backwards-compatible new functionality
+- **Bug fixes:** Use `Version: patch` for backwards-compatible bug fixes (or omit - patch is the default post-release bump)
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt.

data/lib/reissue/fragment_handler/git_fragment_handler.rb

@@ -4,12 +4,12 @@ module Reissue
   class FragmentHandler
     # Handles reading changelog entries from git commit trailers
     class GitFragmentHandler < FragmentHandler
-      # Regex to match changelog section trailers in commit messages
-      TRAILER_REGEX = /^(Added|Changed|Deprecated|Removed|Fixed|Security):\s*(.+)$/i
-
       # Valid changelog sections that can be used as trailers
       VALID_SECTIONS = %w[Added Changed Deprecated Removed Fixed Security].freeze
 
+      # Regex to match changelog section trailers in commit messages
+      TRAILER_REGEX = /^(#{VALID_SECTIONS.join("|")}):\s*(.+)$/i
+
       # Read changelog entries from git commit trailers
       #
       # @return [Hash] A hash of changelog entries organized by section
@@ -27,6 +27,36 @@ module Reissue
         nil
       end
 
+      # Get the last version tag used for comparison
+      #
+      # @return [String, nil] The most recent version tag or nil if no tags found
+      def last_tag
+        return nil unless git_available? && in_git_repo?
+        find_last_tag
+      end
+
+      # Read version bump from git commit trailers
+      #
+      # @return [Symbol, nil] One of :major, :minor, :patch, or nil if none found
+      def read_version_bump
+        return nil unless git_available? && in_git_repo?
+
+        commits = commits_since_last_tag
+        parse_version_bump_from_commits(commits)
+      end
+
+      # Get the version from the last git tag
+      #
+      # @return [Gem::Version, nil] The version from the last tag, or nil if no tags exist
+      def last_tag_version
+        tag = last_tag
+        return nil unless tag
+
+        # Extract version number from tag (e.g., "v1.2.3" -> "1.2.3")
+        version_string = tag.sub(/^v/, "")
+        ::Gem::Version.new(version_string)
+      end
+
       private
 
       def git_available?
@@ -48,17 +78,35 @@ module Reissue
           "HEAD"
         end
 
-        # Get commit messages with trailers, in reverse order (oldest first)
-        output = `git log #{commit_range} --reverse --format=%B 2>/dev/null`
+        # Get commit hash and message using format specifiers
+        # %h = short hash, %x00 = null byte separator, %B = commit body
+        output = `git log #{commit_range} --reverse --format='%h%x00%B%x00' 2>/dev/null`
         return [] if output.empty?
 
-        # Split by double newline to separate commits
-        output.split(/\n\n+/)
+        # Split by null bytes and group into pairs of (hash, message)
+        parts = output.split("\x00")
+        commits = []
+
+        # Process pairs: hash, message, (empty from double null), repeat
+        i = 0
+        while i < parts.length - 1
+          sha = parts[i].strip
+          message = parts[i + 1] || ""
+
+          if !sha.empty?
+            commits << {sha: sha, message: message}
+          end
+
+          i += 2
+        end
+
+        commits
       end
 
       def find_last_tag
-        # Try to find the most recent tag
-        tag = `git describe --tags --abbrev=0 2>/dev/null`.strip
+        # Find the most recent semantic version tag (v*.*.*) by tag creation date across all branches
+        # This ensures we exclude commits that are already in ANY tagged release, not just the current branch
+        tag = `git for-each-ref --sort=-creatordate --format='%(refname:short)' 'refs/tags/v[0-9]*.[0-9]*.[0-9]*' --count=1 2>/dev/null`.strip
         tag.empty? ? nil : tag
       end
 
@@ -66,8 +114,11 @@ module Reissue
         result = {}
 
         commits.each do |commit|
-          # Split commit into lines and look for trailers
-          commit.lines.each do |line|
+          sha = commit[:sha]
+          message = commit[:message]
+
+          # Split commit message into lines and look for trailers
+          message.lines.each do |line|
             line = line.strip
             next if line.empty?
 
@@ -76,7 +127,8 @@ module Reissue
               trailer_value = match[2].strip
 
               result[section_name] ||= []
-              result[section_name] << trailer_value
+              # Append the short SHA in parentheses
+              result[section_name] << "#{trailer_value} (#{sha})"
             end
           end
         end
@@ -88,6 +140,39 @@ module Reissue
         # Normalize to proper case (e.g., "FIXED" -> "Fixed", "added" -> "Added")
         name.capitalize
       end
+
+      def parse_version_bump_from_commits(commits)
+        # Precedence order (major > minor > patch)
+        precedence = {major: 3, minor: 2, patch: 1}
+
+        # Regex to match version trailers
+        version_regex = /^version:\s*(major|minor|patch)\s*$/i
+
+        highest_bump = nil
+        highest_precedence = 0
+
+        commits.each do |commit|
+          message = commit[:message]
+
+          # Split commit message into lines and look for version trailers
+          message.lines.each do |line|
+            line = line.strip
+            next if line.empty?
+
+            if (match = line.match(version_regex))
+              bump_value = match[1].downcase.to_sym
+
+              # Check if this bump has higher precedence
+              if precedence[bump_value] && precedence[bump_value] > highest_precedence
+                highest_bump = bump_value
+                highest_precedence = precedence[bump_value]
+              end
+            end
+          end
+        end
+
+        highest_bump
+      end
     end
   end
 end

data/lib/reissue/gem.rb

@@ -11,8 +11,8 @@ module Reissue
 end
 Reissue::Task.prepend Reissue::Gem
 
-# Run rake reissue:finalize _before_ the build task as a prerequisite.
-Rake::Task[:build].enhance(["reissue:finalize"])
+# Run rake reissue:bump and reissue:finalize _before_ the build task as prerequisites.
+Rake::Task[:build].enhance(["reissue:bump", "reissue:finalize"])
 
 # Run the reissue task after the release task.
 Rake::Task["release"].enhance do

data/lib/reissue/rake.rb

@@ -238,6 +238,18 @@ module Reissue
         if fragment
           require_relative "fragment_handler"
           handler = Reissue::FragmentHandler.for(fragment)
+
+          # Show comparison tag for git trailers
+          if fragment == :git && handler.respond_to?(:last_tag)
+            last_tag = handler.last_tag
+            if last_tag
+              puts "Comparing against: #{last_tag}"
+              puts "  (Run 'git fetch --tags' if this seems out of date)\n\n"
+            else
+              puts "No version tags found (comparing against all commits)\n\n"
+            end
+          end
+
           entries = handler.read
 
           if entries.empty?
@@ -282,6 +294,46 @@ module Reissue
           end
         end
       end
+
+      desc "Bump version based on git trailers"
+      task "#{name}:bump" do
+        # Only check for version trailers when using git fragments
+        next unless fragment == :git
+
+        require_relative "fragment_handler"
+        require_relative "version_updater"
+
+        handler = Reissue::FragmentHandler.for(:git)
+
+        # Get current version from version file
+        version_content = File.read(version_file)
+        current_version = ::Gem::Version.new(version_content.match(Reissue::VersionUpdater::VERSION_MATCH)[0])
+
+        # Get version from last git tag
+        tag_version = handler.last_tag_version
+
+        # Only bump if current version matches tag version (hasn't been bumped yet)
+        if tag_version && current_version == tag_version
+          bump = handler.read_version_bump
+
+          if bump
+            updater = Reissue::VersionUpdater.new(version_file, version_redo_proc: version_redo_proc)
+            updater.call(bump)
+            puts "Version bumped (#{bump}) to #{updater.instance_variable_get(:@new_version)}"
+          end
+        elsif tag_version && current_version != tag_version
+          puts "Version already bumped (#{tag_version} → #{current_version}), skipping"
+        else
+          # No tag exists, check for version trailers anyway
+          bump = handler.read_version_bump
+
+          if bump
+            updater = Reissue::VersionUpdater.new(version_file, version_redo_proc: version_redo_proc)
+            updater.call(bump)
+            puts "Version bumped (#{bump}) to #{updater.instance_variable_get(:@new_version)}"
+          end
+        end
+      end
     end
   end
 end

data/lib/reissue/version.rb

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

metadata

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