dip 7.0.1 → 7.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6effe7d3575e71e95f9e4ec3d61fe016cf55691c1adaa96a0e75ab1e04e894f
-  data.tar.gz: 7f4f7ca8bded48c8b7abb7979148b9deb77d8f2e2b15493c8cc8831a4600c49f
+  metadata.gz: 42ac21bbebf1b0ad111a5bc783a9a539ad9b27bf6ef46b6e64fb3a6109f87005
+  data.tar.gz: 8988eb2450aaa51ddfacc05749405fdc1879da5f622bc130fb8d4a64af0b7359
 SHA512:
-  metadata.gz: 8a2d4acb5cac37f00a2dcb3132ca034fb9b8121c1d2d0b816a4b37a565b631afdc12b73a2701cd115389d56efb60d4241fe55253e5b59c122dce364b174b8a06
-  data.tar.gz: ca168782f5af0500f4352631dd56237543b3c685b8b3d40819c240b58ec62c075ee01e5fd211c506855875e8c32e33c4afaf0df1f3131bbef2c98aa126fff518
+  metadata.gz: f9f6c9e006584fa20d7d42b4586b8b35a5908aa8f1587f4ca506cb42445b786db5a569033af8f466606db015c681458b6f961221afef360d0b7558cf941fa631
+  data.tar.gz: f77739aa2ffc4c245630732c88f2264a4c83421d1dc8b83807776d8c2eac507b991743aa3e482a117edcfc0424deb3e4a93785e69c9a46e47fb8d08db2fa28a9

data/README.md

@@ -81,7 +81,7 @@ Also, you can check out examples at the top.
 
 ```yml
 # Required minimum dip version
-version: '7.0'
+version: '7.1'
 
 environment:
   COMPOSE_EXT: development
@@ -142,6 +142,12 @@ interaction:
     default_args: db_dev
     command: psql -h pg -U postgres
 
+  setup_key:
+    description: Copy key
+    service: app
+    command: cp `pwd`/config/key.pem /root/keys/
+    shell: false # you can disable shell interpolations on the host machine and send the command as is
+
   clean_cache:
     description: Delete cache files on the host machine
     command: rm -rf $(pwd)/tmp/cache/*
@@ -292,8 +298,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
@@ -314,8 +318,6 @@ networks:
 baz-project/docker-compose.yml
 
 ```yml
-version: '2'
-
 services:
   baz-web:
     image: company/baz_image

data/lib/dip/cli.rb

@@ -111,7 +111,7 @@ module Dip
     subcommand :nginx, Dip::CLI::Nginx
 
     require_relative "cli/console"
-    desc "console", "Integrate Dip commands into shell (only ZSH and Bash is supported)"
+    desc "console", "Integrate Dip commands into shell (only ZSH and Bash are supported)"
     subcommand :console, Dip::CLI::Console
   end
 end

data/lib/dip/command.rb

@@ -6,38 +6,47 @@ module Dip
   class Command
     extend Forwardable
 
-    def_delegators self, :shell, :subshell
+    def_delegators self, :exec_program, :exec_subprocess
 
-    class ExecRunner
+    class ProgramRunner
       def self.call(cmdline, env: {}, **options)
-        ::Process.exec(env, cmdline, options)
+        if cmdline.is_a?(Array)
+          ::Kernel.exec(env, cmdline[0], *cmdline[1..-1], **options)
+        else
+          ::Kernel.exec(env, cmdline, **options)
+        end
       end
     end
 
-    class SubshellRunner
+    class SubprocessRunner
       def self.call(cmdline, env: {}, panic: true, **options)
-        return if ::Kernel.system(env, cmdline, options)
+        return if ::Kernel.system(env, cmdline, **options)
         raise Dip::Error, "Command '#{cmdline}' executed with error." if panic
       end
     end
 
     class << self
-      def shell(cmd, argv = [], subshell: false, **options)
+      def exec_program(*args, **kwargs)
+        run(ProgramRunner, *args, **kwargs)
+      end
+
+      def exec_subprocess(*args, **kwargs)
+        run(SubprocessRunner, *args, **kwargs)
+      end
+
+      private
+
+      def run(runner, cmd, argv = [], shell: true, **options)
         cmd = Dip.env.interpolate(cmd)
         argv = [argv] if argv.is_a?(String)
         argv = argv.map { |arg| Dip.env.interpolate(arg) }
