dip 5.0.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a87d6ff7ea5665545d848e94b4c9d0b2a1cbcc5a4af392b122a38026666db45a
-  data.tar.gz: 73069ac850450b0dbf2f2ab927a399f880a4d02b02b0e8d9a3645240cfeba0c8
+  metadata.gz: 965a10ab510e886e51a4e307a152358177caceb7c6504ac2c15d222c537ebb12
+  data.tar.gz: 2d9c98f79718a7774ba7f12f66ecb8495b7f965db3f6aac855586cfe8bb0b7cd
 SHA512:
-  metadata.gz: f1492bf810a27125097852ad6cace0f245a7b296656b800e644061f42e31473662ef75b110bb969f9275d7418f41b3e03cf145f183e93b3e8d2b39359d7ebbd8
-  data.tar.gz: 76a43d9ca8ef960b2b602573802b8395411247fd9e720e5d6d01a824049898351afa1d78c517e7cbefa2550e6e82b51d32376671b77ef5875c437d3850c01146
+  metadata.gz: 3d44176de01f624cff9e98b578c23e525e7c4b6ddc4ad9bdf35cfa54923851f6bea24633c377f20167263deb0b133482f92d3203adffbc6e79b09cdf0c390f71
+  data.tar.gz: ff3ba16f8461fe8e1eb8a5070e312f88702c06c2f2cdcf4f4e0a61390bee09bdd69ce3510c1bd26100addc1bca163e876aa9a78aa615fb2394b2d2a55fbaea01

data/README.md

@@ -80,7 +80,7 @@ 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/5.0.0/dip-`uname -s`-`uname -m` > /usr/local/bin/dip
+curl -L https://github.com/bibendi/dip/releases/download/v6.0.0/dip-`uname -s`-`uname -m` > /usr/local/bin/dip
 chmod +x /usr/local/bin/dip
 ```
 

data/exe/dip

@@ -6,7 +6,7 @@ $LOAD_PATH.unshift(lib_path) unless $LOAD_PATH.include?(lib_path)
 
 begin
   require 'pry-byebug' if ENV["DIP_ENV"] == "debug"
-rescue LoadError # rubocop:disable Lint/SuppressedException
+rescue LoadError
   # do nothing
 end
 

data/lib/dip/commands/compose.rb

@@ -20,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
@@ -43,13 +43,14 @@ module Dip
         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/config.rb

@@ -13,6 +13,15 @@ module Dip
   class Config
     DEFAULT_PATH = "dip.yml"
 
+    CONFIG_DEFAULTS = {
+      environment: {},
+      compose: {},
+      interation: {},
+      provision: []
+    }.freeze
+
+    ConfigKeyMissingError = Class.new(ArgumentError)
+
     class ConfigFinder
       attr_reader :file_path
 
@@ -78,7 +87,7 @@ module Dip
 
     %i[environment compose interaction provision].each do |key|
       define_method(key) do
-        config[key]
+        config[key] || (raise config_missing_error(key))
       end
     end
 
@@ -106,7 +115,12 @@ module Dip
       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
+      @config = CONFIG_DEFAULTS.merge(config)
+    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}
+      ConfigKeyMissingError.new(msg)
     end
   end
 end

data/lib/dip/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dip
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 6.0.0
 platform: ruby
 authors:
 - bibendi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-24 00:00:00.000000000 Z
+date: 2020-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -92,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
@@ -176,7 +176,7 @@ 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:
   - - ">="