testcontainers-postgres 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25e023c24e32f22ba240ff88dc76549f0a09613aa68f1c36c531797bfde7ff06
-  data.tar.gz: f0664ba9fadfca4dac0d16128d520ca822adae889270cc7162730db5ac1bd666
+  metadata.gz: 9fa51139e6cf8b5e0788a82e7135912294fcd97a41187b7c23070e33ce96b0b4
+  data.tar.gz: 54f5b94f4612768cb390ad2a815bc828ee4c171194341ac3fbe2e765bed0d604
 SHA512:
-  metadata.gz: 85ef1679c31fe67156afa4bb324dd0b6b050cd8a4d62bbf044a88753799a995e458dfdc69d5836bdd253d5ceddcfce022b57c86e9e2c4f68975636a04de86aff
-  data.tar.gz: 78ce60e49c0a6d680fd13061fe008b7737ff437b6709399f578dd6c8a3f63ea13238dbab38f07e6b9517fdf0d4f17437426b0f66378c6b5809d09bb0afe4dc07
+  metadata.gz: 4dca70a42fe9bc958b83c586041dd3af1efcd0d09c2bfe38da8efc75b27197f9843c62cd6092e169b5aca8ee1cc844d514f02d289b043c45d6a6816a8831a7f5
+  data.tar.gz: 5b39f565609eec88957906b4a3754f363f187be0425ec79a7c883ece941cc89e89fc38a4c8a3c3ca8edb345dd2f7e43e6a02cb56a0414731f836d501ca2e25be

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## [0.1.1] - 2023-6-10
+
+### Added
+
+- Add healthcheck support on start
+
+### Fixed
+
+- Remove support for custom ports, it is not supported by underlying
+  images.
+
 ## [0.1.0] - 2023-05-13
 
 ### Added

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: ../core
   specs:
-    testcontainers-core (0.1.2)
+    testcontainers-core (0.1.3)
       docker-api (~> 2.2)
 
 PATH
   remote: .
   specs:
-    testcontainers-postgres (0.1.0)
-      testcontainers-core (~> 0.1.1)
+    testcontainers-postgres (0.1.1)
+      testcontainers-core (~> 0.1.3)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -137,7 +137,7 @@ end
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/guilleiguaran/testcontainers. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/guilleiguaran/testcontainers-ruby/blob/main/CODE_OF_CONDUCT.md).
+Bug reports and pull requests are welcome on GitHub at https://github.com/testcontainers/testcontainers-ruby. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/testcontainers/testcontainers-ruby/blob/main/CODE_OF_CONDUCT.md).
 
 ## License
 
@@ -145,4 +145,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the Testcontainers project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/guilleiguaran/testcontainers-ruby/blob/main/CODE_OF_CONDUCT.md).
+Everyone interacting in the Testcontainers project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/testcontainers/testcontainers-ruby/blob/main/CODE_OF_CONDUCT.md).

data/lib/testcontainers/postgres/version.rb

@@ -2,6 +2,6 @@
 
 module Testcontainers
   module Postgres
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/lib/testcontainers/postgres.rb

@@ -5,7 +5,6 @@ require "uri"
 module Testcontainers
   # PostgresContainer class is used to manage containers that runs a PostgresQL database
   #
-  # @attr_reader [String] port used by the container
   # @attr_reader [String] username used by the container
   # @attr_reader [String] password used by the container
   # @attr_reader [String] database used by the container
@@ -20,7 +19,7 @@ module Testcontainers
     POSTGRES_DEFAULT_PASSWORD = "test"
     POSTGRES_DEFAULT_DATABASE = "test"
 
-    attr_reader :port, :username, :password, :database
+    attr_reader :username, :password, :database
 
     # Initializes a new instance of PostgresContainer
     #
@@ -33,21 +32,29 @@ module Testcontainers
     # @return [PostgresContainer] a new instance of PostgresContainer
     def initialize(image = POSTGRES_DEFAULT_IMAGE, username: nil, password: nil, database: nil, port: nil, **kwargs)
       super(image, **kwargs)
-      @port = port || ENV.fetch("POSTGRES_PORT", POSTGRES_DEFAULT_PORT)
       @username = username || ENV.fetch("POSTGRES_USER", POSTGRES_DEFAULT_USERNAME)
       @password = password || ENV.fetch("POSTGRES_PASSWORD", POSTGRES_DEFAULT_PASSWORD)
       @database = database || ENV.fetch("POSTGRES_DATABASE", POSTGRES_DEFAULT_DATABASE)
+      @healthcheck ||= add_healthcheck(_default_healthcheck_options)
+      @wait_for ||= add_wait_for(:healthcheck)
     end
 
     # Starts the container
     #
     # @return [PostgresContainer] self
     def start
-      with_exposed_ports(@port)
+      with_exposed_ports(port)
       _configure
       super
     end
 
+    # Returns the port used by the container
+    #
+    # @return [Integer] the port used by the container
+    def port
+      POSTGRES_DEFAULT_PORT
+    end
+
     # Returns the database url (e.g. postgres://user:password@host:port/database)
     #
     # @param protocol [String] the protocol to use in the string (default: "postgres")
@@ -103,5 +110,9 @@ module Testcontainers
       add_env("POSTGRES_PASSWORD", @password)
       add_env("POSTGRES_ROOT_PASSWORD", @password)
     end
+
+    def _default_healthcheck_options
+      {test: ["psql", "--port=#{port}", "--user=#{username}", "--dbname=#{database}", "--quiet", "-c", "\\l"], interval: 1, timeout: 5, retries: 5}
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testcontainers-postgres
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Pedro Piza
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-13 00:00:00.000000000 Z
+date: 2023-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: testcontainers-core
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -112,13 +112,13 @@ files:
 - Rakefile
 - lib/testcontainers/postgres.rb
 - lib/testcontainers/postgres/version.rb
-homepage: https://github.com/guilleiguaran/testcontainers-ruby
+homepage: https://github.com/testcontainers/testcontainers-ruby
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/guilleiguaran/testcontainers-ruby/blob/main/postgres
-  source_code_uri: https://github.com/guilleiguaran/testcontainers-ruby/blob/main/postgres
-  changelog_uri: https://github.com/guilleiguaran/testcontainers-ruby/blob/main/postgres/CHANGELOG.md
+  homepage_uri: https://github.com/testcontainers/testcontainers-ruby/blob/main/postgres
+  source_code_uri: https://github.com/testcontainers/testcontainers-ruby/blob/main/postgres
+  changelog_uri: https://github.com/testcontainers/testcontainers-ruby/blob/main/postgres/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths: