docker-compose 1.0.0rc1 → 1.0.0rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 365d253ec8bea621b383762ab6d130991374aaef
-  data.tar.gz: 678be8f50dd021feffbf00e4c67eb0da5985321f
+  metadata.gz: 0ac6123a9b77b5d0ff6902f5e89467fd17ed34fe
+  data.tar.gz: 585201f65eb1fb6d654af2a484a09e2f8f27ba75
 SHA512:
-  metadata.gz: 42fe1651bc466fdcf4df95098ccc566b613d485f79b056f41eb3bc9a68c90cb1d5642bee1227e4ee7f4361106f7fef8071a7eacfe6994d5a93b25a3b5ed2c902
-  data.tar.gz: b096804ff73321e4efad1b29725feb4d2388068106f6f0a7d751c9e23236f4f8c6c06e32143c09959ef97cdc78b82ca9148c2ef8fe9bb35c1b35c86a75fdb42c
+  metadata.gz: 4517ccd9c0f2e9aef88e4c30a8fd653cc27cc3aa2b11759e191569a687ae03d8358c9d2db5dc8a74f24435add97ac7007121ab9a504804642438437c2f0b5e8d
+  data.tar.gz: 07c4f04f8417b07fa8b9dda91026c512186840b0cfb9ffed0d9ecfe2d8562b34a62948397004cf7f69c6a26c2c56bf73c1cc475edc4ca43fa758f8dd7eb1a17a

data/.coveralls.yml

@@ -0,0 +1 @@
+repo_token: hMWX6XPNvG4Gfy9gCDEvrxhQVKdyN5e2m

data/Gemfile

@@ -1,13 +1,16 @@
-# encoding: utf-8
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in docker-compose.gemspec
 gemspec
 
-gem 'backticks', path:'/Users/tony/Code/xeger/backticks'
+gem 'backticks', '1.0.0rc1'
 
 group :development do
   gem 'pry'
   gem 'pry-byebug'
   gem 'rubocop'
 end
+
+group :test do
+  gem 'coveralls', require: false
+end

data/README.md

