dip 7.1.1 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e42a461aef491ba31638884320252a28f891416510128a0dee140d8c8b3e8a8
-  data.tar.gz: 836d775a9c88f2df8bc807207710f84b39502b4e1f7e19747cf4f231fb3e7b06
+  metadata.gz: 737530a0e1bcc0319fdd15a9f5a1cd21f5d5fe5283ed6e6811b322797608bbff
+  data.tar.gz: 246fd6ef9d149b08cbe260ca9d22247824029af5c018b525460c68cffdf8c104
 SHA512:
-  metadata.gz: 88e61d6a5dfe78dd7dba7f1993ea8260f991fabc1921c144157dd4778bf1ccd4839472436327548d12b29222437bcfc08588f25a94e724fc74701b3a81c2d904
-  data.tar.gz: 564e4cc1f1fe2aa824b9ca061a0e7a446074faeadb24ee620192cc53bcb3f7fab0cdf3d4849611ee963f7a0d3700089bc1932911096f740212165420b45e452d
+  metadata.gz: 54cf7a9194457a328326b4d43cef583c3baedfd880f3679fd2e6c2699b728b48f5017f238a957ab9c799145e790146695f15c5e4abd4ae0a1860ff58e177ead6
+  data.tar.gz: 69295132d41712bda09979dea08e504eae8d55805639c940545586bc8f4544e1963d36472cddc2e933758ecefa8783c468b8dcc6c3737ef4a82e7c2a6b313013

data/README.md

@@ -47,7 +47,7 @@ When we change the current directory, all shell aliases will be automatically re
 
 Also, in shell mode Dip is trying to determine manually passed environment variables. For example:
 
-```shhttps://ya-webdesign.com/images250_/vertical-divider-png-1.pnghttps://ya-webdesign.com/images250_/vertical-divider-png-1.png
+```sh
 VERSION=20180515103400 rails db:migrate:down
 ```
 
@@ -201,6 +201,8 @@ returned is `/app/sub-project-dir`.
 
 Run commands defined within the `interaction` section of dip.yml
 
+By default, a command will be executed using [`docker compose`](https://docs.docker.com/compose/install/) command. If you are still using `docker-compose` binary (i.e., prior to Compose V2 changes), a command would be run through it. You can disable using of Compose V2 by passing an environment variable `DIP_COMPOSE_V2=false dip run`.
+
 ```sh
 dip run rails c
 dip run rake db:migrate
@@ -298,8 +300,6 @@ Runs Nginx server container based on [bibendi/nginx-proxy](https://github.com/bi
 foo-project/docker-compose.yml
 
 ```yml
-version: '2'
-
 services:
   foo-web:
     image: company/foo_image
@@ -320,8 +320,6 @@ networks:
 baz-project/docker-compose.yml
 
 ```yml
-version: '2'
-
 services:
   baz-web:
     image: company/baz_image

data/lib/dip/commands/compose.rb

@@ -23,7 +23,11 @@ module Dip
 
         compose_argv = Array(find_files) + Array(cli_options) + argv
 
-        exec_program("docker-compose", compose_argv, shell: shell)
+        if compose_v2?
+          exec_program("docker", compose_argv.unshift("compose"), shell: shell)
+        else
+          exec_program("docker-compose", compose_argv, shell: shell)
+        end
       end
 
       private
@@ -39,7 +43,7 @@ module Dip
             next unless file_path.exist?
 
             memo << "--file"
-            memo << file_path.to_s
+            memo << Shellwords.escape(file_path.to_s)
           end
         end
       end
@@ -68,6 +72,14 @@ module Dip
           ip.empty? ? DOCKER_EMBEDDED_DNS : ip
         end
       end
+
+      def compose_v2?
+        if %w[false no 0].include?(Dip.env["DIP_COMPOSE_V2"]) || Dip.test?
+          return false
+        end
+
+        !!exec_subprocess("docker", "compose version", panic: false, out: File::NULL, err: File::NULL)
+      end
     end
   end
 end

data/lib/dip/commands/run.rb

@@ -78,7 +78,11 @@ module Dip
 
       def get_args
         if argv.any?
-          argv
+          if command[:shell]
+            [argv.shelljoin]
+          else
+            Array(argv)
+          end
         elsif !(default_args = command[:default_args]).empty?
           if command[:shell]
             default_args.shellsplit

data/lib/dip/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dip
-  VERSION = "7.1.1"
+  VERSION = "7.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dip
 version: !ruby/object:Gem::Version
-  version: 7.1.1
+  version: 7.2.0
 platform: ruby
 authors:
 - bibendi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-17 00:00:00.000000000 Z
+date: 2021-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -19,7 +19,7 @@ dependencies:
         version: '0.20'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '0.20'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement