Merge pull request #1850 from tbhaxor/feature/completion/ngrok

Added completion for ngrok tool

aliases/available/docker-compose.aliases.bash

@@ -7,3 +7,4 @@ alias dco="docker-compose"
 alias dcofresh="docker-compose-fresh"
 alias dcol="docker-compose logs -f --tail 100"
 alias dcou="docker-compose up"
+alias dcouns="dcou --no-start"

aliases/available/git.aliases.bash

@@ -84,7 +84,7 @@ alias glsum='git diff --name-only --diff-filter=U' # Show unmerged (conflicted)
 alias ggui='git gui'
 
 # home
-alias ghm='cd '\''$(git rev-parse --show-toplevel)'\''' # Git home
+alias ghm='cd "$(git rev-parse --show-toplevel)"' # Git home
 # appendage to ghm
 if ! _command_exists gh; then
 	alias gh='ghm'
@@ -127,6 +127,7 @@ alias grm='git rm'
 
 # rebase
 alias grb='git rebase'
+alias grbc='git rebase --continue'
 alias grm='git rebase master'
 alias grmi='git rebase master -i'
 alias gprom='git fetch origin master && git rebase origin/master && git update-ref refs/heads/master origin/master' # Rebase with latest remote master

aliases/available/kubectl.aliases.bash

@@ -18,7 +18,7 @@ function _set_pkg_aliases()
     alias kcgpan='kubectl get pods --all-namespaces'
     alias kcgdan='kubectl get deployments --all-namespaces'
     # launches a disposable netshoot pod in the k8s cluster
-    alias kcnetshoot='kubectl run --generator=run-pod/v1 netshoot-$(date +%s) --rm -i --tty --image nicolaka/netshoot -- /bin/bash'
+    alias kcnetshoot='kubectl run netshoot-$(date +%s) --rm -i --tty --image nicolaka/netshoot -- /bin/bash'
   fi
 }
 

aliases/available/npm.aliases.bash

@@ -22,6 +22,7 @@ alias nud='npm update'
 alias nr='npm run'
 alias nls='npm list --depth=0 2>/dev/null'
 alias nlsg='npm list -g --depth=0 2>/dev/null'
+alias nt='npm test'
 
 # npx
 alias nx='npx'

aliases/available/systemd.aliases.bash

@@ -3,13 +3,20 @@ about-alias 'systemd service'
 
 case $OSTYPE in
     linux*)
+# Improve aliases by bringing the common root `sc|scd` + `sre` for action + `u` for user
 	alias sc='systemctl'
-	alias scr='systemctl daemon-reload'
 	alias scu='systemctl --user'
-	alias scur='systemctl --user daemon-reload'
+	alias scdr='systemctl daemon-reload'
+	alias scdru='systemctl --user daemon-reload'
+	alias scr='systemctl restart'
+	alias scru='systemctl --user restart'
 	alias sce='systemctl stop'
-	alias scue='systemctl --user stop'
+	alias sceu='systemctl --user stop'
 	alias scs='systemctl start'
-	alias scus='systemctl --user start'
+	alias scsu='systemctl --user start'
+# Keeping previous aliases for a non-breaking change.
+	alias scue='sceu'
+	alias scus='scsu'
+	alias scur='scdru'
     ;;
 esac

aliases/available/terraform.aliases.bash

@@ -7,4 +7,4 @@ alias tf='terraform'
 alias tfv='terraform validate'
 alias tfp='terraform plan'
 alias tfa='terraform apply'
-alias tfd='terraform destory'
+alias tfd='terraform destroy'

clean_files.txt

@@ -43,7 +43,9 @@ themes/bobby-python
 themes/brainy
 themes/brunton
 themes/command_duration.theme.bash
+themes/easy
 themes/modern
+themes/purity
 
 # plugins
 #
@@ -82,6 +84,7 @@ completion/available/kubectl.completion.bash
 completion/available/lerna.completion.bash
 completion/available/minikube.completion.bash
 completion/available/notify-send.completion.bash
