dip 6.1.0 → 7.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33e5ab547c594c58ea29e95555ac2d055480456f8427c1673db014a4d75388df
-  data.tar.gz: 2304c89be09d4ad6a348f3fe66492bcee50292b430df54d12902346cbb005aab
+  metadata.gz: 010da1a5c2791726c3797c9fa44085447852418fc28a5094875f62ed341f340c
+  data.tar.gz: 91d1b18a57ecdaaddcd3546dc25aebe63e6894e717371e073bac80dc582f9f04
 SHA512:
-  metadata.gz: 58a00ed2d495ec460579afde5a6e1a7df48983d7979512985e2606b606ab8731aa3b281c1d0a3387534f147a3cd957a9d5884f69a7997fd72c402155e2c7c7c3
-  data.tar.gz: 34aa9e6d7739a39633431d8756446bc49be63ab9329b2afeaf6e6133745f1b84614d926ad5a13e50330bb7f6425604764d6cf51eae23cb0bf6f8643bc8d3e80c
+  metadata.gz: d8a7bc54c7040a2c679392ffc4cedbafe34ee9a311e469c2a7a55743ca31c3aa2b10bbc3643d60f6852ea601ef61a8960669ceab3014bfbaf3671bc42fbe7733
+  data.tar.gz: 140c5edce7128128891b2bde78c72d39f5bfcd4aba8994930a75c212fec300de0cd92afd068e53e380d5d365653383dae9dc4abdb4c1420e16847e7befb89a74

data/README.md

@@ -19,6 +19,8 @@ A command-line utility that gives the "native" interaction with applications con
 - Dockerized Ruby on Rails applications: [one](https://github.com/lewagon/rails-k8s-demo), [two](https://github.com/bibendi/dip-example-rails), [three](https://github.com/evilmartians/evil_chat)
 - Dockerized Node.js application: [one](https://github.com/bibendi/twinkle.js), [two](https://github.com/bibendi/yt-graphql-react-event-booking-api)
 - [Dockerized Ruby gem](https://github.com/bibendi/schked)
+- [Dockerizing Ruby and Rails development](https://evilmartians.com/chronicles/ruby-on-whales-docker-for-ruby-rails-development)
+- [Reusable development containers with Docker Compose and Dip](https://evilmartians.com/chronicles/reusable-development-containers-with-docker-compose-and-dip)
 
 [![asciicast](https://asciinema.org/a/210236.svg)](https://asciinema.org/a/210236)
 
@@ -36,6 +38,7 @@ After that we can type commands without `dip` prefix. For example:
 <run-command> *any-args
 compose *any-compose-arg
 up <service>
+build
 down
 provision
 ```
@@ -53,41 +56,11 @@ After that, it will be automatically applied when you open your preferred termin
 
 ## Installation
 
-You have many ways.
-
-### Homebrew
-
-
-You can use [Homebrew](https://brew.sh) on macOS (or [Linux](https://docs.brew.sh/Homebrew-on-Linux)).
-
-Today Homebrew tap for DIP is located at https://github.com/bibendi/homebrew-dip
-
-```sh
-brew tap bibendi/dip
-brew install dip
-```
-
-### Ruby Gem
-
 ```sh
 gem install dip
 ```
 
-### Precompiled binary
-
-If you don't have installed Ruby, then you could copy a precompiled binary to your system.
-It can be found at [releases page](https://github.com/bibendi/dip/releases)
-or type bellow into your terminal:
-
-```sh
-curl -L https://github.com/bibendi/dip/releases/download/v6.1.0/dip-`uname -s`-`uname -m` > /usr/local/bin/dip
-chmod +x /usr/local/bin/dip
-```
-
-## Docker installation
-
-- [Ubuntu](docs/docker-ubuntu-install.md)
-- [Mac OS](docs/docker-for-mac-install.md)
+The compiled binary is no more provided since version 7, because of new version of [Ruby Packer](https://github.com/pmq20/ruby-packer) not released for a long time with recent Ruby version. Also there was a lot of work to prepare each release of Dip for MacOS version.
 
 ## Usage
 
@@ -108,7 +81,7 @@ Also, you can check out examples at the top.
 
 ```yml
 # Required minimum dip version
-version: '4.1'
+version: '7.1'
 
 environment:
   COMPOSE_EXT: development
@@ -121,7 +94,7 @@ compose:
   project_name: bear
 
 interaction:
-  bash:
+  shell:
     description: Open the Bash shell in app's container
     service: app
     command: bash
@@ -169,8 +142,19 @@ 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/*
+
 provision:
   - dip compose down --volumes
+  - dip clean_cache
   - dip compose up -d pg redis
   - dip bash -c ./bin/setup
 ```

data/exe/dip

@@ -1,20 +1,20 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-lib_path = File.expand_path('../lib', __dir__)
+lib_path = File.expand_path("../lib", __dir__)
 $LOAD_PATH.unshift(lib_path) unless $LOAD_PATH.include?(lib_path)
 
 begin
-  require 'pry-byebug' if ENV["DIP_ENV"] == "debug"
+  require "pry-byebug" if ENV["DIP_ENV"] == "debug"
 rescue LoadError
   # do nothing
 end
 
-require 'dip'
-require 'dip/cli'
-require 'dip/run_vars'
+require "dip"
+require "dip/cli"
+require "dip/run_vars"
 
-Signal.trap('INT') do
+Signal.trap("INT") do
   warn("\n#{caller.join("\n")}: interrupted")
   exit(1)
 end

data/lib/dip.rb

@@ -18,7 +18,7 @@ module Dip
       $PROGRAM_NAME.start_with?("./") ? File.expand_path($PROGRAM_NAME) : "dip"
     end
 
-    %w(test debug).each do |key|
+    %w[test debug].each do |key|
       define_method("#{key}?") do
         ENV["DIP_ENV"] == key
       end

data/lib/dip/cli.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'thor'
-require 'dip/run_vars'
+require "thor"
+require "dip/run_vars"
 
 module Dip
   class CLI < Thor
@@ -34,25 +34,30 @@ module Dip
 
     stop_on_unknown_option! :run
 
-    desc 'version', 'dip version'
+    desc "version", "dip version"
     def version
-      require_relative 'version'
+      require_relative "version"
       puts Dip::VERSION
     end
-    map %w(--version -v) => :version
+    map %w[--version -v] => :version
 
-    desc 'ls', 'List available run commands'
+    desc "ls", "List available run commands"
     def ls
-      require_relative 'commands/list'
+      require_relative "commands/list"
       Dip::Commands::List.new.execute
     end
 
-    desc 'compose CMD [OPTIONS]', 'Run docker-compose commands'
+    desc "compose CMD [OPTIONS]", "Run docker-compose commands"
     def compose(*argv)
-      require_relative 'commands/compose'
+      require_relative "commands/compose"
       Dip::Commands::Compose.new(*argv).execute
     end
 
+    desc "build [OPTIONS] SERVICE", "Run `docker-compose build` command"
+    def build(*argv)
+      compose("build", *argv)
+    end
+
     desc "up [OPTIONS] SERVICE", "Run `docker-compose up` command"
     def up(*argv)
       compose("up", *argv)
@@ -63,50 +68,50 @@ module Dip
       compose("stop", *argv)
     end
 
-    desc "down all services [OPTIONS]", "Run `docker-compose down` command"
+    desc "down [OPTIONS]", "Run `docker-compose down` command"
     def down(*argv)
       compose("down", *argv)
     end
 
-    desc 'run [OPTIONS] CMD [ARGS]', 'Run configured command in a docker-compose service. `run` prefix may be omitted'
-    method_option :publish, aliases: '-p', type: :string, repeatable: true,
+    desc "run [OPTIONS] CMD [ARGS]", "Run configured command in a docker-compose service. `run` prefix may be omitted"
+    method_option :publish, aliases: "-p", type: :string, repeatable: true,
                             desc: "Publish a container's port(s) to the host"
-    method_option :help, aliases: '-h', type: :boolean, desc: 'Display usage information'
+    method_option :help, aliases: "-h", type: :boolean, desc: "Display usage information"
     def run(*argv)
       if argv.empty? || options[:help]
-        invoke :help, ['run']
+        invoke :help, ["run"]
       else
-        require_relative 'commands/run'
+        require_relative "commands/run"
         Dip::Commands::Run.new(*argv, publish: options[:publish]).execute
       end
     end
 
     desc "provision", "Execute commands within provision section"
-    method_option :help, aliases: '-h', type: :boolean,
-                         desc: 'Display usage information'
+    method_option :help, aliases: "-h", type: :boolean,
+                         desc: "Display usage information"
     def provision
       if options[:help]
-        invoke :help, ['provision']
+        invoke :help, ["provision"]
       else
-        require_relative 'commands/provision'
+        require_relative "commands/provision"
         Dip::Commands::Provision.new.execute
       end
     end
 
-    require_relative 'cli/ssh'
+    require_relative "cli/ssh"
     desc "ssh", "ssh-agent container commands"
     subcommand :ssh, Dip::CLI::SSH
 
-    require_relative 'cli/dns'
+    require_relative "cli/dns"
     desc "dns", "DNS server for automatic docker container discovery"
     subcommand :dns, Dip::CLI::DNS
 
-    require_relative 'cli/nginx'
+    require_relative "cli/nginx"
     desc "nginx", "Nginx reverse proxy server"
     subcommand :nginx, Dip::CLI::Nginx
 
-    require_relative 'cli/console'
-    desc "console", "Integrate Dip commands into shell (only ZSH and Bash is supported)"
+    require_relative "cli/console"
+    desc "console", "Integrate Dip commands into shell (only ZSH and Bash are supported)"
     subcommand :console, Dip::CLI::Console
   end
 end

data/lib/dip/cli/console.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'thor'
+require "thor"
 require_relative "./base"
 require_relative "../commands/console"
 
@@ -8,11 +8,11 @@ module Dip
   class CLI
     class Console < Base
       desc "start", "Integrate Dip into current shell"
-      method_option :help, aliases: '-h', type: :boolean,
-                           desc: 'Display usage information'
+      method_option :help, aliases: "-h", type: :boolean,
+                           desc: "Display usage information"
       def start
         if options[:help]
-          invoke :help, ['start']
+          invoke :help, ["start"]
         else
           Dip::Commands::Console::Start.new.execute
         end
@@ -21,11 +21,11 @@ module Dip
       default_task :start
 
       desc "inject", "Inject aliases"
-      method_option :help, aliases: '-h', type: :boolean,
-                           desc: 'Display usage information'
+      method_option :help, aliases: "-h", type: :boolean,
+                           desc: "Display usage information"
       def inject
         if options[:help]
-          invoke :help, ['inject']
+          invoke :help, ["inject"]
         else
           Dip::Commands::Console::Inject.new.execute
         end

data/lib/dip/cli/dns.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'thor'
+require "thor"
 require_relative "./base"
 require_relative "../commands/dns"
 
@@ -9,23 +9,23 @@ module Dip
     # See more https://github.com/aacebedo/dnsdock
     class DNS < Base
       desc "up", "Run dnsdock container"
-      method_option :help, aliases: '-h', type: :boolean,
-                           desc: 'Display usage information'
-      method_option :name, aliases: '-n', type: :string, default: "dnsdock",
-                           desc: 'Container name'
-      method_option :socket, aliases: '-s', type: :string, default: "/var/run/docker.sock",
-                             desc: 'Path to docker socket'
-      method_option :net, aliases: '-t', type: :string, default: "frontend",
-                          desc: 'Container network name'
-      method_option :publish, aliases: '-p', type: :string, default: "53/udp",
-                              desc: 'Container port'
-      method_option :image, aliases: '-i', type: :string, default: "aacebedo/dnsdock:latest-amd64",
-                            desc: 'Docker image name'
-      method_option :domain, aliases: '-d', type: :string, default: "docker",
-                             desc: 'Top level domain'
+      method_option :help, aliases: "-h", type: :boolean,
+                           desc: "Display usage information"
+      method_option :name, aliases: "-n", type: :string, default: "dnsdock",
+                           desc: "Container name"
+      method_option :socket, aliases: "-s", type: :string, default: "/var/run/docker.sock",
+                             desc: "Path to docker socket"
+      method_option :net, aliases: "-t", type: :string, default: "frontend",
+                          desc: "Container network name"
+      method_option :publish, aliases: "-p", type: :string, default: "53/udp",
+                              desc: "Container port"
+      method_option :image, aliases: "-i", type: :string, default: "aacebedo/dnsdock:latest-amd64",
+                            desc: "Docker image name"
+      method_option :domain, aliases: "-d", type: :string, default: "docker",
+                             desc: "Top level domain"
       def up
         if options[:help]
-          invoke :help, ['up']
+          invoke :help, ["up"]
         else
           Dip::Commands::DNS::Up.new(
             name: options.fetch(:name),
@@ -39,13 +39,13 @@ module Dip
       end
 
       desc "down", "Stop dnsdock container"
-      method_option :help, aliases: '-h', type: :boolean,
-                           desc: 'Display usage information'
-      method_option :name, aliases: '-n', type: :string, default: "dnsdock",
-                           desc: 'Container name'
+      method_option :help, aliases: "-h", type: :boolean,
+                           desc: "Display usage information"
+      method_option :name, aliases: "-n", type: :string, default: "dnsdock",
+                           desc: "Container name"
       def down
         if options[:help]
-          invoke :help, ['down']
+          invoke :help, ["down"]
         else
           Dip::Commands::DNS::Down.new(
             name: options.fetch(:name)
@@ -54,11 +54,11 @@ module Dip
       end
 
       desc "restart", "Stop and start dnsdock container"
-      method_option :help, aliases: '-h', type: :boolean,
-                           desc: 'Display usage information'
+      method_option :help, aliases: "-h", type: :boolean,
+                           desc: "Display usage information"
       def restart(*args)
         if options[:help]
-          invoke :help, ['restart']
+          invoke :help, ["restart"]
         else
           Dip::CLI::DNS.start(["down"] + args)
           sleep 1
@@ -67,15 +67,15 @@ module Dip
       end
 
       desc "ip", "Get ip address of dnsdock container"
-      method_option :help, aliases: '-h', type: :boolean,
-                           desc: 'Display usage information'
-      method_option :name, aliases: '-n', type: :string, default: "dnsdock",
-                           desc: 'Container name'
-      method_option :net, aliases: '-t', type: :string, default: "frontend",
-                          desc: 'Container network name'
+      method_option :help, aliases: "-h", type: :boolean,
+                           desc: "Display usage information"
+      method_option :name, aliases: "-n", type: :string, default: "dnsdock",
+                           desc: "Container name"
+      method_option :net, aliases: "-t", type: :string, default: "frontend",
+                          desc: "Container network name"
       def ip
         if options[:help]
-          invoke :help, ['status']
+          invoke :help, ["status"]
         else
           Dip::Commands::DNS::IP.new(
             name: options.fetch(:name),

data/lib/dip/cli/nginx.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'thor'
+require "thor"
 require_relative "./base"
 require_relative "../commands/nginx"
 
@@ -9,24 +9,24 @@ module Dip
     # See more https://github.com/bibendi/nginx-proxy
     class Nginx < Base
       desc "up", "Run nginx container"
-      method_option :help, aliases: '-h', type: :boolean,
-                           desc: 'Display usage information'
-      method_option :name, aliases: '-n', type: :string, default: "nginx",
-                           desc: 'Container name'
-      method_option :socket, aliases: '-s', type: :string, default: "/var/run/docker.sock",
-                             desc: 'Path to docker socket'
-      method_option :net, aliases: '-t', type: :string, default: "frontend",
-                          desc: 'Container network name'
-      method_option :publish, aliases: '-p', type: :array, default: ["80:80"],
-                              desc: 'Container port(s). For more than one port, separate them by a space'
-      method_option :image, aliases: '-i', type: :string, default: "bibendi/nginx-proxy:latest",
-                            desc: 'Docker image name'
-      method_option :domain, aliases: '-d', type: :string, default: "docker",
-                             desc: 'Top level domain'
-      method_option :certs, aliases: '-c', type: :string, desc: 'Path to ssl certificates'
+      method_option :help, aliases: "-h", type: :boolean,
+                           desc: "Display usage information"
+      method_option :name, aliases: "-n", type: :string, default: "nginx",
+                           desc: "Container name"
+      method_option :socket, aliases: "-s", type: :string, default: "/var/run/docker.sock",
+                             desc: "Path to docker socket"
+      method_option :net, aliases: "-t", type: :string, default: "frontend",
+                          desc: "Container network name"
+      method_option :publish, aliases: "-p", type: :array, default: ["80:80"],
+                              desc: "Container port(s). For more than one port, separate them by a space"
+      method_option :image, aliases: "-i", type: :string, default: "bibendi/nginx-proxy:latest",
+                            desc: "Docker image name"
+      method_option :domain, aliases: "-d", type: :string, default: "docker",
+                             desc: "Top level domain"
+      method_option :certs, aliases: "-c", type: :string, desc: "Path to ssl certificates"
       def up
         if options[:help]
-          invoke :help, ['up']
+          invoke :help, ["up"]
         else
           Dip::Commands::Nginx::Up.new(
             name: options.fetch(:name),
@@ -41,13 +41,13 @@ module Dip
       end
 
       desc "down", "Stop nginx container"
-      method_option :help, aliases: '-h', type: :boolean,
-                           desc: 'Display usage information'
-      method_option :name, aliases: '-n', type: :string, default: "nginx",
-                           desc: 'Container name'
+      method_option :help, aliases: "-h", type: :boolean,
+                           desc: "Display usage information"
+      method_option :name, aliases: "-n", type: :string, default: "nginx",
+                           desc: "Container name"
       def down
         if options[:help]
-          invoke :help, ['down']
+          invoke :help, ["down"]
         else
           Dip::Commands::Nginx::Down.new(
             name: options.fetch(:name)
@@ -56,11 +56,11 @@ module Dip
       end
 
       desc "restart", "Stop and start nginx container"
-      method_option :help, aliases: '-h', type: :boolean,
-                           desc: 'Display usage information'
+      method_option :help, aliases: "-h", type: :boolean,
+                           desc: "Display usage information"
       def restart(*args)
         if options[:help]
-          invoke :help, ['restart']
+          invoke :help, ["restart"]
         else
           Dip::CLI::Nginx.start(["down"] + args)
           sleep 1

data/lib/dip/cli/ssh.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'thor'
+require "thor"
 require_relative "./base"
 require_relative "../commands/ssh"
 
@@ -8,22 +8,22 @@ module Dip
   class CLI
     class SSH < Base
       desc "up", "Run ssh-agent container"
-      method_option :help, aliases: '-h', type: :boolean,
-                           desc: 'Display usage information'
-      method_option :key, aliases: '-k', type: :string, default: "$HOME/.ssh/id_rsa",
-                          desc: 'Path to ssh key'
-      method_option :volume, aliases: '-v', type: :string, default: "$HOME",
-                             desc: 'Mounted docker volume'
-      method_option :interactive, aliases: '-t', type: :boolean, default: true,
-                                  desc: 'Run in interactive mode'
-      method_option :user, aliases: '-u', type: :string,
-                           desc: 'UID for ssh-agent container'
+      method_option :help, aliases: "-h", type: :boolean,
+                           desc: "Display usage information"
+      method_option :key, aliases: "-k", type: :string, default: "$HOME/.ssh/id_rsa",
+                          desc: "Path to ssh key"
+      method_option :volume, aliases: "-v", type: :string, default: "$HOME",
+                             desc: "Mounted docker volume"
+      method_option :interactive, aliases: "-t", type: :boolean, default: true,
+                                  desc: "Run in interactive mode"
+      method_option :user, aliases: "-u", type: :string,
+                           desc: "UID for ssh-agent container"
       # Backward compatibility
-      method_option :nonteractive, aliases: '-T', type: :boolean,
-                                   desc: 'Run in noninteractive mode'
+      method_option :nonteractive, aliases: "-T", type: :boolean,
+                                   desc: "Run in noninteractive mode"
       def up
         if options[:help]
-          invoke :help, ['up']
+          invoke :help, ["up"]
         else
           Dip::Commands::SSH::Up.new(
             key: options.fetch(:key),
@@ -37,22 +37,22 @@ module Dip
       map add: :up
 
       desc "down", "Stop ssh-agent container"
-      method_option :help, aliases: '-h', type: :boolean,
-                           desc: 'Display usage information'
+      method_option :help, aliases: "-h", type: :boolean,
+                           desc: "Display usage information"
       def down
         if options[:help]
-          invoke :help, ['down']
+          invoke :help, ["down"]
         else
           Dip::Commands::SSH::Down.new.execute
         end
       end
 
       desc "restart", "Stop and start ssh-agent container"
-      method_option :help, aliases: '-h', type: :boolean,
-                           desc: 'Display usage information'
+      method_option :help, aliases: "-h", type: :boolean,
+                           desc: "Display usage information"
       def restart(*args)
         if options[:help]
-          invoke :help, ['restart']
+          invoke :help, ["restart"]
         else
           Dip::CLI::SSH.start(["down"] + args)
           sleep 1
@@ -61,11 +61,11 @@ module Dip
       end
 
       desc "status", "Show status of ssh-agent container"
-      method_option :help, aliases: '-h', type: :boolean,
-                           desc: 'Display usage information'
+      method_option :help, aliases: "-h", type: :boolean,
+                           desc: "Display usage information"
       def status
         if options[:help]
-          invoke :help, ['status']
+          invoke :help, ["status"]
         else
           Dip::Commands::SSH::Status.new.execute
         end

data/lib/dip/command.rb

@@ -6,35 +6,46 @@ module Dip
   class Command
     extend Forwardable
 
-    def_delegators self, :shell, :subshell
-
-    class ExecRunner
-      def self.call(cmd, argv, env: {}, **options)
-        ::Process.exec(env, cmd, *argv, options)
+    def_delegators self, :exec_program, :exec_subprocess
+
+    class ProgramRunner
+      def self.call(cmdline, env: {}, **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
-      def self.call(cmd, argv, env: {}, panic: true, **options)
-        return if ::Kernel.system(env, cmd, *argv, options)
-        raise Dip::Error, "Command '#{([cmd] + argv).join(' ')}' executed with error." if panic
+    class SubprocessRunner
+      def self.call(cmdline, env: {}, panic: true, **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
+        cmdline = cmdline.join(" ").strip if shell
 
-        puts [Dip.env.vars, cmd, argv].inspect if Dip.debug?
-
-        runner = subshell ? SubshellRunner : ExecRunner
-        runner.call(cmd, argv, env: Dip.env.vars, **options)
-      end
+        puts [Dip.env.vars, cmdline].inspect if Dip.debug?
 
-      def subshell(*args, **kwargs)
-        kwargs[:subshell] = true
-        shell(*args, **kwargs)
+        runner.call(cmdline, env: Dip.env.vars, **options)
       end
     end
   end

data/lib/dip/commands/compose.rb

@@ -1,19 +1,20 @@
 # frozen_string_literal: true
 
-require 'pathname'
+require "pathname"
 
-require_relative '../command'
-require_relative 'dns'
+require_relative "../command"
+require_relative "dns"
 
 module Dip
   module Commands
     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
@@ -49,7 +50,7 @@ module Dip
           next unless value.is_a?(String)
 
           value = ::Dip.env.interpolate(value)
-          ["--#{name.to_s.gsub('_', '-')}", value]
+          ["--#{name.to_s.tr("_", "-")}", value]
         end.compact
       end
 
@@ -58,9 +59,9 @@ module Dip
         net = Dip.env["FRONTEND_NETWORK"] || "frontend"
 
         IO.pipe do |r, w|
-          Dip::Commands::DNS::IP.
-            new(name: name, net: net).
-            execute(out: w, err: File::NULL, panic: false)
+          Dip::Commands::DNS::IP
+            .new(name: name, net: net)
+            .execute(out: w, err: File::NULL, panic: false)
 
           w.close_write
           ip = r.readlines[0].to_s.strip

data/lib/dip/commands/console.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../command'
+require_relative "../command"
 
 module Dip
   module Commands
@@ -13,9 +13,9 @@ module Dip
         private
 
         def script
-          <<-SH.gsub(/^[ ]{12}/, '')
+          <<-SH.gsub(/^ {12}/, "")
             export DIP_SHELL=1
-            export DIP_EARLY_ENVS=#{ENV.keys.join(',')}
+            export DIP_EARLY_ENVS=#{ENV.keys.join(",")}
             export DIP_PROMPT_TEXT="ⅆ"
 
             function dip_clear() {
@@ -88,7 +88,7 @@ module Dip
         def execute
           if Dip.config.exist?
             add_aliases(*Dip.config.interaction.keys) if Dip.config.interaction
-            add_aliases("compose", "up", "stop", "down", "provision")
+            add_aliases("compose", "up", "stop", "down", "provision", "build")
           end
 
           clear_aliases
@@ -107,7 +107,7 @@ module Dip
 
         def clear_aliases
           out << "function dip_clear() { \n" \
-                  "#{aliases.any? ? aliases.map { |a| "  unset -f #{a}" }.join("\n") : 'true'} " \
+                  "#{aliases.any? ? aliases.map { |a| "  unset -f #{a}" }.join("\n") : "true"} " \
                   "\n}"
         end
       end

data/lib/dip/commands/dns.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "shellwords"
-require_relative '../command'
+require_relative "../command"
 
 module Dip
   module Commands
@@ -17,20 +17,20 @@ module Dip
         end
 
         def execute
-          subshell("docker", "network create #{@net}".shellsplit, panic: false, err: File::NULL)
-          subshell("docker", "run #{container_args} #{@image} --domain=#{@domain}".shellsplit)
+          exec_subprocess("docker", "network create #{@net}", panic: false, err: File::NULL)
+          exec_subprocess("docker", "run #{container_args} #{@image} --domain=#{@domain}")
         end
 
         private
 
         def container_args
-          result = %w(--detach)
+          result = %w[--detach]
           result << "--volume #{@socket}:/var/run/docker.sock:ro"
           result << "--restart always"
           result << "--publish #{@publish}"
           result << "--net #{@net}"
           result << "--name #{@name}"
-          result.join(' ')
+          result.join(" ")
         end
       end
 
@@ -40,8 +40,8 @@ module Dip
         end
 
         def execute
-          subshell("docker", "stop #{@name}".shellsplit, panic: false, out: File::NULL, err: File::NULL)
-          subshell("docker", "rm -v #{@name}".shellsplit, 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,11 +52,11 @@ module Dip
         end
 
         def execute(**options)
-          subshell("docker",
-                   "inspect " \
-                   "--format '{{ .NetworkSettings.Networks.#{@net}.IPAddress }}' " \
-                   "#{@name}".shellsplit,
-                   **options)
+          exec_subprocess(
+            "docker",
+            "inspect --format '{{ .NetworkSettings.Networks.#{@net}.IPAddress }}' #{@name}",
+            **options
+          )
         end
       end
     end

data/lib/dip/commands/list.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../command'
-require_relative '../interaction_tree'
+require_relative "../command"
+require_relative "../interaction_tree"
 
 module Dip
   module Commands
@@ -12,7 +12,7 @@ module Dip
         longest_name = tree.keys.map(&:size).max
 
         tree.each do |name, command|
-          puts "#{name.ljust(longest_name)}  ##{command[:description] ? ' ' + command[:description] : ''}"
+          puts "#{name.ljust(longest_name)}  ##{command[:description] ? " #{command[:description]}" : ""}"
         end
       end
     end

data/lib/dip/commands/nginx.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "shellwords"
-require_relative '../command'
+require_relative "../command"
 
 module Dip
   module Commands
@@ -18,22 +18,22 @@ module Dip
         end
 
         def execute
-          subshell("docker", "network create #{@net}".shellsplit, panic: false, err: File::NULL)
-          subshell("docker", "run #{container_args} #{@image}".shellsplit)
+          exec_subprocess("docker", "network create #{@net}", panic: false, err: File::NULL)
+          exec_subprocess("docker", "run #{container_args} #{@image}")
         end
 
         private
 
         def container_args
-          result = %w(--detach)
+          result = %w[--detach]
           result << "--volume #{@socket}:/tmp/docker.sock:ro"
           result << "--volume #{@certs}:/etc/nginx/certs" unless @certs.to_s.empty?
           result << "--restart always"
-          result << Array(@publish).map { |p| "--publish #{p}" }.join(' ')
+          result << Array(@publish).map { |p| "--publish #{p}" }.join(" ")
           result << "--net #{@net}"
           result << "--name #{@name}"
           result << "--label com.dnsdock.alias=#{@domain}"
-          result.join(' ')
+          result.join(" ")
         end
       end
 
@@ -43,8 +43,8 @@ module Dip
         end
 
         def execute
-          subshell("docker", "stop #{@name}".shellsplit, panic: false, out: File::NULL, err: File::NULL)
-          subshell("docker", "rm -v #{@name}".shellsplit, 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

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require_relative '../command'
+require_relative "../command"
 
 module Dip
   module Commands
     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

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'shellwords'
-require_relative '../../../lib/dip/run_vars'
-require_relative '../command'
-require_relative '../interaction_tree'
-require_relative 'compose'
+require "shellwords"
+require_relative "../../../lib/dip/run_vars"
+require_relative "../command"
+require_relative "../interaction_tree"
+require_relative "compose"
 
 module Dip
   module Commands
@@ -12,21 +12,25 @@ module Dip
       def initialize(cmd, *argv, publish: nil)
         @publish = publish
 
-        @command, @argv = InteractionTree.
-                          new(Dip.config.interaction).
-                          find(cmd, *argv)&.
-                          values_at(:command, :argv)
+        @command, @argv = InteractionTree
+          .new(Dip.config.interaction)
+          .find(cmd, *argv)&.values_at(:command, :argv)
 
-        raise Dip::Error, "Command `#{[cmd, *argv].join(' ')}` not recognized!" unless command
+        raise Dip::Error, "Command `#{[cmd, *argv].join(" ")}` not recognized!" unless command
 
         Dip.env.merge(command[:environment])
       end
 
       def execute
-        Dip::Commands::Compose.new(
-          command[:compose][:method],
-          *compose_arguments
-        ).execute
+        if command[:service].nil?
+          exec_program(command[:command], get_args, shell: command[:shell])
+        else
+          Dip::Commands::Compose.new(
+            command[:compose][:method],
+            *compose_arguments,
+            shell: command[:shell]
+          ).execute
+        end
       end
 
       private
@@ -44,11 +48,15 @@ module Dip
 
         compose_argv << command.fetch(:service)
 
-        unless (cmd = command[:command].to_s).empty?
-          compose_argv.concat(cmd.shellsplit)
+        unless (cmd = command[:command]).empty?
+          if command[:shell]
+            compose_argv << cmd
+          else
+            compose_argv.concat(cmd.shellsplit)
+          end
         end
 
-        compose_argv.concat(argv.any? ? argv : command[:default_args])
+        compose_argv.concat(get_args)
 
         compose_argv
       end
@@ -57,7 +65,7 @@ module Dip
         run_vars = Dip::RunVars.env
         return [] unless run_vars
 
-        run_vars.map { |k, v| ["-e", "#{k}=#{v}"] }.flatten
+        run_vars.map { |k, v| ["-e", "#{k}=#{Shellwords.escape(v)}"] }.flatten
       end
 
       def published_ports
@@ -67,6 +75,24 @@ module Dip
           []
         end
       end
+
+      def get_args
+        if argv.any?
+          if command[:shell]
+            [argv.shelljoin]
+          else
+            Array(default_args)
+          end
+        elsif !(default_args = command[:default_args]).empty?
+          if command[:shell]
+            default_args.shellsplit
+          else
+            Array(default_args)
+          end
+        else
+          []
+        end
+      end
     end
   end
 end

data/lib/dip/commands/ssh.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "shellwords"
-require_relative '../command'
+require_relative "../command"
 
 module Dip
   module Commands
@@ -15,44 +15,44 @@ module Dip
         end
 
         def execute
-          subshell("docker", "volume create --name ssh_data".shellsplit, 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".shellsplit
+            "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}".shellsplit)
+          exec_subprocess("docker", "run #{container_args} whilp/ssh-agent ssh-add #{key}")
         end
 
         private
 
         def user_args
-          "-u #{@user}" if @user
+          "-u #{@user} " if @user
         end
 
         def container_args
-          result = %w(--rm)
+          result = %w[--rm]
           volume = Dip.env.interpolate(@volume)
           result << "--volume ssh_data:/ssh"
           result << "--volume #{volume}:#{volume}"
           result << "--interactive --tty" if @interactive
-          result.join(' ')
+          result.join(" ")
         end
       end
 
       class Down < Dip::Command
         def execute
-          subshell("docker", "stop ssh-agent".shellsplit, panic: false, out: File::NULL, err: File::NULL)
-          subshell("docker", "rm -v ssh-agent".shellsplit, panic: false, out: File::NULL, err: File::NULL)
-          subshell("docker", "volume rm ssh_data".shellsplit, 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".shellsplit)
+          exec_subprocess("docker", "inspect --format '{{.State.Status}}' ssh-agent")
         end
       end
     end

data/lib/dip/config.rb

@@ -29,10 +29,10 @@ module Dip
         @override = override
 
         @file_path = if ENV["DIP_FILE"]
-                       Pathname.new(prepared_name(ENV["DIP_FILE"]))
-                     else
-                       find(Pathname.new(work_dir))
-                     end
+          Pathname.new(prepared_name(ENV["DIP_FILE"]))
+        else
+          find(Pathname.new(work_dir))
+        end
       end
 
       def exist?
@@ -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
 
@@ -119,7 +128,7 @@ module Dip
     end
 
     def config_missing_error(config_key)
-      msg = 'config for %<key>s is not defined in %<path>s' % {key: config_key, path: finder.file_path}
+      msg = "config for %<key>s is not defined in %<path>s" % {key: config_key, path: finder.file_path}
       ConfigKeyMissingError.new(msg)
     end
   end

data/lib/dip/environment.rb

@@ -4,7 +4,7 @@ require "pathname"
 
 module Dip
   class Environment
-    VAR_REGEX = /\$[\{]?(?<var_name>[a-zA-Z_][a-zA-Z0-9_]*)[\}]?/.freeze
+    VAR_REGEX = /\$\{?(?<var_name>[a-zA-Z_][a-zA-Z0-9_]*)\}?/.freeze
     SPECIAL_VARS = %i[os work_dir_rel_path].freeze
 
     attr_reader :vars
@@ -26,8 +26,8 @@ module Dip
       vars.fetch(name) { ENV[name] }
     end
 
-    def fetch(name)
-      vars.fetch(name) { ENV.fetch(name) { yield } }
+    def fetch(name, &block)
+      vars.fetch(name) { ENV.fetch(name, &block) }
     end
 
     def []=(key, value)
@@ -35,18 +35,18 @@ module Dip
     end
 
     def interpolate(value)
-      value.gsub(VAR_REGEX) do
+      value.gsub(VAR_REGEX) do |match|
         var_name = Regexp.last_match[:var_name]
 
         if special_vars.key?(var_name)
           fetch(var_name) { send(special_vars[var_name]) }
         else
-          self[var_name]
+          fetch(var_name) { match }
         end
       end
     end
 
-    alias replace interpolate
+    alias_method :replace, :interpolate
 
     private
 

data/lib/dip/ext/hash.rb

@@ -24,7 +24,7 @@ module ActiveSupportHashHelpers
       merge!(other_hash) do |key, this_val, other_val|
         if this_val.is_a?(Hash) && other_val.is_a?(Hash)
           this_val.deep_merge(other_val, &block)
-        elsif block_given?
+        elsif block
           block.call(key, this_val, other_val)
         else
           other_val

data/lib/dip/interaction_tree.rb

@@ -58,9 +58,10 @@ module Dip
     def build_command(entry)
       {
         description: entry[:description],
-        service: entry.fetch(:service),
-        command: entry[:command],
-        default_args: prepare_default_args(entry[:default_args]),
+        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: {
           method: entry.dig(:compose, :method) || entry[:compose_method] || "run",
@@ -76,19 +77,6 @@ module Dip
       entry[:description] ||= nil
     end
 
-    def prepare_default_args(args)
-      return [] if args.nil?
-
-      case args
-      when Array
-        args
-      when String
-        args.shellsplit
-      else
-        raise ArgumentError, "Unknown type for default_args: #{args.inspect}"
-      end
-    end
-
     def compose_run_options(value)
       return [] unless value
 

data/lib/dip/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dip
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 7.1.2
 platform: ruby
 authors:
 - bibendi
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-19 00:00:00.000000000 Z
+date: 2021-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -87,19 +87,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.81'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.81'
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -168,7 +196,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org/
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -176,15 +204,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Ruby gem CLI tool for better interacting docker-compose files.
 test_files: []