docker_compose_env 0.1.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 983f82e4fbf0cee9a569d69390a95e0a6ef2d39b07c7c2e235b6fc9a5a6a4f0e
-  data.tar.gz: 7173656c5aff94ef7943831a0b01cbfe79a0f9e4038ac544941ba9f6411bc9ff
+  metadata.gz: 868f40c79b116b7b4dbbcd10e94024a52b4d7f8d9b156a576aac44d6d8d49310
+  data.tar.gz: 6bf3bcecd5547acfa4661ef38705bcc8861d8dd5f67b8b946f54af9e5d133144
 SHA512:
-  metadata.gz: cdc507683f5ef3f601d8c4f3010abf7e489fa0ea7b110e86664f3c9ac5e4a2227b4c03a5ed17c2bcf84c6c8e728db08eabb6554096520b024750426845a1e45b
-  data.tar.gz: af2db94a97243e093278b3800e761946602672edd9671782b53e3575a1840e5ac6879984756863c32f85707e8fc32c3f1eef3496117ac6e3606a27bc7b9d6277
+  metadata.gz: 8fd76aed8ade95ead447f7d7d8090246a2affbbddf3905571ede9630b7cafc349e26a3e5ba835855660ef9baac8b6d119acd94fb78b754bcc0c9db64cafb5444
+  data.tar.gz: '088bf436417fed41901aa6100e35ac6ce222cc7c5f62e3ec70ae1a011be8ed6a67884db7f62eb64a125232d7a0b93175f657c53c7ea644f800d00cff3be180d5'

data/.tool-versions

@@ -1 +1 @@
-ruby 2.4.1
+ruby 2.7.2

data/.travis.yml

@@ -2,14 +2,14 @@ language: ruby
 sudo: required
 
 env:
-  - DOCKER_COMPOSE_VERSION=1.16.1
+  - DOCKER_COMPOSE_VERSION=1.27.4
 
 before_install:
   - docker version
   - docker-compose version
   - sudo apt-get update
   - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
-  - gem install bundler -v 1.15.4
+  - gem install bundler -v 2.1.4
   - sudo rm /usr/local/bin/docker-compose
   - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
   - chmod +x docker-compose
@@ -18,7 +18,7 @@ before_install:
   - docker-compose version
 
 rvm:
-  - 2.4.1
+  - 2.7.2
 
 services:
   - docker

data/CHANGELOG.md

@@ -5,6 +5,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+## [0.2.1] - 2020-12-03
+
+### Changed
+
+- Fix bug with Open3 not being required
+
+## [0.2.0] - 2020-11-21
+
+### Changed
+
+- Update ruby for development to 2.7.2
+- Bump rake version dependency for devlopment
+- Update to latest Bundler gem version on Travis CI
+- Use latest docker-compose version on Travis CI
+- No longer show message on stdout if docker-compose command is not found
+
 ## [0.1.2] - 2019-08-26
 
 ### Added
@@ -27,7 +43,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial version
 
-[unreleased]: https://github.com/CoffeeAndCode/docker_compose_env/compare/v0.1.2...HEAD
+[unreleased]: https://github.com/CoffeeAndCode/docker_compose_env/compare/v0.2.1...HEAD
+[0.2.1]: https://github.com/CoffeeAndCode/docker_compose_env/compare/v0.2.0...v0.2.1
+[0.2.0]: https://github.com/CoffeeAndCode/docker_compose_env/compare/v0.1.2...v0.2.0
 [0.1.2]: https://github.com/CoffeeAndCode/docker_compose_env/compare/v0.1.1...v0.1.2
 [0.1.1]: https://github.com/CoffeeAndCode/docker_compose_env/compare/v0.1.0...v0.1.1
 [0.1.0]: https://github.com/CoffeeAndCode/docker_compose_env/releases/tag/v0.1.0

data/docker_compose_env.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'reek'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'minitest', '~> 5.10'

data/lib/docker_compose_env/version.rb

@@ -1,3 +1,3 @@
 module DockerComposeEnv
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.2.1'.freeze
 end

data/lib/docker_compose_env.rb

@@ -1,19 +1,25 @@
 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 env["#{service_name.upcase}_HOST"].nil?
@@ -26,7 +32,10 @@ module DockerComposeEnv
           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
             if env["#{service_name.upcase}_HOST"].nil?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker_compose_env
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.1
 platform: ruby
 authors:
 - Jonathan Knapp
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-08-26 00:00:00.000000000 Z
+date: 2020-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: reek
   requirement: !ruby/object:Gem::Requirement
@@ -112,7 +112,7 @@ homepage: https://github.com/CoffeeAndCode/docker_compose_env
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -127,8 +127,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Simplify configuration between Docker Compose and Ruby/Rails apps in development.
 test_files: []