discharger 0.2.23 → 0.2.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9f8f3d34471e92401604bcbdc9b1cae5fc0083666895bdf4bf4ab30b40ea381
-  data.tar.gz: b43d23aea4793cfa6f69c569b36f739156cd4f4d871d9a8ee63b55ecb433846c
+  metadata.gz: 9f3ccebbf82065fe09a136e6f5d44a5e78bfa95643b52fee75f40d0763941615
+  data.tar.gz: c46241c30ee25101a1e0873e891d03c9beb89a9a65c587324a59a7645334a585
 SHA512:
-  metadata.gz: 2e2401d031e40cc3ef91bf5fe230e2837a3c113cfb23699df9e01abf2bb565c5bf686be6298213aed4d605997235a4a2e1f1808f80ad11595ef1eda8c14cef32
-  data.tar.gz: fbe5642253ef02128866f2e732b2d7d2574361f409b7a44a12a555e16b7f869e93ee68ef702b415ae60f653e629f11ea9283d5dd4a870ab4299e0cf7cc746e9b
+  metadata.gz: 2e6ed61916d2d2502eece7911d48d108026e74c5e11b1c689dec61ae451c0e5aeb99decf4215d521d2193f96634c9b880fb0e8cffa22a989db288f434de219c2
+  data.tar.gz: 21eee7c2dce99efa8cdf15fbb9d04ac1484209773b3941ead3e950a322a16c1d52f9ea37e95236b9d37ba805eb6e25d80f09f6bda59967114d9c89a9ffa92854

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.23] - 2026-01-16
+## [0.2.24] - 2026-01-22
 
-## [0.2.22] - 2026-01-07
+## [0.2.23] - 2026-01-16

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

@@ -70,11 +70,28 @@ module Discharger
             create_container(name: name, port: port, image: image, env: env, volume: volume, internal_port: internal_port)
           end
 
-          # Verify container is running
-          sleep 2
-          unless system_quiet("docker ps | grep #{name} > /dev/null 2>&1")
-            log "#{name} container failed to start"
-            raise "#{name} container failed to start"
+          wait_for_container_running(name)
+        end
+
+        def wait_for_container_running(name, timeout: 30)
+          require "open3"
+          start_time = Time.now
+          loop do
+            return true if system_quiet("docker ps | grep #{name} > /dev/null 2>&1")
+
+            status, = Open3.capture3("docker", "inspect", "-f", "{{.State.Status}}", name)
+            status = status.strip
+            if status == "exited"
+              exit_code, = Open3.capture3("docker", "inspect", "-f", "{{.State.ExitCode}}", name)
+              logs, = Open3.capture3("docker", "logs", "--tail", "20", name)
+              raise "#{name} container exited with code #{exit_code.strip}:\n#{logs}"
+            end
+
+            if Time.now - start_time > timeout
+              raise "#{name} container failed to start within #{timeout} seconds (current status: #{status})"
+            end
+
+            sleep 1
           end
         end
 

data/lib/discharger/task.rb

@@ -1,6 +1,7 @@
 require "rake/tasklib"
 require "reissue/rake"
 require "rainbow/refinement"
+require "open3"
 using Rainbow
 
 module Discharger
@@ -34,6 +35,7 @@ module Discharger
     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
@@ -63,6 +65,7 @@ module Discharger
       @production_branch = "main"
       @description = "Release the current version to #{staging_branch}"
       @clear_fragments = true
+      @auto_deploy_staging = false
     end
     private attr_reader :tasker
 
@@ -109,15 +112,72 @@ module Discharger
       success
     end
 
-    # Echo a message to the console
-    #
-    # @param message [String] the message to echo
-    # return [TrueClass]
     def sysecho(message, output: $stdout)
       output.puts message
       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
+
+    # 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)
+
+      if head_sha.nil? || release_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.
+        ERROR
+      end
+
+      return sysecho("✓ HEAD is the release commit (#{head_sha[0, 8]})".bg(:green).black, output:) if head_sha == release_sha
+
+      abort <<~ERROR.bg(:red).white
+        HEAD is not the release commit!
+
+        HEAD:           #{head_sha[0, 8]}
+        Release commit: #{release_sha[0, 8]} (last commit to touch #{version_file})
+
+        Something was merged after the release PR. Verify the branch contents and retry.
+      ERROR
+    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_local_sha(branch)
+      stdout, _, status = Open3.capture3("git", "rev-parse", branch)
+      return nil unless status.success?
+      stdout.strip
+    end
+
+    def git_version_file_commit(branch)
+      stdout, _, status = Open3.capture3("git", "log", branch, "-1", "--format=%H", "--", version_file)
+      return nil unless status.success?
+      stdout.strip
+    end
+
     def define
       require "slack-ruby-client"
       Slack.configure do |config|
@@ -137,22 +197,40 @@ module Discharger
       DESC
       task "#{name}": [:environment] do
         current_version = Object.const_get(version_constant)
+
+        # 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
+
         sysecho <<~MSG
           Releasing version #{current_version} to production.
 
           This will tag the current version and push it to the production branch.
+          Release source: #{release_source}
         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)
 
-        continue = syscall(
+        # 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 #{staging_branch}:#{staging_branch} #{production_branch}:#{production_branch}"],
+          ["git fetch origin #{release_source}:#{release_source} #{production_branch}:#{production_branch}"]
+        )
+
+        if auto_deploy_staging
+          # Ensure HEAD is the release commit (the commit that touched the version file)
+          validate_release_commit!(release_source)
+        else
+          # Standard mode: validate staging branch has same VERSION as working branch
+          validate_version_match!(staging_branch, working_branch)
+        end
+
+        continue = syscall(
           ["git checkout #{production_branch}"],
-          ["git reset --hard #{staging_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 push origin v#{current_version}"]
@@ -209,6 +287,10 @@ module Discharger
 
         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
 
@@ -287,6 +369,9 @@ module Discharger
 
           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"
+
           continue = syscall ["git push origin #{finish_branch} --force"] do
             sysecho <<~MSG
               Branch #{finish_branch} created.
@@ -295,8 +380,8 @@ module Discharger
               #{pr_url}
 
               Once the PR is merged, pull down #{working_branch} and run
-                'rake #{name}:stage'
-              to stage the release branch.
+                '#{next_step}'
+              to #{next_step_desc}.
             MSG
           end
           if continue
@@ -316,6 +401,15 @@ module Discharger
               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)
 

data/lib/discharger/version.rb

@@ -1,3 +1,3 @@
 module Discharger
-  VERSION = "0.2.23"
+  VERSION = "0.2.24"
 end

metadata

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