docker-compose 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f68e64a415d160c3d7dceb0ee8276efe6ed99698
-  data.tar.gz: 4c1ea3f627a72012c2141b289fd6e5094fcb6194
+  metadata.gz: a85e6cd467f9c5c4a6704724d9429a4f681d065a
+  data.tar.gz: a5f85af19b15c215b68a01e7004bf0c0cb05587e
 SHA512:
-  metadata.gz: 07fa36e16495693c7c1866728f3ee303c010ee5408ac50bc69048d36f1fdc13861483e30b8e69c842474ccc94dfd12768431d32d0335c351524d71e140a907f8
-  data.tar.gz: 708a6502e5a4b335f840418a140b0d41da2cc3434d3fdd71ba20f1ae3d50aec9df351ee6a14370fc91bec84f7f591d3165e10dee79185c8e245dd86cee74dfcc
+  metadata.gz: 1a9143db8626ea989d500c29a802c79b84c50ebd66674daf9bfff474f413353a9d3203bd1860d5dce3dbefa2301fc44521db597fd56b4cdf95d9ff295d11be57
+  data.tar.gz: f2f68bd762d659926ec4880423db394e75ef03ea72f7ee0cf7af65e06639be902f0f0d9819128f64d6dc8e4d56d06b5ceb05795ed3e800ac1383f23b3939947d

data/lib/docker/compose/mapper.rb

@@ -20,7 +20,19 @@ module Docker::Compose
     # @param [NetInfo] net_info
     # @yield yields with each substituted (key, value) pair
     def self.map(env, strict:true, session:Session.new, net_info:NetInfo.new)
-      mapper = self.new(session, net_info.docker_routable_ip, strict:strict)
+      # 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 = self.new(session, override_host, strict:strict)
       env.each_pair do |k, v|
         begin
           v = mapper.map(v)
@@ -33,15 +45,14 @@ module Docker::Compose
 
     # Create an instance of Mapper
     # @param [Docker::Compose::Session] session
-    # @param [String] docker_host DNS hostnrame or IPv4 address of the host
-    #   that is publishing Docker services (i.e. the `DOCKER_HOST` hostname or
-    #   IP if you are using a non-clustered Docker environment)
+    # @param [String] override_host forcible address or DNS hostname to use;
+    #   leave nil to trust docker-compose output.
     # @param [Boolean] strict if true, raise BadSubstitution when unrecognized
     #        syntax is passed to #map; if false, simply return unrecognized
     #        values without substituting anything
-    def initialize(session, docker_host, strict:true)
+    def initialize(session, override_host=nil, strict:true)
       @session = session
-      @docker_host = docker_host
+      @override_host = override_host
       @strict  = strict
     end
 
@@ -81,10 +92,12 @@ module Docker::Compose
     # "service not running" case and the "container port not published" case!
     #
     # @raise [NoService] if service is not up or does not publish port
-    # @return [Integer] host port number, or nil if port not published
-    def published_port(service, port)
-      result = @session.port(service, port)
-      Integer(result.split(':').last.gsub("\n", ""))
+    # @return [Array] (String, Integer) pair of host address and port number
+    def host_and_port(service, port)
+      result = @session.port(service, port).chomp
+      host, port = result.split(':')
+      host = @override_host if @override_host
+      [host, Integer(port)]
     rescue RuntimeError
       raise NoService, "Service '#{service}' not running, or does not publish port '#{port}'"
     end
@@ -99,27 +112,26 @@ module Docker::Compose
 
       if uri && uri.scheme && uri.host
         # absolute URI with scheme, authority, etc
-        uri.port = published_port(uri.host, uri.port)
-        uri.host = @docker_host
+        uri.host, uri.port = host_and_port(uri.host, uri.port)
         return uri.to_s
       elsif pair.size == 2
         # "host:port" pair; three sub-cases...
         if pair.first =~ ELIDED
           # output only the port
           service = pair.first.gsub(REMOVE_ELIDED, '')
-          port = published_port(service, pair.last)
+          _, port = host_and_port(service, pair.last)
           return port.to_s
         elsif pair.last =~ ELIDED
           # output only the hostname; resolve the port anyway to ensure that
           # the service is running.
           service = pair.first
           port = pair.last.gsub(REMOVE_ELIDED, '')
-          published_port(service, port)
-          return @docker_host
+          host, _ = host_and_port(service, port)
+          return host
         else
           # output port:hostname pair
-          port = published_port(pair.first, pair.last)
-          return "#{@docker_host}:#{port}"
+          host, port = host_and_port(pair.first, pair.last)
+          return "#{host}:#{port}"
         end
       elsif @strict
         raise BadSubstitution, "Can't understand '#{value}'"

data/lib/docker/compose/session.rb

@@ -1,4 +1,5 @@
 require 'backticks'
+require 'yaml'
 
 module Docker::Compose
   # A Ruby OOP interface to a docker-compose session. A session is bound to
@@ -22,6 +23,14 @@ module Docker::Compose
       @file = file
     end
 
+    # Validate docker-compose file and return it as Hash
+    # @return [Hash] the docker-compose config file
+    # @raise [Error] if command fails
+    def config(*args)
+      config = run!('config', *args)
+      YAML.load(config)
+    end
+
     # Monitor the logs of one or more containers.
     # @param [Array] services list of String service names to show logs for
     # @return [true] always returns true

data/lib/docker/compose/version.rb

@@ -1,5 +1,5 @@
 module Docker
   module Compose
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-compose
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Tony Spataro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backticks