dip 3.6.1 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6ed9787f57436a499d2003b50c9a1775948f74785477e6b8ed2d99ffcc215a8
-  data.tar.gz: 91de83c0a7347e66ccf7aae58fb48649817b2b654ff4840ff850e298073a096f
+  metadata.gz: 5eaf38b3627e299f0f3d6e6650d21ea564a6f38bb1ce84afc8fff76a1665b0d5
+  data.tar.gz: af01914d8226fc9c886b266098303fccde34e18e78a1cc3c8225119e1f127c5f
 SHA512:
-  metadata.gz: 10f3c53ad59b05e9dcfb887510fd2b76c487546374cdb24a778c1d4e05579b764f2a8cdd915f0dadaf9462aa65f4bc60bb25759dfa497011f9f84f0fb386a60e
-  data.tar.gz: c1e87222e4a1e235de27e75e242a802ad4f449ffdd0e0bfbdebdd3c118d34f9d1ca50417e0ae7a978df7c485739ac6793932d0dd63efea353ef58ca196e64aa5
+  metadata.gz: e18bb5db1b8e11fe071f182016e8e117090b662551388969f68199d3314a730995f6697827ede5449aee4f514302d586a4828bb8b71b152f0dfc95df2757aa37
+  data.tar.gz: 1ef69de40baedbf4ae515fff82386eb8058bd79ce7eb36ee1cca7edac07046bd41ca3801910ce32d3c1c5734ef78b05783ca073264b547b1ffdcd66c0681ea51

data/README.md

@@ -22,10 +22,10 @@ Command line utility that gives the "native" interaction with applications confi
 
 ## Integration with shell
 
-Dip can be injected into current shell. For now, it supported ZSH only.
+Dip can be injected into current shell (ZSH or Bash).
 
 ```sh
-dip console | source /dev/stdin
+eval "$(dip console)"
 ```
 
 After that we can type commands without `dip` prefix. For example:
@@ -46,6 +46,9 @@ Also, in shell mode Dip is trying to determine passed manually environment varia
 VERSION=20180515103400 rails db:migrate:down
 ```
 
+You could add this `eval` at the end of your `~/.zshrc`, or `~/.bashrc`, or `~/.bash_profile`. 
+After that, it will be automatically applied when you open your preferred terminal.
+
 ## Installation
 
 ```sh

data/lib/dip/cli.rb

@@ -50,12 +50,17 @@ module Dip
       end
     end
 
-    desc "up [OPTIONS] SERVICE", "Run docker-compose up command"
+    desc "up [OPTIONS] SERVICE", "Run `docker-compose up` command"
     def up(*argv)
       compose("up", *argv)
     end
 
-    desc "down [OPTIONS]", "Run docker-compose down command"
+    desc "stop [OPTIONS] SERVICE", "Run `docker-compose stop` command"
+    def stop(*argv)
+      compose("stop", *argv)
+    end
+
+    desc "down [OPTIONS]", "Run `docker-compose down` command"
     def down(*argv)
       compose("down", *argv)
     end
@@ -97,7 +102,7 @@ module Dip
     subcommand :nginx, Dip::CLI::Nginx
 
     require_relative 'cli/console'
-    desc "console", "Integrate Dip commands into shell (only ZSH is supported now)"
+    desc "console", "Integrate Dip commands into shell (only ZSH and Bash is supported)"
     subcommand :console, Dip::CLI::Console
   end
 end

data/lib/dip/commands/console.rb

@@ -18,6 +18,48 @@ module Dip
             export DIP_EARLY_ENVS=#{ENV.keys.join(',')}
             export DIP_PROMPT_TEXT="ⅆ"
 
+            function dip_clear() {
+              # just stub, will be redefined after injecting aliases
+              true
+            }
+
+            function dip_inject() {
+              eval "$(#{Dip.bin_path} console inject)"
+            }
+
+            function dip_reload() {
+              dip_clear
+              dip_inject
+            }
+
+            # Inspired by RVM
+            function __zsh_like_cd() {
+              \\typeset __zsh_like_cd_hook
+              if
+                builtin "$@"
+              then
+                for __zsh_like_cd_hook in chpwd "${chpwd_functions[@]}"
+                do
+                  if \\typeset -f "$__zsh_like_cd_hook" >/dev/null 2>&1
+                  then "$__zsh_like_cd_hook" || break # finish on first failed hook
+                  fi
+                done
+                true
+              else
+                return $?
+              fi
+            }
+
+            [[ -n "${ZSH_VERSION:-}" ]] ||
+            {
+              function cd()    { __zsh_like_cd cd    "$@" ; }
+              function popd()  { __zsh_like_cd popd  "$@" ; }
+              function pushd() { __zsh_like_cd pushd "$@" ; }
+            }
+
+            export -a chpwd_functions
+            [[ " ${chpwd_functions[*]} " == *" dip_reload "* ]] || chpwd_functions+=(dip_reload)
+
             if [[ "$ZSH_THEME" = "agnoster" ]]; then
               eval "`declare -f prompt_end | sed '1s/.*/_&/'`"
 
@@ -30,25 +72,14 @@ module Dip
               }
             fi
 
-            function dip_remove_aliases() {
-              # will be redefined
-            }
-
-            function dip_source_aliases() {
-              #{Dip.bin_path} console inject | source /dev/stdin
-            }
-
-            dip_source_aliases
-
-            function chpwd() {
-              dip_remove_aliases
-              dip_source_aliases
-            }
+            dip_reload
           SH
         end
       end
 
       class Inject < Dip::Command
+        attr_reader :out, :aliases
+
         def initialize
           @aliases = []
           @out = []
@@ -56,38 +87,27 @@ module Dip
 
         def execute
           if Dip::Config.exist?
-            alias_interaction if Dip.config.interaction
-            alias_compose
-            add_alias("provision")
+            add_aliases(*Dip.config.interaction.keys) if Dip.config.interaction
+            add_aliases("compose", "up", "stop", "down", "provision")
           end
 
-          fill_removing_aliases
+          clear_aliases
 
-          puts @out.join("\n\n")
+          puts out.join("\n\n")
         end
 
         private
 
-        def alias_interaction
-          Dip.config.interaction.keys.each do |name|
-            add_alias(name)
+        def add_aliases(*names)
+          names.each do |name|
+            aliases << name
+            out << "function #{name}() { #{Dip.bin_path} #{name} $@; }"
           end
         end
 
-        def alias_compose
-          %w(compose up down).each do |name|
-            add_alias(name)
-          end
-        end
-
-        def add_alias(name)
-          @aliases << name
-          @out << "function #{name}() { #{Dip.bin_path} #{name} $@; }"
-        end
-
-        def fill_removing_aliases
-          @out << "function dip_remove_aliases() { \n" \
-                  "#{@aliases.map { |a| "  unset -f #{a}" }.join("\n")} " \
+        def clear_aliases
+          out << "function dip_clear() { \n" \
+                  "#{aliases.any? ? aliases.map { |a| "  unset -f #{a}" }.join("\n") : 'true'} " \
                   "\n}"
         end
       end

data/lib/dip/version.rb

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

metadata

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