docker-compose 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e34ae573ca7de8849b4abec1d2a64e310d9aeb1
-  data.tar.gz: ba3fc1a5c2853685a53b4e197554aa549be1a25b
+  metadata.gz: 478beb29d6142fc515826e1aa6e14962dd7b35b9
+  data.tar.gz: 814a525fa49f283e11c88833e7c567045562aa3d
 SHA512:
-  metadata.gz: 7d20035a66e70117ef15c1e6de3b4462178add5f8b5f6d11d46aff985f05aa8e675443b588784e07a06d3b76779a25b33268cbb3441ec6519cd94bfa3cc8d5b6
-  data.tar.gz: c5f1e12aa81b3bf0921746de8c361226e30aaed310333a0441f79adeef7d7cfc2ea95c8a61e1aa2fca8bbff50d4da60697063fc0c035d92d822eaa7c3632f74e
+  metadata.gz: 27fbfc9b939b33b8a6c5435049342ab073c34c1ca80dae8b6ccaa139789286fe812d9c529029914f5d568bdfd92478a200e3e235f13ff0fd6b75b666e00179e2
+  data.tar.gz: c8a10bd86422094fad06353303c817c7d0633c5218dbd073cff769f93899bcc4a88626370f90ad7de7b312afe97a25836d2f4a98baa2b719d77f9c59b272b8e0

data/lib/docker/compose/container.rb

@@ -6,27 +6,30 @@ module Docker::Compose
     PS_FMT_LEN = PS_FMT.count('.')
     # Pattern that parses human-readable values from ps .Status
     PS_STATUS  = /^([A-Za-z]+) ?\(?([0-9]*)\)? ?(.*)$/i
+    # Pattern that parses FIRST occurrence of container size from a string,
+    # along with its units.
+    PS_SIZE = /^([0-9.]+)\s*([kmgt]?B)/i
 
     attr_reader :id, :image, :size, :status, :exitstatus
     attr_reader :names, :labels, :ports
 
     # @param [String] id
     # @param [String] image
-    # @param [String,Numeric] size
+    # @param [String,Integer] size e.g. "0B (virtual 100MB)"
     # @param [String,#map] status e.g. ['Exited', '0', '3 minutes ago']
     # @param [String,Array] names list of container names (CSV)
     # @param [String,Array] labels list of container labels (CSV)
     # @param [String,Array] ports list of exposed ports (CSV)
     def initialize(id, image, size, status, names, labels, ports)
-      if size.is_a?(String)
-        scalar, units = size.split(' ')
-        scalar = size[0].to_i # lazy: invalid --> 0
+      if size.is_a?(String) && (m = PS_SIZE.match(size))
+        scalar, units = m[1], m[2]
+        scalar = scalar.to_f # lazy: invalid --> 0.0
         mult = case units.downcase
         when 'b'  then 1
         when 'kb' then 1_024
-        when 'mb' then 1_024^2
-        when 'gb' then 1_024^3
-        when 'tb' then 1_024^4
+        when 'mb' then 1_024**2
+        when 'gb' then 1_024**3
+        when 'tb' then 1_024**4
         else
           raise Error.new('Service#new', units, 'Impossibly large unit')
         end
@@ -60,8 +63,8 @@ module Docker::Compose
     end
 
     # static sanity checking ftw!
-    unless ( initarity = instance_method(:initialize).arity ) == ( psfmtcnt = PS_FMT.count('.') )
-      raise LoadError.new("#{__FILE__}:#{__LINE__} - arity(\#initialize) != len(PS_FMT); #{initarity} != #{psfmtcnt}")
+    unless ( initarity = instance_method(:initialize).arity ) == PS_FMT_LEN
+      raise LoadError.new("#{__FILE__}:#{__LINE__} - arity(\#initialize) != PS_FMT_LEN; #{initarity} != #{PS_FMT_LEN}")
     end
 
     # @return [String]

data/lib/docker/compose/session.rb

@@ -288,8 +288,11 @@ module Docker::Compose
       str.gsub(ANSI, '')
     end
 
-    # parse values enclosed within parentheses; values may contain nested
-    # matching pairs of parentheses
+    # Parse a string that consists of a sequence of values enclosed within parentheses.
+    # Ignore any bytes that are outside of parentheses. Values may include nested parentheses.
+    #
+    # @param [String] str e.g. "(foo) ((bar)) ... (baz)"
+    # @return [Array] e.g. ["foo", "bar", "baz"]
     def parse(str)
       fields = []
       nest = 0
@@ -303,6 +306,7 @@ module Docker::Compose
         else
           if ch == '('
             nest += 1
+            field << ch
           elsif ch == ')'
             nest -= 1
             if nest == 0

data/lib/docker/compose/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Docker
   module Compose
-    VERSION = '1.1.4'
+    VERSION = '1.1.5'
   end
 end

metadata

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