discharger 0.3.5 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97070aca58c88a6f43e34f7d45bec964122a6db867e9bd5333988a082bb41d47
-  data.tar.gz: 0f39ea2c1136914a33666593af2bdaeed6f358a34364f9ffcb9b1557976c3fae
+  metadata.gz: 3212b79aa38f448d44523f2f83b622c7dfec1cff7bff08ed6033bbe1fea79761
+  data.tar.gz: 6d9d0c008a85560a666522c58a97ee08feae68ef1ea4e8f7cda86e29b0e8bd75
 SHA512:
-  metadata.gz: 617ed8ed6727d1e1817e7859ce8121553399bd1ec0c5c70b2002d93eb0273915e112d5b30d6ba2e045e18ff0b4fd1bf075cc78d0000f0b8abdc360102d14cb0c
-  data.tar.gz: d8470a667ff24259e5efc590ad63fb7be3884e31ce3e35a5e3b8d22fdb3a399fe4948b3e8e465d2b4aee34e24e2ef25fce86453a041083abb6947b6b3454d7f7
+  metadata.gz: a54728bf513a01a7f4f91507d0951f4075ab8d2fbd7a80cb01223bbd967f4f5bcc0dfba8a8842a3d3e6ab30c94995180bef978089c19a519ac07de608234f787
+  data.tar.gz: bf5d95387d7f861cfef6041871c39a946f986225a8c20aa3597b5dc3d5840e5f3ac16ebe5babc354da4b292e84820bcf8cc5a75b56d519414c12614e325a350b

data/CHANGELOG.md

@@ -5,14 +5,39 @@ 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.5] - 2026-08-10
+## [0.4.1] - 2026-09-29
 
 ### Added
 
-- github_packages setup step storing bundler credentials for a private GitHub Packages gem source via the gh CLI (2cff4b6)
+- Setup prints each step's elapsed time and the total (063521c)
+- bin/setup opens with a do-not-edit notice, and `discharger:install --setup-only` regenerates only the script (71ee122)
 
-## [0.3.4] - 2026-07-22
+### Changed
+
+- Gem author listed as Savannah Albanez (a48c8d8)
+
+### Removed
+
+- Stale Qualify setup script from the repo root, never shipped in the gem (8744c43)
+
+### Fixed
+
+- Releases finish when the Slack token is missing or the post fails (3cf9b6d)
+- bin/setup bootstraps a fresh clone: GitHub Packages credentials, bundle install, then re-exec under bundle exec (7196fe4)
+- github_packages stores bundler credentials only after the source accepts them (41fab0f)
+
+## [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)
+
+### 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)

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.
@@ -201,6 +211,33 @@ $ bin/setup
 
 This script is idempotent - you can run it multiple times safely, and it will ensure your environment is properly configured.
 
+It works on a fresh clone with no gems installed. The generated script first runs a
+standard-library-only pass that stores bundler credentials for a configured
+`github_packages` source (from your GitHub CLI login, when its token has the
+`read:packages` scope), installs the bundle, and then
+re-execs itself under `bundle exec` so default gems such as psych never clash with
+`Gemfile.lock`. The `DISCHARGER_SETUP_BUNDLED` environment variable marks the second
+pass; the `github_packages` step later verifies the stored credentials and warns when
+the token lacks the `read:packages` scope. Rails still has to boot before the steps
+run, so an app whose boot needs `.env` or `config/database.yml` copies them in
+`pre_steps` (see below).
+
+Each step prints its elapsed time when it finishes, and the closing line reports the
+total, so a slow setup shows which step to look at.
+
+### Keeping bin/setup Generated
+
+`bin/setup` is a verbatim copy of the gem's template and opens with a notice saying
+so. Do not hand-edit it in an app: app-specific work belongs in `config/setup.yml`
+(`pre_steps`, `steps`, `custom_steps`), and changes to the script itself belong in
+this gem's template so every app picks them up. After bumping to a discharger
+release that changed the template, regenerate the script without touching
+`config/setup.yml` or the initializer:
+
+```bash
+$ bin/rails generate discharger:install --setup-only --force
+```
+
 ### Configuration
 
 The setup process is configured through `config/setup.yml`. Here's an example configuration:
@@ -295,7 +332,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
 
