discharger 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3212b79aa38f448d44523f2f83b622c7dfec1cff7bff08ed6033bbe1fea79761
-  data.tar.gz: 6d9d0c008a85560a666522c58a97ee08feae68ef1ea4e8f7cda86e29b0e8bd75
+  metadata.gz: 8e3fabd68a173b372966725b98da677f18061b6377d47838e10305cb0baaa820
+  data.tar.gz: 9c29847b75d29cc764f6cd1eb621c7afdf5d98323877a106322a481ade425c3e
 SHA512:
-  metadata.gz: a54728bf513a01a7f4f91507d0951f4075ab8d2fbd7a80cb01223bbd967f4f5bcc0dfba8a8842a3d3e6ab30c94995180bef978089c19a519ac07de608234f787
-  data.tar.gz: bf5d95387d7f861cfef6041871c39a946f986225a8c20aa3597b5dc3d5840e5f3ac16ebe5babc354da4b292e84820bcf8cc5a75b56d519414c12614e325a350b
+  metadata.gz: 06d72d2a6be99df84988f1222311a6436d01f59d74d17fd971d4df25c0057f78e5b41435861556dffeae48e8bd21238ea6dc46c47b0a90b34df09460944be19d
+  data.tar.gz: 80711c35ce3061f8543658160fb7784d0b3ca5cdb465d36f11b375d6c961a0385a30204229084852923463c456d8a0f53327e794ae87ddf95b44099b5f3d1701

data/CHANGELOG.md

@@ -5,39 +5,38 @@ 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.1] - 2026-09-29
+## [0.5.0] - 2026-10-02
 
 ### Added
 
-- 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)
+- discharger:setup:check fails when bin/setup is missing or differs from the installed gem's template, naming the regenerate command and the first differing line (512544a)
 
 ### Changed
 
-- Gem author listed as Savannah Albanez (a48c8d8)
+- Setup creates missing config/**/*.example and .env.example counterparts before pre_steps and Rails, so apps no longer copy them in pre_steps (e7a8ce9)
+- rake release refuses to reset the working branch over unpushed local commits (6d87ce7)
+- rake release tags the release commit on the working branch and pushes the tag; nothing merges into a production branch (af4484d)
+- working_branch defaults to main (af4484d)
+- rake release checks the tree, unpushed commits, the release commit and the tag before asking to confirm (af4484d)
+- rake release stops with a clear message when the version's tag already exists on origin (af4484d)
 
 ### Removed
 
-- Stale Qualify setup script from the repo root, never shipped in the gem (8744c43)
+- staging_branch, production_branch, auto_deploy_staging and description settings; their writers warn and do nothing until 0.6 (af4484d)
+- release:stage, release:build and DISCHARGER_BUILD_BRANCH (af4484d)
+- the runbook preview on the stage build (af4484d)
 
 ### 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)
+- bin/setup stores a gh token only when the GitHub Packages source answers 2xx (0ed1239)
+- The yarn step installs the packageManager yarn with corepack install instead of corepack use, so setup no longer rewrites package.json (91967a1)
 
-## [0.4.0] - 2026-09-24
+## [0.4.2] - 2026-09-30
 
 ### Added
 
-- 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)
+- database.db_name in setup.yml sets the exported DB_NAME, or false leaves it to database.yml (836e811)
 
 ### 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)
+- The generated bin/setup stores a gh token only after the GitHub Packages source accepts it (1ef5a44)

data/README.md

@@ -113,9 +113,7 @@ Runbook: Run \`rake data:cleanup\` after deploy"
 
 `rake release:prepare` finalizes the runbook alongside the changelog, so the release tag
 records exactly which steps that version needs. Discharger posts the checklist to Slack as
-a reply in the deploy thread — both on the stage build (`rake release:build` /
-`rake release:stage`, threaded under "Building…") and after the production release
-(threaded under the release announcement, right after the changelog):
+a reply in the release thread, right after the changelog:
 
 ```
 *Post-release runbook for 1.2.3* — 2 steps
@@ -124,9 +122,6 @@ a reply in the deploy thread — both on the stage build (`rake release:build` /
 • Re-index search documents (def5678)
 ```
 
-Staging shows the steps as a preview so the team sees what production will need before it
-happens; the production thread repeats them when the release actually lands.
-
 When a release needs no follow-up, the thread says so explicitly rather than staying
 silent, so nobody has to wonder whether the check was skipped:
 
@@ -139,63 +134,49 @@ Leave `runbook_file` unset and Discharger posts nothing extra. See the
 [Reissue runbook documentation](https://github.com/SOFware/reissue#post-release-runbook)
 for how items are collected and merged.
 
-## Available Tasks
+## Release Flow
 
-The gem creates several Rake tasks for managing your deployment workflow:
+Discharger assumes one long-lived branch, `main` by default. CI deploys every push to that
+branch to staging, and production deploys from `v*` tags. There is no staging branch and no
+production branch to keep in sync.
 
 ```bash
 $ rake -T release
-rake release                            # ---------- STEP 3 ----------
-rake release:build                      # Release the current version to stage
+rake release                            # ---------- STEP 2 ----------
 rake release:config                     # Echo the configuration settings
 rake release:prepare                    # ---------- STEP 1 ----------
 rake release:slack[text,channel,emoji]  # Send a message to Slack
-rake release:stage                      # ---------- STEP 2 ----------
-```
-
-### Workflow Steps
-
-1. **Prepare** (`rake release:prepare`): Create a new branch to prepare the release, update the changelog, and bump the version
-2. **Stage** (`rake release:stage`): Update the staging branch and create a PR to production
-3. **Release** (`rake release`): Release the current version to production by tagging and pushing to the production branch
-
-### Building with a Working Branch
-
-To release a specific working branch to stage instead of the default branch, use the `DISCHARGER_BUILD_BRANCH` environment variable:
-
-```bash
-DISCHARGER_BUILD_BRANCH=your-feature-branch rake build
 ```
 
-This will deploy your working branch to the staging environment.
+1. **Prepare** (`rake release:prepare`): Cut a finish branch from `main`, finalize the
+   changelog and runbook, and open a PR back to `main`. Merging that PR puts the finalized
+   release on staging.
+2. **Release** (`rake release`): Tag the release commit on `main`, push the tag, announce
+   the release in Slack, then open the PR that bumps `main` to the next version.
 
-#### Configuring Branch Names
+`rake release` 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.
+Production ships the tagged commit, which can be older than what staging last ran.
 
-You can configure the branch names in your Rakefile when setting up the discharger task:
+### Configuring the Branch
 
 ```ruby
-require "discharger"
-
-Discharger::Task.new do |task|
+Discharger::Task.create do |task|
   task.app_name = "MyApp"
-  task.working_branch = ENV.fetch("WORKING_BRANCH", "develop")
-  task.staging_branch = ENV.fetch("STAGING_BRANCH", "stage")
-  task.production_branch = ENV.fetch("PRODUCTION_BRANCH", "main")
+  task.working_branch = ENV.fetch("WORKING_BRANCH", "main")
   # ... other configuration
 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
+### Upgrading to 0.5.0
 
-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`:
+Before bumping the gem, CI must deploy every push to the working branch to staging and
+every `v*` tag to production. Then:
 
-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.
+- Remove `staging_branch`, `production_branch`, `auto_deploy_staging` and `description`
+  from the Rakefile. In 0.5.0 they warn and do nothing; 0.6 removes them.
+- `working_branch` now defaults to `main`. Set it if the app releases from another branch.
+- `release:stage` and `release:build` are gone; nothing replaces them.
 
 ## Development Setup Automation
 
@@ -209,18 +190,19 @@ After installing Discharger, run the setup script to configure your development
 $ bin/setup
 ```
 
-This script is idempotent - you can run it multiple times safely, and it will ensure your environment is properly configured.
+You can rerun it whenever your environment drifts. Every run drops and rebuilds the development and test databases, so local data is lost.
 
 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
+`github_packages` source (from your GitHub CLI login, only once the source
+accepts that token), 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).
+the token lacks the `read:packages` scope. Before `pre_steps` or Rails run, setup
+creates every missing counterpart of `config/**/*.example` and `.env.example`, so an
+app whose boot needs `.env` or `config/database.yml` gets them without copying
+them in `pre_steps`.
 
 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.
@@ -238,6 +220,16 @@ release that changed the template, regenerate the script without touching
 $ bin/rails generate discharger:install --setup-only --force
 ```
 
+To catch drift in CI, run the check. It exits non-zero when `bin/setup` is missing
+or differs from the installed gem's template, and names the command above:
+
+```bash
+$ bin/rails discharger:setup:check
+```
+
+A script generated elsewhere takes its path as the task argument:
+`discharger:setup:check[scripts/setup]`.
+
 ### Configuration
 
 The setup process is configured through `config/setup.yml`. Here's an example configuration:
@@ -250,6 +242,9 @@ database:
   name: "db-your-app"
   version: "14"
   password: "postgres"
+  # Optional. DB_NAME exported before Rails boots; defaults to the container
+  # name without "db-". false leaves it to database.yml.
+  # db_name: "your-app"
   # Optional. Controls how the docker step handles a native PostgreSQL
   # already listening on the configured port:
   #   omitted/nil/false - silently skip Docker and use the native instance (legacy default)
@@ -294,14 +289,15 @@ pre_steps:
   # - postgresql_tools
 ```
 
