01bdee42a2
Improve the rbenv prompt by using `version-name`
...
Prior to this, the rbenv prompt only showed something if the
$RBENV_VERSION environment variable was set. This was not a complete
solution because rbenv can be configured locally, per directory, with
dotfiles. When using dotfiles, the $RBENV_VERSION variables is not set.
This fixes the issue by taking the output of the `rbenv version-name`
command which shows the real rbenv version being used based on any of
the 4 ways to change rbenv as shown here:
https://github.com/rbenv/rbenv#choosing-the-ruby-version
If the current version of Ruby being used is the same as the global
Ruby, nothing is shown.
This commit also adds documentation to the README that describes the
prompt.
Fixes issue #215
2016-02-19 14:56:09 -08:00
2d196fa12f
Merge pull request #211 from Falkor/feature/better_dirty_check
...
VCS dirty check even in subdirs
2016-02-09 10:18:03 -08:00
52982e3f63
mention to git_compare_version
...
Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
2016-02-09 14:22:47 +01:00
0fd9d277f9
correct half-dirty detection -- restrict to untracked files
...
Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
2016-02-09 14:09:33 +01:00
56bc1b3f47
dirty check even in subdirs
...
Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
2016-02-08 17:14:28 +01:00
1a05542901
Merge pull request #208 from dritter/fix_joining
...
Fix joining segments from #186
2016-02-06 11:52:55 -08:00
e9da3d5146
Fix joining segments
2016-02-06 20:07:42 +01:00
9e191d4305
Pull PR #204 into `next`. Introduces new VCS state, `untracked`
2016-02-05 11:00:08 -08:00
4bbff138fb
Merging @theminor's changes from PR #204
2016-02-05 10:59:33 -08:00
4897c795fa
Merge branch 'master' into next
2016-02-05 10:57:56 -08:00
d5ac1735da
Merge pull request #207 from gitter-badger/gitter-badge
...
Add a Gitter chat badge to README.md
2016-02-05 13:56:29 -05:00
dfd7ae1f1d
Merge pull request #205 from dritter/dir_delimiter
...
Change default dir truncation delimitor to ellipsis
2016-02-05 10:49:09 -05:00
43e6c80029
Add Gitter badge
2016-02-05 15:43:36 +00:00
4f4a15de82
Merge pull request #198 from dritter/vcs_customizable
...
VCS-hooks customizable
2016-02-05 10:40:20 -05:00
25bf6d60a0
Merge pull request #181 from dritter/split_up_ram_segment
...
Split up `ram` segment into `ram` and `swap`.
2016-02-05 10:37:28 -05:00
65e9438210
Merge pull request #203 from dritter/beanstalk
...
Reworked the AWS-Beanstalk segment
2016-02-05 10:34:34 -05:00
6072f1e56c
Merge pull request #202 from dritter/join_conditional_segments
...
Allows the use of `_join` on conditional segments.
2016-02-05 10:33:12 -05:00
54254600d1
Change default dir truncation delimitor to ellipsis
2016-02-03 22:35:14 +01:00
177bfc9602
update CHANGELOG re new UNTRACKED state in vcs segment
2016-01-31 10:08:09 +00:00
d7c26513c8
Add "_UNTRACKED" option for _VCS to change colors - default yellow
2016-01-27 22:52:48 +00:00
3b7dfff7ea
Add VCS_WORKDIR_HALF_DIRTY vrbl for unstaged files
2016-01-26 17:20:20 -05:00
15665a4f95
Joining conditional segments now work as expected. If between the last
...
printed segment is a full but conditional segment, the joined one gets
promoted.
This fixes #186
2016-01-23 01:45:39 +01:00
ed28b8d26f
Use explicit word splitting. No need to set SH_WORD_SPLIT
2016-01-23 01:45:39 +01:00
cd78c66997
First try: Now joined segments are promoted to "full" segments, if their
...
predecessor was conditional and had no output.
2016-01-23 01:45:39 +01:00
930ae170a4
Made the VCS-hooks customizable.
2016-01-23 01:44:22 +01:00
45184839f3
Added changelog entry.
2016-01-23 01:39:50 +01:00
eba3a3ca95
Reworked the AWS Elastic Beanstalk segment.
2016-01-23 01:35:53 +01:00
6763826c4e
More space for the Beanstalk-Icon.
2016-01-23 01:34:48 +01:00
a6174e31ea
Added documentation for the AWS Beanstalk segment.
2016-01-23 01:34:48 +01:00
af119c9406
Adding command prompt for AWS Elastic Beanstalk environment name.
2016-01-23 01:34:01 +01:00
6aadf76397
Split up `ram` segment into `ram` and `swap`.
2016-01-23 01:27:05 +01:00
472fb6f674
README: Arrghhhhh. Newlines in tables breaking things.
2016-01-22 16:12:20 -08:00
bd88fe9637
README: Documenting new background_jobs feature
2016-01-22 16:11:41 -08:00
f58da93481
README: Updating language about ZSH frameworks
2016-01-22 16:06:08 -08:00
c379cf2657
Syntax fix.
2016-01-22 19:52:00 +01:00
657a097ef0
Merge pull request #201 from Kayant/zsh-frameworks
...
Add more ZSH framework instructions
2016-01-21 19:02:01 -08:00
8172425cd2
Merge pull request #200 from V1rgul/next
...
background_jobs segment : add number of jobs if >1
2016-01-21 18:59:37 -08:00
ce72ca3a16
add background_jobs change in changelog
2016-01-22 02:11:25 +01:00
29b346930b
fix wc glitch on OSX
2016-01-22 01:56:43 +01:00
684291e734
Fix spacing derp
2016-01-21 21:33:56 +00:00
193e19f597
Add more ZSH framework instructions
...
*Zgen
*Antibody
*ZPM
*ZIM
2016-01-20 13:58:30 +00:00
11d00ce713
background_jobs: show number if verbose
2016-01-18 05:11:05 +01:00
a0c664b174
Merge pull request #1 from bhilburn/next
...
Merge original repo
2016-01-18 05:09:19 +01:00
0b1849d034
Improve zsh framework install description and add zplug
2016-01-17 19:18:43 +00:00
67895cc5da
README: Added a tl;dr
2016-01-17 10:04:27 -08:00
24e7ee75fe
Merge pull request #197 from dritter/changelog_additions
...
Changelog entries added for 'HOME_SUBFOLDER' state of the `dir` segment.
2016-01-17 10:01:15 -08:00
13b7d26e76
Changelog entries added for 'HOME_SUBFOLDER' state of the `dir` segment.
2016-01-17 15:05:34 +01:00
dc4871f1a0
README: Minor cleanups
2016-01-16 20:02:10 -08:00
02cb0fd88f
README: Turns out you can't linebreak in tables.
2016-01-16 19:59:39 -08:00
8a3c16ae24
README: Trying out tables to describe variables.
2016-01-16 19:56:27 -08:00
Nate McCurdy
Ben Hilburn
Sebastien Varrette
Dominik Ritter
The Gitter Badger
John Minor
theminor
James Bowman
v1rgul
Anthony
V1rgul