@@ -322,6 +359,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.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "fileutils"
-require "pathname"
+require_relative "timing"
 
 # Unified entry point for Discharger setup.
 # Handles both pre-Rails prerequisites and post-Rails setup commands.
@@ -34,21 +34,23 @@ module Discharger
         validate_environment
         print_header
 
-        # Phase 1: Load bundler first (activates correct gem versions)
-        # This must happen before we parse YAML to avoid psych version conflicts
-        load_bundler
+        elapsed = Timing.measure do
+          # Phase 1: Load bundler first (activates correct gem versions)
+          # This must happen before we parse YAML to avoid psych version conflicts
+          load_bundler
 
-        # Phase 2: Pre-Rails setup (env vars, system dependencies)
-        # These run AFTER bundler but BEFORE Rails loads
-        run_prerequisites
+          # Phase 2: Pre-Rails setup (env vars, system dependencies)
+          # These run AFTER bundler but BEFORE Rails loads
+          run_prerequisites
 
-        # Phase 3: Load Rails (uses env vars from phase 2)
-        load_rails
+          # Phase 3: Load Rails (uses env vars from phase 2)
+          load_rails
 
-        # Phase 4: Run Discharger commands (after Rails loads)
-        run_setup_commands
+          # Phase 4: Run Discharger commands (after Rails loads)
+          run_setup_commands
+        end
 
-        print_footer
+        print_footer(elapsed)
       end
     end
 
@@ -71,8 +73,8 @@ module Discharger
       puts "Configuration loaded from: #{config_path}"
     end
 
-    def print_footer
-      puts "\n== Setup completed successfully! =="
+    def print_footer(elapsed)
+      puts format("\n== Setup completed successfully! (%.2fs) ==", elapsed)
     end
 
     def load_bundler
@@ -89,8 +91,11 @@ module Discharger
       # Load Rails from the standard location
       rails_config = File.join(app_root, "config", "application.rb")
       if File.exist?(rails_config)
-        require rails_config
-        Rails.application.initialize!
+        elapsed = Timing.measure do
+          require rails_config
+          Rails.application.initialize!
+        end
+        puts format("\n== Rails loaded (%.2fs) ==", elapsed)
       else
         puts "Warning: config/application.rb not found. Skipping Rails initialization."
       end

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

@@ -6,10 +6,43 @@ 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.
+      # using the GitHub CLI, so Gemfiles don't need embedded tokens. A token
+      # the source rejects is not stored, so it cannot shadow a working
+      # credential in the user's own bundler config. 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}"
@@ -28,13 +61,14 @@ module Discharger
             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."
+          unless credentials_valid?(username, token)
+            log "#{source} rejected the gh token, so bundler credentials were left alone. The token " \
+              "may lack the read:packages scope — run `gh auth refresh -s read:packages` and rerun setup."
+            return
           end
+
+          store_bundler_credentials(username, token)
+          log "Configured bundler credentials for #{source}"
         end
 
         def can_execute?
@@ -48,7 +82,7 @@ module Discharger
         protected
 
         def source
-          config.github_packages&.source if config.respond_to?(:github_packages)
+          config.github_packages&.source
         end
 
         def gh_installed?

data/lib/discharger/setup_runner/runner.rb

@@ -2,6 +2,7 @@
 
 require "fileutils"
 require "logger"
+require_relative "../timing"
 require_relative "command_factory"
 
 module Discharger
@@ -15,7 +16,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,12 +26,16 @@ module Discharger
           puts Rainbow("=" * 50).blue
         end
 
-        FileUtils.chdir app_root do
-          execute_commands
+        warn_unscheduled_commands
+
+        elapsed = Timing.measure do
+          FileUtils.chdir app_root do
+            execute_commands
+          end
         end
 
         unless ENV["QUIET_SETUP"] || ENV["DISABLE_OUTPUT"]
-          puts Rainbow("\n✅ Setup completed successfully!").bright.green
+          puts Rainbow(format("\n✅ Setup completed successfully! (%.2fs)", elapsed)).bright.green
         end
       rescue => e
         unless ENV["QUIET_SETUP"] || ENV["DISABLE_OUTPUT"]
@@ -76,6 +81,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)
@@ -94,7 +111,10 @@ module Discharger
         unless ENV["QUIET_SETUP"] || ENV["DISABLE_OUTPUT"]
           puts Rainbow("\n▶️  #{command.description}").bright
         end
-        command.execute
+        elapsed = Timing.measure { command.execute }
+        unless ENV["QUIET_SETUP"] || ENV["DISABLE_OUTPUT"]
+          puts Rainbow(format("   %s: %.2fs", command.description, elapsed)).faint
+        end
       rescue => e
         unless ENV["QUIET_SETUP"] || ENV["DISABLE_OUTPUT"]
           require "rainbow"

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
 
-      abort <<~ERROR.bg(:red).white
-        HEAD is not the release commit!
+    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?
 
-        HEAD:           #{head_sha[0, 8]}
-        Release commit: #{release_sha[0, 8]} (last commit to touch #{version_file})
+        sysecho("Could not merge #{tag} into #{production_branch}: #{stderr.strip}".bg(:yellow).black, output:)
+        nil
+      end
 
-        Something was merged after the release PR. Verify the branch contents and retry.
-      ERROR
+      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}")
+
+      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.
@@ -214,6 +266,10 @@ module Discharger
       message
     end
 
+    def echo_unsent_slack_message(text, channel)
+      sysecho "Post this to #{channel} yourself:\n\n#{text}\n"
+    end
+
     def existing_pr_number(base, head)
       stdout, _, status = Open3.capture3(
         "gh", "pr", "list",
@@ -258,6 +314,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 +322,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 +346,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 +389,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 +401,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}"
+
+          syscall(["git push origin #{new_version_branch} --force"]) do
+            sysecho <<~MSG
+              Branch #{new_version_branch} created.
 
-            Open a PR to #{working_branch} to mark the version and update the chaneglog
-            for the next release.
+              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
+              Opening PR: #{pr_url}
+            MSG
+          end.then do |success|
+            syscall ["open", pr_url] if success
+          end
         end
       end
 
@@ -402,17 +463,33 @@ module Discharger
 
         desc "Send a message to Slack."
         task :slack, [:text, :channel, :emoji, :ts] => :environment do |_, args|
+          instance_variable_set(:@last_message_ts, nil)
           args.with_defaults(
             channel: release_message_channel,
             emoji: nil
           )
+          if chat_token.blank?
+            sysecho <<~MSG.bg(:yellow).black
+              Slack message not sent: chat_token is not set.
+              Set it with the Slack release token from your team's password manager before the next release.
+            MSG
+            echo_unsent_slack_message(args[:text], args[:channel])
+            next
+          end
+
           client = Slack::Web::Client.new
           options = args.to_h
           options[:icon_emoji] = options.delete(:emoji) if options[:emoji]
           options[:thread_ts] = options.delete(:ts) if options[:ts]
 
           sysecho "Sending message to Slack:".bg(:green).black + " #{args[:text]}"
