dip 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39afd269d744387e64e708e2c173c38ffe35605ae8aa4dffa9cd074142e0e9b1
-  data.tar.gz: efb60031ad5646986fc5672b4579671d3225624b9bc38d1d26ba142a91b1b3ee
+  metadata.gz: f6b63ce6f69f4354b803173e399cb4f60578424af67138b7414374a5b72f459d
+  data.tar.gz: c1d60e9f4967bd4646b8c25eddf78f73c50573f2c8a0ecb8fd4124ec43356759
 SHA512:
-  metadata.gz: c6d434a4250d5276e4ce91d3ed2393be9cbc93108a8fe32052f3cb6f54b2fd8fd740ee0652352fb32f26310ed30e559dbe17565eb2e16a195d7e6d7f226aaa58
-  data.tar.gz: 5a5512fff638facb0f3bf185703a53df02fb009e1d3c29a80803724336607f8198891f4465f0b9b2cd730d6b866225118dd9d2efa59eacc77776038039be64c5
+  metadata.gz: '0315179aee1699c6e95ab45adb50d41a4ee672830c325f82f5e1e5fb99dde1080e89f728507b81b6b92d3a24db0161e290f85c9e32768aa0ef15b1bf7ef9c943'
+  data.tar.gz: dde2a5dc5f9c9ba5560a596ab0c3e4a8ce7793f66968bf618354063dedeae96ef988ed544b817ffd2744bdcd7aaa4d58346b2e035fbac4f7812cd28aad24e2af

data/README.md

@@ -121,25 +121,31 @@ dip compose up -d redis
 
 ### Integration with shell
 
-Dip can be injected into your current shell. For now, it supported ZSH only.
+Dip can be injected into current shell. For now, it supported ZSH only.
 
 Inject Dip rc file (by default it saved to ~/.dip_shell_rc) into ZSH:
 
 ```sh
-source $(dip console)
+dip console | source /dev/stdin
 ```
 
-After that you can type commands without `dip` prefix. For example:
+After that we can type commands without `dip` prefix. For example:
 
 ```sh
-d> <run-command> *any-args
-d> compose *any-compose-arg
-d> up <service>
-d> down
-d> provision
+<run-command> *any-args
+compose *any-compose-arg
+up <service>
+down
+provision
 ```
 
-When you change the current directory, all shell aliases will be automatically removed. But when you will enter back to a directory with a dip.yml file, then shell aliases will be renewed.
+When we change the current directory, all shell aliases will be automatically removed. But when we will enter back to a directory with a dip.yml file, then shell aliases will be renewed.
+
+Also, in shell mode Dip is trying to determine passed manually environment variables. For example:
+
+```sh
+VERSION=20180515103400 rails db:migrate:down
+```
 
 ### dip ssh
 

data/exe/dip

@@ -6,6 +6,7 @@ $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?
@@ -19,23 +20,7 @@ Signal.trap('INT') do
 end
 
 begin
-  run_vars = []
-
-  ARGV.each do |arg|
-    if !run_vars.frozen? && arg.include?("=")
-      key, val = arg.split("=", 2)
-      run_vars << "#{'--x-dip-run-vars=' if run_vars.empty?}#{key}:#{val}"
-    else
-      run_vars.freeze
-    end
-  end
-
-  unless run_vars.empty?
-    ARGV.shift(run_vars.size)
-    ARGV.push(*run_vars)
-  end
-
-  Dip::CLI.start
+  Dip::CLI.start(Dip::RunVars.call(ARGV, ENV))
 rescue Dip::Error => err
   puts "ERROR: #{err.message}"
   exit 1

data/lib/dip/commands/console.rb

@@ -7,22 +7,16 @@ module Dip
     module Console
       class Start < Dip::Command
         def execute
-          File.write(rc_file, script_content)
-
-          puts rc_file
+          puts script
         end
 
         private
 
-        def rc_file
-          @rc_file ||= "#{Dir.home}/.dip_shell_rc"
-        end
-
-        def script_content
+        def script
           <<-SH.gsub(/^[ ]{12}/, '')
             if [ "$DIP_SHELL" != "1" ]; then
-              export PS1="${PS1}d> "
-              export DIP_SHELL=1
+              export DIP_SHELL=zsh
+              export DIP_EARLY_ENVS=#{ENV.keys.join(',')}
             fi
 
             function _dip_remove_aliases() {

data/lib/dip/run_vars.rb

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

data/lib/dip/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dip
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - bibendi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-12 00:00:00.000000000 Z
+date: 2018-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -150,6 +150,7 @@ files:
 - lib/dip/commands/ssh.rb
 - lib/dip/config.rb
 - lib/dip/environment.rb
+- lib/dip/run_vars.rb
 - lib/dip/version.rb
 homepage: https://github.com/bibendi/dip
 licenses: