dip 4.1.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ceb8c2f3312fdbc11a07bb73df3bb6c1a7a5bffbbab5b8adfd9a40585acb463
-  data.tar.gz: 2f34aae2a69df0f8356245558f996f37ae459c72bd00136b39bd6bce63fc3977
+  metadata.gz: 33e5ab547c594c58ea29e95555ac2d055480456f8427c1673db014a4d75388df
+  data.tar.gz: 2304c89be09d4ad6a348f3fe66492bcee50292b430df54d12902346cbb005aab
 SHA512:
-  metadata.gz: acd4d9ac91aadf4ea842350a3bcd2cf18c6ef05c55c6a659f2f32a822b03fa0effbde00e163ad8de9dc98e24dd5d0329320eb79f03b6b109cc6b318d07b1b928
-  data.tar.gz: 3f0933d9bd9c482b733bb5672fd23b0def1fbfe6484166f759a017b6fc6beb5e20554b6de54a46009da8856894fbfbd0376cde2e3103426290205bcfe540965e
+  metadata.gz: 58a00ed2d495ec460579afde5a6e1a7df48983d7979512985e2606b606ab8731aa3b281c1d0a3387534f147a3cd957a9d5884f69a7997fd72c402155e2c7c7c3
+  data.tar.gz: 34aa9e6d7739a39633431d8756446bc49be63ab9329b2afeaf6e6133745f1b84614d926ad5a13e50330bb7f6425604764d6cf51eae23cb0bf6f8643bc8d3e80c

data/README.md

@@ -8,11 +8,16 @@ Docker Interaction Process
 
 A command-line utility that gives the "native" interaction with applications configured with Docker Compose. It is for local development only. In practice, it creates the feeling that you work without containers.
 
