docker_compose_env 0.1.2 → 1.0.0

data/lib/docker_compose_env.rb

@@ -1,40 +1,50 @@
 require 'docker_compose_env/version'
+require 'open3'
 require 'yaml'
 
 # The main module for DockerComposeEnv, this provides a single "easy mode"
 # method for setting up the environment.
 module DockerComposeEnv
-  def self.setup!(env: ENV, file: 'docker-compose.yml')
+  def self.setup!(env: ENV, file: 'docker-compose.yml', process_env: {})
     config = YAML.safe_load(File.read(file))
 
     config.fetch('services', {}).keys.each do |service_name|
       (config['services'][service_name]['ports'] || []).each do |container_port|
+        compose_port_info = nil
+
         if /(\d+)\/udp$/ =~ container_port
           parsed_port = /(?<port>\d+)\/udp$/.match(container_port).named_captures['port']
 
           command = "docker-compose --file=#{file} port --protocol=udp #{service_name} #{parsed_port}"
-          compose_port_info = `#{command}`
+          Open3.popen3(process_env, command) do |stdin, stdout, stderr, wait_thr|
+            compose_port_info = stdout.read
+            wait_thr.value
+          end
 
-          if (compose_port_info =~ /^0\.0\.0\.0\:\d+\s*$/) == 0
+          if (compose_port_info =~ /^(0\.0\.0\.0\:)?\d+\s*$/) == 0
             if env["#{service_name.upcase}_HOST"].nil?
               env["#{service_name.upcase}_HOST"] = '0.0.0.0'
             end
 
             if env["#{service_name.upcase}_PORT_#{parsed_port}_UDP"].nil?
-              env["#{service_name.upcase}_PORT_#{parsed_port}_UDP"] = compose_port_info.gsub(/0\.0\.0\.0:(\d+)\s*/, '\1')
+              env["#{service_name.upcase}_PORT_#{parsed_port}_UDP"] = compose_port_info.gsub('0.0.0.0:', '').gsub(/(\d+)\s*/, '\1')
             end
           end
         else
           command = "docker-compose --file=#{file} port #{service_name} #{container_port}"
-          compose_port_info = `#{command}`
+          Open3.popen3(process_env, command) do |stdin, stdout, stderr, wait_thr|
+            compose_port_info = stdout.read
+            wait_thr.value
+          end
 
-          if (compose_port_info =~ /^0\.0\.0\.0\:\d+\s*$/) == 0
+          # podman-compose appears to return as "44577\n" w/out 0.0.0.0:44577
+          if (compose_port_info =~ /^(0\.0\.0\.0\:)?\d+\s*$/) == 0
             if env["#{service_name.upcase}_HOST"].nil?
               env["#{service_name.upcase}_HOST"] = '0.0.0.0'
             end
 
             if env["#{service_name.upcase}_PORT_#{container_port}"].nil?
-              env["#{service_name.upcase}_PORT_#{container_port}"] = compose_port_info.gsub(/0\.0\.0\.0:(\d+)\s*/, '\1')
+              env["#{service_name.upcase}_PORT_#{container_port}"] = compose_port_info.gsub('0.0.0.0', '').gsub(/(\d+)\s*/, '\1')
             end
           end
         end

metadata

@@ -1,43 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: docker_compose_env
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Jonathan Knapp
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-26 00:00:00.000000000 Z
+date: 1980-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: reek
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +69,16 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '0'
 description: Simplify configuration between Docker Compose and Ruby/Rails apps in
   development.
 email:
@@ -88,12 +87,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".envrc"
 - ".gitignore"
 - ".rubocop.yml"
 - ".tool-versions"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -103,6 +104,9 @@ files:
 - docker_compose_env.gemspec
 - docker_compose_env_rails.gemspec
 - docs/why.md
+- flake.lock
+- flake.nix
+- gemset.nix
 - lib/docker_compose_env.rb
 - lib/docker_compose_env/now.rb
 - lib/docker_compose_env/railtie.rb
@@ -112,7 +116,6 @@ homepage: https://github.com/CoffeeAndCode/docker_compose_env
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -127,8 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Simplify configuration between Docker Compose and Ruby/Rails apps in development.
 test_files: []