dip 3.4.0 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6b63ce6f69f4354b803173e399cb4f60578424af67138b7414374a5b72f459d
-  data.tar.gz: c1d60e9f4967bd4646b8c25eddf78f73c50573f2c8a0ecb8fd4124ec43356759
+  metadata.gz: f20dbfd7641a1820ae40df24486eb9a5c406263dd4e6505a180dc9c608907162
+  data.tar.gz: 28fc371a9a4f953d5f6beb06d023ea63e7feb94ec7c68559f134a86c369c2276
 SHA512:
-  metadata.gz: '0315179aee1699c6e95ab45adb50d41a4ee672830c325f82f5e1e5fb99dde1080e89f728507b81b6b92d3a24db0161e290f85c9e32768aa0ef15b1bf7ef9c943'
-  data.tar.gz: dde2a5dc5f9c9ba5560a596ab0c3e4a8ce7793f66968bf618354063dedeae96ef988ed544b817ffd2744bdcd7aaa4d58346b2e035fbac4f7812cd28aad24e2af
+  metadata.gz: 6a681f1c2a369f362360e94e6535e8df78cedc62d146d78fe6b7d65ecd901c366618faec79f74504aa17511a6ec28d29cb8f367296f653a4eed7506ef1162e3d
+  data.tar.gz: 48e7d213640ab4aaf879918e3a3600e8c06c1026e870a1a2c881447dfc5d48e93a25dcb63965ee47823049eda32cfb8655d60fd5e1fe2c460428269394a7cf87

data/exe/dip

@@ -20,7 +20,7 @@ Signal.trap('INT') do
 end
 
 begin
-  Dip::CLI.start(Dip::RunVars.call(ARGV, ENV))
+  Dip::CLI.start(ARGV)
 rescue Dip::Error => err
   puts "ERROR: #{err.message}"
   exit 1

data/lib/dip/cli.rb

@@ -11,6 +11,10 @@ module Dip
 
         super
       end
+
+      def start(argv)
+        super Dip::RunVars.call(argv, ENV)
+      end
     end
 
     stop_on_unknown_option! :up
@@ -61,18 +65,12 @@ module Dip
     desc 'CMD or dip run CMD [OPTIONS]', 'Run configured command in a docker-compose service'
     method_option :help, aliases: '-h', type: :boolean,
                          desc: 'Display usage information'
-    method_option :x_dip_run_vars,
-                  type: :hash,
-                  desc: "Enforce environment variables into container, recommended run like 'dip FOO=bar cmd'"
     def run(cmd, subcmd = nil, *argv)
       if options[:help]
         invoke :help, ['run']
       else
         require_relative 'commands/run'
-        Dip::Commands::Run.
-          new(cmd, subcmd, argv,
-              run_vars: options[:x_dip_run_vars]).
-          execute
+        Dip::Commands::Run.new(cmd, subcmd, argv).execute
       end
     end
 

data/lib/dip/commands/run.rb

@@ -7,11 +7,10 @@ require_relative 'compose'
 module Dip
   module Commands
     class Run < Dip::Command
-      def initialize(cmd, subcmd = nil, argv = [], run_vars: nil)
+      def initialize(cmd, subcmd = nil, argv = [])
         @cmd = cmd.to_sym
         @subcmd = subcmd.to_sym if subcmd
         @argv = argv
-        @run_vars = run_vars
         @config = ::Dip.config.interaction
       end
 
@@ -54,9 +53,10 @@ module Dip
       end
 
       def run_vars
-        return [] unless @run_vars
+        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}=#{v}"] }.flatten
       end
     end
   end

data/lib/dip/run_vars.rb

@@ -2,60 +2,52 @@
 
 module Dip
   class RunVars
-    attr_reader :argv, :env, :early_envs, :env_vars, :result_argv
+    attr_reader :argv, :env
 
-    def self.call(*args)
-      new(*args).call
+    class << self
+      attr_accessor :env
+
+      def call(*args)
+        new(*args).call
+      end
     end
 
     def initialize(argv, env = ENV)
       @argv = argv
       @env = env
-      @env_vars = {}
-      @result_argv = []
+      self.class.env = {}
     end
 
     def call
       extract_new_env_vars
-      extract_passed_env_vars
-
-      result_argv.push(*argv_env_vars) unless env_vars.empty?
-
-      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_")
 
-        env_vars[key] = env[key]
-      end
-    end
-
-    def extract_passed_env_vars
       stop_parse = false
+      result_argv = []
 
       argv.each do |arg|
         if !stop_parse && arg.include?("=")
           key, val = arg.split("=", 2)
-          env_vars[key] = val
+          self.class.env[key] = val
         else
           result_argv << arg
           stop_parse ||= true
         end
       end
+
+      result_argv
     end
 
-    def argv_env_vars
-      result = env_vars.map { |key, val| "#{key}:#{val}" }
-      result[0] = "--x-dip-run-vars=#{result[0]}"
+    private
 
-      result
+    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?("_")
+
+        self.class.env[key] = env[key]
+      end
     end
   end
 end

data/lib/dip/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dip
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.1
 platform: ruby
 authors:
 - bibendi