5ec27a7d31a36d915e8d10b947ba0c9a05acef1f

Author
Michael Aquilina <michaelaquilina@gmail.com>
Committer
GitHub <noreply@github.com>
Date

Message

Merge pull request #48 from MichaelAquilina/colored_python_version

Color the displayed python version

Diff

  1diff --git a/.gitignore b/.gitignore
  2new file mode 100644
  3index 0000000000000000000000000000000000000000..4bedaf95c21180cd507cb0646a32b49ceb77b679
  4--- /dev/null
  5+++ b/.gitignore
  6@@ -0,0 +1,2 @@
  7+.venv
  8+Pipfile
  9diff --git a/autoswitch_virtualenv.plugin.zsh b/autoswitch_virtualenv.plugin.zsh
 10index e248e440f0c8980cfe7a63f1fd7ba7c360d7ed77..88b8092060178c36ae97fe8c263321e9590ae207 100644
 11--- a/autoswitch_virtualenv.plugin.zsh
 12+++ b/autoswitch_virtualenv.plugin.zsh
 13@@ -20,9 +20,9 @@ fi
 14 function _print_python_version() {
 15    # For some reason python --version writes to stderr
 16    if type python > /dev/null; then
 17-       printf "[%s]\n" "$(python --version 2>&1)"
 18+       printf "\e[32m[%s]\e[0m\n" "$(python --version 2>&1)"
 19    elif type python3 > /dev/null; then
 20-       printf "[%s]\n" "$(python3 --version 2>&1)"
 21+       printf "\e[32m[%s][\[0m\n" "$(python3 --version 2>&1)"
 22    else
 23        printf "Unable to find python installed on this machine"
 24     fi
 25diff --git a/tests/test_check_venv.zunit b/tests/test_check_venv.zunit
 26index 3bc7decfedda017d073847ceca7aac7b80eb7bfa..9d11970afe8acb5b2d0329079a074597101821ef 100644
 27--- a/tests/test_check_venv.zunit
 28+++ b/tests/test_check_venv.zunit
 29@@ -69,7 +69,7 @@
 30     run check_venv
 31 
 32     assert $status equals 0
 33-    assert "$output" same_as "Switching virtualenv: foobar  [$PYTHON_VERSION]"
 34+    assert "$output" same_as "Switching virtualenv: foobar  \e[32m[$PYTHON_VERSION]\e[0m"
 35 }
 36 
 37 @test 'check_venv - No security warning for readable by group permission' {
 38@@ -84,7 +84,7 @@
 39     run check_venv
 40 
 41     assert $status equals 0
 42-    assert "$output" same_as "Switching virtualenv: foobar  [$PYTHON_VERSION]"
 43+    assert "$output" same_as "Switching virtualenv: foobar  \e[32m[$PYTHON_VERSION]\e[0m"
 44 }
 45 
 46 @test 'check_venv - No security warning for readable only by owner permission' {
 47@@ -98,7 +98,7 @@
 48     run check_venv
 49 
 50     assert $status equals 0
 51-    assert "$output" same_as "Switching virtualenv: foobar  [$PYTHON_VERSION]"
 52+    assert "$output" same_as "Switching virtualenv: foobar  \e[32m[$PYTHON_VERSION]\e[0m"
 53 }
 54 
 55 
 56@@ -124,7 +124,7 @@
 57     run check_venv
 58 
 59     assert $status equals 0
 60-    assert "$output" same_as "Switching virtualenv: foodefault  [$PYTHON_VERSION]"
 61+    assert "$output" same_as "Switching virtualenv: foodefault  \e[32m[$PYTHON_VERSION]\e[0m"
 62 }
 63 
 64 
 65@@ -140,7 +140,7 @@
 66     run check_venv
 67 
 68     assert $status equals 0
 69-    assert "$output" same_as "Switching pipenv: foobar  [$PYTHON_VERSION]"
 70+    assert "$output" same_as "Switching pipenv: foobar  \e[32m[$PYTHON_VERSION]\e[0m"
 71 }
 72 
 73 
 74@@ -170,5 +170,5 @@
 75     run check_venv
 76 
 77     assert $status equals 0
 78-    assert "$output" same_as "Switching virtualenv: foobar  [$PYTHON_VERSION]"
 79+    assert "$output" same_as "Switching virtualenv: foobar  \e[32m[$PYTHON_VERSION]\e[0m"
 80 }
 81diff --git a/tests/test_maybepipenv.zunit b/tests/test_maybepipenv.zunit
 82index 655fbd2d6b01d5c9cf03897dd8ae97a747c09f52..50cb6bd57a6cb32e2cafee10e799a70309715737 100644
 83--- a/tests/test_maybepipenv.zunit
 84+++ b/tests/test_maybepipenv.zunit
 85@@ -27,9 +27,7 @@
 86     run _maybepipenv "$(pipenv --venv)"
 87 
 88     assert $state equals 0
 89-    assert "$output" matches "Switching pipenv: $(basename "$PWD")-[^\s]{8}  \[$PYTHON_VERSION\]"
 90-
 91-
 92+    assert "$output" matches "Switching pipenv: $(basename "$PWD")-[^\s]{8}"
 93 }
 94 
 95 @test '_maybepipenv - switches virtualenv if current virtualenv is different' {
 96@@ -38,7 +36,7 @@
 97     run _maybepipenv "$(pipenv --venv)"
 98 
 99     assert $state equals 0
100-    assert "$output" matches "Switching pipenv: $(basename "$PWD")-[^\s]{8}  \[$PYTHON_VERSION\]"
101+    assert "$output" matches "Switching pipenv: $(basename "$PWD")-[^\s]{8}"
102 }
103 
104 @test '_maybepipenv - switches virtualenv if current virtualenv is different (silent)' {
105diff --git a/tests/test_maybeworkon.zunit b/tests/test_maybeworkon.zunit
106index bac535b930523447b6b8d60430a46a94f1f678c9..519a58deddea04836ddcc2f6567ca38bedd663ee 100644
107--- a/tests/test_maybeworkon.zunit
108+++ b/tests/test_maybeworkon.zunit
109@@ -27,7 +27,7 @@
110     run _maybeworkon foobar
111 
112     assert $state equals 0
113-    assert "$output" same_as "Switching virtualenv: foobar  [$PYTHON_VERSION]"
114+    assert "$output" same_as "Switching virtualenv: foobar  \e[32m[$PYTHON_VERSION]\e[0m"
115 }
116 
117 @test '_maybeworkon - switches virtualenv if current virtualenv is different' {
118@@ -36,7 +36,7 @@
119     run _maybeworkon foobar
120 
121     assert $state equals 0
122-    assert "$output" contains "Switching virtualenv: foobar  [$PYTHON_VERSION]"
123+    assert "$output" contains "Switching virtualenv: foobar  \e[32m[$PYTHON_VERSION]\e[0m"
124 }
125 
126 @test '_maybeworkon - switches virtualenv if current virtualenv is different (silent)' {
127diff --git a/tests/test_plugin.zunit b/tests/test_plugin.zunit
128index 3a09cdfdb6978425ed88eb19f196940429c14401..dfa917ab0ae91cf4648ad429c3471ebc3dc6b975 100644
129--- a/tests/test_plugin.zunit
130+++ b/tests/test_plugin.zunit
131@@ -37,7 +37,7 @@
132     run load ../autoswitch_virtualenv.plugin.zsh
133 
134     assert $status equals 0
135-    assert "$output" same_as "Switching virtualenv: foobar  [$PYTHON_VERSION]"
136+    assert "$output" same_as "Switching virtualenv: foobar  \e[32m[$PYTHON_VERSION]\e[0m"
137 }
138 
139 @test 'plugin - does nothing if switching to directory without .venv' {
140@@ -63,7 +63,7 @@
141     run cd "$TEMP_DIR"
142 
143     assert $status equals 0
144-    assert "$output" same_as "Switching virtualenv: foobar  [$PYTHON_VERSION]"
145+    assert "$output" same_as "Switching virtualenv: foobar  \e[32m[$PYTHON_VERSION]\e[0m"
146 
147     mkdir "$TEMP_DIR/foo"
148 
149@@ -71,5 +71,5 @@
150     run cd "$TEMP_DIR/foo"
151 
152     assert $status equals 0
153-    assert "$output" same_as "Switching virtualenv: foobar  [$PYTHON_VERSION]"
154+    assert "$output" same_as "Switching virtualenv: foobar  \e[32m[$PYTHON_VERSION]\e[0m"
155 }