+completion/available/ngrok.completion.bash
 completion/available/npm.completion.bash
 completion/available/packer.completion.bash
 completion/available/pip.completion.bash

completion/available/ngrok.completion.bash

@@ -0,0 +1,45 @@
+# shellcheck shell=bash
+
+__ngrok_completion() {
+	local prev=$(_get_pword)
+	local curr=$(_get_cword)
+
+	local BASE_NO_CONF="--log --log-format --log-level --help"
+	local BASE="--config $BASE_NO_CONF"
+	local DEFAULT="$BASE --authtoken --region"
+
+	case $prev in
+		authtoken)
+			# shellcheck disable=SC2207
+			COMPREPLY=($(compgen -W "$BASE" -- "$curr"))
+			;;
+		http)
+			# shellcheck disable=SC2207
+			COMPREPLY=($(compgen -W "$DEFAULT --auth --bind-tls --host-header --hostname --inspect --subdomain" -- "$curr"))
+			;;
+		start)
+			# shellcheck disable=SC2207
+			COMPREPLY=($(compgen -W "$DEFAULT --all --none" -- "$curr"))
+			;;
+		tcp)
+			# shellcheck disable=SC2207
+			COMPREPLY=($(compgen -W "$DEFAULT --remote-addr" -- "$curr"))
+			;;
+		tls)
+			# shellcheck disable=SC2207
+			COMPREPLY=($(compgen -W "$DEFAULT --client-cas --crt --hostname --key --subdomain" -- "$curr"))
+			;;
+		update)
+			# shellcheck disable=SC2207
+			COMPREPLY=($(compgen -W "$BASE_NO_CONF --channel" -- "$curr"))
+			;;
+		ngrok)
+			# shellcheck disable=SC2207
+			COMPREPLY=($(compgen -W "authtoken credits http start tcp tls update version help" -- "$curr"))
+			;;
+		*) ;;
+
+	esac
+}
+
+complete -F __ngrok_completion ngrok

docs/README.md

@@ -9,7 +9,7 @@
 Includes autocompletion, themes, aliases, custom functions, a few stolen pieces from Steve Losh, and more.
 
 Bash-it provides a solid framework for using, developing and maintaining shell scripts and custom commands for your daily work.