-        cmdline = [cmd, *argv].compact.join(" ").strip
+        cmdline = [cmd, *argv].compact
+        cmdline = cmdline.join(" ").strip if shell
 
         puts [Dip.env.vars, cmdline].inspect if Dip.debug?
 
-        runner = subshell ? SubshellRunner : ExecRunner
         runner.call(cmdline, env: Dip.env.vars, **options)
       end
-
-      def subshell(*args, **kwargs)
-        kwargs[:subshell] = true
-        shell(*args, **kwargs)
-      end
     end
   end
 end

data/lib/dip/commands/compose.rb

@@ -10,10 +10,11 @@ module Dip
     class Compose < Dip::Command
       DOCKER_EMBEDDED_DNS = "127.0.0.11"
 
-      attr_reader :argv, :config
+      attr_reader :argv, :config, :shell
 
-      def initialize(*argv)
+      def initialize(*argv, shell: true)
         @argv = argv
+        @shell = shell
         @config = ::Dip.config.compose || {}
       end
 
@@ -22,7 +23,7 @@ module Dip
 
         compose_argv = Array(find_files) + Array(cli_options) + argv
 
-        shell("docker-compose", compose_argv)
+        exec_program("docker-compose", compose_argv, shell: shell)
       end
 
       private

data/lib/dip/commands/dns.rb

@@ -17,8 +17,8 @@ module Dip
         end
 
         def execute
-          subshell("docker", "network create #{@net}", panic: false, err: File::NULL)
-          subshell("docker", "run #{container_args} #{@image} --domain=#{@domain}")
+          exec_subprocess("docker", "network create #{@net}", panic: false, err: File::NULL)
+          exec_subprocess("docker", "run #{container_args} #{@image} --domain=#{@domain}")
         end
 
         private
@@ -40,8 +40,8 @@ module Dip
         end
 
         def execute
-          subshell("docker", "stop #{@name}", panic: false, out: File::NULL, err: File::NULL)
-          subshell("docker", "rm -v #{@name}", panic: false, out: File::NULL, err: File::NULL)
+          exec_subprocess("docker", "stop #{@name}", panic: false, out: File::NULL, err: File::NULL)
+          exec_subprocess("docker", "rm -v #{@name}", panic: false, out: File::NULL, err: File::NULL)
         end
       end
 
@@ -52,7 +52,7 @@ module Dip
         end
 
         def execute(**options)