-You can also define custom pre_steps with shell commands:
+You can also define custom pre_steps with shell commands. `config/**/*.example` and
+`.env.example` counterparts are created before `pre_steps` run, so a step can rely
+on them, as Qualify's does here:
 
 ```yaml
 pre_steps:
   - homebrew
-  - description: "Set up environment variables"
-    command: "cp .env.example .env"
-    condition: "!File.exist?('.env')"
+  - description: "Check .env against .env.example"
+    command: "bin/check-env"
 ```
 
 ### Using Default Steps
@@ -314,11 +310,11 @@ The `steps` array specifies which built-in setup commands to run. Available comm
 - `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
+- `config` - Copy Procfile.dev to Procfile and any example config file still missing
 - `docker` - Setup Docker containers
 - `pg_tools` - Create Docker-aware `pg_dump` and `psql` wrappers for apps that use `structure.sql` or call those tools directly
-- `env` - Configure environment variables
-- `database` - Setup and migrate database
+- `env` - Create .env from .env.example if still missing
+- `database` - Drop and recreate the development and test databases, load the schema, migrate, and seed. Every run resets local data.
 
 ### Selecting Specific Steps
 

data/lib/discharger/railtie.rb

@@ -9,6 +9,10 @@ module Discharger
       end
     end
 
+    rake_tasks do
+      load File.expand_path("../tasks/discharger.rake", __dir__)
+    end
+
     config.after_initialize do |app|
       if Rails.env.development? && Discharger.slack_token.nil?
         warn "Your application Discharger.slack_token must be set."

data/lib/discharger/setup.rb

@@ -12,9 +12,10 @@ require_relative "timing"
 #
 # This will automatically:
 # 1. Load bundler/setup (activates correct gem versions)
-# 2. Run pre_steps (before Rails loads) - env vars, homebrew, etc.
-# 3. Initialize Rails
-# 4. Run regular setup steps and custom_steps
+# 2. Create missing config/**/*.example and .env.example counterparts
+# 3. Run pre_steps (before Rails loads) - env vars, homebrew, etc.
+# 4. Initialize Rails
+# 5. Run regular setup steps and custom_steps
 #
 module Discharger
   class Setup
@@ -39,14 +40,17 @@ module Discharger
           # This must happen before we parse YAML to avoid psych version conflicts
           load_bundler
 
-          # Phase 2: Pre-Rails setup (env vars, system dependencies)
+          # Phase 2: Config files Rails needs to boot
+          create_example_files
+
+          # Phase 3: 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)
+          # Phase 4: Load Rails (uses env vars from phase 3)
           load_rails
 
-          # Phase 4: Run Discharger commands (after Rails loads)
+          # Phase 5: Run Discharger commands (after Rails loads)
           run_setup_commands
         end
 
@@ -81,6 +85,15 @@ module Discharger
       require "bundler/setup"
     end
 
+    def create_example_files
+      require_relative "setup_runner/example_files"
+      created = SetupRunner::ExampleFiles.create_missing(app_root)
+      return if created.empty?
+
+      puts "\n== Created config files from their examples =="
+      created.each { |path| puts "  #{path}" }
+    end
+
     def run_prerequisites
       puts "\n== Setting up prerequisites =="
       require_relative "prerequisites"

data/lib/discharger/setup_check.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require_relative "version"
+
+module Discharger
+  class SetupCheck
+    TEMPLATE = File.expand_path("../generators/discharger/install/templates/setup", __dir__)
+    GENERATE = "bin/rails generate discharger:install --setup-only --force"
+
+    def self.run(setup_path = "bin/setup", out: $stdout)
+      new(setup_path).run(out: out)
+    end
+
+    def initialize(setup_path = "bin/setup")
+      @setup_path = setup_path
+    end
+
+    def run(out: $stdout)
+      unless File.exist?(@setup_path)
+        out.puts "#{@setup_path} not found. Generate it: #{generate_command}"
+        return false
+      end
+
+      if (line = first_differing_line)
+        out.puts "#{@setup_path} differs from the discharger #{VERSION} template at line #{line}. " \
+          "Regenerate it: #{generate_command}"
+        return false
+      end
+
+      out.puts "#{@setup_path} matches the discharger #{VERSION} template"
+      true
+    end
+
+    private
+
+    def first_differing_line
+      actual = File.readlines(@setup_path)
+      expected = File.readlines(TEMPLATE)
+      return if actual == expected
+
+      (actual.zip(expected).index { |a, e| a != e } || actual.size) + 1
+    end
+
+    def generate_command
+      return GENERATE if @setup_path == "bin/setup"
+
+      "#{GENERATE} --setup_path=#{@setup_path}"
+    end
+  end
+end

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "base_command"
+require_relative "../example_files"
 require "fileutils"
 
 module Discharger
@@ -10,15 +11,6 @@ module Discharger
         def execute
           log "Ensuring configuration files are present"
 
-          # Copy database.yml if needed
-          database_yml = File.join(app_root, "config/database.yml")
-          database_yml_example = File.join(app_root, "config/database.yml.example")
-
-          if !File.exist?(database_yml) && File.exist?(database_yml_example)
-            FileUtils.cp(database_yml_example, database_yml)
-            log "Copied config/database.yml.example to config/database.yml"
-          end
-
           # Copy Procfile.dev to Procfile if needed
           procfile = File.join(app_root, "Procfile")
           procfile_dev = File.join(app_root, "Procfile.dev")
@@ -28,13 +20,9 @@ module Discharger
             log "Copied Procfile.dev to Procfile"
           end
 
-          # Copy any other example config files
-          Dir.glob(File.join(app_root, "config/**/*.example")).each do |example_file|
-            config_file = example_file.sub(/\.example$/, "")
-            unless File.exist?(config_file)
-              FileUtils.cp(example_file, config_file)
-              log "Copied #{example_file.sub(app_root + "/", "")} to #{config_file.sub(app_root + "/", "")}"
-            end
+          # No-op after Discharger::Setup; covers a Runner used without it.
+          ExampleFiles.create_missing(app_root, [ExampleFiles::CONFIG]).each do |path|
+            log "Copied #{path}.example to #{path}"
           end
         end
 

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

@@ -61,8 +61,8 @@ module Discharger
             return
           end
 
-          unless credentials_valid?(username, token)
-            log "#{source} rejected the gh token, so bundler credentials were left alone. The token " \
+          unless source_accepts_token?(username, token)
+            log "Leaving bundler credentials for #{source} alone: it did not accept the gh token. The token " \
               "may lack the read:packages scope — run `gh auth refresh -s read:packages` and rerun setup."
             return
           end
@@ -116,10 +116,7 @@ module Discharger
           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)
+        def source_accepts_token?(username, token)
           require "net/http"
           require "uri"
           uri = URI.join("#{source.chomp("/")}/", "versions")
@@ -129,10 +126,10 @@ module Discharger
             request.basic_auth(username, token)
             http.request(request)
           end
-          !%w[401 403].include?(response.code)
+          response.is_a?(Net::HTTPSuccess)
         rescue => e
           logger&.debug("Could not verify GitHub Packages credentials: #{e.message}")
-          true
+          false
         end
       end
     end

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

@@ -14,25 +14,11 @@ module Discharger
             if system_quiet("which corepack")
               system! "corepack enable"
 
-              package_json_path = File.join(app_root, "package.json")
-              if File.exist?(package_json_path)
-                begin
-                  require "json"
-                  package_json = JSON.parse(File.read(package_json_path))
-
-                  if package_json["packageManager"]&.start_with?("yarn@")
-                    yarn_spec = package_json["packageManager"].split("+").first
-                    log "Using #{yarn_spec} from package.json"
-                    system! "corepack use #{yarn_spec}"
-                  else
-                    system! "corepack use yarn@stable"
-                  end
-                rescue JSON::ParserError => e
-                  log "Warning: Could not parse package.json: #{e.message}"
-                  system! "corepack use yarn@stable"
-                end
+              if (yarn_spec = package_manager_yarn_spec)
+                log "Using #{yarn_spec} from package.json"
+                system! "corepack install"
               else
-                system! "corepack use yarn@stable"
+                system! "corepack install -g yarn@stable"
               end
             end
 
@@ -59,6 +45,17 @@ module Discharger
         def description
           "Install JavaScript dependencies"
         end
+
+        private
+
+        def package_manager_yarn_spec
+          require "json"
+          package_manager = JSON.parse(File.read(File.join(app_root, "package.json")))["packageManager"]
+          package_manager.split("+").first if package_manager&.start_with?("yarn@")
+        rescue JSON::ParserError => e
+          log "Warning: Could not parse package.json: #{e.message}"
+          nil
+        end
       end
     end
   end

data/lib/discharger/setup_runner/configuration.rb

@@ -39,7 +39,7 @@ module Discharger
     end
 
     class DatabaseConfig
-      attr_accessor :port, :name, :version, :password, :prefer_docker
+      attr_accessor :port, :name, :version, :password, :prefer_docker, :db_name
 
       def initialize
         @port = 5432
@@ -47,6 +47,7 @@ module Discharger
         @version = "14"
         @password = "postgres"
         @prefer_docker = nil
+        @db_name = nil
       end
 
       def from_hash(hash)
@@ -55,6 +56,7 @@ module Discharger
         @version = hash["version"] if hash["version"]
         @password = hash["password"] if hash["password"]
         @prefer_docker = hash["prefer_docker"] if hash.key?("prefer_docker")
+        @db_name = hash["db_name"] if hash.key?("db_name")
       end
     end
 

data/lib/discharger/setup_runner/example_files.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require "fileutils"
+
+module Discharger
+  module SetupRunner
+    # Creates the counterpart of each example file that is missing, so Rails
+    # can boot on a fresh clone. Returns the created paths relative to app_root.
+    module ExampleFiles
+      CONFIG = "config/**/*.example"
+      ENV_FILE = ".env.example"
+
+      def self.create_missing(app_root, patterns = [CONFIG, ENV_FILE])
+        patterns.flat_map { |pattern| Dir.glob(pattern, base: app_root) }.sort.filter_map do |example|
+          target = example.delete_suffix(".example")
+          next if File.exist?(File.join(app_root, target))
+
+          FileUtils.cp(File.join(app_root, example), File.join(app_root, target))
+          target
+        end
+      end
+    end
+  end
+end

data/lib/discharger/setup_runner/prerequisites_loader.rb

@@ -86,15 +86,17 @@ module Discharger
       end
 
       def set_db_name(db_config)
-        if db_config["name"] && !ENV["DB_NAME"]
-          container_name = db_config["name"].to_s
-          db_name = container_name.sub(/^db-/, "")
+        return if db_config["db_name"] == false
+
+        container_name = db_config["name"].to_s
+        db_name = (db_config["db_name"] || container_name.sub(/^db-/, "")).to_s
+        return if db_name.empty?
+
+        if ENV["DB_NAME"]
+          warn_if_mismatch("DB_NAME", ENV["DB_NAME"], db_name)
+        else
           ENV["DB_NAME"] = db_name
           puts "  Setting DB_NAME=#{db_name} from config/setup.yml (container: #{container_name})"
-        elsif ENV["DB_NAME"]
-          container_name = db_config["name"].to_s
-          expected_db_name = container_name.sub(/^db-/, "")
-          warn_if_mismatch("DB_NAME", ENV["DB_NAME"], expected_db_name)
         end
       end
 

data/lib/discharger/task.rb

@@ -33,12 +33,7 @@ module Discharger
 
     attr_accessor :name
 
-    attr_accessor :description
-
     attr_accessor :working_branch
-    attr_accessor :staging_branch
-    attr_accessor :production_branch
-    attr_accessor :auto_deploy_staging
 
     attr_accessor :release_message_channel
     attr_accessor :version_constant
@@ -61,15 +56,19 @@ module Discharger
       }
     )
 
+    REMOVED_SETTINGS = %i[staging_branch production_branch auto_deploy_staging description].freeze
+
+    REMOVED_SETTINGS.each do |setting|
+      define_method(:"#{setting}=") do |_value|
+        warn "#{setting} was removed in discharger 0.5.0 and does nothing. Delete it from the Rakefile."
+      end
+    end
+
     def initialize(name = :release, tasker: Rake::Task)
       @name = name
       @tasker = tasker
-      @working_branch = "develop"
-      @staging_branch = "stage"
-      @production_branch = "main"
-      @description = "Release the current version to #{staging_branch}"
+      @working_branch = "main"
       @clear_fragments = true
-      @auto_deploy_staging = false
     end
     private attr_reader :tasker
 
@@ -107,10 +106,6 @@ module Discharger
       end
       if block_given?
         success = !!yield(stdout, stderr, status)
-        # If the error reports that a rule was bypassed, consider the command successful
-        # because we are bypassing the rule intentionally when merging the release branch
-        # to the production branch.
-        success = true if stderr.match?(/bypassed rule violations/i)
         abort(stderr) unless success
       end
       success
@@ -121,21 +116,6 @@ module Discharger
       true
     end
 
-    # Abort if staging branch has different VERSION than working branch
-    def validate_version_match!(staging, working, output: $stdout)
-      staging_v = git_show_version(staging)
-      working_v = git_show_version(working)
-
-      return sysecho("✓ Versions match (#{working_v})".bg(:green).black, output:) if staging_v == working_v
-
-      abort <<~ERROR.bg(:red).white
-        VERSION mismatch: #{staging}=#{staging_v || "not found"}, #{working}=#{working_v || "not found"}
-
-        Run: rake #{name}:stage
-        Then retry: rake #{name}
-      ERROR
-    end
-
     # 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)
@@ -156,29 +136,6 @@ module Discharger
       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?
-
-        sysecho("Could not merge #{tag} into #{production_branch}: #{stderr.strip}".bg(:yellow).black, output:)
-        nil
-      end
-
-      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)
-      content, _, status = Open3.capture3("git", "show", "origin/#{branch}:#{version_file}")
-      return nil unless status.success?
-      content[/VERSION\s*=\s*["']([^"']+)["']/, 1]
-    end
-
     def git_file_commits(branch, path)
       stdout, _, status = Open3.capture3("git", "log", "--no-merges", branch, "--format=%H", "--", path)
       return [] unless status.success?
@@ -222,6 +179,8 @@ module Discharger
     end
 
     def ensure_branch_not_ahead!(branch)
+      return true unless local_branch?(branch)
+
       stdout, _, status = Open3.capture3("git", "rev-list", "--count", "origin/#{branch}..#{branch}")
       return true if status.success? && stdout.strip == "0"
 
@@ -232,6 +191,44 @@ module Discharger
       ERROR
     end
 
+    def ensure_tag_absent!(tag)
+      stdout, stderr, status = Open3.capture3("git", "ls-remote", "--tags", "origin", "refs/tags/#{tag}")
+      abort "Could not list tags on origin: #{stderr}" unless status.success?
+      return true if stdout.strip.empty?
+
+      abort <<~ERROR.bg(:red).white
+        Tag #{tag} already exists on origin.
+
+        Bump the version, or delete the tag if it was pushed by mistake, before releasing.
+      ERROR
+    end
+
+    def local_branch?(branch)
+      _, _, status = Open3.capture3("git", "rev-parse", "--verify", "--quiet", "refs/heads/#{branch}")
+      status.success?
+    end
+
+    def fetch_working_branch!
+      syscall(["git fetch origin #{working_branch}"])
+    end
+
+    def checkout_working_branch!
+      syscall(
+        ["git checkout #{working_branch}"],
+        ["git reset --hard origin/#{working_branch}"]
+      )
+    end
+
+    def confirm_or_exit!
+      sysecho "Are you ready to continue? (Press Enter to continue, Type 'x' and Enter to exit)".bg(:yellow).black
+      exit if $stdin.gets.chomp.match?(/^x/i)
+    end
+
+    def post_to_slack(text, emoji = nil, thread_ts = nil)
+      tasker["#{name}:slack"].reenable
+      tasker["#{name}:slack"].invoke(text, release_message_channel, emoji, thread_ts)
+    end
+
     # The post-release steps collected from "Runbook:" commit trailers.
     # Empty when no runbook is configured or the file has yet to be written.
     def runbook_items
@@ -254,15 +251,13 @@ module Discharger
     end
 
     # Post the runbook as a reply in a Slack thread, when a runbook is
-    # configured. Reuses the same message on the stage build and the
-    # production release. Returns the message posted, or nil when there is
-    # no thread to reply to or no runbook to announce.
+    # configured. Returns the message posted, or nil when there is no thread
+    # to reply to or no runbook to announce.
     def post_runbook_to_thread(version, thread_ts)
       return unless thread_ts.present?
       return unless (message = runbook_announcement(version))
 
-      tasker["#{name}:slack"].reenable
-      tasker["#{name}:slack"].invoke(message, release_message_channel, ":clipboard:", thread_ts)
+      post_to_slack(message, ":clipboard:", thread_ts)
       message
     end
 
@@ -284,16 +279,6 @@ module Discharger
       pr.empty? ? nil : pr
     end
 
-    def pr_already_merged?(pr_ref)
-      stdout, _, status = Open3.capture3(
-        "gh", "pr", "view", pr_ref.to_s,
-        "--json", "state",
-        "--jq", ".state"
-      )
-      return false unless status.success?
-      stdout.strip == "MERGED"
-    end
-
     def define
       require "slack-ruby-client"
       Slack.configure do |config|
@@ -301,11 +286,11 @@ module Discharger
       end
 
       desc <<~DESC
-        ---------- STEP 3 ----------
+        ---------- STEP 2 ----------
         Release the current version to production
 
-        This task merges the release branch into production via a GitHub pull
-        request and tags the current version.
+        This task tags the release commit on #{working_branch} and pushes the
+        tag. Production deploys from the tag.
 
         After the release is complete, a new branch will be created to bump the
         version for the next release.
@@ -315,82 +300,38 @@ module Discharger
           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!
+        ensure_clean_worktree!
 
         current_version = Object.const_get(version_constant)
+        tag = "v#{current_version}"
 
-        # When auto_deploy_staging is enabled, release directly from working_branch
-        # 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
+        fetch_working_branch!
+        ensure_branch_not_ahead!(working_branch)
+        ensure_tag_absent!(tag)
+        tag_ref = find_release_commit!("origin/#{working_branch}")
 
         sysecho <<~MSG
           Releasing version #{current_version} to production.
 
-          #{release_action}
-          Release source: #{release_source}
+          This will tag #{tag_ref[0, 8]} on #{working_branch} as #{tag} and push the tag.
         MSG
-        sysecho "Are you ready to continue? (Press Enter to continue, Type 'x' and Enter to exit)".bg(:yellow).black
-        input = $stdin.gets
-        exit if input.chomp.match?(/^x/i)
+        confirm_or_exit!
+
+        checkout_working_branch!
 
         syscall(
-          ["git checkout #{working_branch}"],
-          ["git branch -D #{staging_branch} 2>/dev/null || true"],
-          ["git branch -D #{production_branch} 2>/dev/null || true"]
+          ["git tag -a #{tag} -m 'Release #{current_version}' #{tag_ref}"],
+          ["git push origin #{tag}"]
         )
 
-        if auto_deploy_staging
-          syscall(
-            ["git fetch origin #{working_branch}"],
-            ["git reset --hard origin/#{working_branch}"]
-          )
-          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)
-
-          pr_ref = release_source
-          if pr_already_merged?(pr_ref)
-            sysecho "PR #{pr_ref} is already merged. Continuing..."
-          else
-            syscall(
-              ["gh pr merge #{pr_ref} --merge"]
-            )
-          end
-
-          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 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} (#{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 = 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)
-
-            post_runbook_to_thread(current_version, thread_ts)
-          end
-          # Signal success — no branch switch needed since we stay on working_branch throughout
-          true
+        post_to_slack("Released #{app_name} #{current_version} (#{tag_ref[0, 8]}) to production.", ":chipmunk:")
+        # Capture the root before replying; each post overwrites last_message_ts.
+        if (thread_ts = last_message_ts).present?
+          changelog = git_show_at_commit(tag_ref, changelog_file) || File.read(Rails.root.join(changelog_file))
+          post_to_slack(changelog, ":log:", thread_ts)
+          post_runbook_to_thread(current_version, thread_ts)
         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.
 
@@ -437,30 +378,6 @@ module Discharger
           sysecho "----------------------------------".bg(:green).black
         end
 
-        desc description
-        task build: :environment do
-          if auto_deploy_staging
-            sysecho "Note: auto_deploy_staging is enabled. Staging deploys automatically from #{working_branch}.".bg(:yellow).black
-          end
-
-          # Allow overriding the working branch via environment variable
-          build_branch = ENV["DISCHARGER_BUILD_BRANCH"] || working_branch
-
-          syscall(
-            ["git fetch origin #{build_branch}"],
-            ["git checkout #{build_branch}"],
-            ["git reset --hard origin/#{build_branch}"],
-            ["git branch -D #{staging_branch} 2>/dev/null || true"],
-            ["git checkout -b #{staging_branch}"],
-            ["git push origin #{staging_branch} --force"]
-          ) do
-            current_version = Object.const_get(version_constant)
-            tasker["#{name}:slack"].invoke("Building #{app_name} #{current_version} (#{commit_identifier.call}) on #{staging_branch}.", release_message_channel)
-            post_runbook_to_thread(current_version, last_message_ts)
-            syscall ["git checkout #{build_branch}"]
-          end
-        end
-
         desc "Send a message to Slack."
         task :slack, [:text, :channel, :emoji, :ts] => :environment do |_, args|
           instance_variable_set(:@last_message_ts, nil)
@@ -496,7 +413,7 @@ module Discharger
 
         desc <<~DESC
           ---------- STEP 1 ----------
-          Prepare the current version for release to production (#{production_branch})
+          Prepare the current version for release to production
 
           This task will create a new branch to prepare the release. The CHANGELOG
           will be updated and the version will be bumped. The branch will be pushed
@@ -512,15 +429,10 @@ module Discharger
           current_version = Object.const_get(version_constant)
           finish_branch = "bump/finish-#{current_version.tr(".", "-")}"
 
-          syscall(
-            ["git fetch origin #{working_branch}"],
-            ["git checkout #{working_branch}"]
-          )
+          fetch_working_branch!
           ensure_branch_not_ahead!(working_branch)
-          syscall(
-            ["git reset --hard origin/#{working_branch}"],
-            ["git checkout -b #{finish_branch}"]
-          )
+          checkout_working_branch!
+          syscall(["git checkout -b #{finish_branch}"])
           sysecho <<~MSG
             Branch #{finish_branch} created.
 
@@ -529,18 +441,14 @@ module Discharger
             If you need to make changes, edit the CHANGELOG and save the file.
             Then return here to continue with this commit.
           MSG
-          sysecho "Are you ready to continue? (Press Enter to continue, Type 'x' and Enter to exit)".bg(:yellow).black
-          input = $stdin.gets
-          exit if input.chomp.match?(/^x/i)
+          confirm_or_exit!
 
           tasker["reissue:finalize"].invoke
 
-          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}.
+              'rake #{name}'
+            to release to production.
           MSG
 
           if pr_label
@@ -583,50 +491,6 @@ module Discharger
             end
           end
         end
-
-        desc <<~DESC
-          ---------- STEP 2 ----------
-          Stage the release branch
-
-          This task will update Stage, open a PR, and instruct you on the next steps.
-
-          NOTE: If you just want to update the stage environment but aren't ready to release, run:
-
-              bin/rails #{name}:build
-        DESC
-        task stage: [:environment] do
-          if auto_deploy_staging
-            sysecho <<~MSG.bg(:yellow).black
-              Note: auto_deploy_staging is enabled.
-              Staging is handled automatically when code is pushed to #{working_branch}.
-              To release to production, run: 'rake #{name}'
-            MSG
-            next
-          end
-
-          tasker["build"].invoke
-          current_version = Object.const_get(version_constant)
-
-          params = {
-            expand: 1,
-            title: "Stage to Main",
-            body: <<~BODY
-              Deploy #{current_version} to production.
-            BODY
-          }
-
-          pr_url = "#{pull_request_url}/compare/#{production_branch}...#{staging_branch}?#{params.to_query}"
-
-          sysecho <<~MSG
-            Branch #{staging_branch} updated.
-            Open a PR to #{production_branch} to release the version.
-
-            Opening PR: #{pr_url}
-
-            Once the PR is **approved**, run 'rake release' to release the version.
-          MSG
-          syscall ["open", pr_url]
-        end
       end
     end
   end

data/lib/discharger/version.rb

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

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

@@ -22,18 +22,31 @@ unless ENV["DISCHARGER_SETUP_BUNDLED"]
       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?
+    unless source_accepts_token?(source, username, token)
+      warn "Leaving bundler credentials for #{source} alone: it did not accept the gh token (gh auth refresh -s read:packages)"
+      return
+    end
 
     system("bundle", "config", "set", "--local", source, "#{username}:#{token}", out: File::NULL, err: File::NULL)
   end
 
+  def source_accepts_token?(source, username, token)
+    require "net/http"
+    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
+    response.is_a?(Net::HTTPSuccess)
+  rescue
+    false
+  end
+
   unless system("bundle", "check", out: File::NULL, err: File::NULL)
     store_github_packages_credentials
     system("bundle", "install") || abort(<<~MSG)

data/lib/tasks/discharger.rake

@@ -0,0 +1,9 @@
+namespace :discharger do
+  namespace :setup do
+    desc "Fail when bin/setup differs from the installed discharger template"
+    task :check, [:setup_path] do |_task, args|
+      require "discharger/setup_check"
+      abort unless Discharger::SetupCheck.run(args[:setup_path] || "bin/setup")
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: discharger
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Jim Gay
@@ -109,6 +109,7 @@ files:
 - lib/discharger/prerequisites.rb
 - lib/discharger/railtie.rb
 - lib/discharger/setup.rb
+- lib/discharger/setup_check.rb
 - lib/discharger/setup_runner.rb
 - lib/discharger/setup_runner/command_factory.rb
 - lib/discharger/setup_runner/command_registry.rb
@@ -127,6 +128,7 @@ files:
 - lib/discharger/setup_runner/commands/yarn_command.rb
 - lib/discharger/setup_runner/condition_evaluator.rb
 - lib/discharger/setup_runner/configuration.rb
+- lib/discharger/setup_runner/example_files.rb
 - lib/discharger/setup_runner/pre_commands/base_pre_command.rb
 - lib/discharger/setup_runner/pre_commands/homebrew_pre_command.rb
 - lib/discharger/setup_runner/pre_commands/postgresql_tools_pre_command.rb
@@ -141,6 +143,7 @@ files:
 - lib/generators/discharger/install/templates/discharger_initializer.rb
 - lib/generators/discharger/install/templates/setup
 - lib/generators/discharger/install/templates/setup.yml
+- lib/tasks/discharger.rake
 homepage: https://github.com/SOFware/discharger
 licenses: []
 metadata: