discharger 0.2.21 → 0.2.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64422159d1dff956fa5ca2024fa98c53176357403868ba2ba2a648bdf9ae9011
-  data.tar.gz: 785a310cf834729d942c74de691316c55d5f9cd06216345997897defa6c12c67
+  metadata.gz: a330978c9c3a143da222b8f82e62d6caa5ce8a7b530ec3f168027abc364176ec
+  data.tar.gz: '08ed901337c5dbc19172928703f46d028249e1dc8811db7862eec005518c7020'
 SHA512:
-  metadata.gz: be46af229902024d7805d02d656f65e8fa9601ac0398b86944fb4e3286fdeaac4cdea32c9b006b12ad803ed36718f56b4d5a3cd4f4d9668d177a0cc18889d1c3
-  data.tar.gz: cdf6ffd777a1e6b53e972c4f449984628297aa8d0a83a9f748747430b961eac2f498339399bc31d1724e709d24d1a3fb50b17f60ed5020664ce1652f38b82e91
+  metadata.gz: b5f2f78a6c014e9367bb32b7b15a4650905669502374fd4bed92397a3c06e4dcab0df2acce30200f51c31dce032269c1dd2e8895ba815031533af938251bd813
+  data.tar.gz: 903aa8c51fca10ee7b86e13c49b69e747967c0315c8c88d8b749ac2f0ac02134a6286303f99dd6a49d6396ad5dfd5474ddc49a29ac603e7bb0b45803e137c419

data/CHANGELOG.md

@@ -5,10 +5,10 @@ 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.22] - 2026-01-07
+
 ## [0.2.21] - 2025-12-17
 
 ### Fixed
 
 - Corrected mis-matched method names for #database and #redis
-
-## [0.2.20] - 2025-12-11

data/lib/discharger/railtie.rb

@@ -1,5 +1,14 @@
 module Discharger
   class Railtie < ::Rails::Railtie
+    # Prepend bin/pg-tools to PATH so Docker-aware pg_dump/psql wrappers are used
+    # This runs before any rake tasks execute, ensuring Rails uses the wrappers
+    initializer "discharger.pg_tools_path", before: :load_config_initializers do
+      pg_tools_path = Rails.root.join("bin", "pg-tools").to_s
+      if File.directory?(pg_tools_path) && !ENV["PATH"].to_s.include?(pg_tools_path)
+        ENV["PATH"] = "#{pg_tools_path}:#{ENV["PATH"]}"
+      end
+    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_runner/commands/pg_tools_command.rb

@@ -0,0 +1,145 @@
+# frozen_string_literal: true
+
+require_relative "base_command"
+
+module Discharger
+  module SetupRunner
+    module Commands
+      class PgToolsCommand < BaseCommand
+        TOOLS = %w[pg_dump psql].freeze
+
+        def description
+          "Setting up PostgreSQL tools wrappers"
+        end
+
+        def can_execute?
+          config.respond_to?(:db_config) && config.db_config&.name.present?
+        end
+
+        def execute
+          create_pg_tools_directory
+          TOOLS.each { |tool| create_wrapper(tool) }
+          create_envrc_if_needed
+        end
+
+        private
+
+        def container_name
+          config.db_config.name
+        end
+
+        def create_pg_tools_directory
+          FileUtils.mkdir_p(File.join(app_root, "bin", "pg-tools"))
+        end
+
+        def create_wrapper(tool)
+          wrapper_path = File.join(app_root, "bin", "pg-tools", tool)
+          File.write(wrapper_path, wrapper_content(tool))
+          FileUtils.chmod(0o755, wrapper_path)
+          log "Created bin/pg-tools/#{tool}"
+        end
+
+        def wrapper_content(tool)
+          if tool == "pg_dump"
+            pg_dump_wrapper_content
+          else
+            generic_wrapper_content(tool)
+          end
+        end
+
+        def pg_dump_wrapper_content
+          <<~BASH
+            #!/usr/bin/env bash
+            set -e
+
+            CONTAINER="#{container_name}"
+
+            # Docker first: use container's pg_dump if running
+            if docker ps --format '{{.Names}}' 2>/dev/null | grep -q "^${CONTAINER}$"; then
+              echo "Using pg_dump from Docker container: $CONTAINER" >&2
+
+              # Parse arguments to handle --file option specially
+              # When running in Docker, we need to output to stdout and redirect locally
+              OUTPUT_FILE=""
+              HAS_USER=""
+              ARGS=()
+              while [[ $# -gt 0 ]]; do
+                case $1 in
+                  --file)
+                    OUTPUT_FILE="$2"
+                    shift 2
+                    ;;
+                  --file=*)
+                    OUTPUT_FILE="${1#*=}"
+                    shift
+                    ;;
+                  -f)
+                    OUTPUT_FILE="$2"
+                    shift 2
+                    ;;
+                  -U|--username|--username=*)
+                    HAS_USER="1"
+                    ARGS+=("$1")
+                    shift
+                    ;;
+                  *)
+                    ARGS+=("$1")
+                    shift
+                    ;;
+                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 "$OUTPUT_FILE" ]]; then
+                # Run pg_dump in container, output to stdout, redirect to local file
+                docker exec -i "$CONTAINER" pg_dump "${ARGS[@]}" > "$OUTPUT_FILE"
+              else
+                # No file output, just exec normally
+                exec docker exec -i "$CONTAINER" pg_dump "${ARGS[@]}"
+              fi
+              exit 0
+            fi
+
+            # Fallback to system pg_dump
+            exec pg_dump "$@"
+          BASH
+        end
+
+        def generic_wrapper_content(tool)
+          <<~BASH
+            #!/usr/bin/env bash
+            set -e
+
+            CONTAINER="#{container_name}"
+
+            # Docker first: use container's #{tool} if running
+            if docker ps --format '{{.Names}}' 2>/dev/null | grep -q "^${CONTAINER}$"; then
+              echo "Using #{tool} from Docker container: $CONTAINER" >&2
+              exec docker exec -i "$CONTAINER" #{tool} "$@"
+            fi
+
+            # Fallback to system #{tool}
+            exec #{tool} "$@"
+          BASH
+        end
+
+        def create_envrc_if_needed
+          envrc_path = File.join(app_root, ".envrc")
+          if File.exist?(envrc_path)
+            # Don't overwrite existing .envrc, but suggest adding PATH if not present
+            unless File.read(envrc_path).include?("bin/pg-tools")
+              log "Note: Add 'PATH_add bin/pg-tools' to existing .envrc for shell access"
+            end
+          else
+            File.write(envrc_path, "PATH_add bin/pg-tools\n")
+            log "Created .envrc (run 'direnv allow' to enable for shell access)"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/discharger/version.rb

@@ -1,3 +1,3 @@
 module Discharger
-  VERSION = "0.2.21"
+  VERSION = "0.2.22"
 end

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

@@ -19,7 +19,7 @@ redis:
   version: "latest"
 
 # Built-in commands to run (empty array runs all available commands)
-# Available commands: brew, asdf, git, bundler, yarn, config, docker, env, database
+# Available commands: brew, asdf, git, bundler, yarn, config, docker, pg_tools, env, database
 steps:
   - brew
   - asdf
@@ -28,6 +28,7 @@ steps:
   - yarn
   - config
   - docker
+  - pg_tools
   - env
   - database
 

metadata

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