docker-compose 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b952c56ce5427a6d9ce38a1ad58ace5c5cf15d79
-  data.tar.gz: 0863c488fa6a6f6a46e6cd7c153c28339be08d24
+  metadata.gz: c5307fb75ebdc1b6f79b326c6d31ff1ba3e08e1d
+  data.tar.gz: 5df6cd398d2238151ad063545ba94a5f3a4d32f5
 SHA512:
-  metadata.gz: b533ef0d4fa4cdfa2672228fbf28da9dfa4495b666dd4ef356a79839d2c94fabbb106d05f0044d852ccd630a43092d1a12f30b671e02b23714ea781d93f1e594
-  data.tar.gz: 9cd0fd736c824ec0ebbebe9d9b22ae16f941f6ad1c6c0a3f372c124b1054c32e14f027016e0035e67c0f420b7ad35f5a7b7f0f7c430a022b1658e841dab05e90
+  metadata.gz: 0a17412a0364656f01e2ff5efe203d5a961f156ad09c699155e11255560d6c0fd2d600c5cbbb08fb5fdde688e71939940dbefcee0aaad472af7a99a7331da8e6
+  data.tar.gz: d7a046c4c39b75fe2fb5a3b69264324debc58571f5a72d090b54896c03ca40ce80017c27b15eb636bc3dae6f3f71f79c176ba201b4084c5651202e3a3304f589

data/lib/docker/compose/mapper.rb

@@ -20,7 +20,7 @@ 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.host_routable_ip, strict:strict)
+      mapper = self.new(session, net_info.docker_routable_ip, strict:strict)
       env.each_pair do |k, v|
         begin
           v = mapper.map(v)
@@ -33,15 +33,15 @@ module Docker::Compose
 
     # Create an instance of Mapper
     # @param [Docker::Compose::Session] session
-    # @param [String] host_ip 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] 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 [Boolean] strict if true, raise BadSubstitution when unrecognized
-    #        syntax is passed to #map; if false, simply return the value without
-    #        substituting anything
-    def initialize(session, host_ip, strict:true)
+    #        syntax is passed to #map; if false, simply return unrecognized
+    #        values without substituting anything
+    def initialize(session, docker_host, strict:true)
       @session = session
-      @host_ip = host_ip
+      @docker_host = docker_host
       @strict  = strict
     end
 
@@ -70,7 +70,7 @@ 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 = @host_ip
+        uri.host = @docker_host
         return uri.to_s
       elsif pair.size == 2
         # "host:port" pair; three sub-cases...
@@ -85,11 +85,11 @@ module Docker::Compose
           service = pair.first
           port = pair.last.gsub(REMOVE_ELIDED, '')
           published_port(service, port)
-          return @host_ip
+          return @docker_host
         else
           # output port:hostname pair
           port = published_port(pair.first, pair.last)
-          return "#{@host_ip}:#{port}"
+          return "#{@docker_host}:#{port}"
         end
       elsif @strict
         raise BadSubstitution, "Can't understand '#{value}'"

data/lib/docker/compose/version.rb

@@ -1,5 +1,5 @@
 module Docker
   module Compose
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-compose
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Tony Spataro