discharger 0.2.28 → 0.2.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed420bb45532ec33805ef43ce1ac52c56b349c7600d5019b4f811eeb4275b8e8
-  data.tar.gz: e37cf9e839380574732bef86f9d087e7117f3ae8472417a363da1948e1cff972
+  metadata.gz: 04fa2c7e508709b01420db373058a6ab1cc81314c8cf6aab7a2c1a627e404c86
+  data.tar.gz: '09a4b2197db9c3c1509c685192abb53911156c8b7980d96671da59c7049be79f'
 SHA512:
-  metadata.gz: f241dc449944f05eeaf4eccf0fb9e5b8d77e4f087cc6e4eef2a79287fa9d28b6088a7b7acd868f0d4a5b295efb08890fa381811665ce3f757dfbb0b1e89924ca
-  data.tar.gz: 0ffd1f6bad8d1fc3ab7a7f6f5ccf55f0f8a33371a1fb16d07aebcae2bb6c2a2d8b476720a16533221a79bfdbb2cb6953fb96112596e5f212bd8c24b469659184
+  metadata.gz: a56b02162d085a4db4ed5460066360c95819f2cc7735dc183f7e522ad31228cbf2a1e1f44c160766b4ceb2f660226f6cfce0b4f7563981a05999016e0e446ae2
+  data.tar.gz: ad6369eb6c7f782e92523c9c4e987a2471480e0140d0c918b4ee32b023f83692dddcc98a14a9eac4f2d4f0490e0c5badecedbb64e8e575e59483ab2309289b70

data/CHANGELOG.md

@@ -5,6 +5,6 @@ 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.2.28] - 2026-02-17
+## [0.2.29] - 2026-03-10
 
-## [0.2.27] - 2026-02-06
+## [0.2.28] - 2026-02-17

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

@@ -98,7 +98,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, "--user", "postgres", "-p", "#{port}:#{internal_port}"]
+          cmd = ["docker", "run", "-d", "--name", name, "-p", "#{port}:#{internal_port}"]
           env.each { |k, v| cmd.push("-e", "#{k}=#{v}") }
           cmd.push("-v", volume) if volume
           cmd.push(image)

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

@@ -104,8 +104,16 @@ module Discharger
               exit 0
             fi
 
-            # Fallback to system pg_dump
-            exec pg_dump "$@"
+            # Fallback to system pg_dump (skip this wrapper in PATH to avoid infinite loop)
+            SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+            CLEAN_PATH="${PATH//$SCRIPT_DIR:/}"
+            CLEAN_PATH="${CLEAN_PATH%:$SCRIPT_DIR}"
+            FALLBACK=$(PATH="$CLEAN_PATH" command -v pg_dump 2>/dev/null)
+            if [[ -n "$FALLBACK" ]]; then
+              exec "$FALLBACK" "$@"
+            fi
+            echo "Error: pg_dump not found. Start Docker or install PostgreSQL client tools." >&2
+            exit 1
           BASH
         end
 
@@ -124,6 +132,7 @@ module Discharger
               # When running in Docker, host paths don't exist in the container
               # so we pipe file content via stdin instead
               INPUT_FILE=""
+              HAS_USER=""
               ARGS=()
               while [[ $# -gt 0 ]]; do
                 case $1 in
@@ -139,6 +148,11 @@ module Discharger
                     INPUT_FILE="$2"
                     shift 2
                     ;;
+                  -U|--username|--username=*)
+                    HAS_USER="1"
+                    ARGS+=("$1")
+                    shift
+                    ;;
                   *)
                     ARGS+=("$1")
                     shift
@@ -146,6 +160,11 @@ module Discharger
                 esac
               done
 
+              # Default to postgres user if not specified (container runs as root)
+              if [[ -z "$HAS_USER" ]]; then
+                ARGS=("-U" "postgres" "${ARGS[@]}")
+              fi
+
               if [[ -n "$INPUT_FILE" ]]; then
                 docker exec -i "$CONTAINER" #{tool} "${ARGS[@]}" < "$INPUT_FILE"
               else
@@ -154,8 +173,16 @@ module Discharger
               exit 0
             fi
 
-            # Fallback to system #{tool}
-            exec #{tool} "$@"
+            # Fallback to system #{tool} (skip this wrapper in PATH to avoid infinite loop)
+            SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+            CLEAN_PATH="${PATH//$SCRIPT_DIR:/}"
+            CLEAN_PATH="${CLEAN_PATH%:$SCRIPT_DIR}"
+            FALLBACK=$(PATH="$CLEAN_PATH" command -v #{tool} 2>/dev/null)
+            if [[ -n "$FALLBACK" ]]; then
+              exec "$FALLBACK" "$@"
+            fi
+            echo "Error: #{tool} not found. Start Docker or install PostgreSQL client tools." >&2
+            exit 1
           BASH
         end
 

data/lib/discharger/task.rb

@@ -179,6 +179,20 @@ module Discharger
       stdout.strip
     end
 
+    def existing_pr_number(base, head)
+      stdout, _, status = Open3.capture3(
+        "gh", "pr", "list",
+        "--base", base,
+        "--head", head,
+        "--state", "open",
+        "--json", "number",
+        "--jq", ".[0].number // empty"
+      )
+      return nil unless status.success?
+      pr = stdout.strip
+      pr.empty? ? nil : pr
+    end
+
     def define
       require "slack-ruby-client"
       Slack.configure do |config|
@@ -189,14 +203,17 @@ module Discharger
         ---------- STEP 3 ----------
         Release the current version to production
 
-        This task rebases the production branch on the staging branch and tags the
-        current version. The production branch and the tag will be pushed to the
-        remote repository.
+        This task merges the release branch into production via a GitHub pull
+        request and tags the current version.
 
         After the release is complete, a new branch will be created to bump the
         version for the next release.
       DESC
       task "#{name}": [:environment] do
+        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
+
         current_version = Object.const_get(version_constant)
 
         # When auto_deploy_staging is enabled, release directly from working_branch
@@ -213,27 +230,45 @@ module Discharger
         input = $stdin.gets
         exit if input.chomp.match?(/^x/i)
 
-        # Fetch first, then validate what we fetched
         syscall(
           ["git checkout #{working_branch}"],
           ["git branch -D #{staging_branch} 2>/dev/null || true"],
-          ["git branch -D #{production_branch} 2>/dev/null || true"],
-          ["git fetch origin #{release_source}:#{release_source} #{production_branch}:#{production_branch}"]
+          ["git branch -D #{production_branch} 2>/dev/null || true"]
         )
 
         if auto_deploy_staging
-          # Ensure HEAD is the release commit (the commit that touched the version file)
+          syscall(
+            ["git fetch origin #{production_branch}:#{production_branch} #{working_branch}"],
+            ["git reset --hard origin/#{working_branch}"]
+          )
           validate_release_commit!(release_source)
         else
-          # Standard mode: validate staging branch has same VERSION as working branch
+          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
+          else
+            syscall(
+              ["gh pr create --base #{production_branch} --head #{release_source} --title 'Release #{current_version}' --body 'Deploy #{current_version} to production.'"]
+            )
+          end
+        end
+
+        syscall(
+          ["gh pr merge #{pr_ref} --merge"]
+        )
+
         continue = syscall(
-          ["git checkout #{production_branch}"],
-          ["git reset --hard #{release_source}"],
-          ["git tag -a v#{current_version} -m 'Release #{current_version}'"],
-          ["git push origin #{production_branch}:#{production_branch} v#{current_version}:v#{current_version}"],
+          ["git fetch origin #{production_branch}:#{production_branch}"],
+          ["git tag -a v#{current_version} -m 'Release #{current_version}' #{production_branch}"],
           ["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:")
@@ -242,7 +277,8 @@ module Discharger
             tasker["#{name}:slack"].reenable
             tasker["#{name}:slack"].invoke(text, release_message_channel, ":log:", last_message_ts)
           end
-          syscall ["git checkout #{working_branch}"]
+          # Signal success — no branch switch needed since we stay on working_branch throughout
+          true
         end
 
         abort "Release failed." unless continue

data/lib/discharger/version.rb

@@ -1,3 +1,3 @@
 module Discharger
-  VERSION = "0.2.28"
+  VERSION = "0.2.29"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: discharger
 version: !ruby/object:Gem::Version
-  version: 0.2.28
+  version: 0.2.29
 platform: ruby
 authors:
 - Jim Gay