discharger 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25a6ab71ff65d9ada8fe82ce0a706b08d335aaa533b10c1b57a652434149cd91
-  data.tar.gz: 524b68d60300a017c7d83bc7162f1962819b44f1be1255ec1fd8651b47740374
+  metadata.gz: 3b0eda964739589ae49d73ea992ff80d8e782b3de287ca19fcb1a82c605d1638
+  data.tar.gz: 5d86440df15d87cb9a66b5133dc1d70d8f736bd0644a7b9f57b5a4d2a3428e89
 SHA512:
-  metadata.gz: 7b67aaf1127f81ca25f3f4f78ce3fc5884920048baa022128b46dfa24e4ab01dee3b4574894d7e3305026cdfc7eb4659351b3cf649dc509e2d8c76982207bf01
-  data.tar.gz: 894a03d8fd806db6d0c831a1c47191332aa5cae0ab02fdf7709a040cab2e50f9e8a2ee02030d6e5015bfe2ab03d8a5e7ae806d6e79e9f0fe3f020a8f2cdc8a75
+  metadata.gz: 82c6912aee9e99edeb92304f26a0443983495b4aa8b3152cea7497da0da895ad892b8d392bdd25d7a1d559176c6a412589fd9b2dab0bc8fae9fb1c28019602ad
+  data.tar.gz: 48a5949f5177ace0de43d0788ce3f45a6dd24b558478704014b5234c6625e23737c209f831550ed224c1ca6b6869f08d0fdb8c30515f1af6efebafeb129c80db

data/CHANGELOG.md

@@ -5,14 +5,24 @@ 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.3.4] - 2026-07-22
+## [0.4.0] - 2026-09-24
 
 ### Added
 
-- Runbook announcement on stage builds, previewing post-release steps before production (c77b552)
+- pr_label option opening the finalize and version-bump PRs via gh with that label (08e1d10)
 
-## [0.3.3] - 2026-07-22
+### Changed
+
+- Auto-deploy releases tag the newest commit that changed the version's changelog section instead of requiring it at HEAD, and no longer open a production PR (476fe1b)
+- Auto-deploy releases merge the release tag into the production branch (a7a1b49)
+
+### Fixed
+
+- retain_changelogs reaches Reissue, so finalize writes the archived changelog file (2a90edf)
+- release:prepare branches from origin, so a stale local branch no longer yields an empty changelog (8eb5fd3)
+
+## [0.3.5] - 2026-08-10
 
 ### Added
 
-- Post-release runbook announcement in the Slack release thread, from Reissue's runbook_file (0cf9620)
+- github_packages setup step storing bundler credentials for a private GitHub Packages gem source via the gh CLI (2cff4b6)

data/README.md

@@ -187,6 +187,16 @@ end
 
 This allows you to use environment variables to override the default branch names, or set project-specific defaults. The `DISCHARGER_BUILD_BRANCH` environment variable (shown above) provides a runtime override specifically for the build task.
 
+### Auto-deploy Staging
+
+For projects whose CI deploys the working branch to staging on every merge, set `task.auto_deploy_staging = true` and skip `rake release:stage`. Once the finalize PR merges, `rake release`:
+
+1. Tags the newest commit that changed the current version's dated changelog section, so work merged after finalizing (or re-finalizing for a hotfix) is left out.
+2. Pushes the tag. Production deploys from `v*` tags.
+3. Merges the tag into `production_branch` so it tracks production. If that push is rejected, the release still completes with a warning.
+
+Production ships the tagged commit, which can be older than what staging last ran.
+
 ## Development Setup Automation
 
 Discharger includes a setup script that automates your development environment configuration. When you run the install generator, it creates a `bin/setup` script and a `config/setup.yml` configuration file.
@@ -274,6 +284,7 @@ The `steps` array specifies which built-in setup commands to run. Available comm
 - `brew` - Install Homebrew dependencies
 - `asdf` - Setup version management with asdf
 - `git` - Configure git settings
+- `github_packages` - Store bundler credentials for a private GitHub Packages gem source using the GitHub CLI (run before `bundler`; requires a `github_packages.source` config entry)
 - `bundler` - Install Ruby gems
 - `yarn` - Install JavaScript packages
 - `config` - Copy configuration files
@@ -294,7 +305,7 @@ steps:
   - yarn
 ```
 
-Leave the array empty or omit it entirely to run all available steps.
+Leave the array empty or omit it entirely to run all available steps, in the order listed above. Custom commands registered through `Discharger::SetupRunner.register_command` run last.
 
 ### Adding Custom Commands
 
@@ -321,6 +332,26 @@ Each custom step can include:
 - `description` - A description shown during setup
 - `command` - The command to execute
 - `condition` - An optional Ruby expression that must evaluate to true for the command to run
+- `name` - An optional name that lets the step be scheduled in the `steps` list
+
+Custom steps run after the built-in steps, in the order listed. To run one
+earlier, give it a `name` and list that name in `steps`:
+
+```yaml
+custom_steps:
+  - name: import_certs
+    description: "Import development certificates"
+    command: "bin/import-certs"
+
+steps:
+  - brew
+  - import_certs  # runs between brew and bundler
+  - bundler
+```
+
+A named step listed in `steps` runs only at that position; named steps that
+are not listed keep the default run-last behavior. A name that collides with
+a built-in step resolves to the built-in, and a warning is logged.
 
 ### Creating Custom Command Classes
 

data/lib/discharger/setup_runner/command_factory.rb

@@ -25,32 +25,69 @@ module Discharger
 
       def create_all_commands
         commands = []
+        scheduled = []
 
-        # Create built-in commands from steps
+        # Create built-in and named custom commands from steps
         if config.steps.any?
+          named_custom = named_custom_steps
           config.steps.each do |step|
-            command = create_command(step)
-            commands << command if command
+            name = step.to_s
+            if CommandRegistry.get(name)
+              if named_custom.key?(name)
+                logger&.warn "custom step name #{name.inspect} is shadowed by a built-in command; the built-in will run"
+              end
+              command = create_command(name)
+              commands << command if command
+            elsif (step_config = named_custom[name])
+              scheduled << step_config
+              commands << build_custom_command(step_config)
+            else
+              logger&.warn "unknown step #{name.inspect}; not a built-in or named custom step"
+            end
           end
         else
           # If no steps specified, create all registered commands
-          CommandRegistry.names.each do |name|
+          CommandRegistry.ordered_names.each do |name|
             command = create_command(name)
             commands << command if command
           end
         end
 
-        # Create custom commands
+        # Create the remaining custom commands
         if config.respond_to?(:custom_steps) && config.custom_steps.any?
-          require_relative "commands/custom_command"
           config.custom_steps.each do |step_config|
-            command = Commands::CustomCommand.new(config, app_root, logger, step_config)
-            commands << command
+            next if scheduled.any? { |s| s.equal?(step_config) }
+            commands << build_custom_command(step_config)
           end
         end
 
         commands
       end
+
+      private
+
+      # Custom steps with a "name" key can be scheduled by that name in
+      # steps:. First entry wins a contested name; later duplicates keep the
+      # default run-last behavior.
+      def named_custom_steps
+        return {} unless config.respond_to?(:custom_steps)
+
+        config.custom_steps.each_with_object({}) do |step_config, named|
+          name = step_config["name"].to_s
+          next if name.empty?
+
+          if named.key?(name)
+            logger&.warn "duplicate custom step name #{name.inspect}; only the first entry can be scheduled"
+            next
+          end
+          named[name] = step_config
+        end
+      end
+
+      def build_custom_command(step_config)
+        require_relative "commands/custom_command"
+        Commands::CustomCommand.new(config, app_root, logger, step_config)
+      end
     end
   end
 end

data/lib/discharger/setup_runner/command_registry.rb

@@ -3,6 +3,24 @@
 module Discharger
   module SetupRunner
     class CommandRegistry
+      # The order built-in steps run in when setup.yml configures no steps.
+      # Registration order cannot be relied on here: it comes from enumerating
+      # Commands.constants, which shifts with require order. Credentials and
+      # toolchains have to be in place before bundler resolves gems.
+      DEFAULT_ORDER = %w[
+        brew
+        asdf
+        git
+        github_packages
+        bundler
+        yarn
+        config
+        docker
+        pg_tools
+        env
+        database
+      ].freeze
+
       class << self
         def register(name, command_class)
           commands[name.to_s] = command_class
@@ -20,6 +38,12 @@ module Discharger
           commands.keys
         end
 
+        # Registered names in pipeline order, with anything outside
+        # DEFAULT_ORDER (custom commands) appended in registration order.
+        def ordered_names
+          (DEFAULT_ORDER & names) + (names - DEFAULT_ORDER)
+        end
+
         def clear
           commands.clear
         end
@@ -41,6 +65,9 @@ module Discharger
             command_class = Commands.const_get(const_name)
             next unless command_class < Commands::BaseCommand
             next if command_class == Commands::BaseCommand
+            # Not schedulable by name: it takes a step_config argument and is
+            # instantiated by CommandFactory from custom_steps entries.
+            next if command_class == Commands::CustomCommand
 
             # Convert class name to command name (e.g., AsdfCommand -> asdf)
             command_name = const_name.to_s.sub(/Command$/, "").gsub(/([A-Z])/, '_\1').downcase.sub(/^_/, "")

data/lib/discharger/setup_runner/commands/docker_command.rb

@@ -104,12 +104,14 @@ module Discharger
           log "Checking #{name} container"
 
           if system_quiet("docker ps | grep #{name} > /dev/null 2>&1")
+            ensure_restart_policy(name)
             log "#{name} container is already running"
             return
           end
 
           # Check if container exists but is stopped
           if system_quiet("docker inspect #{name} > /dev/null 2>&1")
+            ensure_restart_policy(name)
             log "Starting existing #{name} container"
             unless system_quiet("docker start #{name}")
               log "Removing failed #{name} container"
@@ -148,7 +150,7 @@ module Discharger
         def create_container(name:, port:, image:, internal_port:, env: {}, volume: nil)
           log "Creating new #{name} container"
 
-          cmd = ["docker", "run", "-d", "--name", name, "-p", "#{port}:#{internal_port}"]
+          cmd = ["docker", "run", "-d", "--restart", "unless-stopped", "--name", name, "-p", "#{port}:#{internal_port}"]
           env.each { |k, v| cmd.push("-e", "#{k}=#{v}") }
           cmd.push("-v", volume) if volume
           cmd.push(image)
@@ -156,6 +158,10 @@ module Discharger
           system!(*cmd)
         end
 
+        def ensure_restart_policy(name)
+          system!("docker", "update", "--restart", "unless-stopped", name)
+        end
+
         def docker_available?
           return true if system_quiet("which docker > /dev/null 2>&1")
 

data/lib/discharger/setup_runner/commands/github_packages_command.rb

@@ -0,0 +1,137 @@
+# frozen_string_literal: true
+
+require_relative "base_command"
+
+module Discharger
+  module SetupRunner
+    module Commands
+      # Stores bundler credentials for a private GitHub Packages gem source
+      # using the GitHub CLI, so Gemfiles don't need embedded tokens.
+      # Credentials are written to the app's .bundle/config — keep .bundle
+      # gitignored. Run this step before "bundler" in setup.yml.
+      class GithubPackagesCommand < BaseCommand
+        # A configured source with nothing scheduled to store its credentials
+        # is inert, and the only symptom is bundler failing against the
+        # private source. The Runner surfaces this before executing commands.
+        # Guarded for duck-typed configs passed to the public Runner API, and
+        # quiet when a custom step's command references the source (assumed
+        # to handle credentials itself).
+        def self.unscheduled_warning(config)
+          return unless config.respond_to?(:github_packages)
+
+          source = config.github_packages&.source
+          return if source.to_s.empty?
+          if config.respond_to?(:custom_steps) &&
+              config.custom_steps.any? { |step| step_handles_source?(step, source) }
+            return
+          end
+
+          "github_packages is configured but missing from steps; " \
+            "credentials will not be stored and bundler may fail for #{source}"
+        end
+
+        # A referencing step only counts as handling credentials when it will
+        # actually run: CustomCommand skips itself when its condition is
+        # false, storing nothing on this run.
+        def self.step_handles_source?(step, source)
+          return false unless step["command"].to_s.include?(source)
+
+          require_relative "../condition_evaluator"
+          ConditionEvaluator.evaluate(step["condition"])
+        end
+        private_class_method :step_handles_source?
+
+        def execute
+          unless gh_installed?
+            log "GitHub CLI (gh) not found; skipping. Install gh and rerun setup or `bundle install` may fail for #{source}"
+            return
+          end
+
+          unless authenticated? || login
+            log "Not logged in to GitHub; skipping. Run `gh auth login` and rerun setup."
+            return
+          end
+
+          username = gh("api", "user", "--jq", ".login")
+          token = gh("auth", "token")
+          if username.to_s.empty? || token.to_s.empty?
+            log "Could not read GitHub credentials from gh; skipping."
+            return
+          end
+
+          store_bundler_credentials(username, token)
+          if credentials_valid?(username, token)
+            log "Configured bundler credentials for #{source}"
+          else
+            log "#{source} rejected the stored credentials. Your gh token may lack " \
+              "the read:packages scope — run `gh auth refresh -s read:packages` and rerun setup."
+          end
+        end
+
+        def can_execute?
+          !source.to_s.empty?
+        end
+
+        def description
+          "Configure GitHub Packages credentials"
+        end
+
+        protected
+
+        def source
+          config.github_packages&.source
+        end
+
+        def gh_installed?
+          system_quiet("which gh")
+        end
+
+        def authenticated?
+          system_quiet("gh auth status")
+        end
+
+        def login
+          return false unless $stdin.tty?
+          log "Logging in to GitHub..."
+          system("gh", "auth", "login")
+          authenticated?
+        end
+
+        def gh(*args)
+          require "open3"
+          stdout, _stderr, status = Open3.capture3("gh", *args)
+          status.success? ? stdout.chomp : nil
+        end
+
+        # Runs bundle config directly instead of through system! so the
+        # token never reaches the spinner display or the debug log.
+        def store_bundler_credentials(username, token)
+          require "open3"
+          _stdout, stderr, status = Open3.capture3(
+            "bundle", "config", "set", "--local", source, "#{username}:#{token}"
+          )
+          raise "bundle config set --local #{source} failed: #{stderr}" unless status.success?
+        end
+
+        # Probes the source's compact index with the stored credentials.
+        # Only a definite 401/403 counts as invalid — network trouble must
+        # not fail setup over an unverifiable token.
+        def credentials_valid?(username, token)
+          require "net/http"
+          require "uri"
+          uri = URI.join("#{source.chomp("/")}/", "versions")
+          response = Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https",
+            open_timeout: 5, read_timeout: 10) do |http|
+            request = Net::HTTP::Get.new(uri)
+            request.basic_auth(username, token)
+            http.request(request)
+          end
+          !%w[401 403].include?(response.code)
+        rescue => e
+          logger&.debug("Could not verify GitHub Packages credentials: #{e.message}")
+          true
+        end
+      end
+    end
+  end
+end

data/lib/discharger/setup_runner/configuration.rb

@@ -5,12 +5,13 @@ require "yaml"
 module Discharger
   module SetupRunner
     class Configuration
-      attr_accessor :app_name, :database, :redis, :services, :steps, :custom_steps, :pre_steps
+      attr_accessor :app_name, :database, :redis, :github_packages, :services, :steps, :custom_steps, :pre_steps
 
       def initialize
         @app_name = "Application"
         @database = DatabaseConfig.new
         @redis = nil
+        @github_packages = nil
         @services = []
         @steps = []
         @custom_steps = []
@@ -27,6 +28,7 @@ module Discharger
         config.app_name = yaml["app_name"] if yaml["app_name"]
         config.database.from_hash(yaml["database"]) if yaml["database"]
         config.redis = RedisConfig.new.tap { |r| r.from_hash(yaml["redis"]) } if yaml["redis"]
+        config.github_packages = GithubPackagesConfig.new.tap { |g| g.from_hash(yaml["github_packages"]) } if yaml["github_packages"]
         config.services = yaml["services"] || []
         config.steps = yaml["steps"] || []
         config.custom_steps = yaml["custom_steps"] || []
@@ -56,6 +58,18 @@ module Discharger
       end
     end
 
+    class GithubPackagesConfig
+      attr_accessor :source
+
+      def initialize
+        @source = nil
+      end
+
+      def from_hash(hash)
+        @source = hash["source"] if hash["source"]
+      end
+    end
+
     class RedisConfig
       attr_accessor :port, :name, :version
 

data/lib/discharger/setup_runner/runner.rb

@@ -15,7 +15,7 @@ module Discharger
         @config = config
         @app_root = app_root || Dir.pwd
         @logger = logger || Logger.new($stdout)
-        @command_factory = CommandFactory.new(config, app_root, logger)
+        @command_factory = CommandFactory.new(config, @app_root, @logger)
       end
 
       def run
@@ -25,6 +25,8 @@ module Discharger
           puts Rainbow("=" * 50).blue
         end
 
+        warn_unscheduled_commands
+
         FileUtils.chdir app_root do
           execute_commands
         end
@@ -76,6 +78,18 @@ module Discharger
         @commands ||= command_factory.create_all_commands
       end
 
+      # Checked at run time, after the customization block, so commands
+      # scheduled through add_command/insert_command_* count as scheduled.
+      def warn_unscheduled_commands
+        CommandRegistry.all.each do |klass|
+          next unless klass.respond_to?(:unscheduled_warning)
+          next if commands.any? { |command| command.is_a?(klass) }
+
+          message = klass.unscheduled_warning(config)
+          logger.warn message if message
+        end
+      end
+
       def execute_commands
         commands.each do |command|
           execute_command(command)

data/lib/discharger/task.rb

@@ -25,6 +25,7 @@ module Discharger
         reissue.clear_fragments = task.clear_fragments
         reissue.tag_pattern = task.tag_pattern
         reissue.runbook_file = task.runbook_file
+        reissue.retain_changelogs = task.retain_changelogs
       end
       task.define
       task
@@ -46,6 +47,7 @@ module Discharger
     attr_accessor :app_name
     attr_accessor :commit_identifier
     attr_accessor :pull_request_url
+    attr_accessor :pr_label
     attr_accessor :fragment_directory
     attr_accessor :fragment
     attr_accessor :clear_fragments
@@ -134,32 +136,41 @@ module Discharger
       ERROR
     end
 
-    # Abort if HEAD is not the commit that last touched the version file
-    def validate_release_commit!(branch, output: $stdout)
-      head_sha = git_local_sha(branch)
-      release_sha = git_version_file_commit(branch)
+    # The newest commit that changed the current version's dated changelog section
+    def find_release_commit!(branch, output: $stdout)
+      version = Object.const_get(version_constant)
+      section = /^## \[#{Regexp.escape(version)}\] - \d{4}-\d{2}-\d{2}.*?(?=^## \[|\z)/m
+      sha = git_file_commits(branch, changelog_file).find do |candidate_sha|
+        released = git_show_at_commit(candidate_sha, changelog_file)&.[](section)
+        released && released != git_show_at_commit("#{candidate_sha}^", changelog_file)&.[](section)
+      end
 
-      if head_sha.nil? || release_sha.nil?
+      if sha.nil?
         abort <<~ERROR.bg(:red).white
-          Could not determine release commit.
-
-          HEAD:           #{head_sha || "not found"}
-          Release commit: #{release_sha || "not found"}
-
-          Ensure #{branch} exists and #{version_file} has been modified.
+          Could not locate a release commit.
+          Ensure #{branch} exists and #{changelog_file} has been finalized for #{version}.
         ERROR
       end
 
-      return sysecho("✓ HEAD is the release commit (#{head_sha[0, 8]})".bg(:green).black, output:) if head_sha == release_sha
+      sysecho("✓ Release commit: #{sha[0, 8]}".bg(:green).black, output:)
+      sha
+    end
+
+    def merge_tag_into_production_branch(tag, output: $stdout)
+      git = ->(*args) do
+        stdout, stderr, status = Open3.capture3("git", *args)
+        return stdout.strip if status.success?
 
-      abort <<~ERROR.bg(:red).white
-        HEAD is not the release commit!
+        sysecho("Could not merge #{tag} into #{production_branch}: #{stderr.strip}".bg(:yellow).black, output:)
+        nil
+      end
 
-        HEAD:           #{head_sha[0, 8]}
-        Release commit: #{release_sha[0, 8]} (last commit to touch #{version_file})
+      return false unless git.call("fetch", "origin", production_branch)
+      return false unless (tree = git.call("merge-tree", "--write-tree", "origin/#{production_branch}", tag))
+      return false unless (commit = git.call("commit-tree", tree, "-p", "origin/#{production_branch}", "-p", "#{tag}^{commit}", "-m", "Merge tag '#{tag}'"))
+      return false unless git.call("push", "origin", "#{commit}:refs/heads/#{production_branch}")
 
-        Something was merged after the release PR. Verify the branch contents and retry.
-      ERROR
+      sysecho("✓ Merged #{tag} into #{production_branch}".bg(:green).black, output:)
     end
 
     def git_show_version(branch)
@@ -168,16 +179,57 @@ module Discharger
       content[/VERSION\s*=\s*["']([^"']+)["']/, 1]
     end
 
-    def git_local_sha(branch)
-      stdout, _, status = Open3.capture3("git", "rev-parse", branch)
-      return nil unless status.success?
-      stdout.strip
+    def git_file_commits(branch, path)
+      stdout, _, status = Open3.capture3("git", "log", "--no-merges", branch, "--format=%H", "--", path)
+      return [] unless status.success?
+      stdout.lines.map(&:strip)
     end
 
-    def git_version_file_commit(branch)
-      stdout, _, status = Open3.capture3("git", "log", branch, "-1", "--format=%H", "--", version_file)
+    def git_show_at_commit(sha, path)
+      stdout, _, status = Open3.capture3("git", "show", "#{sha}:#{path}")
       return nil unless status.success?
-      stdout.strip
+      stdout
+    end
+
+    def ensure_clean_worktree!
+      stdout, _, status = Open3.capture3("git", "status", "--porcelain")
+      return true if status.success? && stdout.empty?
+
+      abort "Working tree has uncommitted changes. Commit or stash them before running rake #{name}:prepare."
+    end
+
+    def validate_pr_label!
+      return true unless pr_label
+
+      stdout, stderr, status = Open3.capture3("gh", "label", "list", "--search", pr_label, "--json", "name", "--jq", ".[].name")
+      return true if status.success? && stdout.lines.map(&:chomp).include?(pr_label)
+
+      abort <<~ERROR.bg(:red).white
+        Could not find GitHub label '#{pr_label}'.
+
+        #{stderr}
+      ERROR
+    end
+
+    def create_labeled_pr!(head:, title:, body:)
+      if (pr_number = existing_pr_number(working_branch, head))
+        return sysecho("Reusing existing PR ##{pr_number} for #{head}.")
+      end
+
+      syscall(
+        ["gh", "pr", "create", "--base", working_branch, "--head", head, "--title", title, "--body", body, "--label", pr_label]
+      )
+    end
+
+    def ensure_branch_not_ahead!(branch)
+      stdout, _, status = Open3.capture3("git", "rev-list", "--count", "origin/#{branch}..#{branch}")
+      return true if status.success? && stdout.strip == "0"
+
+      abort <<~ERROR.bg(:red).white
+        Local #{branch} has commits not on origin/#{branch}. Refusing to reset --hard.
+
+        Push or remove them before retrying.
+      ERROR
     end
 
     # The post-release steps collected from "Runbook:" commit trailers.
@@ -258,6 +310,7 @@ module Discharger
         unless system("gh --version > /dev/null 2>&1")
           abort "Error: GitHub CLI (gh) is required for the release process but was not found. Install it: https://cli.github.com"
         end
+        validate_pr_label!
 
         current_version = Object.const_get(version_constant)
 
@@ -265,10 +318,16 @@ module Discharger
         # instead of staging_branch (for CI/CD pipelines that auto-deploy staging)
         release_source = auto_deploy_staging ? working_branch : staging_branch
 
+        release_action = if auto_deploy_staging
+          "This will tag the release commit on #{working_branch}, push the tag, and merge it into #{production_branch}."
+        else
+          "This will tag the current version and push it to the production branch."
+        end
+
         sysecho <<~MSG
           Releasing version #{current_version} to production.
 
-          This will tag the current version and push it to the production branch.
+          #{release_action}
           Release source: #{release_source}
         MSG
         sysecho "Are you ready to continue? (Press Enter to continue, Type 'x' and Enter to exit)".bg(:yellow).black
@@ -283,48 +342,39 @@ module Discharger
 
         if auto_deploy_staging
           syscall(
-            ["git fetch origin #{production_branch}:#{production_branch} #{working_branch}"],
+            ["git fetch origin #{working_branch}"],
             ["git reset --hard origin/#{working_branch}"]
           )
-          validate_release_commit!(release_source)
+          tag_ref = find_release_commit!(release_source)
         else
           syscall(
             ["git fetch origin #{release_source}:#{release_source} #{production_branch}:#{production_branch}"]
           )
           validate_version_match!(staging_branch, working_branch)
-        end
 
-        pr_ref = release_source
-        if auto_deploy_staging
-          pr_number = existing_pr_number(production_branch, release_source)
-          if pr_number
-            sysecho "Reusing existing PR ##{pr_number} from #{release_source} to #{production_branch}."
-            pr_ref = pr_number
+          pr_ref = release_source
+          if pr_already_merged?(pr_ref)
+            sysecho "PR #{pr_ref} is already merged. Continuing..."
           else
             syscall(
-              ["gh pr create --base #{production_branch} --head #{release_source} --title 'Release #{current_version}' --body 'Deploy #{current_version} to production.'"]
+              ["gh pr merge #{pr_ref} --merge"]
             )
           end
-        end
 
-        if pr_already_merged?(pr_ref)
-          sysecho "PR #{pr_ref} is already merged. Continuing..."
-        else
-          syscall(
-            ["gh pr merge #{pr_ref} --merge"]
-          )
+          syscall(["git fetch origin #{production_branch}:#{production_branch}"])
+          tag_ref = production_branch
         end
 
+        slack_sha = auto_deploy_staging ? tag_ref[0, 8] : commit_identifier.call
         continue = syscall(
-          ["git fetch origin #{production_branch}:#{production_branch}"],
-          ["git tag -a v#{current_version} -m 'Release #{current_version}' #{production_branch}"],
+          ["git tag -a v#{current_version} -m 'Release #{current_version}' #{tag_ref}"],
           ["git push origin v#{current_version}"]
         ) do
-          tasker["#{name}:slack"].invoke("Released #{app_name} #{current_version} (#{commit_identifier.call}) to production.", release_message_channel, ":chipmunk:")
+          tasker["#{name}:slack"].invoke("Released #{app_name} #{current_version} (#{slack_sha}) to production.", release_message_channel, ":chipmunk:")
           # Capture the root before replying; each post overwrites last_message_ts.
           thread_ts = last_message_ts
           if thread_ts.present?
-            text = File.read(Rails.root.join(changelog_file))
+            text = git_show_at_commit(tag_ref, changelog_file) || File.read(Rails.root.join(changelog_file))
             tasker["#{name}:slack"].reenable
             tasker["#{name}:slack"].invoke(text, release_message_channel, ":log:", thread_ts)
 
@@ -335,6 +385,7 @@ module Discharger
         end
 
         abort "Release failed." unless continue
+        merge_tag_into_production_branch("v#{current_version}") if auto_deploy_staging
 
         sysecho <<~MSG
           Version #{current_version} released to production.
@@ -346,20 +397,26 @@ module Discharger
 
         new_version_branch = `git rev-parse --abbrev-ref HEAD`.strip
         new_version = new_version_branch.split("/").last
-        params = {expand: 1, title: "Bump version to #{new_version}"}
-        pr_url = "#{pull_request_url}/compare/#{working_branch}...#{new_version_branch}?#{params.to_query}"
 
-        syscall(["git push origin #{new_version_branch} --force"]) do
-          sysecho <<~MSG
-            Branch #{new_version_branch} created.
+        if pr_label
+          syscall(["git push origin #{new_version_branch} --force"])
+          create_labeled_pr!(head: new_version_branch, title: "Bump version to #{new_version}", body: "")
+        else
+          params = {expand: 1, title: "Bump version to #{new_version}"}
+          pr_url = "#{pull_request_url}/compare/#{working_branch}...#{new_version_branch}?#{params.to_query}"
 
-            Open a PR to #{working_branch} to mark the version and update the chaneglog
-            for the next release.
+          syscall(["git push origin #{new_version_branch} --force"]) do
+            sysecho <<~MSG
+              Branch #{new_version_branch} created.
 
-            Opening PR: #{pr_url}
-          MSG
-        end.then do |success|
-          syscall ["open", pr_url] if success
+              Open a PR to #{working_branch} to mark the version and update the chaneglog
+              for the next release.
+
+              Opening PR: #{pr_url}
+            MSG
+          end.then do |success|
+            syscall ["open", pr_url] if success
+          end
         end
       end
 
@@ -429,12 +486,19 @@ module Discharger
           the release.
         DESC
         task prepare: [:environment] do
+          ensure_clean_worktree!
+          validate_pr_label!
+
           current_version = Object.const_get(version_constant)
           finish_branch = "bump/finish-#{current_version.tr(".", "-")}"
 
           syscall(
             ["git fetch origin #{working_branch}"],
-            ["git checkout #{working_branch}"],
+            ["git checkout #{working_branch}"]
+          )
+          ensure_branch_not_ahead!(working_branch)
+          syscall(
+            ["git reset --hard origin/#{working_branch}"],
             ["git checkout -b #{finish_branch}"]
           )
           sysecho <<~MSG
@@ -451,34 +515,52 @@ module Discharger
 
           tasker["reissue:finalize"].invoke
 
-          params = {
-            expand: 1,
-            title: "Finish version #{current_version}",
-            body: <<~BODY
-              Completing development for #{current_version}.
-            BODY
-          }
-
-          pr_url = "#{pull_request_url}/compare/#{finish_branch}?#{params.to_query}"
-
           next_step = auto_deploy_staging ? "rake #{name}" : "rake #{name}:stage"
           next_step_desc = auto_deploy_staging ? "release to production" : "stage the release branch"
+          after_merge = <<~MSG.chomp
+            Once the PR is merged, pull down #{working_branch} and run
+              '#{next_step}'
+            to #{next_step_desc}.
+          MSG
 
-          continue = syscall ["git push origin #{finish_branch} --force"] do
+          if pr_label
+            syscall ["git push origin #{finish_branch} --force"]
+            create_labeled_pr!(
+              head: finish_branch,
+              title: "Finish version #{current_version}",
+              body: "Completing development for #{current_version}."
+            )
             sysecho <<~MSG
-              Branch #{finish_branch} created.
-              Open a PR to #{working_branch} to finalize the release.
+              Branch #{finish_branch} pushed and its PR labeled '#{pr_label}'.
 
-              #{pr_url}
-
-              Once the PR is merged, pull down #{working_branch} and run
-                '#{next_step}'
-              to #{next_step_desc}.
+              #{after_merge}
             MSG
-          end
-          if continue
-            syscall ["git checkout #{working_branch}"],
-              ["open", pr_url]
+            syscall ["git checkout #{working_branch}"]
+          else
+            params = {
+              expand: 1,
+              title: "Finish version #{current_version}",
+              body: <<~BODY
+                Completing development for #{current_version}.
+              BODY
+            }
+
+            pr_url = "#{pull_request_url}/compare/#{finish_branch}?#{params.to_query}"
+
+            continue = syscall ["git push origin #{finish_branch} --force"] do
+              sysecho <<~MSG
+                Branch #{finish_branch} created.
+                Open a PR to #{working_branch} to finalize the release.
+
+                #{pr_url}
+
+                #{after_merge}
+              MSG
+            end
+            if continue
+              syscall ["git checkout #{working_branch}"],
+                ["open", pr_url]
+            end
           end
         end
 

data/lib/discharger/version.rb

@@ -1,3 +1,3 @@
 module Discharger
-  VERSION = "0.3.4"
+  VERSION = "0.4.0"
 end

data/lib/generators/discharger/install/templates/setup.yml

@@ -18,6 +18,14 @@ redis:
   name: "redis-your-app"
   version: "latest"
 
+# Private GitHub Packages gem source (optional)
+# Stores bundler credentials from the GitHub CLI (gh) so the Gemfile
+# doesn't need an embedded token. Add "github_packages" to steps, before
+# "bundler". Credentials are written to .bundle/config — keep .bundle
+# gitignored.
+# github_packages:
+#   source: "https://rubygems.pkg.github.com/your-org"
+
 # Pre-Rails steps (run BEFORE Rails loads)
 # These are for system dependencies and environment setup that must happen
 # before bundler/Rails can initialize. Use sparingly.
@@ -36,11 +44,13 @@ pre_steps: []
   # - postgresql_tools # Optional: for apps that use structure.sql or pg_dump/psql directly
 
 # Built-in commands to run (empty array runs all available commands)
-# Available commands: brew, asdf, git, bundler, yarn, config, docker, pg_tools, env, database
+# Available commands: brew, asdf, git, github_packages, bundler, yarn, config, docker, pg_tools, env, database
 steps:
   - brew
   - asdf
   - git
+  # Uncomment with the github_packages block above. Must precede bundler.
+  # - github_packages
   - bundler
   - yarn
   - config
@@ -52,6 +62,11 @@ steps:
 #   - pg_tools
 
 # Custom commands for application-specific setup (run AFTER Rails loads)
+# Steps run last by default. Give a step a name and list it in steps: above
+# to run it earlier, e.g.:
+#   - name: import_certs
+#     description: "Import development certificates"
+#     command: "bin/import-certs"
 custom_steps:
   - description: "Seed application data"
     command: "bin/rails db:seed"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: discharger
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Jim Gay
@@ -122,6 +122,7 @@ files:
 - lib/discharger/setup_runner/commands/docker_command.rb
 - lib/discharger/setup_runner/commands/env_command.rb
 - lib/discharger/setup_runner/commands/git_command.rb
+- lib/discharger/setup_runner/commands/github_packages_command.rb
 - lib/discharger/setup_runner/commands/pg_tools_command.rb
 - lib/discharger/setup_runner/commands/yarn_command.rb
 - lib/discharger/setup_runner/condition_evaluator.rb