+<p float="left">
+<a href="https://evilmartians.com/?utm_source=dip"><img src="https://evilmartians.com/badges/sponsored-by-evil-martians.svg" alt="Sponsored by Evil Martians" height="80" /></a>
+<img src="https://ya-webdesign.com/images250_/vertical-divider-png-1.png" width="50" height="100" />
+<a href="https://www.jetbrains.com/?from=DIP"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/1/1a/JetBrains_Logo_2016.svg/1200px-JetBrains_Logo_2016.svg.png" alt="Sponsored by JetBrains" height="100" /></a></p>
+
 ## Presentations and examples
 
 - [Local development with Docker containers](https://slides.com/bibendi/dip)
-- [Dockerized Ruby on Rails application](https://github.com/bibendi/dip-example-rails)
-- [Dockerized Node.js application](https://github.com/bibendi/yt-graphql-react-event-booking-api)
+- 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)
 
 [![asciicast](https://asciinema.org/a/210236.svg)](https://asciinema.org/a/210236)
@@ -39,11 +44,11 @@ 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:
 
-```sh
+```shhttps://ya-webdesign.com/images250_/vertical-divider-png-1.pnghttps://ya-webdesign.com/images250_/vertical-divider-png-1.png
 VERSION=20180515103400 rails db:migrate:down
 ```
 
-You could add this `eval` at the end of your `~/.zshrc`, or `~/.bashrc`, or `~/.bash_profile`. 
+You could add this `eval` at the end of your `~/.zshrc`, or `~/.bashrc`, or `~/.bash_profile`.
 After that, it will be automatically applied when you open your preferred terminal.
 
 ## Installation
@@ -70,14 +75,14 @@ gem install dip
 
 ### Precompiled binary
 
-If you don't have installed Ruby, then you could copy a precompiled binary to your system. 
+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/4.1.0/dip-`uname -s`-`uname -m` > /usr/local/bin/dip
+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
 
@@ -93,17 +98,17 @@ dip SUBCOMMAND --help
 
 ### dip.yml
 
-The configuration file `dip.yml` should be placed in a project root directory.
+The configuration is loaded from `dip.yml` file. It may be located in a working directory, or it will be found in the nearest parent directory up to the file system root. If nearby places `dip.override.yml` file, it will be merged into the main config.
+
 Also, in some cases, you may want to change the default config path by providing an environment variable `DIP_FILE`.
-If nearby places `dip.override.yml` file it would be merged into the main config.
 
-Below is an example of a real config. 
-`dip.yml` reference will be written soon. 
-Also, you can check out examples in the top.
+Below is an example of a real config.
+Config file reference will be written soon.
+Also, you can check out examples at the top.
 
 ```yml
 # Required minimum dip version
-version: '4'
+version: '4.1'
 
 environment:
   COMPOSE_EXT: development
@@ -119,6 +124,7 @@ interaction:
   bash:
     description: Open the Bash shell in app's container
     service: app
+    command: bash
     compose:
       run_options: [no-deps]
 
@@ -148,7 +154,7 @@ interaction:
         description: Run Rails server at http://localhost:3000
         service: web
         compose:
-          run_options: [service-ports]
+          run_options: [service-ports, use-aliases]
 
   sidekiq:
     description: Run sidekiq in background
@@ -169,6 +175,44 @@ provision:
   - dip bash -c ./bin/setup
 ```
 
+### Predefined environment variables
+
+#### $DIP_OS
+
+Current OS architecture (e.g. `linux`, `darwin`, `freebsd`, and so on). Sometime it may be useful to have one common `docker-compose.yml` and OS-dependent Compose configs.
+
+#### $DIP_WORK_DIR_REL_PATH
+
+Relative path from the current directory to the nearest directory where a Dip's config is found. It is useful when you need to mount a specific local directory to a container along with ability to change its working dir. For example:
+
+```
+- project_root
+  |- dip.yml (1)
+  |- docker-compose.yml (2)
+  |- sub-project-dir
+     |- your current directory is here <<<
+```
+
+```yml
+# dip.yml (1)
+environment:
+  WORK_DIR: /app/${DIP_WORK_DIR_REL_PATH}
+```
+
+```yml
+# docker-compose.yml (2)
+services:
+  app:
+    working_dir: ${WORK_DIR:-/app}
+```
+
+```sh
+cd sub-project-dir
+dip run bash -c pwd
+```
+
+returned is `/app/sub-project-dir`.
+
 ### dip run
 
 Run commands defined within the `interaction` section of dip.yml
@@ -178,16 +222,27 @@ dip run rails c
 dip run rake db:migrate
 ```
 
-`run` argument can be omitted
+Also, `run` argument can be omitted
 
 ```sh
 dip rake db:migrate
+```
+
+You can pass in a custom environment variable into a container:
+
+```sh
 dip VERSION=12352452 rake db:rollback
 ```
 
+Use options `-p, --publish=[]` if you need to additionally publish a container's port(s) to the host unless this behaviour is not configured at dip.yml:
+
+```sh
+dip run -p 3000:3000 bundle exec rackup config.ru
+```
+
 ### dip ls
 
-List al available run commands.
+List all available run commands.
 
 ```sh
 dip ls
@@ -237,6 +292,21 @@ volumes:
       name: ssh_data
 ```
 
+if you want to use non-root user you can specify UID like so:
+
+```
+dip ssh up -u 1000
+```
+
+This especially helpful if you have something like this in your docker-compose.yml:
+
+```
+services:
+  web:
+    user: "1000:1000"
+
+```
+
 ### dip nginx
 
 Runs Nginx server container based on [bibendi/nginx-proxy](https://github.com/bibendi/nginx-proxy) image. An application's docker-compose.yml should contain environment variable `VIRTUAL_HOST` and `VIRTUAL_PATH` and connects to external network `frontend`.
@@ -293,6 +363,20 @@ curl www.bar-app.docker/api/v1/quz
 curl www.bar-app.docker/api/v1/baz_service/qzz
 ```
 
+#### Pass SSL certificates
+
+```sh
+dip nginx up -c $HOME/ssl_certificates
+```
+
+#### Publish more than one port to localhost
+
+Just pass a list, separated by a space:
+
+```sh
+dip nginx up -p 80:80 443:443
+```
+
 ### dip dns
 
 Runs a DNS server container based on https://github.com/aacebedo/dnsdock. It is used for container to container requests through Nginx. An application's docker-compose.yml should define `dns` configuration with environment variable `$DIP_DNS` and connect to external network `frontend`. `$DIP_DNS` will be automatically assigned by dip.

data/exe/dip

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

data/lib/dip.rb

@@ -11,7 +11,7 @@ module Dip
     end
 
     def env
-      @env ||= Dip::Environment.new(Dip::Config.exist? ? config.environment : {})
+      @env ||= Dip::Environment.new(config.exist? ? config.environment : {})
     end
 
     def bin_path

data/lib/dip/cli.rb

@@ -5,6 +5,8 @@ require 'dip/run_vars'
 
 module Dip
   class CLI < Thor
+    TOP_LEVEL_COMMANDS = %w[help version ls compose up stop down run provision ssh dns nginx console].freeze
+
     class << self
       # Hackery. Take the run method away from Thor so that we can redefine it.
       def is_thor_reserved_word?(word, type)
@@ -13,24 +15,24 @@ module Dip
         super
       end
 
-      def start(argv)
-        super Dip::RunVars.call(argv, ENV)
+      def exit_on_failure?
+        true
       end
-    end
 
-    stop_on_unknown_option! :up
+      def start(argv)
+        argv = Dip::RunVars.call(argv, ENV)
 
-    def method_missing(cmd, *args)
-      if Dip.config.interaction.key?(cmd.to_sym)
-        self.class.start(["run", cmd.to_s, *args])
-      else
-        super
+        cmd = argv.first
+
+        if cmd && !TOP_LEVEL_COMMANDS.include?(cmd) && Dip.config.exist? && Dip.config.interaction.key?(cmd.to_sym)
+          argv.unshift("run")
+        end
+
+        super Dip::RunVars.call(argv, ENV)
       end
     end
 
-    def respond_to_missing?(cmd)
-      Dip.config.interaction.key?(cmd.to_sym)
-    end
+    stop_on_unknown_option! :run
 
     desc 'version', 'dip version'
     def version
@@ -66,10 +68,17 @@ module Dip
       compose("down", *argv)
     end
 
-    desc 'CMD or dip run CMD [OPTIONS]', 'Run configured command in a docker-compose service'
+    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'
     def run(*argv)
-      require_relative 'commands/run'
-      Dip::Commands::Run.new(*argv).execute
+      if argv.empty? || options[:help]
+        invoke :help, ['run']
+      else
+        require_relative 'commands/run'
+        Dip::Commands::Run.new(*argv, publish: options[:publish]).execute
+      end
     end
 
     desc "provision", "Execute commands within provision section"

data/lib/dip/cli/base.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Dip
+  class CLI
+    class Base < Thor
+      def self.exit_on_failure?
+        true
+      end
+    end
+  end
+end

data/lib/dip/cli/console.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 require 'thor'
+require_relative "./base"
 require_relative "../commands/console"
 
 module Dip
   class CLI
-    class Console < Thor
+    class Console < Base
       desc "start", "Integrate Dip into current shell"
       method_option :help, aliases: '-h', type: :boolean,
                            desc: 'Display usage information'

data/lib/dip/cli/dns.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
 require 'thor'
+require_relative "./base"
 require_relative "../commands/dns"
 
 module Dip
   class CLI
     # See more https://github.com/aacebedo/dnsdock
-    class DNS < Thor
+    class DNS < Base
       desc "up", "Run dnsdock container"
       method_option :help, aliases: '-h', type: :boolean,
                            desc: 'Display usage information'

data/lib/dip/cli/nginx.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
 require 'thor'
+require_relative "./base"
 require_relative "../commands/nginx"
 
 module Dip
   class CLI
     # See more https://github.com/bibendi/nginx-proxy
-    class Nginx < Thor
+    class Nginx < Base
       desc "up", "Run nginx container"
       method_option :help, aliases: '-h', type: :boolean,
                            desc: 'Display usage information'
@@ -16,12 +17,13 @@ module Dip
                              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: "80:80",
-                              desc: 'Container port'
+      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']
@@ -32,7 +34,8 @@ module Dip
             net: options.fetch(:net),
             publish: options.fetch(:publish),
             image: options.fetch(:image),
-            domain: options.fetch(:domain)
+            domain: options.fetch(:domain),
+            certs: options[:certs]
           ).execute
         end
       end

data/lib/dip/cli/ssh.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 require 'thor'
+require_relative "./base"
 require_relative "../commands/ssh"
 
 module Dip
   class CLI
-    class SSH < Thor
+    class SSH < Base
       desc "up", "Run ssh-agent container"
       method_option :help, aliases: '-h', type: :boolean,
                            desc: 'Display usage information'
@@ -15,6 +16,8 @@ module Dip
                              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'
@@ -25,7 +28,8 @@ module Dip
           Dip::Commands::SSH::Up.new(
             key: options.fetch(:key),
             volume: options.fetch(:volume),
-            interactive: options.nonteractive? ? false : options.interactive?
+            interactive: options.nonteractive? ? false : options.interactive?,
+            user: options.user
           ).execute
         end
       end

data/lib/dip/commands/compose.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'pathname'
+
 require_relative '../command'
 require_relative 'dns'
 
@@ -18,7 +20,7 @@ module Dip
       def execute
         Dip.env["DIP_DNS"] ||= find_dns
 
-        compose_argv = Array(find_files) + Array(find_project_name) + argv
+        compose_argv = Array(find_files) + Array(cli_options) + argv
 
         shell("docker-compose", compose_argv)
       end
@@ -29,23 +31,26 @@ module Dip
         return unless (files = config[:files])
 
         if files.is_a?(Array)
-          files.each_with_object([]) do |file_name, memo|
-            file_name = ::Dip.env.interpolate(file_name)
-            next unless File.exist?(file_name)
+          files.each_with_object([]) do |file_path, memo|
+            file_path = ::Dip.env.interpolate(file_path)
+            file_path = Pathname.new(file_path)
+            file_path = Dip.config.file_path.parent.join(file_path).expand_path if file_path.relative?
+            next unless file_path.exist?
 
             memo << "--file"
-            memo << file_name
+            memo << file_path.to_s
           end
         end
       end
 
-      def find_project_name
-        return unless (project_name = config[:project_name])
+      def cli_options
+        %i[project_name project_directory].flat_map do |name|
+          next unless (value = config[name])
+          next unless value.is_a?(String)
 
-        if project_name.is_a?(String)
-          project_name = ::Dip.env.interpolate(project_name)
-          ["--project-name", project_name]
-        end
+          value = ::Dip.env.interpolate(value)
+          ["--#{name.to_s.gsub('_', '-')}", value]
+        end.compact
       end
 
       def find_dns

data/lib/dip/commands/console.rb

@@ -86,7 +86,7 @@ module Dip
         end
 
         def execute
-          if Dip::Config.exist?
+          if Dip.config.exist?
             add_aliases(*Dip.config.interaction.keys) if Dip.config.interaction
             add_aliases("compose", "up", "stop", "down", "provision")
           end

data/lib/dip/commands/nginx.rb

@@ -7,13 +7,14 @@ module Dip
   module Commands
     module Nginx
       class Up < Dip::Command
-        def initialize(name:, socket:, net:, publish:, image:, domain:)
+        def initialize(name:, socket:, net:, publish:, image:, domain:, certs:)
           @name = name
           @socket = socket
           @net = net
           @publish = publish
           @image = image
           @domain = domain
+          @certs = certs
         end
 
         def execute
@@ -26,8 +27,9 @@ module Dip
         def container_args
           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 << "--publish #{@publish}"
+          result << Array(@publish).map { |p| "--publish #{p}" }.join(' ')
           result << "--net #{@net}"
           result << "--name #{@name}"
           result << "--label com.dnsdock.alias=#{@domain}"

data/lib/dip/commands/run.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'shellwords'
+require_relative '../../../lib/dip/run_vars'
 require_relative '../command'
 require_relative '../interaction_tree'
 require_relative 'compose'
@@ -8,7 +9,9 @@ require_relative 'compose'
 module Dip
   module Commands
     class Run < Dip::Command
-      def initialize(cmd, *argv)
+      def initialize(cmd, *argv, publish: nil)
+        @publish = publish
+
         @command, @argv = InteractionTree.
                           new(Dip.config.interaction).
                           find(cmd, *argv)&.
@@ -28,13 +31,14 @@ module Dip
 
       private
 
-      attr_reader :command, :argv
+      attr_reader :command, :argv, :publish
 
       def compose_arguments
         compose_argv = command[:compose][:run_options].dup
 
         if command[:compose][:method] == "run"
           compose_argv.concat(run_vars)
+          compose_argv.concat(published_ports)
           compose_argv << "--rm"
         end
 
@@ -55,6 +59,14 @@ module Dip
 
         run_vars.map { |k, v| ["-e", "#{k}=#{v}"] }.flatten
       end
+
+      def published_ports
+        if publish.respond_to?(:each)
+          publish.map { |p| "--publish=#{p}" }
+        else
+          []
+        end
+      end
     end
   end
 end

data/lib/dip/commands/ssh.rb

@@ -7,16 +7,20 @@ module Dip
   module Commands
     module SSH
       class Up < Dip::Command
-        def initialize(key:, volume:, interactive:)
+        def initialize(key:, volume:, interactive:, user: nil)
           @key = key
           @volume = volume
           @interactive = interactive
+          @user = user
         end
 
         def execute
           subshell("docker", "volume create --name ssh_data".shellsplit, out: File::NULL, err: File::NULL)
 
-          subshell("docker", "run --detach --volume ssh_data:/ssh --name=ssh-agent whilp/ssh-agent".shellsplit)
+          subshell(
+            "docker",
+            "run #{user_args} --detach --volume ssh_data:/ssh --name=ssh-agent whilp/ssh-agent".shellsplit
+          )
 
           key = Dip.env.interpolate(@key)
           subshell("docker", "run #{container_args} whilp/ssh-agent ssh-add #{key}".shellsplit)
@@ -24,6 +28,10 @@ module Dip
 
         private
 
+        def user_args
+          "-u #{@user}" if @user
+        end
+
         def container_args
           result = %w(--rm)
           volume = Dip.env.interpolate(@volume)

data/lib/dip/config.rb

@@ -2,6 +2,7 @@
 
 require "yaml"
 require "erb"
+require "pathname"
 
 require "dip/version"
 require "dip/ext/hash"
@@ -12,47 +13,98 @@ module Dip
   class Config
     DEFAULT_PATH = "dip.yml"
 
-    class << self
-      def exist?
-        File.exist?(path)
+    CONFIG_DEFAULTS = {
+      environment: {},
+      compose: {},
+      interation: {},
+      provision: []
+    }.freeze
+
+    ConfigKeyMissingError = Class.new(ArgumentError)
+
+    class ConfigFinder
+      attr_reader :file_path
+
+      def initialize(work_dir, override: false)
+        @override = override
+
+        @file_path = if ENV["DIP_FILE"]
+                       Pathname.new(prepared_name(ENV["DIP_FILE"]))
+                     else
+                       find(Pathname.new(work_dir))
+                     end
       end
 
-      def path
-        ENV["DIP_FILE"] || File.join(Dir.pwd, DEFAULT_PATH)
+      def exist?
+        file_path&.exist?
       end
 
-      def override_path
+      private
+
+      attr_reader :override
+
+      def prepared_name(path)
+        return path unless override
+
         path.gsub(/\.yml$/, ".override.yml")
       end
 
+      def find(path)
+        file = path.join(prepared_name(DEFAULT_PATH))
+        return file if file.exist?
+        return if path.root?
+
+        find(path.parent)
+      end
+    end
+
+    class << self
       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!
+        )&.deep_symbolize_keys! || {}
       end
     end
 
-    %i[environment compose interaction provision].each do |key|
-      define_method(key) do
-        config[key]
-      end
+    def initialize(work_dir = Dir.pwd)
+      @work_dir = work_dir
+    end
+
+    def file_path
+      finder.file_path
+    end
+
+    def exist?
+      finder.exist?
     end
 
     def to_h
       config
     end
 
+    %i[environment compose interaction provision].each do |key|
+      define_method(key) do
+        config[key] || (raise config_missing_error(key))
+      end
+    end
+
     private
 
+    attr_reader :work_dir
+
+    def finder
+      @finder ||= ConfigFinder.new(work_dir)
+    end
+
     def config
       return @config if @config
 
-      raise ArgumentError, "Dip config not found at path '#{self.class.path}'" unless self.class.exist?
+      raise Dip::Error, "Could not find dip.yml config" unless finder.exist?
 
-      config = self.class.load_yaml
+      config = self.class.load_yaml(finder.file_path)
 
       unless Gem::Version.new(Dip::VERSION) >= Gem::Version.new(config.fetch(:version))
         raise VersionMismatchError, "Your dip version is `#{Dip::VERSION}`, " \
@@ -60,9 +112,15 @@ module Dip
                                     "Please upgrade your dip!"
       end
 
-      config.deep_merge!(self.class.load_yaml(self.class.override_path))
+      override_finder = ConfigFinder.new(work_dir, override: true)
+      config.deep_merge!(self.class.load_yaml(override_finder.file_path)) if override_finder.exist?
+
+      @config = CONFIG_DEFAULTS.merge(config)
+    end
 
-      @config = config
+    def config_missing_error(config_key)
+      msg = 'config for %<key>s is not defined in %<path>s' % {key: config_key, path: finder.file_path}
+      ConfigKeyMissingError.new(msg)
     end
   end
 end

data/lib/dip/environment.rb

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
+require "pathname"
+
 module Dip
   class Environment
     VAR_REGEX = /\$[\{]?(?<var_name>[a-zA-Z_][a-zA-Z0-9_]*)[\}]?/.freeze
-    SPECIAL_VARS = {"DIP_OS" => :find_dip_os}.freeze
+    SPECIAL_VARS = %i[os work_dir_rel_path].freeze
 
     attr_reader :vars
 
@@ -24,6 +26,10 @@ module Dip
       vars.fetch(name) { ENV[name] }
     end
 
+    def fetch(name)
+      vars.fetch(name) { ENV.fetch(name) { yield } }
+    end
+
     def []=(key, value)
       @vars[key] = value
     end
@@ -32,8 +38,8 @@ module Dip
       value.gsub(VAR_REGEX) do
         var_name = Regexp.last_match[:var_name]
 
-        if SPECIAL_VARS.key?(var_name)
-          self[var_name] || send(SPECIAL_VARS[var_name])
+        if special_vars.key?(var_name)
+          fetch(var_name) { send(special_vars[var_name]) }
         else
           self[var_name]
         end
@@ -44,8 +50,18 @@ module Dip
 
     private
 
-    def find_dip_os
+    def special_vars
+      @special_vars ||= SPECIAL_VARS.each_with_object({}) do |key, memo|
+        memo["DIP_#{key.to_s.upcase}"] = "find_#{key}"
+      end
+    end
+
+    def find_os
       @dip_os ||= Gem::Platform.local.os
     end
+
+    def find_work_dir_rel_path
+      @find_work_dir_rel_path ||= Pathname.getwd.relative_path_from(Dip.config.file_path.parent).to_s
+    end
   end
 end

data/lib/dip/version.rb

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

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: dip
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 6.1.0
 platform: ruby
 authors:
 - bibendi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-23 00:00:00.000000000 Z
+date: 2020-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.20'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.20'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.59'
+        version: '0.81'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.59'
+        version: '0.81'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +142,7 @@ files:
 - exe/dip
 - lib/dip.rb
 - lib/dip/cli.rb
+- lib/dip/cli/base.rb
 - lib/dip/cli/console.rb
 - lib/dip/cli/dns.rb
 - lib/dip/cli/nginx.rb
@@ -169,15 +176,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Ruby gem CLI tool for better interacting docker-compose files.