8a887c505282b771193ac3ee6df05a1fa3f8426a

Author
LFDM <1986gh@gmail.com>
Committer
LFDM <1986gh@gmail.com>
Date

Message

Joins ruby prompt files and adds ruby_prompt_info.

Diff

 1diff --git a/lib/chruby.zsh b/lib/chruby.zsh
 2deleted file mode 100644
 3index b78d04f86794ad209f37edd232e75bb71e314bf2..0000000000000000000000000000000000000000
 4--- a/lib/chruby.zsh
 5+++ /dev/null
 6@@ -1,4 +0,0 @@
 7-# using the chruby plugin will override this with a real implementation
 8-function chruby_prompt_info() {
 9-  return 1
10-}
11diff --git a/lib/rbenv.zsh b/lib/rbenv.zsh
12deleted file mode 100644
13index f58074b8377a3d4fdef0ea09e63e425f0017ad97..0000000000000000000000000000000000000000
14--- a/lib/rbenv.zsh
15+++ /dev/null
16@@ -1,4 +0,0 @@
17-# using the rbenv plugin will override this with a real implementation
18-function rbenv_prompt_info() {
19-  return 1
20-}
21diff --git a/lib/ruby_prompts.zsh b/lib/ruby_prompts.zsh
22new file mode 100644
23index 0000000000000000000000000000000000000000..287b3ff0ae5418a59ebb0de51a2bd2dbf4063604
24--- /dev/null
25+++ b/lib/ruby_prompts.zsh
26@@ -0,0 +1,22 @@
27+# get the name of the rvm ruby version
28+function rvm_prompt_info() {
29+  [ -f $HOME/.rvm/bin/rvm-prompt ] || return 1
30+  local rvm_prompt
31+  rvm_prompt=$(eval "$HOME/.rvm/bin/rvm-prompt $ZSH_THEME_RVM_PROMPT_OPTIONS" 2>/dev/null)
32+  [[ "${rvm_prompt}x" == "x" ]] && return 1
33+  echo "${ZSH_THEME_RVM_PROMPT_PREFIX:=(}${rvm_prompt}${ZSH_THEME_RVM_PROMPT_SUFFIX:=)}"
34+}
35+
36+# using the rbenv plugin will override this with a real implementation
37+function rbenv_prompt_info() {
38+  return 1
39+}
40+
41+# using the chruby plugin will override this with a real implementation
42+function chruby_prompt_info() {
43+  return 1
44+}
45+
46+function ruby_prompt_info() {
47+  echo $(rvm_prompt_info || rbenv_prompt_info || chruby_prompt_info)
48+}
49diff --git a/lib/rvm.zsh b/lib/rvm.zsh
50deleted file mode 100644
51index 04d1163979dce9145c0a74f3cd1198e7ff5d138b..0000000000000000000000000000000000000000
52--- a/lib/rvm.zsh
53+++ /dev/null
54@@ -1,8 +0,0 @@
55-# get the name of the ruby version
56-function rvm_prompt_info() {
57-  [ -f $HOME/.rvm/bin/rvm-prompt ] || return 1
58-  local rvm_prompt
59-  rvm_prompt=$(eval "$HOME/.rvm/bin/rvm-prompt $ZSH_THEME_RVM_PROMPT_OPTIONS" 2>/dev/null)
60-  [[ "${rvm_prompt}x" == "x" ]] && return 1
61-  echo "${ZSH_THEME_RVM_PROMPT_PREFIX:=(}${rvm_prompt}${ZSH_THEME_RVM_PROMPT_SUFFIX:=)}"
62-}