-          result = client.chat_postMessage(**options)
+          begin
+            result = client.chat_postMessage(**options)
+          rescue Faraday::Error => e
+            sysecho "Slack message not sent: #{e.message}.".bg(:yellow).black
+            echo_unsent_slack_message(args[:text], args[:channel])
+            next
+          end
           instance_variable_set(:@last_message_ts, result["ts"])
           sysecho %(Message sent: #{result["ts"]})
         end
@@ -429,12 +506,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 +535,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.
-
-              #{pr_url}
+              Branch #{finish_branch} pushed and its PR labeled '#{pr_label}'.
 
-              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/timing.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Discharger
+  module Timing
+    # Seconds the block took, from the monotonic clock.
+    def self.measure
+      started = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      yield
+      Process.clock_gettime(Process::CLOCK_MONOTONIC) - started
+    end
+  end
+end

data/lib/discharger/version.rb

@@ -1,3 +1,3 @@
 module Discharger
-  VERSION = "0.3.5"
+  VERSION = "0.4.1"
 end

data/lib/generators/discharger/install/install_generator.rb

@@ -8,7 +8,14 @@ module Discharger
         default: "bin/setup",
         desc: "Path where the setup script should be created"
 
+      class_option :setup_only,
+        type: :boolean,
+        default: false,
+        desc: "Only (re)generate the setup script, leaving config/setup.yml and the initializer alone"
+
       def copy_initializer
+        return if options[:setup_only]
+
         template "discharger_initializer.rb", "config/initializers/discharger.rb"
       end
 
@@ -18,6 +25,8 @@ module Discharger
       end
 
       def create_sample_setup_yml
+        return if options[:setup_only]
+
         template "setup.yml", "config/setup.yml"
       end
     end

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

@@ -1,30 +1,51 @@
 #!/usr/bin/env ruby
 
-# Path to the application root.
-APP_ROOT = File.expand_path("..", __dir__)
-
-Dir.chdir(APP_ROOT) do
-  # This script uses Discharger to set up your development environment automatically.
-  # All setup steps are configured in config/setup.yml
-  # This script is idempotent, so you can run it at any time and get an expectable outcome.
-
-  # Find discharger gem path from Gemfile without loading bundler
-  # (loading bundler early can cause gem version conflicts)
-  gemfile = File.read("Gemfile")
-  if (match = gemfile.match(/gem\s+["']discharger["'].*path:\s*["']([^"']+)["']/))
-    discharger_path = File.expand_path(match[1], APP_ROOT)
-    $LOAD_PATH.unshift(File.join(discharger_path, "lib"))
-  else
-    # Fall back to installed gem
-    begin
-      gem "discharger"
-    rescue Gem::MissingSpecError
-      puts "Could not find discharger gem."
-      puts "If using a custom bundle path, try: bundle exec bin/setup"
-      exit 1
+# GENERATED BY DISCHARGER. DO NOT EDIT. Edits here are lost on regeneration.
+#
+# App setup belongs in config/setup.yml (pre_steps, steps, custom_steps).
+# Script changes belong in the discharger gem's template,
+# lib/generators/discharger/install/templates/setup; release it, bump it, then
+#   bin/rails generate discharger:install --setup-only --force
+
+script = File.expand_path(__FILE__)
+Dir.chdir(File.expand_path("..", __dir__))
+
+# First pass, standard library only: the bundle may not exist yet. Re-exec
+# under bundle exec before yaml loads, or a default psych clashes with Gemfile.lock.
+# Mirrors the github_packages and bundler steps, which re-run under bundle exec.
+unless ENV["DISCHARGER_SETUP_BUNDLED"]
+  def store_github_packages_credentials
+    require "yaml"
+    source = begin
+      YAML.safe_load_file("config/setup.yml")&.dig("github_packages", "source")
+    rescue SystemCallError, Psych::Exception
+      nil # reported by Discharger::Setup on the second pass
+    end
+    return if source.to_s.empty?
+    unless `gh auth status 2>&1`.include?("read:packages")
+      warn "Skipping #{source} credentials: the gh token lacks read:packages (gh auth refresh -s read:packages)"
+      return
     end
+
+    username = `gh api user --jq .login 2>/dev/null`.strip
+    token = `gh auth token 2>/dev/null`.strip
+    return if username.empty? || token.empty?
+
+    system("bundle", "config", "set", "--local", source, "#{username}:#{token}", out: File::NULL, err: File::NULL)
   end
 
-  require "discharger/setup"
-  Discharger::Setup.run("config/setup.yml")
+  unless system("bundle", "check", out: File::NULL, err: File::NULL)
+    store_github_packages_credentials
+    system("bundle", "install") || abort(<<~MSG)
+
+      == bundle install failed ==
+      If the Gemfile uses a private GitHub Packages source, run `gh auth login`
+      (or `gh auth refresh -s read:packages`) and rerun bin/setup.
+    MSG
+  end
+
+  exec({"DISCHARGER_SETUP_BUNDLED" => "1"}, "bundle", "exec", RbConfig.ruby, script, *ARGV)
 end
+
+require "discharger/setup"
+Discharger::Setup.run("config/setup.yml")

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

@@ -49,6 +49,8 @@ steps:
   - brew
   - asdf
   - git
+  # Uncomment with the github_packages block above. Must precede bundler.
+  # - github_packages
   - bundler
   - yarn
   - config
@@ -60,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,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: discharger
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.1
 platform: ruby
 authors:
 - Jim Gay
-- Savannah Moore
+- Savannah Albanez
 bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
@@ -135,6 +135,7 @@ files:
 - lib/discharger/setup_runner/runner.rb
 - lib/discharger/setup_runner/version.rb
 - lib/discharger/task.rb
+- lib/discharger/timing.rb
 - lib/discharger/version.rb
 - lib/generators/discharger/install/install_generator.rb
 - lib/generators/discharger/install/templates/discharger_initializer.rb