aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #214 from dritter/fix_vcs_foreground_colorBen Hilburn2016-02-262-20/+25
|\ | | | | Allowing VCS Foreground Color to be over-rideable.
| * Clean up states in VCS segmentDominik Ritter2016-02-261-5/+13
| |
| * Fix dynamic coloring of VCS segmentDominik Ritter2016-02-182-15/+12
| | | | | | | | | | | | The VCS segment had a lot of own color definitions. Now they are all gone, so that the only color definitions are when the segment gets printed.
* | Merge pull request #216 from natemccurdy/issues/215Ben Hilburn2016-02-212-2/+19
|\ \ | |/ |/| Improve the rbenv prompt by using `version-name`
| * Improve the rbenv prompt by using `version-name`Nate McCurdy2016-02-202-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Reflect submodule status in VCS prompty by default.Ben Hilburn2016-02-182-3/+9
| |
* | README: Adding Travis-CI status to READMEBen Hilburn2016-02-181-0/+1
| |
* | Merge pull request #212 from dritter/unit_testingBen Hilburn2016-02-1812-1/+492
|\ \ | |/ |/| Adding Unit Tests, supported by Travis-CI
| * Fix go testDominik Ritter2016-02-171-1/+1
| | | | | | | | If no GO is available, there should be no output.
| * Add tests for `go_version`Dominik Ritter2016-02-152-0/+41
| |
| * Add tests for `rust_version`Dominik Ritter2016-02-152-0/+41
| |
| * Add documentation for Unit TestsDominik Ritter2016-02-131-0/+14
| |
| * Run tests on trusty, where ZSH 5.0.2 is availableDominik Ritter2016-02-131-1/+1
| |
| * Add tests for the dir segmentDominik Ritter2016-02-132-0/+119
| |
| * Avoid color warning on travisDominik Ritter2016-02-131-0/+1
| |
| * Add test for overwriting iconsDominik Ritter2016-02-131-0/+10
| |
| * Improve isolation of testsDominik Ritter2016-02-133-3/+4
| |
| * Add tests for visual identifiersDominik Ritter2016-02-131-0/+36
| |
| * Add tests for functions/colors.zshDominik Ritter2016-02-122-0/+43
| |
| * Add tests for functions/utilities.zshDominik Ritter2016-02-121-0/+86
| | | | | | | | | | In particular: `defined`, `set_default`, `getRelevantItem` and `segmentShouldBeJoined`
| * Add documentation for printSizeHumanReadableDominik Ritter2016-02-121-0/+3
| |
| * Add unit tests for printSizeHumanReadableDominik Ritter2016-02-122-0/+23
| |
| * Load submodules from HTTPSDominik Ritter2016-02-121-1/+1
| |
| * Install ZSH on Travis-CIDominik Ritter2016-02-121-5/+18
| |
| * Add Unit-TestsDominik Ritter2016-02-124-0/+60
| | | | | | | | | | Add unittests via shunit2 (https://github.com/kward/shunit2), that integrate with travis-ci.org.
* | Merge pull request #211 from Falkor/feature/better_dirty_checkBen Hilburn2016-02-091-1/+5
|\ \ | | | | | | VCS dirty check even in subdirs
| * | mention to git_compare_versionSebastien Varrette2016-02-091-1/+1
| | | | | | | | | | | | Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
| * | correct half-dirty detection -- restrict to untracked filesSebastien Varrette2016-02-091-1/+1
| | | | | | | | | | | | Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
| * | dirty check even in subdirsSebastien Varrette2016-02-081-1/+5
|/ / | | | | | | Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
* | Merge pull request #208 from dritter/fix_joiningBen Hilburn2016-02-061-2/+2
|\ \ | |/ |/| Fix joining segments from #186
| * Fix joining segmentsDominik Ritter2016-02-061-2/+2
|/
* Pull PR #204 into `next`. Introduces new VCS state, `untracked`Ben Hilburn2016-02-053-5/+33
|\
| * Merging @theminor's changes from PR #204Ben Hilburn2016-02-053-5/+33
|/|
| * update CHANGELOG re new UNTRACKED state in vcs segmentJohn Minor2016-01-311-0/+19
| |
| * Add "_UNTRACKED" option for _VCS to change colors - default yellowJohn Minor2016-01-281-2/+8
| |
| * Add VCS_WORKDIR_HALF_DIRTY vrbl for unstaged filestheminor2016-01-271-1/+3
| |
* | Merge branch 'master' into nextBen Hilburn2016-02-054-0/+19
|\ \
| * \ Merge pull request #207 from gitter-badger/gitter-badgeBen Hilburn2016-02-051-0/+2
| |\ \ | | | | | | | | Add a Gitter chat badge to README.md
| | * | Add Gitter badgeThe Gitter Badger2016-02-051-0/+2
| |/ /
| * | Merge pull request #203 from dritter/beanstalkBen Hilburn2016-02-054-0/+19
| |\ \ | | |/ | |/| Reworked the AWS-Beanstalk segment
| | * Added changelog entry.Dominik Ritter2016-01-231-0/+6
| | |
| | * Reworked the AWS Elastic Beanstalk segment.Dominik Ritter2016-01-231-3/+4
| | |
| | * More space for the Beanstalk-Icon.Dominik Ritter2016-01-231-3/+3
| | |
| | * Added documentation for the AWS Beanstalk segment.Dominik Ritter2016-01-231-0/+1
| | |
| | * Adding command prompt for AWS Elastic Beanstalk environment name.James Bowman2016-01-232-0/+11
| |/
* | Merge pull request #205 from dritter/dir_delimiterBen Hilburn2016-02-051-1/+1
|\ \ | | | | | | Change default dir truncation delimitor to ellipsis
| * | Change default dir truncation delimitor to ellipsisDominik Ritter2016-02-041-1/+1
| |/
* | Merge pull request #198 from dritter/vcs_customizableBen Hilburn2016-02-051-2/+4
|\ \ | | | | | | VCS-hooks customizable
| * | Made the VCS-hooks customizable.Dominik Ritter2016-01-231-2/+4
| |/
* | Merge pull request #181 from dritter/split_up_ram_segmentBen Hilburn2016-02-054-47/+47
|\ \ | | | | | | Split up `ram` segment into `ram` and `swap`.