dip 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abbdaa0602b48327279319f97a75b9ca796721a4874474d08ca2920290177658
-  data.tar.gz: 78a0e91fede2c213845c9a22c3ce25384ac84c5228dba420f1bdb47ac5332146
+  metadata.gz: 68471b4b42a417236e46b120ffc1fc1b3fa2b460f20b872f606e485db200f919
+  data.tar.gz: bb84c40826d34bd0e5aed8f821d96989255a9657dc66c4d4906af773ab2881e9
 SHA512:
-  metadata.gz: f3f12268f1e7f51ba336beb65bf40e0ba50ce6c4ca95551e7b7d394a67500a61df66adba5cd375c8b61d379b964e774c1d126ee0ca42e94b37e4df9a4b03fbeb
-  data.tar.gz: 62820d8bfe0fb92bf20a6b9f4723c47a6b8cddf005ef20a03cff917744df6fcb2d1a37e0ea460383ba87d72a8db7f13a5658e5baae712f622849406500e847ec
+  metadata.gz: b655ab8c4f76cc4efd40b374c2c4e027fa8d8069d49c4f988e106c936f8add208f7ef8266fa662dcccc7febc60ec01eeae7b45149fba802ae0876c9022478817
+  data.tar.gz: a5fef124479d47fa6e9b113cfc0355a9284d92c748548d7e5552b04e038e8b7775a2a467ca699c3f6f3309f4cefbe62e5fba70de6c96c6090f1f4b61354c0150

data/exe/dip

@@ -6,7 +6,12 @@ $LOAD_PATH.unshift(lib_path) unless $LOAD_PATH.include?(lib_path)
 
 require 'dip'
 require 'dip/cli'
-require 'pry-byebug' if Dip.debug?
+
+begin
+  require 'pry-byebug' if Dip.debug?
+rescue LoadError
+  puts "pry-byebug not found!"
+end
 
 Signal.trap('INT') do
   warn("\n#{caller.join("\n")}: interrupted")

data/lib/dip.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "dip/version"
 require "dip/config"
 require "dip/environment"
 
@@ -8,24 +7,18 @@ module Dip
   Error = Class.new(StandardError)
 
   class << self
-    def config_path
-      ENV["DIP_FILE"] || File.join(Dir.pwd, "dip.yml")
-    end
-
     def config
-      @config ||= Dip::Config.new(config_path)
+      @config ||= Dip::Config.new
     end
 
     def env
-      @env ||= Dip::Environment.new(config.environment)
-    end
-
-    def test?
-      ENV["DIP_ENV"] == "test"
+      @env ||= Dip::Environment.new(config.exist? ? config.environment : {})
     end
 
-    def debug?
-      ENV["DIP_ENV"] == "debug"
+    %w(test debug).each do |key|
+      define_method("#{key}?") do
+        ENV["DIP_ENV"] == key
+      end
     end
 
     def reset!

data/lib/dip/commands/compose.rb

@@ -11,7 +11,7 @@ module Dip
       def initialize(cmd, argv = [])
         @cmd = cmd
         @argv = argv
-        @config = ::Dip.config.compose
+        @config = ::Dip.config.compose || {}
       end
 
       def execute

data/lib/dip/config.rb

@@ -5,42 +5,40 @@ require "erb"
 
 module Dip
   class Config
-    def initialize(config_path)
-      load_or_default(config_path)
-    end
+    DEFAULT_PATH = "dip.yml"
 
-    def merge(config)
-      @config.merge!(config)
+    def initialize
+      @path = ENV["DIP_FILE"] || File.join(Dir.pwd, DEFAULT_PATH)
     end
 
-    def environment
-      @config.fetch(:environment, {})
+    def exist?
+      File.exist?(@path)
     end
 
-    def compose
-      @config.fetch(:compose, {})
+    %i[environment compose interaction provision].each do |key|
+      define_method(key) do
+        config[key]
+      end
     end
 
-    def interaction
-      @config.fetch(:interaction, {})
+    def to_h
+      config
     end
 
-    def provision
-      @config.fetch(:provision)
+    private
+
+    def config
+      @config ||= load
     end
 
-    private
+    def load
+      raise ArgumentError, "Dip config not found at path '#{@path}'" unless exist?
 
-    def load_or_default(config_path)
-      @config ||= if File.exist?(config_path) && !Dip.test?
-                    YAML.safe_load(
-                      ERB.new(File.read(config_path)).result,
-                      [], [], true,
-                      symbolize_names: true
-                    )
-                  else
-                    {}
-                  end
+      @config = YAML.safe_load(
+        ERB.new(File.read(@path)).result,
+        [], [], true,
+        symbolize_names: true
+      )
     end
   end
 end

data/lib/dip/environment.rb

@@ -10,7 +10,7 @@ module Dip
     def initialize(default_vars)
       @vars = {}
 
-      merge(default_vars)
+      merge(default_vars || {})
     end
 
     def merge(new_vars)

data/lib/dip/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dip
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
 platform: ruby
 authors:
 - bibendi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-06 00:00:00.000000000 Z
+date: 2018-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor