docker-compose 1.1.10 → 1.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bb93cb726412ee4fe63d98785a8ca806d719bbd8
-  data.tar.gz: 4aaffbc9c273d60be1ea5d17662647be07a0b6fe
+SHA256:
+  metadata.gz: e6262f4b5327a6262a8ce2444095d7e8ef3d146d1c51a8274bfd630316283319
+  data.tar.gz: 1c55d47ce905b4bd05e107c14e5526aa4639eea8855e9fe570b55baacc5db078
 SHA512:
-  metadata.gz: a0c816f8753a9d62abba91abe4ed358b4702b7bfdbede8c6025ad6752aa51829887c6b616111e7eac0d279ea0f2fe228e19fb2456a6b1555271492ad5aa48626
-  data.tar.gz: fec6a8d2b260ced3635d3b3faa61cee28b91b2f3c770ca7018479dcab7759a9acb0f1eb9c789dc1b71b0fa0a05089e709f189213363b2397c31d84cd9c9f953b
+  metadata.gz: e32beed052983ef9da71bc0e2fbb34cdf7f91933f4a711f2afe601087832e449d2a09ca487534d2e23f2206eb5e2c3d49baccceb1d421347037d3afa6fbb0a7b
+  data.tar.gz: ce78f94fd2d0a4c6a35f39edfe6d4a93423df3126036ee4bd16d037d5b26f403e2b5609cc0c408858ec3cc4bd4e1acc8dc2853b469bea7cdff16a6db712b6feb

data/.rubocop.yml

@@ -2,22 +2,25 @@
 #  - any cop that can be auto-corrected with `rubocop -a` is mandatory
 #  - other cops may be enabled if committer fixes all issues
 AllCops:
+  NewCops: enable
   Exclude:
-  - features/**/*
-  - spec/**/*
+    - features/**/*
+    - spec/**/*
 Style/Encoding:
   Enabled: true
 Style/FormatString:
   Enabled: false
 Style/GuardClause:
   Enabled: false
+Layout/LineLength:
+  Enabled: false
 Lint/AmbiguousRegexpLiteral:
   Enabled: false
 Metrics/AbcSize:
   Enabled: false
-Metrics/ClassLength:
+Metrics/BlockLength:
   Enabled: false
-Metrics/LineLength:
+Metrics/ClassLength:
   Enabled: false
 Metrics/MethodLength:
   Enabled: false

data/.ruby-version

@@ -1,2 +1 @@
-2.3.3
-
+3.0.0

data/.travis.yml

@@ -3,4 +3,6 @@ rvm:
   - 2.0
   - 2.1
   - 2.3.1
+  - 2.7.1
+  - 3.0.0
 before_install: gem install bundler -v 1.10.6

data/Gemfile

@@ -7,6 +7,8 @@ group :development do
   gem 'pry'
   gem 'pry-byebug'
   gem 'rubocop'
+  gem 'rubocop-rake'
+  gem 'rubocop-rspec'
 end
 
 group :test do

data/docker-compose.gemspec

@@ -19,11 +19,11 @@ 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.0', '< 4.0')
 
   spec.add_dependency 'backticks', '~> 1.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.10'
+  spec.add_development_dependency 'bundler', '~> 2.3'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec'
 end

data/lib/docker/compose/rake_tasks.rb

@@ -17,6 +17,10 @@ module Docker::Compose
     # @return [String]
     attr_accessor :dir
 
+    # Set the project name. Default is not to pass a custom name.
+    # @return [String]
+    attr_accessor :project_name
+
     # Set the name of the docker-compose file. Default is`docker-compose.yml`.
     # @return [String]
     attr_accessor :file
@@ -57,6 +61,7 @@ module Docker::Compose
     # can be configured by calling #server_env=, #file= and so forth.
     def initialize
       self.dir = Rake.application.original_dir
+      self.project_name = nil
       self.file = 'docker-compose.yml'
       self.host_env = {}
       self.extra_host_env = {}
@@ -64,7 +69,7 @@ module Docker::Compose
       yield self if block_given?
 
       @shell = Backticks::Runner.new
-      @session = Docker::Compose::Session.new(@shell, dir: dir, file: file)
+      @session = Docker::Compose::Session.new(@shell, dir: dir, project_name: project_name, file: file)
       @net_info = Docker::Compose::NetInfo.new
       @shell_printer = Docker::Compose::ShellPrinter.new
 
@@ -80,7 +85,7 @@ module Docker::Compose
           @shell.interactive = false # suppress useless 'port' output
 
           tty = STDOUT.tty?
-          tlt = Rake.application.top_level_tasks.include?('docker:compose:env')
+          tlt = Rake.application.top_level_tasks.include?(task_name('env'))
 
           # user invoked this task directly; print some helpful tips on
           # how we intend it to be used.
@@ -92,7 +97,7 @@ module Docker::Compose
         end
 
         desc 'Run command on host, linked to services in containers'
-        task :host, [:command] => ['docker:compose:env'] do |_task, args|
+        task :host, [:command] => [task_name('env')] do |_task, args|
           if host_services
             @session.up(*host_services, detached: true)
           else
@@ -151,11 +156,16 @@ module Docker::Compose
     private :print_env
 
     def print_usage
-      command = "rake #{rake_namespace}:env"
+      command = "rake #{task_name('env')}"
       command = 'bundle exec ' + command if defined?(Bundler)
       puts @shell_printer.comment('To export these variables to your shell, run:')
       puts @shell_printer.comment(@shell_printer.eval_output(command))
     end
     private :print_usage
+
+    def task_name(task)
+      [rake_namespace, task].join(':')
+    end
+    private :task_name
   end
 end

data/lib/docker/compose/session.rb

@@ -21,14 +21,22 @@ module Docker::Compose
     # Working directory (determines compose project name); default is Dir.pwd
     attr_reader :dir
 
+    # Project name; default is not to pass a custom name
+    attr_reader :project_name
+
     # Project file; default is 'docker-compose.yml'
     attr_reader :file
 
+    # Reference to the last executed command.
+    attr_reader :last_command
+
     def initialize(shell = Backticks::Runner.new(buffered: [:stderr], interactive: true),
-                   dir: Dir.pwd, file: 'docker-compose.yml')
+                   dir: Dir.pwd, project_name: nil, file: 'docker-compose.yml')
       @shell = shell
+      @project_name = project_name
       @dir = dir
       @file = file
+      @last_command = nil
     end
 
     # Validate docker-compose file and return it as Hash
@@ -133,8 +141,8 @@ module Docker::Compose
     # @param [Boolean] no_tty disable pseudo-tty allocation (see: -T flag)
     # @param [String] user run as specified username or uid (see: -u flag)
     # @raise [Error] if command fails
-    def run(service, *cmd, detached: false, no_deps: false, volumes: [], env: [], rm: false, no_tty: false, user: nil)
-      o = opts(d: [detached, false], no_deps: [no_deps, false], rm: [rm, false], T: [no_tty, false], u: [user, nil])
+    def run(service, *cmd, detached: false, no_deps: false, volumes: [], env: [], rm: false, no_tty: false, user: nil, service_ports: false)
+      o = opts(d: [detached, false], no_deps: [no_deps, false], rm: [rm, false], T: [no_tty, false], u: [user, nil], service_ports: [service_ports, false])
       env_params = env.map { |v| { e: v } }
       volume_params = volumes.map { |v| { v: v } }
       run!('run', o, *env_params, *volume_params, service, cmd)
@@ -246,6 +254,11 @@ module Docker::Compose
     # @return [String] output of the command
     # @raise [Error] if command fails
     def run!(*args)
+      project_name_args = if @project_name
+        [{ project_name: @project_name }]
+      else
+        []
+      end
       file_args = case @file
       when 'docker-compose.yml'
         []
@@ -259,10 +272,10 @@ module Docker::Compose
       end
 
       @shell.chdir = dir
-      cmd = @shell.run('docker-compose', *file_args, *args).join
-      status = cmd.status
-      out = cmd.captured_output
-      err = cmd.captured_error
+      @last_command = @shell.run('docker-compose', *project_name_args, *file_args, *args).join
+      status = @last_command.status
+      out = @last_command.captured_output
+      err = @last_command.captured_error
       status.success? || fail(Error.new(args.first, status, out+err))
       out
     end
@@ -270,7 +283,7 @@ module Docker::Compose
     private
 
     def docker_ps(id)
-      cmd = @shell.run('docker', 'ps', a: true, f: "id=#{id}", format: Container::PS_FMT).join
+      cmd = @shell.run('docker', 'ps', a: true, f: "id=#{id}", no_trunc: true, format: Container::PS_FMT).join
       status, out, err = cmd.status, cmd.captured_output, cmd.captured_error
       raise Error.new('docker ps', status, out+err) unless status.success?
       lines = out.split(/[\r\n]+/)

data/lib/docker/compose/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-compose
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 1.1.13
 platform: ruby
 authors:
 - Tony Spataro
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-11-08 00:00:00.000000000 Z
+date: 2022-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backticks
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -106,24 +106,26 @@ homepage: https://github.com/xeger/docker-compose
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.0'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Wrapper docker-compose with added Rake smarts.
 test_files: []