dip 3.4.1 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f20dbfd7641a1820ae40df24486eb9a5c406263dd4e6505a180dc9c608907162
-  data.tar.gz: 28fc371a9a4f953d5f6beb06d023ea63e7feb94ec7c68559f134a86c369c2276
+  metadata.gz: 6b21915c036184db87af0116695d6b54ab3345ded9f3ed9747c01c5dbe454c6d
+  data.tar.gz: 50d05b8888f9636f202873b1c1fe684e312994f25f4d400b1a0c9394b020ff01
 SHA512:
-  metadata.gz: 6a681f1c2a369f362360e94e6535e8df78cedc62d146d78fe6b7d65ecd901c366618faec79f74504aa17511a6ec28d29cb8f367296f653a4eed7506ef1162e3d
-  data.tar.gz: 48e7d213640ab4aaf879918e3a3600e8c06c1026e870a1a2c881447dfc5d48e93a25dcb63965ee47823049eda32cfb8655d60fd5e1fe2c460428269394a7cf87
+  metadata.gz: cc24363f19b3b433efb1602e7e22b641cbca774b2d4bfc6a34cbf5683e4a170065615589e7abc32cba7a3039cc5378a6b96aea381ec95421115594aff01cc3f5
+  data.tar.gz: 9927d87bd8dc6b75a0115e1c363566d5e27e00fd788cbabbe56daff5764870254375f7015b30da2d33645ee695ca3165939bccde8bb5dfc579e7f2b02a363f08

data/lib/dip/cli.rb

@@ -21,9 +21,7 @@ module Dip
 
     def method_missing(cmd, *args)
       if Dip.config.interaction.key?(cmd.to_sym)
-        args.unshift(cmd.to_s)
-        args.unshift("run")
-        self.class.start(args)
+        self.class.start(["run", cmd] + args)
       else
         super
       end

data/lib/dip/run_vars.rb

@@ -12,42 +12,52 @@ module Dip
       end
     end
 
+    self.env = {}
+
     def initialize(argv, env = ENV)
       @argv = argv
       @env = env
-      self.class.env = {}
+
+      self.class.env.clear
     end
 
     def call
-      extract_new_env_vars
+      populate_env_vars
+      parse_argv
+    end
+
+    private
+
+    def populate_env_vars
+      return if early_envs.empty?
+
+      (env.keys - early_envs).each do |key|
+        next if env_excluded?(key)
+
+        self.class.env[key] = env[key]
+      end
+    end
 
+    def parse_argv
       stop_parse = false
-      result_argv = []
 
-      argv.each do |arg|
+      argv.each_with_object([]) do |arg, memo|
         if !stop_parse && arg.include?("=")
           key, val = arg.split("=", 2)
           self.class.env[key] = val
         else
-          result_argv << arg
+          memo << arg
           stop_parse ||= true
         end
       end
-
-      result_argv
     end
 
-    private
-
-    def extract_new_env_vars
-      early_envs = env['DIP_EARLY_ENVS'].to_s
-      return if early_envs.empty?
-
-      (env.keys - early_envs.split(',')).each do |key|
-        next if key.start_with?("DIP_") || key.start_with?("_")
+    def early_envs
+      @early_envs ||= env["DIP_EARLY_ENVS"].to_s.split(",")
+    end
 
-        self.class.env[key] = env[key]
-      end
+    def env_excluded?(key)
+      key.start_with?("DIP_", "_")
     end
   end
 end

data/lib/dip/version.rb

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

metadata

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