docker-compose 1.0.0rc2 → 1.0.0rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ac6123a9b77b5d0ff6902f5e89467fd17ed34fe
-  data.tar.gz: 585201f65eb1fb6d654af2a484a09e2f8f27ba75
+  metadata.gz: 5f54bf97c62e651b2fafd4c8983891c4432f765d
+  data.tar.gz: f71754cf9158c49496842855919ff21b6888bd63
 SHA512:
-  metadata.gz: 4517ccd9c0f2e9aef88e4c30a8fd653cc27cc3aa2b11759e191569a687ae03d8358c9d2db5dc8a74f24435add97ac7007121ab9a504804642438437c2f0b5e8d
-  data.tar.gz: 07c4f04f8417b07fa8b9dda91026c512186840b0cfb9ffed0d9ecfe2d8562b34a62948397004cf7f69c6a26c2c56bf73c1cc475edc4ca43fa758f8dd7eb1a17a
+  metadata.gz: 32a4092bfa5f11f01f2444f2e7911b5a5d86883d7caafbaff3fcd1ceb2e345620ffe07faefcec4f7bbde9061187d4968799d6268ae7bad4b0e1fe8ac477b784c
+  data.tar.gz: a91add327817914365a8e5bb5d4c66398a0f2e1aed87ad03dd4754af7d9f508b0ead4ab89ff180d47bb9321087824e9cdfd7358818aa382a29167102ddc6e7b8

data/.ruby-version

@@ -1 +1,2 @@
-2.2.2
+2.3.1
+

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
-  - 2.0
+  - 2.1
+  - 2.3.1
 before_install: gem install bundler -v 1.10.6

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in docker-compose.gemspec
 gemspec
 
-gem 'backticks', '1.0.0rc1'
+gem 'backticks', '1.0.0rc2'
 
 group :development do
   gem 'pry'

data/docker-compose.gemspec

@@ -19,9 +19,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = Gem::Requirement.new("~> 2.0")
+  spec.required_ruby_version = Gem::Requirement.new('~> 2.1')
 
-  spec.add_dependency 'backticks', '>= 1.0.0rc1'
+  spec.add_dependency 'backticks', '>= 1.0.0rc2'
 
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/docker/compose/error.rb

@@ -10,7 +10,7 @@ module Docker::Compose
       @status = status
       @detail = detail
 
-      brief = detail.split("\n").first || '(no output)'
+      brief = detail.split(/[\r\n]+/).select { |l| !l.empty? }.first || '(no output)'
 
       case status
       when Numeric

data/lib/docker/compose/mapper.rb

@@ -100,12 +100,19 @@ module Docker::Compose
     # @raise [NoService] if service is not up or does not publish port
     # @return [Array] (String, Integer) pair of host address and port number
     def host_and_port(service, port)
-      result = @session.port(service, port).chomp
+      result = @session.port(service, port)
+      if result
+        result.chomp!
+      else
+        raise NoService,
+              "Service '#{service}' not running, or does not " \
+              "publish port '#{port}'"
+      end
+
       host, port = result.split(':')
       host = @override_host if @override_host
+
       [host, Integer(port)]
-    rescue RuntimeError, TypeError
-      raise NoService, "Service '#{service}' not running, or does not publish port '#{port}'"
     end
 
     private

data/lib/docker/compose/session.rb

@@ -15,7 +15,11 @@ 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
-    attr_reader :dir, :file
+    # Working directory (determines compose project name); default is Dir.pwd
+    attr_reader :dir
+
+    # Project file; default is 'docker-compose.yml'
+    attr_reader :file
 
     def initialize(shell = Backticks::Runner.new(buffered: [:stderr], interactive: true),
                    dir: Dir.pwd, file: 'docker-compose.yml')
@@ -110,6 +114,11 @@ module Docker::Compose
       run!('run', o, *env_params, service, cmd)
     end
 
+    def restart(*services, timeout:10)
+      o = opts(timeout: [timeout, 10])
+      run!('restart', o, *services)
+    end
+
     # Pause running services.
     # @param [Array] services list of String service names to run
     def pause(*services)
@@ -216,14 +225,13 @@ module Docker::Compose
         [{ file: @file.to_s }]
       end
 
-      Dir.chdir(@dir) do
-        cmd = @shell.run('docker-compose', *file_args, *args).join
-        status = cmd.status
-        out = cmd.captured_output
-        err = cmd.captured_error
-        status.success? || fail(Error.new(args.first, status, err))
-        out
-      end
+      @shell.chdir = dir
+      cmd = @shell.run('docker-compose', *file_args, *args).join
+      status = cmd.status
+      out = cmd.captured_output
+      err = cmd.captured_error
+      status.success? || fail(Error.new(args.first, status, out+err))
+      out
     end
 
     private

data/lib/docker/compose/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Docker
   module Compose
-    VERSION = '1.0.0rc2'
+    VERSION = '1.0.0rc3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-compose
 version: !ruby/object:Gem::Version
-  version: 1.0.0rc2
+  version: 1.0.0rc3
 platform: ruby
 authors:
 - Tony Spataro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2016-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backticks
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0rc1
+        version: 1.0.0rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0rc1
+        version: 1.0.0rc2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Wrapper docker-compose with added Rake smarts.