-If you're using the _Bourne Again Shell_ (Bash) regularly and have been looking for an easy way on how to keep all of these nice little scripts and aliases under control, then Bash-it is for you!
+If you're using the _Bourne Again Shell_ (Bash) regularly and have been looking for an easy way on how to keep all of these nice little scripts and aliases under control, then Bash-it is for you!  
 Stop polluting your `~/bin` directory and your `.bashrc` file, fork/clone Bash-it and start hacking away.
 
 - [Main Page](https://bash-it.readthedocs.io/en/latest)
@@ -55,4 +55,8 @@ please feel free to read through this page if you're interested in how Bash-it l
 
 * [List of contributors][contribute]
 
+## License
+
+Bash-it is licensed under the [MIT License](https://github.com/Bash-it/bash-it/blob/master/LICENSE).
+
 [contribute]: https://github.com/Bash-it/bash-it/contributors

docs/index.rst

@@ -8,7 +8,7 @@ Welcome to Bash-it's documentation!
 Includes autocompletion, themes, aliases, custom functions, a few stolen pieces from Steve Losh, and more.
 
 Bash-it provides a solid framework for using, developing and maintaining shell scripts and custom commands for your daily work.
-If you're using the *Bourne Again Shell* (Bash) regularly and have been looking for an easy way on how to keep all of these nice little scripts and aliases under control, then Bash-it is for you!
+If you're using the *Bourne Again Shell* (Bash) regularly and have been looking for an easy way on how to keep all of these nice little scripts and aliases under control, then Bash-it is for you!  
 Stop polluting your ``~/bin`` directory and your ``.bashrc`` file, fork/clone Bash-it and start hacking away.
 
 .. toctree::

docs/themes-list/easy.rst

@@ -0,0 +1,14 @@
+.. _easy:
+
+Easy Theme
+==========
+
+A simple theme
+
+Examples
+--------
+
+.. code-block:: bash
+
+    user@hostname ~/.bash_it
+    [ master ✓ ] ❯

docs/themes-list/index.rst

@@ -187,6 +187,22 @@ Doubletime Multiline Python Only
    :alt:
 
 
+----
+
+Easy
+^^^^
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/easy-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/easy-black.jpg
+   :alt:
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/easy-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/easy-white.jpg
+   :alt:
+
+
 ----
 
 Envy

docs/themes-list/powerline-base.rst

@@ -70,6 +70,7 @@ The contents of the prompt can be "reordered", all the "segments" (every piece o
 * ``battery`` - Battery information (you'll need to enable the ``battery`` plugin)
 * ``clock`` - Current time in ``HH:MM:SS`` format
 * ``cwd`` - Current working directory including full folder hierarchy (c.f. ``wd``\ )
+* ``gcloud`` - Current gcloud active account
 * ``hostname`` - Host name of machine
 * ``in_toolbox`` - Show identifier if running inside a `toolbox <https://github.com/containers/toolbox>`_
 * ``in_vim`` - Show identifier if running in ``:terminal`` from vim

install.sh

@@ -171,7 +171,8 @@ while getopts "hsinaf" opt; do
 			;;
 	esac
 done
-shift $(("$OPTIND" - 1))
+
+shift $((OPTIND - 1))
 
 if [[ $silent ]] && [[ $interactive ]]; then
 	echo -e "\033[91mOptions --silent and --interactive are mutually exclusive. Please choose one or the other.\033[m"

lib/helpers.bash

@@ -742,14 +742,14 @@ _help-plugins()
     printf '%s' 'please wait, building help...'
     typeset grouplist=$(mktemp -t grouplist.XXXXXX)
     typeset func
-    for func in $(typeset_functions)
+    for func in $(_typeset_functions)
     do
         typeset group="$(typeset -f $func | metafor group)"
         if [ -z "$group" ]; then
             group='misc'
         fi
         typeset about="$(typeset -f $func | metafor about)"
-        letterpress "$about" $func >> $grouplist.$group
+        _letterpress "$about" $func >> $grouplist.$group
         echo $grouplist.$group >> $grouplist
     done
     # clear progress message
@@ -788,7 +788,7 @@ all_groups ()
 
     typeset func
     typeset file=$(mktemp -t composure.XXXX)
-    for func in $(typeset_functions)
+    for func in $(_typeset_functions)
     do
         typeset -f $func | metafor group >> $file
     done

plugins/available/extract.plugin.bash

@@ -37,7 +37,7 @@ End-Of-Usage
 
         local -r filename=$(basename -- $1)
         local -r filedirname=$(dirname -- $1)
-        local targetdirname=$(sed 's/\(\.tar\.bz2$\|\.tbz$\|\.tbz2$\|\.tar\.gz$\|\.tgz$\|\.tar$\|\.tar\.xz$\|\.txz$\|\.tar\.Z$\|\.7z$\)//g' <<< $filename)
+        local targetdirname=$(sed 's/\(\.tar\.bz2$\|\.tbz$\|\.tbz2$\|\.tar\.gz$\|\.tgz$\|\.tar$\|\.tar\.xz$\|\.txz$\|\.tar\.Z$\|\.7z$\|\.nupkg$\|\.zip$\|\.war$\|\.jar$\)//g' <<< $filename)
         if [ "$filename" = "$targetdirname" ]; then
             # archive type either not supported or it doesn't need dir creation
             targetdirname=""
@@ -61,9 +61,9 @@ End-Of-Usage
                 *.rpm) rpm2cpio "$1" | cpio -idm${verbose} ;;
                 *.tar) tar "x${verbose}f" "$1" -C "$filedirname/$targetdirname" ;;
                 *.xz) xz --decompress "$1" ;;
-                *.zip|*.war|*.jar) unzip "$1" ;;
+                *.zip|*.war|*.jar|*.nupkg) unzip "$1" -d "$filedirname/$targetdirname" ;;
                 *.Z) uncompress "$1" ;;
