discharger 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3ccade0fc5dd3187492ca714a564007743c6b4b18633293fcd95de540e8b8cb
-  data.tar.gz: 55833bfc91a090b58e1a853df4138699eab4dee9b5f60f5a5d01911d5adf580c
+  metadata.gz: 86a58f41a34e61bfc155a9563e55bbc1eb42d4bd6904c09fe4aafb9bc61f3411
+  data.tar.gz: 62d3b3ad5ffec0dcdee073f5ca0109416b383dd2fe180f8501af47f2028d9122
 SHA512:
-  metadata.gz: e679dfc9501cc0d0739143785af0ef29de20295577ed0971c21fb66a4cb9506d67b3d644a19497e4a0353f925180413ae978d8366fb614b4a544150f3014b99d
-  data.tar.gz: a92efb287ab888f7ff550797cf54bbdd6d8bad18d23cedfbc1f673309c4969ac86f1b9afc4fb7b2d8d9902a6d250854592d79056e5d2692635c1f9ef5879dfde
+  metadata.gz: d0f6c58d5fde62fb7dd63b5dbe56c867600eea46e5c8e74b9eee22025da5dd299bf9d0b1093a40a67411c5cc279b9ca826e0c6d0af8659635fb6692279fa8fab
+  data.tar.gz: 4ef09b9ca157755c99aa693d3c768e11df6f4fb470ed2d3c4736cf7c2fb894fb46352e941e550c2c200ec95bfd98f40a5daf22ca0928431231fdad04e07fe1ca

data/CHANGELOG.md

@@ -5,14 +5,14 @@ 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.31] - 2026-04-09
+## [0.3.1] - 2026-05-13
 
 ### Added
 
-- Unified setup entry point with pre-steps support (1459633)
+- database.prefer_docker setup.yml option for explicit Docker vs native PostgreSQL selection (2fca81e)
 
-## [0.2.30] - 2026-03-11
+## [0.2.31] - 2026-04-09
 
-### Changed
+### Added
 
-- Use git trailer fragments for changelog generation (70396ca)
+- Unified setup entry point with pre-steps support (1459633)

data/README.md

@@ -163,6 +163,12 @@ database:
   name: "db-your-app"
   version: "14"
   password: "postgres"
+  # 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)
+  #   true              - always create the Docker container; fail if a native instance holds the port
+  #   "prompt"          - ask the developer (interactive shells only; non-interactive runs fall back to native)
+  prefer_docker: "prompt"
 
 redis:
   port: 6379

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

@@ -7,35 +7,8 @@ module Discharger
     module Commands
       class DockerCommand < BaseCommand
         def execute
-          # Setup database container if configured
-          if database_configured?
-            puts "  → Checking database configuration..." unless ENV["QUIET_SETUP"]
-            if native_postgresql_available?
-              puts "  → Native PostgreSQL detected on port #{native_postgresql_port}, skipping Docker setup" unless ENV["QUIET_SETUP"]
-              ENV["DB_PORT"] ||= native_postgresql_port.to_s
-            else
-              puts "  → No native PostgreSQL found, setting up Docker container..." unless ENV["QUIET_SETUP"]
-              ensure_docker_running
-              setup_container(
-                name: database_config.name || "db-app",
-                port: database_config.port || 5432,
-                image: "postgres:#{database_config.version || "14"}",
-                env: {"POSTGRES_PASSWORD" => database_config.password || "postgres"},
-                volume: "#{database_config.name || "db-app"}:/var/lib/postgresql/data",
-                internal_port: 5432
-              )
-            end
-          end
-
-          # Setup Redis container if configured
-          if redis_configured?
-            setup_container(
-              name: redis_config.name || "redis-app",
-              port: redis_config.port || 6379,
-              image: "redis:#{redis_config.version || "latest"}",
-              internal_port: 6379
-            )
-          end
+          setup_database if database_configured?
+          setup_redis if redis_configured?
         end
 
         def can_execute?
@@ -49,6 +22,84 @@ module Discharger
 
         private
 
