Merge branch 'master' into feat/cargo

.all-contributorsrc

@@ -142,6 +142,46 @@
         "bug",
         "code"
       ]
+    },
+    {
+      "login": "newmaniese",
+      "name": "Michael Newman",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/64894?v=4",
+      "profile": "http://newmaniese.com",
+      "contributions": [
+        "bug",
+        "code",
+        "doc",
+        "test"
+      ]
+    },
+    {
+      "login": "k-lyda",
+      "name": "Konrad",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/6491400?v=4",
+      "profile": "https://github.com/k-lyda",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "dubnev",
+      "name": "Will Neville",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/3227558?v=4",
+      "profile": "https://github.com/dubnev",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "danieltrautmann",
+      "name": "Daniel Trautmann",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/4022138?v=4",
+      "profile": "https://github.com/danieltrautmann",
+      "contributions": [
+        "code"
+      ]
     }
-  ]
+  ],
+  "contributorsPerLine": 7
 }

CHANGELOG.md

@@ -1,3 +1,17 @@
+## [2.3.1](https://github.com/matchai/spacefish/compare/v2.3.0...v2.3.1) (2019-03-02)
+
+
+### Bug Fixes
+
+* correct typo in venv configuration variables ([#167](https://github.com/matchai/spacefish/issues/167)) ([8a3585c](https://github.com/matchai/spacefish/commit/8a3585c))
+
+# [2.3.0](https://github.com/matchai/spacefish/compare/v2.2.4...v2.3.0) (2019-02-24)
+
+
+### Features
+
+* add Python venv section ([#164](https://github.com/matchai/spacefish/issues/164)) ([3d777fc](https://github.com/matchai/spacefish/commit/3d777fc)), closes [#146](https://github.com/matchai/spacefish/issues/146)
+
 ## [2.2.4](https://github.com/matchai/spacefish/compare/v2.2.3...v2.2.4) (2019-02-17)
 
 

README.md

@@ -77,8 +77,9 @@ Spacefish is a minimalistic, powerful and extremely customizable <a href="https:
 * Current Rust version (`𝗥`).
 * Current version of Haskell GHC Compiler, defined in stack.yaml file (`λ`).
 * Current Julia version (`ஃ`).
-* Current Conda version (`🅒`).
 * Current Amazon Web Services (AWS) profile (`☁️`) ([Using named profiles](http://docs.aws.amazon.com/cli/latest/userguide/cli-multiple-profiles.html)).
+* Current Python virtualenv.
+* Current Conda version (`🅒`).
 * Current Python pyenv (`🐍`).
 * Current .NET SDK version, through dotnet-cli (`.NET`).
 * Current Kubectl context (`☸️`).
@@ -135,9 +136,10 @@ Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds
 
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
 <!-- prettier-ignore -->
-| [<img src="https://avatars0.githubusercontent.com/u/4658208?v=4" width="100px;"/><br /><sub><b>Matan Kushner</b></sub>](https://twitter.com/matchai)<br />[🐛](https://github.com/matchai/spacefish/issues?q=author%3Amatchai "Bug reports") [💻](https://github.com/matchai/spacefish/commits?author=matchai "Code") [📖](https://github.com/matchai/spacefish/commits?author=matchai "Documentation") [👀](#review-matchai "Reviewed Pull Requests") [⚠️](https://github.com/matchai/spacefish/commits?author=matchai "Tests") [🔧](#tool-matchai "Tools") [🎨](#design-matchai "Design") | [<img src="https://avatars2.githubusercontent.com/u/11183523?v=4" width="100px;"/><br /><sub><b>Tiffany Le-Nguyen</b></sub>](https://github.com/sirMerr)<br />[🐛](https://github.com/matchai/spacefish/issues?q=author%3AsirMerr "Bug reports") [💻](https://github.com/matchai/spacefish/commits?author=sirMerr "Code") [📖](https://github.com/matchai/spacefish/commits?author=sirMerr "Documentation") [👀](#review-sirMerr "Reviewed Pull Requests") | [<img src="https://avatars0.githubusercontent.com/u/26250962?v=4" width="100px;"/><br /><sub><b>Snuggle</b></sub>](https://github.com/Snuggle)<br />[🐛](https://github.com/matchai/spacefish/issues?q=author%3ASnuggle "Bug reports") [💻](https://github.com/matchai/spacefish/commits?author=Snuggle "Code") [📖](https://github.com/matchai/spacefish/commits?author=Snuggle "Documentation") [👀](#review-Snuggle "Reviewed Pull Requests") [⚠️](https://github.com/matchai/spacefish/commits?author=Snuggle "Tests") | [<img src="https://avatars2.githubusercontent.com/u/11844760?v=4" width="100px;"/><br /><sub><b>Jaskaran Bindra</b></sub>](https://github.com/jskrnbindra)<br />[💻](https://github.com/matchai/spacefish/commits?author=jskrnbindra "Code") [📖](https://github.com/matchai/spacefish/commits?author=jskrnbindra "Documentation") [⚠️](https://github.com/matchai/spacefish/commits?author=jskrnbindra "Tests") | [<img src="https://avatars3.githubusercontent.com/u/6306918?v=4" width="100px;"/><br /><sub><b>Konstantin Labun</b></sub>](https://labun.me)<br />[💻](https://github.com/matchai/spacefish/commits?author=kulabun "Code") [📖](https://github.com/matchai/spacefish/commits?author=kulabun "Documentation") [⚠️](https://github.com/matchai/spacefish/commits?author=kulabun "Tests") | [<img src="https://avatars0.githubusercontent.com/u/2652762?v=4" width="100px;"/><br /><sub><b>Kyle Holzinger</b></sub>](https://medium.com/@kyleholzinger)<br />[💻](https://github.com/matchai/spacefish/commits?author=kyleholzinger "Code") [📖](https://github.com/matchai/spacefish/commits?author=kyleholzinger "Documentation") | [<img src="https://avatars0.githubusercontent.com/u/10276208?v=4" width="100px;"/><br /><sub><b>Salmanul Farzy</b></sub>](https://github.com/salmanulfarzy)<br />[💻](https://github.com/matchai/spacefish/commits?author=salmanulfarzy "Code") [👀](#review-salmanulfarzy "Reviewed Pull Requests") |
+| [<img src="https://avatars0.githubusercontent.com/u/4658208?v=4" width="100px;" alt="Matan Kushner"/><br /><sub><b>Matan Kushner</b></sub>](https://twitter.com/matchai)<br />[🐛](https://github.com/matchai/spacefish/issues?q=author%3Amatchai "Bug reports") [💻](https://github.com/matchai/spacefish/commits?author=matchai "Code") [📖](https://github.com/matchai/spacefish/commits?author=matchai "Documentation") [👀](#review-matchai "Reviewed Pull Requests") [⚠️](https://github.com/matchai/spacefish/commits?author=matchai "Tests") [🔧](#tool-matchai "Tools") [🎨](#design-matchai "Design") | [<img src="https://avatars2.githubusercontent.com/u/11183523?v=4" width="100px;" alt="Tiffany Le-Nguyen"/><br /><sub><b>Tiffany Le-Nguyen</b></sub>](https://github.com/sirMerr)<br />[🐛](https://github.com/matchai/spacefish/issues?q=author%3AsirMerr "Bug reports") [💻](https://github.com/matchai/spacefish/commits?author=sirMerr "Code") [📖](https://github.com/matchai/spacefish/commits?author=sirMerr "Documentation") [👀](#review-sirMerr "Reviewed Pull Requests") | [<img src="https://avatars0.githubusercontent.com/u/26250962?v=4" width="100px;" alt="Snuggle"/><br /><sub><b>Snuggle</b></sub>](https://github.com/Snuggle)<br />[🐛](https://github.com/matchai/spacefish/issues?q=author%3ASnuggle "Bug reports") [💻](https://github.com/matchai/spacefish/commits?author=Snuggle "Code") [📖](https://github.com/matchai/spacefish/commits?author=Snuggle "Documentation") [👀](#review-Snuggle "Reviewed Pull Requests") [⚠️](https://github.com/matchai/spacefish/commits?author=Snuggle "Tests") | [<img src="https://avatars2.githubusercontent.com/u/11844760?v=4" width="100px;" alt="Jaskaran Bindra"/><br /><sub><b>Jaskaran Bindra</b></sub>](https://github.com/jskrnbindra)<br />[💻](https://github.com/matchai/spacefish/commits?author=jskrnbindra "Code") [📖](https://github.com/matchai/spacefish/commits?author=jskrnbindra "Documentation") [⚠️](https://github.com/matchai/spacefish/commits?author=jskrnbindra "Tests") | [<img src="https://avatars3.githubusercontent.com/u/6306918?v=4" width="100px;" alt="Konstantin Labun"/><br /><sub><b>Konstantin Labun</b></sub>](https://labun.me)<br />[💻](https://github.com/matchai/spacefish/commits?author=kulabun "Code") [📖](https://github.com/matchai/spacefish/commits?author=kulabun "Documentation") [⚠️](https://github.com/matchai/spacefish/commits?author=kulabun "Tests") | [<img src="https://avatars0.githubusercontent.com/u/2652762?v=4" width="100px;" alt="Kyle Holzinger"/><br /><sub><b>Kyle Holzinger</b></sub>](https://medium.com/@kyleholzinger)<br />[💻](https://github.com/matchai/spacefish/commits?author=kyleholzinger "Code") [📖](https://github.com/matchai/spacefish/commits?author=kyleholzinger "Documentation") | [<img src="https://avatars0.githubusercontent.com/u/10276208?v=4" width="100px;" alt="Salmanul Farzy"/><br /><sub><b>Salmanul Farzy</b></sub>](https://github.com/salmanulfarzy)<br />[💻](https://github.com/matchai/spacefish/commits?author=salmanulfarzy "Code") [👀](#review-salmanulfarzy "Reviewed Pull Requests") |
 | :---: | :---: | :---: | :---: | :---: | :---: | :---: |
-| [<img src="https://avatars0.githubusercontent.com/u/46186?v=4" width="100px;"/><br /><sub><b>owais</b></sub>](https://owais.lone.pw)<br />[💻](https://github.com/matchai/spacefish/commits?author=owais "Code") [📖](https://github.com/matchai/spacefish/commits?author=owais "Documentation") [⚠️](https://github.com/matchai/spacefish/commits?author=owais "Tests") | [<img src="https://avatars3.githubusercontent.com/u/35412203?v=4" width="100px;"/><br /><sub><b>Samantha Enders</b></sub>](https://github.com/ladysamantha)<br />[💻](https://github.com/matchai/spacefish/commits?author=ladysamantha "Code") [📖](https://github.com/matchai/spacefish/commits?author=ladysamantha "Documentation") [⚠️](https://github.com/matchai/spacefish/commits?author=ladysamantha "Tests") | [<img src="https://avatars2.githubusercontent.com/u/887196?v=4" width="100px;"/><br /><sub><b>Evan Relf</b></sub>](https://evanrelf.com)<br />[💻](https://github.com/matchai/spacefish/commits?author=evanrelf "Code") [📖](https://github.com/matchai/spacefish/commits?author=evanrelf "Documentation") | [<img src="https://avatars1.githubusercontent.com/u/10660468?v=4" width="100px;"/><br /><sub><b>Jason Etcovitch</b></sub>](https://jasonet.co)<br />[💻](https://github.com/matchai/spacefish/commits?author=JasonEtco "Code") [📖](https://github.com/matchai/spacefish/commits?author=JasonEtco "Documentation") | [<img src="https://avatars0.githubusercontent.com/u/4988133?v=4" width="100px;"/><br /><sub><b>hrvoj3e</b></sub>](https://github.com/hrvoj3e)<br />[🐛](https://github.com/matchai/spacefish/issues?q=author%3Ahrvoj3e "Bug reports") [💻](https://github.com/matchai/spacefish/commits?author=hrvoj3e "Code") |
+| [<img src="https://avatars0.githubusercontent.com/u/46186?v=4" width="100px;" alt="owais"/><br /><sub><b>owais</b></sub>](https://owais.lone.pw)<br />[💻](https://github.com/matchai/spacefish/commits?author=owais "Code") [📖](https://github.com/matchai/spacefish/commits?author=owais "Documentation") [⚠️](https://github.com/matchai/spacefish/commits?author=owais "Tests") | [<img src="https://avatars3.githubusercontent.com/u/35412203?v=4" width="100px;" alt="Samantha Enders"/><br /><sub><b>Samantha Enders</b></sub>](https://github.com/ladysamantha)<br />[💻](https://github.com/matchai/spacefish/commits?author=ladysamantha "Code") [📖](https://github.com/matchai/spacefish/commits?author=ladysamantha "Documentation") [⚠️](https://github.com/matchai/spacefish/commits?author=ladysamantha "Tests") | [<img src="https://avatars2.githubusercontent.com/u/887196?v=4" width="100px;" alt="Evan Relf"/><br /><sub><b>Evan Relf</b></sub>](https://evanrelf.com)<br />[💻](https://github.com/matchai/spacefish/commits?author=evanrelf "Code") [📖](https://github.com/matchai/spacefish/commits?author=evanrelf "Documentation") | [<img src="https://avatars1.githubusercontent.com/u/10660468?v=4" width="100px;" alt="Jason Etcovitch"/><br /><sub><b>Jason Etcovitch</b></sub>](https://jasonet.co)<br />[💻](https://github.com/matchai/spacefish/commits?author=JasonEtco "Code") [📖](https://github.com/matchai/spacefish/commits?author=JasonEtco "Documentation") | [<img src="https://avatars0.githubusercontent.com/u/4988133?v=4" width="100px;" alt="hrvoj3e"/><br /><sub><b>hrvoj3e</b></sub>](https://github.com/hrvoj3e)<br />[🐛](https://github.com/matchai/spacefish/issues?q=author%3Ahrvoj3e "Bug reports") [💻](https://github.com/matchai/spacefish/commits?author=hrvoj3e "Code") | [<img src="https://avatars1.githubusercontent.com/u/64894?v=4" width="100px;" alt="Michael Newman"/><br /><sub><b>Michael Newman</b></sub>](http://newmaniese.com)<br />[🐛](https://github.com/matchai/spacefish/issues?q=author%3Anewmaniese "Bug reports") [💻](https://github.com/matchai/spacefish/commits?author=newmaniese "Code") [📖](https://github.com/matchai/spacefish/commits?author=newmaniese "Documentation") [⚠️](https://github.com/matchai/spacefish/commits?author=newmaniese "Tests") | [<img src="https://avatars0.githubusercontent.com/u/6491400?v=4" width="100px;" alt="Konrad"/><br /><sub><b>Konrad</b></sub>](https://github.com/k-lyda)<br />[🐛](https://github.com/matchai/spacefish/issues?q=author%3Ak-lyda "Bug reports") |
+| [<img src="https://avatars1.githubusercontent.com/u/3227558?v=4" width="100px;" alt="Will Neville"/><br /><sub><b>Will Neville</b></sub>](https://github.com/dubnev)<br />[🐛](https://github.com/matchai/spacefish/issues?q=author%3Adubnev "Bug reports") | [<img src="https://avatars1.githubusercontent.com/u/4022138?v=4" width="100px;" alt="Daniel Trautmann"/><br /><sub><b>Daniel Trautmann</b></sub>](https://github.com/danieltrautmann)<br />[💻](https://github.com/matchai/spacefish/commits?author=danieltrautmann "Code") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!

docs/Options.md

@@ -218,18 +218,6 @@ Haskell section is shown only in directories that contain `stack.yaml`.
 | `SPACEFISH_HASKELL_SYMBOL` | `λ·` | Character to be shown before Haskell version |
 | `SPACEFISH_HASKELL_COLOR` | `red` | Color of Haskell section |
 
-### Conda \(`conda`\)
-
-Conda section is shown when ```conda``` is installed and $CONDA_DEFAULT_ENV is set.
-
-| Variable | Default | Meaning |
-| :------- | :-----: | ------- |
-| `SPACEFISH_CONDA_SHOW` | `true` | Show current Conda version |
-| `SPACEFISH_CONDA_PREFIX` | `$SPACEFISH_PROMPT_DEFAULT_PREFIX` | Prefix before the conda section |
-| `SPACEFISH_CONDA_SUFFIX` | `$SPACEFISH_PROMPT_DEFAULT_SUFFIX` | Suffix after the conda section |
-| `SPACEFISH_CONDA_SYMBOL` | `🅒·` | Character to be shown before Conda version |
-| `SPACEFISH_CONDA_COLOR` | `blue` | Color of Conda section |
-
 ### Amazon Web Services (AWS) (`aws`)
 
 Shows selected Amazon Web Services profile configured using  [`AWS_PROFILE`](http://docs.aws.amazon.com/cli/latest/userguide/cli-multiple-profiles.html) variable.
@@ -242,6 +230,32 @@ Shows selected Amazon Web Services profile configured using  [`AWS_PROFILE`](htt
 | `SPACESHIP_AWS_SYMBOL` | `☁️·` | Character to be shown before AWS profile |
 | `SPACESHIP_AWS_COLOR` | `ff8700` | Color of AWS section |
 
+### Virtualenv (`venv`)
+
+Python virtual environment when $VIRTUAL_ENV is set.
+
+| Variable | Default | Meaning |
+| :------- | :-----: | ------- |
+| `SPACEFISH_VENV_SHOW` | `true` | Show current Python virtualenv or not |
+| `SPACEFISH_VENV_PREFIX` | `$SPACEFISH_PROMPT_DEFAULT_PREFIX` | Prefix before the virtualenv section |
+| `SPACEFISH_VENV_SUFFIX` | `$SPACEFISH_PROMPT_DEFAULT_SUFFIX` | Suffix after the virtualenv section |
+| `SPACEFISH_VENV_SYMBOL` | `·` | Character to be shown before virtualenv |
+| `SPACEFISH_VENV_GENERIC_NAMES` | `virtualenv venv .venv` | If the virtualenv folder is in this *array*, than use its parent directory as its name instead |
+| `SPACEFISH_VENV_COLOR` | `blue` | Color of virtualenv environment section |
+
+
+### Conda \(`conda`\)
+
+Conda section is shown when ```conda``` is installed and $CONDA_DEFAULT_ENV is set.
+
+| Variable | Default | Meaning |
+| :------- | :-----: | ------- |
+| `SPACEFISH_CONDA_SHOW` | `true` | Show current Conda version |
+| `SPACEFISH_CONDA_PREFIX` | `$SPACEFISH_PROMPT_DEFAULT_PREFIX` | Prefix before the conda section |
+| `SPACEFISH_CONDA_SUFFIX` | `$SPACEFISH_PROMPT_DEFAULT_SUFFIX` | Suffix after the conda section |
+| `SPACEFISH_CONDA_SYMBOL` | `🅒·` | Character to be shown before Conda version |
+| `SPACEFISH_CONDA_COLOR` | `blue` | Color of Conda section |
+
 ### Pyenv \(`pyenv`\)
 
 Pyenv section is shown only in directories that contain `.python-version`, `requirements.txt`, `pyproject.toml`, or any other file with `.py` extension.
@@ -340,7 +354,7 @@ By default, Battery section is shown only if battery level is below `SPACEFISH_B
 | :--- | :---: | --- |
 | `SPACEFISH_BATTERY_SHOW` | `true` | Show battery section \(`true`, `false`, `always` or `charged`\) |
 | `SPACEFISH_BATTERY_PREFIX` | ` ` | Prefix before battery section |
-| `SPACEFISH_BATTERY_SUFFIX` | `SPACEFISH_PROMPT_DEFAULT_SUFFIX` | Suffix after battery section |
+| `SPACEFISH_BATTERY_SUFFIX` | `$SPACEFISH_PROMPT_DEFAULT_SUFFIX` | Suffix after battery section |
 | `SPACEFISH_BATTERY_SYMBOL_CHARGING` | `⇡` | Character to be shown if battery is charging |
 | `SPACEFISH_BATTERY_SYMBOL_DISCHARGING` | `⇣` | Character to be shown if battery is discharging |
 | `SPACEFISH_BATTERY_SYMBOL_FULL` | `•` | Character to be shown if battery is full |
@@ -363,7 +377,7 @@ This section shows mode indicator only when Vi-mode is enabled.
 | :--- | :---: | --- |
 | `SPACEFISH_VI_MODE_SHOW` | `true` | Shown current Vi-mode or not |
 | `SPACEFISH_VI_MODE_PREFIX` | ` ` | Prefix before Vi-mode section |
-| `SPACEFISH_VI_MODE_SUFFIX` | `SPACEFISH_PROMPT_DEFAULT_SUFFIX` | Suffix after Vi-mode section |
+| `SPACEFISH_VI_MODE_SUFFIX` | `$SPACEFISH_PROMPT_DEFAULT_SUFFIX` | Suffix after Vi-mode section |
 | `SPACEFISH_VI_MODE_INSERT` | `[I]` | Text to be shown when in insert mode |
 | `SPACEFISH_VI_MODE_NORMAL` | `[N]` | Text to be shown when in normal mode |
 | `SPACEFISH_VI_MODE_VISUAL` | `[V]` | Text to be shown when in visual mode |

fish_prompt.fish

@@ -1,7 +1,7 @@
 function fish_prompt
 	# Store the exit code of the last command
 	set -g sf_exit_code $status
-	set -g SPACEFISH_VERSION 2.2.4
+	set -g SPACEFISH_VERSION 2.3.1
 
 	# ------------------------------------------------------------------------------
 	# Configuration
@@ -13,7 +13,7 @@ function fish_prompt
 	__sf_util_set_default SPACEFISH_PROMPT_SUFFIXES_SHOW true
 	__sf_util_set_default SPACEFISH_PROMPT_DEFAULT_PREFIX "via "
 	__sf_util_set_default SPACEFISH_PROMPT_DEFAULT_SUFFIX " "
-	__sf_util_set_default SPACEFISH_PROMPT_ORDER time user dir host git package node ruby golang php rust haskell julia docker aws conda pyenv dotnet kubecontext exec_time line_sep battery vi_mode jobs exit_code char
+	__sf_util_set_default SPACEFISH_PROMPT_ORDER time user dir host git package node ruby golang php rust haskell julia docker aws venv conda pyenv dotnet kubecontext exec_time line_sep battery vi_mode jobs exit_code char
 
 	# ------------------------------------------------------------------------------
 	# Sections