-                *.7z) 7za x "$1" ;;
+                *.7z) 7za x -o"$filedirname/$targetdirname" "$1" ;;
                 *) echo "'$1' cannot be extracted via extract" >&2;;
             esac
         fi

test/lib/helpers.bats

@@ -69,6 +69,11 @@ function local_setup {
   assert_line -n 0 ""
 }
 
+@test "helpers: bash-it help plugins" {
+  run bash-it help plugins
+  assert_line -n 1 "base:"
+}
+
 @test "helpers: bash-it help list aliases without any aliases enabled" {
   run _help-list-aliases "$BASH_IT/aliases/available/ag.aliases.bash"
   assert_line -n 0 "ag:"

themes/base.theme.bash

@@ -188,6 +188,12 @@ function terraform_workspace_prompt {
 	fi
 }
 
+function active_gcloud_account_prompt {
+	if _command_exists gcloud; then
+		echo -e "$(gcloud config list account --format "value(core.account)" 2> /dev/null)"
+	fi
+}
+
 function git_prompt_minimal_info {
 	SCM_STATE=${SCM_THEME_PROMPT_CLEAN}
 

themes/easy/easy.theme.bash

@@ -0,0 +1,19 @@
+# shellcheck shell=bash
+
+SCM_THEME_PROMPT_PREFIX="${bold_green}[ ${normal}"
+SCM_THEME_PROMPT_SUFFIX="${bold_green} ] "
+SCM_THEME_PROMPT_DIRTY=" ${red}✗"
+SCM_THEME_PROMPT_CLEAN=" ${bold_green}✓"
+
+prompt_command() {
+	if [ "$(whoami)" = root ]; then
+		cursor_color="${bold_red}"
+		user_color="${green}"
+	else
+		cursor_color="${bold_green}"
+		user_color="${white}"
+	fi
+	PS1="${user_color}\u${normal}@${white}\h ${bold_black}\w\n${reset_color}$(scm_prompt_info)${cursor_color}❯ ${normal}"
+}
+
+safe_append_prompt_command prompt_command

themes/powerline-multiline/powerline-multiline.theme.bash

@@ -91,6 +91,9 @@ HISTORY_NUMBER_THEME_PROMPT_CHAR=${POWERLINE_HISTORY_NUMBER_CHAR:="#"}
 COMMAND_NUMBER_THEME_PROMPT_COLOR=${POWERLINE_COMMAND_NUMBER_COLOR:=0}
 COMMAND_NUMBER_THEME_PROMPT_CHAR=${POWERLINE_COMMAND_NUMBER_CHAR:="#"}
 
+GCLOUD_THEME_PROMPT_COLOR=${POWERLINE_GCLOUD_COLOR:=161}
+GCLOUD_CHAR=${POWERLINE_GCLOUD_CHAR:="❲G❳ "}
+
 POWERLINE_LEFT_PROMPT=${POWERLINE_LEFT_PROMPT:="scm python_venv ruby node cwd"}
 POWERLINE_RIGHT_PROMPT=${POWERLINE_RIGHT_PROMPT:="in_vim clock battery user_info"}
 

themes/powerline-naked/powerline-naked.theme.bash

@@ -86,6 +86,9 @@ HISTORY_NUMBER_THEME_PROMPT_CHAR=${POWERLINE_HISTORY_NUMBER_CHAR:="#"}
 COMMAND_NUMBER_THEME_PROMPT_COLOR=${POWERLINE_COMMAND_NUMBER_COLOR:=254}
 COMMAND_NUMBER_THEME_PROMPT_CHAR=${POWERLINE_COMMAND_NUMBER_CHAR:="#"}
 
+GCLOUD_THEME_PROMPT_COLOR=${POWERLINE_GCLOUD_COLOR:=161}
+GCLOUD_CHAR=${POWERLINE_GCLOUD_CHAR:="❲G❳ "}
+
 POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv ruby node cwd"}
 
 safe_append_prompt_command __powerline_prompt_command

themes/powerline-plain/powerline-plain.theme.bash

@@ -83,6 +83,9 @@ HISTORY_NUMBER_THEME_PROMPT_CHAR=${POWERLINE_HISTORY_NUMBER_CHAR:="#"}
 COMMAND_NUMBER_THEME_PROMPT_COLOR=${POWERLINE_COMMAND_NUMBER_COLOR:=0}
 COMMAND_NUMBER_THEME_PROMPT_CHAR=${POWERLINE_COMMAND_NUMBER_CHAR:="#"}
 
+GCLOUD_THEME_PROMPT_COLOR=${POWERLINE_GCLOUD_COLOR:=161}
+GCLOUD_CHAR=${POWERLINE_GCLOUD_CHAR:="❲G❳ "}
+
 POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv ruby node cwd"}
 
 safe_append_prompt_command __powerline_prompt_command

themes/powerline/powerline.base.bash

@@ -49,6 +49,13 @@ function __powerline_terraform_prompt() {
 	fi
 }
 
+function __powerline_gcloud_prompt() {
+	local active_gcloud_account=""
+
+	active_gcloud_account="$(active_gcloud_account_prompt)"
+	[[ -n "${active_gcloud_account}" ]] && echo "${GCLOUD_CHAR}${active_gcloud_account}|${GCLOUD_THEME_PROMPT_COLOR}"
+}
+
 function __powerline_node_prompt() {
 	local node_version=""
 

themes/powerline/powerline.theme.bash

@@ -88,6 +88,9 @@ HISTORY_NUMBER_THEME_PROMPT_CHAR=${POWERLINE_HISTORY_NUMBER_CHAR:="#"}
 COMMAND_NUMBER_THEME_PROMPT_COLOR=${POWERLINE_COMMAND_NUMBER_COLOR:=0}
 COMMAND_NUMBER_THEME_PROMPT_CHAR=${POWERLINE_COMMAND_NUMBER_CHAR:="#"}
 
+GCLOUD_THEME_PROMPT_COLOR=${POWERLINE_GCLOUD_COLOR:=161}
+GCLOUD_CHAR=${POWERLINE_GCLOUD_CHAR:="❲G❳ "}
+
 POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv ruby node cwd"}
 
 safe_append_prompt_command __powerline_prompt_command

themes/purity/purity.theme.bash

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
 
 SCM_THEME_PROMPT_DIRTY=" ${bold_red}⊘${normal}"
 SCM_THEME_PROMPT_CLEAN=" ${bold_green}✓${normal}"
@@ -14,9 +14,21 @@ STATUS_THEME_PROMPT_BAD="${bold_red}❯${reset_color}${normal} "
 STATUS_THEME_PROMPT_OK="${bold_green}❯${reset_color}${normal} "
 PURITY_THEME_PROMPT_COLOR="${PURITY_THEME_PROMPT_COLOR:=$blue}"
 
+venv_prompt() {
+	python_venv=""
+	# Detect python venv
+	if [[ -n "${CONDA_DEFAULT_ENV}" ]]; then
+		python_venv="($PYTHON_VENV_CHAR${CONDA_DEFAULT_ENV}) "
+	elif [[ -n "${VIRTUAL_ENV}" ]]; then
+		python_venv="($PYTHON_VENV_CHAR$(basename "${VIRTUAL_ENV}")) "
+	fi
+	[[ -n "${python_venv}" ]] && echo "${python_venv}"
+}
+
 function prompt_command() {
-    local ret_status="$( [ $? -eq 0 ] && echo -e "$STATUS_THEME_PROMPT_OK" || echo -e "$STATUS_THEME_PROMPT_BAD")"
+	retval=$?
-    PS1="\n${PURITY_THEME_PROMPT_COLOR}\w $(scm_prompt_info)\n${ret_status} "
+	local ret_status="$([ $retval -eq 0 ] && echo -e "$STATUS_THEME_PROMPT_OK" || echo -e "$STATUS_THEME_PROMPT_BAD")"
+	PS1="\n${PURITY_THEME_PROMPT_COLOR}\w $(scm_prompt_info)\n${ret_status}$(venv_prompt)"
 }
 
 safe_append_prompt_command prompt_command