docker-compose 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76d9302ebcd4e76f964dd3f7b85b65cfe6ab0f22
-  data.tar.gz: 0d62eabe174c7b93d7a80d120287550e48031457
+  metadata.gz: 29ab019002254403adcb4a1ac1eb8f0de9eae404
+  data.tar.gz: 3f811096eb9db88a6a258f7d1a3cd52aee1e7b5b
 SHA512:
-  metadata.gz: ea304f03ad24a904e99af6ce03241f4553cb05cef8876b508c641cc69e05ff7cf7b055dcb7e8ab599069736f3eb597933d97daa1c8915cdea73b0bf9bc40b102
-  data.tar.gz: ee9da68c8abe02a2430959bc238c4d79c456da0ae7c7089daf01e5f3db00049afa11f84e597cad3e53b77feae55b9686f00d4c46f1fdeabf0ea56d010cca1c4a
+  metadata.gz: 43a2569c8c2b64cda6c1f2d0296429a313220c83c8b4a44aef84e344e99cde89d4293b0386ed5623cd572fc59ec9af2b5c7a3a198f6bf24debcfbe1fe5bb8250
+  data.tar.gz: 8dacdec35378f7d22b9c681af9a9411b3617647d4627b54180159b9db0f7139e07f8aac1bca68488211516daff95f061b2d05ed76ae7663e6eb4d58708d177a3

data/docker-compose.yml

@@ -1,6 +1,11 @@
+# basic smoke test for the gem.
+# TODO: write cucumber features for comprehensive functional tests!
 apple:
   image: busybox
   command: /bin/sh -c 'sleep 3600'
+  ports:
+    - 123
+    - 456
 orange:
   image: busybox
   command: /bin/sh -c 'sleep 3600'

data/lib/docker/compose/container.rb

@@ -38,15 +38,22 @@ module Docker::Compose
         raise Error.new('Service#new', status, 'Unrecognized status') unless status
       end
 
-      names = names.split(',') if names.is_a?(String)
-      labels = labels.split(',') if labels.is_a?(String)
-      ports = ports.split(',') if ports.is_a?(String)
+      names = names.split(',').map{ |x| x.strip } if names.is_a?(String)
+      labels = labels.split(',').map{ |x| x.strip } if labels.is_a?(String)
+      ports = ports.split(',').map{ |x| x.strip } if ports.is_a?(String)
 
       @id = id
       @image = image
       @size = size
       @status = status[1].downcase.to_sym
-      @exitstatus = !status[2].empty? && status[2].to_i # sloppy!
+
+      @exitstatus = case @status
+      when :up
+        nil
+      else
+        status[2].to_i
+      end
+
       @names = names
       @labels = labels
       @ports = ports

data/lib/docker/compose/session.rb

@@ -45,7 +45,6 @@ module Docker::Compose
       inter = @shell.interactive
       @shell.interactive = false
 
-
       lines = run!('ps', q:true).split(/[\r\n]+/)
       containers = Collection.new
 
@@ -77,8 +76,8 @@ module Docker::Compose
       true
     end
 
-    def rm(*services, force:false, volumes:false, all:true)
-      run!('rm', { f: force, v: volumes, a: all }, services)
+    def rm(*services, force:false, volumes:false)
+      run!('rm', { f: force, v: volumes }, services)
     end
 
     # Idempotently run an arbitrary command with a service container.
@@ -88,13 +87,31 @@ module Docker::Compose
     #   otherwise, monitor logs in the foreground and shutdown on Ctrl+C
     # @param [Boolean] no_deps if true, just run specified services without
     #   running the services that they depend on
-    # @param [Array] env_vars a list of environment variables (see: -e flag)
+    # @param [Array] env a list of environment variables (see: -e flag)
+    # @param [Array] env_vars DEPRECATED alias for env kwarg
     # @param [Boolean] rm remove the container when done
     # @raise [Error] if command fails
-    def run(service, *cmd, detached:false, no_deps:false, env_vars:[], rm:false)
-      formated_vars = env_vars.map { |v| { e: v } }
+    def run(service, *cmd, detached:false, no_deps:false, env:[], env_vars:nil, rm:false)
+      # handle deprecated kwarg
+      if (env.nil? || env.empty?) && !env_vars.nil?
+        env = env_vars
+      end
+
+      env_params = env.map { |v| { e: v } }
       run!('run',
-           { d: detached, no_deps: no_deps, rm: rm }, *formated_vars, service, cmd)
+           { d: detached, no_deps: no_deps, rm: rm }, *env_params, service, cmd)
+    end
+
+    # Pause running services.
+    # @param [Array] services list of String service names to run
+    def pause(*services)
+      run!('pause', *services)
+    end
+
+    # Unpause running services.
+    # @param [Array] services list of String service names to run
+    def unpause(*services)
+      run!('unpause', *services)
     end
 
     # Stop running services.
@@ -105,6 +122,14 @@ module Docker::Compose
       run!('stop', { timeout: timeout }, services)
     end
 
+    # Forcibly stop running services.
+    # @param [Array] services list of String service names to stop
+    # @param [String] name of murderous signal to use, default is 'KILL'
+    # @see Signal.list for a list of acceptable signal names
+    def kill(*services, signal:'KILL')
+      run!('kill', { s: signal }, services)
+    end
+
     # Figure out which host a port a given service port has been published to.
     # @param [String] service name of service from docker-compose.yml
     # @param [Integer] port number of port

data/lib/docker/compose/version.rb

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

metadata

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