@@ -1,14 +1,11 @@
-
-
-[![Build Status](https://travis-ci.org/xeger/docker-compose.svg)](https://travis-ci.org/xeger/docker-compose) [![Docs](https://img.shields.io/badge/docs-rubydoc-orange.svg)](http://www.rubydoc.info/gems/docker-compose)
-
+[![Build Status](https://travis-ci.org/xeger/docker-compose.svg)](https://travis-ci.org/xeger/docker-compose) [![Coverage Status](https://coveralls.io/repos/github/xeger/docker-compose/badge.svg?branch=coveralls)](https://coveralls.io/github/xeger/docker-compose?branch=coveralls) [![Docs](https://img.shields.io/badge/docs-rubydoc-blue.svg)](http://www.rubydoc.info/gems/docker-compose)
 
 # Docker::Compose
 
 This is a Ruby OOP wrapper for the [docker-compose](https://github.com/docker/compose)
-container orchestration tool from Docker Inc. 
+container orchestration tool from Docker Inc.
 
-In addition to wrapping the CLI, this gem provides an environment-variable mapping 
+In addition to wrapping the CLI, this gem provides an environment-variable mapping
 feature that allows you to export environment variables into your _host_ that point
 to network services exposed by containers. This allows you to run an application on
 your host for quicker and easier development, but run all of its dependencies --
@@ -54,7 +51,7 @@ exited = compose.ps.where { |c| !c.up? }
 puts "We have some exited containers: " + exited.join(', ')
 
 sum = compose.ps.inject(0) { |a,c| a + c.size }
-puts format("Composition is using %.1f MiB disk space", sum/1024.0**2) 
+puts format("Composition is using %.1f MiB disk space", sum/1024.0**2)
 ```
 
 ### Invoking from Rake
@@ -171,4 +168,3 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/xeger/
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/lib/docker/compose/mapper.rb

@@ -1,7 +1,16 @@
 # encoding: utf-8
 module Docker::Compose
   # Uses a Session to discover information about services' IP addresses and
-  # ports as reachable from the host, then
+  # ports as reachable from localhost, then maps URLs and other common network
+  # address formats so they point to the right host and port.
+  #
+  # **NOTE**: this class uses some heuristics to deal with cases where the
+  # Docker client is talking to a remote server because the `DOCKER_HOST`
+  # environment variable is set. In those cases, Mapper tries to determine
+  # the IP address of the exposed services as reachable from localhost;
+  # it generally makes a correct guess, but in certain super-complex networking
+  # scenarios it may guess wrong. Please open a GitHub issue if you find
+  # a situation where Mapper provides a wrong answer.
   class Mapper
     # Pattern that matches an "elided" host or port that should be omitted from
     # output, but is needed to identify a specific container and port.
@@ -16,23 +25,12 @@ module Docker::Compose
     # Instantiate a mapper; map some environment variables; yield to caller for
     # additional processing.
     #
+    # @param [Hash] env a set of keys/values whose values will be mapped
     # @param [Session] session
     # @param [NetInfo] net_info
     # @yield yields with each substituted (key, value) pair
     def self.map(env, session:Session.new, net_info:NetInfo.new)
-      # TODO: encapsulate this trickiness better ... inside NetInfo perhaps?
-      docker_host = ENV['DOCKER_HOST']
-      if docker_host.nil? || docker_host =~ /^(\/|unix|file)/
-        # If DOCKER_HOST is blank, or pointing to a local socket, then we
-        # can trust the address information returned by `docker-compose port`.
-        override_host = nil
-      else
-        # If DOCKER_HOST is present, assume that containers have bound to
-        # whatever IP we reach it at; don't fall victim to dirty NAT lies!
-        override_host = net_info.docker_routable_ip
-      end
-
-      mapper = new(session, override_host)
+      mapper = new(session, net_info)
       env.each_pair do |k, v|
         begin
           v = mapper.map(v)
@@ -44,10 +42,22 @@ module Docker::Compose
     end
 
     # Create an instance of Mapper
+    #
     # @param [Docker::Compose::Session] session
-    # @param [String] override_host forcible address or DNS hostname to use;
-    #   leave nil to trust docker-compose output.
-    def initialize(session, override_host = nil)
+    # @param [NetInfo] net_info
+    def initialize(session=Session.new, net_info=NetInfo.new)
+      docker_host = ENV['DOCKER_HOST']
+      if docker_host.nil? || docker_host =~ /^(\/|unix|file)/
+        # If DOCKER_HOST is blank, or pointing to a local socket, then we
+        # can trust the address information returned by `docker-compose port`.
+        override_host = nil
+      else
+        # If DOCKER_HOST is present, assume that containers have bound to
+        # whatever IP we reach it at; don't fall victim to docker-compose's
+        # dirty lies!
+        override_host = net_info.docker_routable_ip
+      end
+
       @session = session
       @override_host = override_host
     end

data/lib/docker/compose/net_info.rb

@@ -73,8 +73,8 @@ module Docker::Compose
         docker_dns = @docker_url.host
         docker_port = @docker_url.port || 2376
       else
-        # Cheap trick: for unix or other protocols, assume docker daemon
-        # is listening on 127.0.0.1:2376
+        # Cheap trick: for unix, file or other protocols, assume docker ports
+        # are proxied to localhost in addition to other interfaces
         docker_dns = 'localhost'
         docker_port = 2376
       end

data/lib/docker/compose/session.rb

@@ -140,15 +140,30 @@ module Docker::Compose
       run!('kill', o, services)
     end
 
-    # Figure out which host a port a given service port has been published to.
+    # Figure out which interface(s) and port a given service port has been published to.
+    #
+    # **NOTE**: if Docker Compose is communicating with a remote Docker host, this method
+    # returns IP addresses from the point of view of *that* host and its interfaces. If
+    # you need to know the address as reachable from localhost, you probably want to use
+    # `Mapper`.
+    #
+    # @see Docker::Compose::Mapper
+    #
     # @param [String] service name of service from docker-compose.yml
     # @param [Integer] port number of port
     # @param [String] protocol 'tcp' or 'udp'
     # @param [Integer] index of container (if multiple instances running)
+    # @return [String,nil] an ip:port pair such as "0.0.0.0:32176" or nil if the service is not running
     # @raise [Error] if command fails
     def port(service, port, protocol: 'tcp', index: 1)
+      inter = @shell.interactive
+      @shell.interactive = false
+
       o = opts(protocol: [protocol, 'tcp'], index: [index, 1])
-      run!('port', o, service, port)
+      s = run!('port', o, service, port).strip
+      (!s.empty? && s) || nil
+    ensure
+      @shell.interactive = inter
     end
 
     # Determine the installed version of docker-compose.

data/lib/docker/compose/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Docker
   module Compose
-    VERSION = '1.0.0rc1'
+    VERSION = '1.0.0rc2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-compose
 version: !ruby/object:Gem::Version
-  version: 1.0.0rc1
+  version: 1.0.0rc2
 platform: ruby
 authors:
 - Tony Spataro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-29 00:00:00.000000000 Z
+date: 2016-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backticks
@@ -74,6 +74,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".coveralls.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"