-          subshell(
+          exec_subprocess(
             "docker",
             "inspect --format '{{ .NetworkSettings.Networks.#{@net}.IPAddress }}' #{@name}",
             **options

data/lib/dip/commands/nginx.rb

@@ -18,8 +18,8 @@ module Dip
         end
 
         def execute
-          subshell("docker", "network create #{@net}", panic: false, err: File::NULL)
-          subshell("docker", "run #{container_args} #{@image}")
+          exec_subprocess("docker", "network create #{@net}", panic: false, err: File::NULL)
+          exec_subprocess("docker", "run #{container_args} #{@image}")
         end
 
         private
@@ -43,8 +43,8 @@ module Dip
         end
 
         def execute
-          subshell("docker", "stop #{@name}", panic: false, out: File::NULL, err: File::NULL)
-          subshell("docker", "rm -v #{@name}", panic: false, out: File::NULL, err: File::NULL)
+          exec_subprocess("docker", "stop #{@name}", panic: false, out: File::NULL, err: File::NULL)
+          exec_subprocess("docker", "rm -v #{@name}", panic: false, out: File::NULL, err: File::NULL)
         end
       end
     end

data/lib/dip/commands/provision.rb

@@ -7,7 +7,7 @@ module Dip
     class Provision < Dip::Command
       def execute
         Dip.config.provision.each do |command|
-          subshell(command)
+          exec_subprocess(command)
         end
       end
     end

data/lib/dip/commands/run.rb

@@ -23,11 +23,12 @@ module Dip
 
       def execute
         if command[:service].nil?
-          shell(command[:command], get_args)
+          exec_program(command[:command], get_args, shell: command[:shell])
         else
           Dip::Commands::Compose.new(
             command[:compose][:method],
-            *compose_arguments
+            *compose_arguments,
+            shell: command[:shell]
           ).execute
         end
       end
@@ -48,7 +49,11 @@ module Dip
         compose_argv << command.fetch(:service)
 
         unless (cmd = command[:command]).empty?
-          compose_argv << cmd
+          if command[:shell]
+            compose_argv << cmd
+          else
+            compose_argv.concat(cmd.shellsplit)
+          end
         end
 
         compose_argv.concat(get_args)
@@ -73,9 +78,17 @@ 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?
-          Array(default_args)
+          if command[:shell]
+            default_args.shellsplit
+          else
+            Array(default_args)
+          end
         else
           []
         end

data/lib/dip/commands/ssh.rb

@@ -15,15 +15,15 @@ module Dip
         end
 
         def execute
-          subshell("docker", "volume create --name ssh_data", out: File::NULL, err: File::NULL)
+          exec_subprocess("docker", "volume create --name ssh_data", out: File::NULL, err: File::NULL)
 
-          subshell(
+          exec_subprocess(
             "docker",
             "run #{user_args}--detach --volume ssh_data:/ssh --name=ssh-agent whilp/ssh-agent"
           )
 
           key = Dip.env.interpolate(@key)
-          subshell("docker", "run #{container_args} whilp/ssh-agent ssh-add #{key}")
+          exec_subprocess("docker", "run #{container_args} whilp/ssh-agent ssh-add #{key}")
         end
 
         private
@@ -44,15 +44,15 @@ module Dip
 
       class Down < Dip::Command
         def execute
-          subshell("docker", "stop ssh-agent", panic: false, out: File::NULL, err: File::NULL)
-          subshell("docker", "rm -v ssh-agent", panic: false, out: File::NULL, err: File::NULL)
-          subshell("docker", "volume rm ssh_data", panic: false, out: File::NULL, err: File::NULL)
+          exec_subprocess("docker", "stop ssh-agent", panic: false, out: File::NULL, err: File::NULL)
+          exec_subprocess("docker", "rm -v ssh-agent", panic: false, out: File::NULL, err: File::NULL)
+          exec_subprocess("docker", "volume rm ssh_data", panic: false, out: File::NULL, err: File::NULL)
         end
       end
 
       class Status < Dip::Command
         def execute
-          subshell("docker", "inspect --format '{{.State.Status}}' ssh-agent")
+          exec_subprocess("docker", "inspect --format '{{.State.Status}}' ssh-agent")
         end
       end
     end

data/lib/dip/config.rb

@@ -62,10 +62,19 @@ module Dip
       def load_yaml(file_path = path)
         return {} unless File.exist?(file_path)
 
-        YAML.safe_load(
-          ERB.new(File.read(file_path)).result,
-          [], [], true
-        )&.deep_symbolize_keys! || {}
+        data = if Gem::Version.new(Psych::VERSION) >= Gem::Version.new("4.0.0")
+          YAML.safe_load(
+            ERB.new(File.read(file_path)).result,
+            aliases: true
+          )
+        else
+          YAML.safe_load(
+            ERB.new(File.read(file_path)).result,
+            [], [], true
+          )
+        end
+
+        data&.deep_symbolize_keys! || {}
       end
     end
 

data/lib/dip/interaction_tree.rb

@@ -60,6 +60,7 @@ module Dip
         description: entry[:description],
         service: entry[:service],
         command: entry[:command].to_s.strip,
+        shell: entry.fetch(:shell, true),
         default_args: entry[:default_args].to_s.strip,
         environment: entry[:environment] || {},
         compose: {

data/lib/dip/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dip
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 7.1.3
 platform: ruby
 authors:
 - bibendi
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-12 00:00:00.000000000 Z
+date: 2021-07-14 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
@@ -196,7 +196,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org/
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -212,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Ruby gem CLI tool for better interacting docker-compose files.
 test_files: []