discharger 0.2.16 → 0.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8a737bf93543b1c7af2206ec1a49c80e7d9b4fce5f7757f4d2c948c6ec46335
-  data.tar.gz: 3a4c510e4302ec0965c55cdadedeb9b003cbb491471ac6a9de45009137ad6644
+  metadata.gz: 91b395df4575048270a328aecfc8a2d8c96822aebcba96abac36bd9309d05704
+  data.tar.gz: bbeb1373a770b5156235cb1ee695157a5d7317f50ff9c116d6dad7156c8bddd1
 SHA512:
-  metadata.gz: '0932bdebb821c1f1374e7a64bb677699c31a2fa10b9c7a892463885ababcbe7634acfb6701393c3ab4c8d4c9e521bd9d16b6c00417c639b4f817d55491d2559f'
-  data.tar.gz: 982a66fe42eae19dc9b8cf08119e763a8f3c1b91b75b2d7d63e583484e8ec06296ada37445cddc5712710463268e82ba533bae65cc430aa312c8856a7630f26e
+  metadata.gz: e8439d2b4ab107c1565580868d13722783848cec3c96d14d890227b56488541e0d4476ea335719caf7adffc083424bf157bb8211b93a98f810d3e2ed0aa2c70b
+  data.tar.gz: 1d8a6167062761e9ec86e05b9aa784d4745f587c2aa63706efe19dc8ced530621af2b0b0ea03daaa7d1ef311ce8003522dbf4877cf25504ceca4da19f6ea50bf

data/CHANGELOG.md

@@ -5,4 +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.17] - 2025-10-27
+
 ## [0.2.16] - 2025-10-24

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

@@ -7,28 +7,22 @@ module Discharger
     module Commands
       class DockerCommand < BaseCommand
         def execute
-          log "Ensure Docker is running"
-
-          unless system_quiet("docker info > /dev/null 2>&1")
-            log "Starting Docker..."
-            system_quiet("open -a Docker")
-            sleep 10
-            unless system_quiet("docker info > /dev/null 2>&1")
-              log "Docker is not running. Please start Docker manually."
-              return
-            end
-          end
-
           # Setup database container if configured
           if config.respond_to?(:database) && config.database
-            setup_container(
-              name: config.database.name || "db-app",
-              port: config.database.port || 5432,
-              image: "postgres:#{config.database.version || "14"}",
-              env: {"POSTGRES_PASSWORD" => config.database.password || "postgres"},
-              volume: "#{config.database.name || "db-app"}:/var/lib/postgresql/data",
-              internal_port: 5432
-            )
+            if native_postgresql_available?
+              log "Native PostgreSQL detected on port #{native_postgresql_port}, skipping Docker container setup"
+              ENV["DB_PORT"] ||= native_postgresql_port.to_s
+            else
+              ensure_docker_running
+              setup_container(
+                name: config.database.name || "db-app",
+                port: config.database.port || 5432,
+                image: "postgres:#{config.database.version || "14"}",
+                env: {"POSTGRES_PASSWORD" => config.database.password || "postgres"},
+                volume: "#{config.database.name || "db-app"}:/var/lib/postgresql/data",
+                internal_port: 5432
+              )
+            end
           end
 
           # Setup Redis container if configured
@@ -44,7 +38,7 @@ module Discharger
 
         def can_execute?
           # Only execute if Docker is available and containers are configured
-          system_quiet("which docker") && (
+          docker_available? && (
             (config.respond_to?(:database) && config.database) ||
             (config.respond_to?(:redis) && config.redis)
           )
@@ -94,6 +88,80 @@ module Discharger
 
           system!(*cmd)
         end
+
+        def docker_available?
+          return true if system_quiet("which docker > /dev/null 2>&1")
+
+          ["/usr/bin/docker", "/usr/local/bin/docker"].each do |path|
+            return true if File.executable?(path)
+          end
+
+          false
+        end
+
+        def docker_running?
+          system_quiet("docker info > /dev/null 2>&1")
+        end
+
+        def start_docker_for_platform
+          case RUBY_PLATFORM
+          when /darwin/
+            system_quiet("open -a Docker")
+          when /linux/
+            if system_quiet("which systemctl > /dev/null 2>&1")
+              log "Attempting to start Docker service..."
+              system_quiet("sudo systemctl start docker")
+            else
+              log "Docker service management not available. Please ensure Docker is running."
+            end
+          else
+            log "Unsupported platform for automatic Docker startup: #{RUBY_PLATFORM}"
+          end
+        end
+
+        def ensure_docker_running
+          log "Ensure Docker is running"
+
+          unless docker_running?
+            log "Starting Docker..."
+            start_docker_for_platform
+            sleep 10
+            unless docker_running?
+              log "Docker is not running. Please start Docker manually."
+              return false
+            end
+          end
+          true
+        end
+
+        def native_postgresql_available?
+          # Check common PostgreSQL ports
+          [5432, 5433].each do |port|
+            if postgresql_running_on_port?(port)
+              @native_pg_port = port
+              return true
+            end
+          end
+          false
+        end
+
+        def native_postgresql_port
+          @native_pg_port || 5432
+        end
+
+        def postgresql_running_on_port?(port)
+          # Method 1: Try pg_isready if available
+          if system_quiet("which pg_isready > /dev/null 2>&1")
+            return system_quiet("pg_isready -h localhost -p #{port} > /dev/null 2>&1")
+          end
+
+          # Method 2: Try psql connection
+          if system_quiet("which psql > /dev/null 2>&1")
+            return system_quiet("psql -h localhost -p #{port} -U postgres -c '\\q' > /dev/null 2>&1")
+          end
+
+          false
+        end
       end
     end
   end

data/lib/discharger/version.rb

@@ -1,3 +1,3 @@
 module Discharger
-  VERSION = "0.2.16"
+  VERSION = "0.2.17"
 end

metadata

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