docker-compose 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78490b9c376e57d362db13f54f4c5d93bd6f20af
-  data.tar.gz: 39a3bc062b31eb381e83cb596dfa1c19c2156b4f
+  metadata.gz: b9be484af8c4f5250961c4df03f04aaceebd7fd2
+  data.tar.gz: a16663183f5a512c9344ad2110fba19179f1a339
 SHA512:
-  metadata.gz: b58bd253248787fa1a5b0d21b4f3840678e8b81f867d57bf81ef5d4031385678f49505a21b5ae4e51f41cec2610203bfe0f8dc958e3832117433e83ef66fc0ce
-  data.tar.gz: 68b1f9549d04957745cd9319abdd9083c4021470caf3267471e8a8abc7d9252653c57590d8a3b5d912711165e15e18fb2152e79fc2fb977a18b909226c4e1a78
+  metadata.gz: b6eb3ed59f86318bbced3d41196924d7c1588f65d367dbbc4f9bd03d4b9524a53d599ba34b142e0b2c779cb94b74c0ecd8657bcfec8d77f43c67872b9e303997
+  data.tar.gz: 8998e342c4af0c810c073cd49dab423e451ad95ed9471e58c4687181a3a59f5e50227ee6a118bbba367584fa8c5d053f59697e369101772644ce413378958fdf

data/lib/docker/compose/session.rb

@@ -15,6 +15,9 @@ module Docker::Compose
   # allowed by the docker-compose CLI, and that options are sometimes renamed
   # for clarity, e.g. the "-d" flag always becomes the "detached:" kwarg.
   class Session
+    # A Regex that matches all ANSI escape sequences.
+    ANSI = /\033\[([0-9];?)+[a-z]/
+
     # Working directory (determines compose project name); default is Dir.pwd
     attr_reader :dir
 
@@ -53,7 +56,7 @@ module Docker::Compose
       containers = Collection.new
 
       lines.each do |id|
-        containers << docker_ps(id)
+        containers << docker_ps(strip_ansi(id))
       end
 
       containers
@@ -171,7 +174,7 @@ module Docker::Compose
       @shell.interactive = false
 
       o = opts(protocol: [protocol, 'tcp'], index: [index, 1])
-      s = run!('port', o, service, port).strip
+      s = strip_ansi(run!('port', o, service, port).strip)
       (!s.empty? && s) || nil
     ensure
       @shell.interactive = inter
@@ -241,16 +244,17 @@ module Docker::Compose
     def docker_ps(id)
       cmd = @shell.run('docker', 'ps', a: true, f: "id=#{id}", format: Container::PS_FMT).join
       status, out, err = cmd.status, cmd.captured_output, cmd.captured_error
-      raise Error.new('docker ps', status, "Unexpected output") unless status.success?
+      raise Error.new('docker ps', status, out+err) unless status.success?
       lines = out.split(/[\r\n]+/)
       return nil if lines.empty?
-      l = lines.shift
+      l = strip_ansi(lines.shift)
       m = parse(l)
       raise Error.new('docker ps', status, "Cannot parse output: '#{l}'") unless m
+      raise Error.new('docker ps', status, "Cannot parse output: '#{l}'") unless m.size == 7
       return Container.new(*m)
     end
 
-    # strip default-values options. the value of each kw should be a pair:
+    # strip default-valued options. the value of each kw should be a pair:
     #  [0] is present value
     #  [1] is default value
     def opts(**kws)
@@ -261,6 +265,11 @@ module Docker::Compose
       res
     end
 
+    # strip all ANSI escape sequences from str
+    def strip_ansi(str)
+      str.gsub(ANSI, '')
+    end
+
     # parse values enclosed within parentheses; values may contain nested
     # matching pairs of parentheses
     def parse(str)

data/lib/docker/compose/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-compose
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Tony Spataro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-15 00:00:00.000000000 Z
+date: 2017-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backticks