Merge ce84456118 into 99e2c31484

Closes #12538

lib/functions.zsh

@@ -57,6 +57,16 @@ function takeurl() {
   cd "$thedir"
 }
 
+function takezip() {
+  local data thedir
+  data="$(mktemp)"
+  curl -L "$1" > "$data"
+  unzip "$data" -d "./"
+  thedir="$(unzip -l "$data" | awk 'NR==4 {print $4}' | sed 's/\/.*//')"
+  rm "$data"
+  cd "$thedir"
+}
+
 function takegit() {
   git clone "$1"
   cd "$(basename ${1%%.git})"
@@ -65,6 +75,8 @@ function takegit() {
 function take() {
   if [[ $1 =~ ^(https?|ftp).*\.(tar\.(gz|bz2|xz)|tgz)$ ]]; then
     takeurl "$1"
+  elif [[ $1 =~ ^(https?|ftp).*\.(zip)$ ]]; then
+    takezip "$1"
   elif [[ $1 =~ ^([A-Za-z0-9]\+@|https?|git|ssh|ftps?|rsync).*\.git/?$ ]]; then
     takegit "$1"
   else

lib/git.zsh

@@ -162,6 +162,18 @@ function git_current_branch() {
   echo ${ref#refs/heads/}
 }
 
+# Outputs the name of the previously checked out branch
+# Usage example: git pull origin $(git_current_branch)
+# rev-parse --symbolic-full-name @{-1} only prints if it is a branch
+function git_previous_branch() {
+  local ref
+  ref=$(__git_prompt_git rev-parse --quiet --symbolic-full-name @{-1} 2> /dev/null)
+  local ret=$?
+  if [[ $ret != 0 ]] || [[ -z $ref ]]; then
+    return  # no git repo or non-branch previous ref
+  fi
+  echo ${ref#refs/heads/}
+}
 
 # Gets the number of commits ahead from remote
 function git_commits_ahead() {

plugins/git-town/README.md

@@ -0,0 +1,24 @@
+# Git-Town plugin
+
+This plugin adds completion and aliases for the `git-town` command. More information
+at https://www.git-town.com.
+
+Enable git-town plugin in your zshrc file:
+```
+plugins=(... git-town)
+```
+
+## Aliases
+
+More information about `git-town` commands:
+https://github.com/Originate/git-town#commands
+
+| Alias   | Command                    | Description                            |
+|---------|----------------------------|----------------------------------------|
+| `gt`    | `git town`                 | Git-Town command                       |
+| `gtab`  | `git town abort`           | Aborts the last run git-town command   |
+| `gtc`   | `git town continue`        | Restarts last after resolved conflict  |
+| `gth`   | `git town hack`            | New feature branch off main branch     |
+| `gtsy`  | `git town sync`            | Updates current branch w/ all changes  |
+| `gtnpr` | `git town new-pull-request`| Create a new pull request              |
+| `gtsh`  | `git town ship`            | Delivers feature branch and removes it |

plugins/git-town/git-town.plugin.zsh

@@ -0,0 +1,23 @@
+#!zsh
+#
+# Installation
+# ------------
+#
+# WIP
+
+#Alias
+| `gt`    | `git town`                 | Git-Town command                       |
+| `gtab`  | `git town abort`           | Aborts the last run git-town command   |
+| `gtc`   | `git town continue`        | Restarts last after resolved conflict  |
+| `gth`   | `git town hack`            | New feature branch off main branch     |
+| `gtsy`  | `git town sync`            | Updates current branch w/ all changes  |
+| `gtnpr` | `git town new-pull-request`| Create a new pull request              |
+| `gtsh`  | `git town ship`            | Delivers feature branch and removes it |
+
+alias gt='git town'
+alias gta='git town abort'
+alias gtc='git town continue'
+alias gth='git town hack'
+alias gtsy='git town sync'
+alias gtnpr='git town new-pull-request'
+alias gtsh='git town ship'

plugins/terraform/README.md

@@ -15,22 +15,23 @@ plugins=(... terraform)
 
 ## Aliases
 
-| Alias  | Command                    |
-|--------|----------------------------|
-| `tf`   | `terraform`                |
-| `tfa`  | `terraform apply`          |
-| `tfc`  | `terraform console`        |
-| `tfd`  | `terraform destroy`        |
-| `tff`  | `terraform fmt`            |
-| `tffr` | `terraform fmt -recursive` |
-| `tfi`  | `terraform init`           |
-| `tfiu` | `terraform init -upgrade`  |
-| `tfo`  | `terraform output`         |
-| `tfp`  | `terraform plan`           |
-| `tfv`  | `terraform validate`       |
-| `tfs`  | `terraform state`          |
-| `tft`  | `terraform test`           |
-| `tfsh` | `terraform show`           |
+| Alias   | Command                          |
+|---------|----------------------------------|
+| `tf`    | `terraform`                      |
+| `tfa`   | `terraform apply`                |
+| `tfaa`  | `terraform apply -auto-approve`  |
+| `tfc`   | `terraform console`              |
+| `tfd`   | `terraform destroy`              |
+| `tff`   | `terraform fmt`                  |
+| `tffr`  | `terraform fmt -recursive`       |
+| `tfi`   | `terraform init`                 |
+| `tfiu`  | `terraform init -upgrade`        |
+| `tfo`   | `terraform output`               |
+| `tfp`   | `terraform plan`                 |
+| `tfv`   | `terraform validate`             |
+| `tfs`   | `terraform state`                |
+| `tft`   | `terraform test`                 |
+| `tfsh`  | `terraform show`                 |
 
 
 ## Prompt function

plugins/terraform/terraform.plugin.zsh

@@ -17,6 +17,7 @@ function tf_version_prompt_info() {
 
 alias tf='terraform'
 alias tfa='terraform apply'
+alias tfaa='terraform apply -auto-approve'
 alias tfc='terraform console'
 alias tfd='terraform destroy'
 alias tff='terraform fmt'

plugins/web-search/README.md

@@ -51,6 +51,7 @@ Available search contexts are:
 | `packagist`           | `https://packagist.org/?query=`                 |
 | `gopkg`               | `https://pkg.go.dev/search?m=package&q=`        |
 | `chatgpt`             | `https://chatgpt.com/?q=`                       |
+| `reddit`              | `https://www.reddit.com/search/?q=`             |
 
 Also there are aliases for bang-searching DuckDuckGo:
 

plugins/web-search/web-search.plugin.zsh

@@ -32,6 +32,7 @@ function web_search() {
     packagist       "https://packagist.org/?query="
     gopkg           "https://pkg.go.dev/search?m=package&q="
     chatgpt         "https://chatgpt.com/?q="
+    reddit          "https://www.reddit.com/search/?q="
   )
 
   # check whether the search engine is supported
@@ -85,6 +86,7 @@ alias npmpkg='web_search npmpkg'
 alias packagist='web_search packagist'
 alias gopkg='web_search gopkg'
 alias chatgpt='web_search chatgpt'
+alias reddit='web_search reddit'
 
 #add your own !bang searches here
 alias wiki='web_search duckduckgo \!w'

themes/gnzh.zsh-theme

@@ -30,8 +30,9 @@ local return_code="%(?..%F{red}%? ↵%f)"
 local user_host="${PR_USER}%F{cyan}@${PR_HOST}"
 local current_dir="%B%F{blue}%~%f%b"
 local git_branch='$(git_prompt_info)'
+local venv_prompt='$(virtualenv_prompt_info)' 
 
-PROMPT="╭─${user_host} ${current_dir} \$(ruby_prompt_info) ${git_branch}
+PROMPT="╭─${venv_prompt}${user_host} ${current_dir} \$(ruby_prompt_info) ${git_branch}
 ╰─$PR_PROMPT "
 RPROMPT="${return_code}"
 
@@ -39,5 +40,7 @@ ZSH_THEME_GIT_PROMPT_PREFIX="%F{yellow}‹"
 ZSH_THEME_GIT_PROMPT_SUFFIX="› %f"
 ZSH_THEME_RUBY_PROMPT_PREFIX="%F{red}‹"
 ZSH_THEME_RUBY_PROMPT_SUFFIX="›%f"
+ZSH_THEME_VIRTUALENV_PREFIX="%F{red}("
+ZSH_THEME_VIRTUALENV_SUFFIX=")%f "
 
 }