+        def setup_database
+          puts "  → Checking database configuration..." unless ENV["QUIET_SETUP"]
+
+          case database_config.prefer_docker
+          when true
+            create_database_container_or_fail
+          when "prompt"
+            if native_postgresql_available? && wants_native_postgresql?
+              use_native_postgresql
+            else
+              create_database_container_or_fail
+            end
+          else
+            # Legacy default: prefer the native instance when one is available.
+            if native_postgresql_available?
+              use_native_postgresql
+            else
+              create_database_container
+            end
+          end
+        end
+
+        def setup_redis
+          setup_container(
+            name: redis_config.name || "redis-app",
+            port: redis_config.port || 6379,
+            image: "redis:#{redis_config.version || "latest"}",
+            internal_port: 6379
+          )
+        end
+
+        def use_native_postgresql
+          puts "  → Native PostgreSQL detected on port #{native_postgresql_port}, skipping Docker setup" unless ENV["QUIET_SETUP"]
+          ENV["DB_PORT"] ||= native_postgresql_port.to_s
+        end
+
+        def create_database_container_or_fail
+          if native_postgresql_available?
+            raise "prefer_docker is set in the database config but native PostgreSQL is " \
+                  "listening on port #{native_postgresql_port}. Stop the native instance " \
+                  "(e.g., `brew services stop postgresql@15`) or remove prefer_docker."
+          end
+          create_database_container
+        end
+
+        def create_database_container
+          puts "  → No native PostgreSQL found, setting up Docker container..." unless ENV["QUIET_SETUP"]
+          ensure_docker_running
+          setup_container(
+            name: database_config.name || "db-app",
+            port: database_config.port || 5432,
+            image: "postgres:#{database_config.version || "14"}",
+            env: {"POSTGRES_PASSWORD" => database_config.password || "postgres"},
+            volume: "#{database_config.name || "db-app"}:/var/lib/postgresql/data",
+            internal_port: 5432
+          )
+        end
+
+        # Ask the developer whether to use the detected native PostgreSQL or set up
+        # the configured Docker container instead. Falls back to native (the legacy
+        # behavior) when stdin is not a TTY, in CI, or when QUIET_SETUP is set,
+        # so non-interactive runs do not hang waiting for input.
+        def wants_native_postgresql?
+          unless interactive_prompt_available?
+            puts "  → Non-interactive shell; defaulting to native PostgreSQL on port #{native_postgresql_port}" unless ENV["QUIET_SETUP"]
+            return true
+          end
+
+          puts "Native PostgreSQL detected on port #{native_postgresql_port}. Use the Docker container anyway?\n ===> Type Y to set up the Docker container\nOtherwise hit any key to use the native PostgreSQL."
+          $stdin.gets&.chomp != "Y"
+        end
+
+        def interactive_prompt_available?
+          return true if ENV["DISCHARGER_FORCE_INTERACTIVE"]
+          return false if ENV["CI"] || ENV["QUIET_SETUP"]
+          $stdin.tty?
+        end
+
         def setup_container(name:, port:, image:, internal_port:, env: {}, volume: nil)
           log "Checking #{name} container"
 

data/lib/discharger/setup_runner/configuration.rb

@@ -37,13 +37,14 @@ module Discharger
     end
 
     class DatabaseConfig
-      attr_accessor :port, :name, :version, :password
+      attr_accessor :port, :name, :version, :password, :prefer_docker
 
       def initialize
         @port = 5432
         @name = "db-app"
         @version = "14"
         @password = "postgres"
+        @prefer_docker = nil
       end
 
       def from_hash(hash)
@@ -51,6 +52,7 @@ module Discharger
         @name = hash["name"] if hash["name"]
         @version = hash["version"] if hash["version"]
         @password = hash["password"] if hash["password"]
+        @prefer_docker = hash["prefer_docker"] if hash.key?("prefer_docker")
       end
     end
 

data/lib/discharger/version.rb

@@ -1,3 +1,3 @@
 module Discharger
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

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