Do not export fun variable when loading function, fixes #269

Author: Jonathan Dahan

changelog.md

@@ -3,6 +3,11 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.0.3 - unreleased
+
+### Fixed
+- Accidental export of local fun variable
+
 ## 2.0.2 - 2019-09-04
 
 ### Fixed

functions/geometry_git.zsh

@@ -1,7 +1,5 @@
 # geometry_git - please see the readme for documentation on all features
 
-(( $+commands[git] )) || return
-
 geometry_git_stashes() {
   git rev-parse --quiet --verify refs/stash >/dev/null \
     && ansi ${GEOMETRY_GIT_COLOR_STASHES:="144"} ${GEOMETRY_GIT_SYMBOL_STASHES:="●"}
@@ -87,6 +85,8 @@ geometry_git_conflicts() {
 }
 
 geometry_git() {
+  (( $+commands[git] )) || return
+
   command git rev-parse --git-dir > /dev/null 2>&1 || return
 
   $(command git rev-parse --is-bare-repository 2>/dev/null) \

functions/geometry_kube.zsh

@@ -1,8 +1,7 @@
 # geometry_kube - show kubectl client version and current context/namespace.
 
-(( $+commands[kubectl] )) || return
-
 geometry_kube() {
+  (( $+commands[kubectl] )) || return
   ( ${GEOMETRY_KUBE_PIN:=false} ) || [[ -n "$KUBECONFIG" ]] || return
   : ${GEOMETRY_KUBE_SEPARATOR:="|"}
 

functions/geometry_node.zsh

@@ -1,8 +1,8 @@
 # geometry_node - show node and npm/yarm version when in a node project context
 
-(( $+commands[node] )) || return
-
 geometry_node() {
+    (( $+commands[node] )) || return
+
     test -n "$GEOMETRY_NODE_PIN" || test -f package.json || test -f yarn.lock || return 1
 
     GEOMETRY_NODE=$(ansi ${GEOMETRY_NODE_COLOR:=green} ${GEOMETRY_NODE_SYMBOL="⬡"})

functions/geometry_ruby.zsh

@@ -1,8 +1,8 @@
 # geometry_ruby - display the current ruby version, rvm version, and gemset
 
-(( $+commands[ruby] )) || return
-
 geometry_ruby() {
+  (( $+commands[ruby] )) || return
+
   GEOMETRY_RUBY=$(ansi ${GEOMETRY_RUBY_COLOR:=default} ${GEOMETRY_RUBY_SYMBOL:="◆"})
 
   [[ $(ruby -v) =~ 'ruby ([0-9a-zA-Z.]+)' ]]

functions/geometry_rustup.zsh

@@ -1,8 +1,8 @@
 # geometry_rustup - display a symbol colored with the currently selected rustup toolchain
 
-(( $+commands[rustup] )) || return
-
 geometry_rustup() {
+    (( $+commands[rustup] )) || return
+
     ( ${GEOMETRY_RUSTUP_PIN:=false} ) || { cargo locate-project 2>/dev/null || { echo -n '' && return; } }
 
     : ${GEOMETRY_RUSTUP_STABLE_COLOR:=green}

geometry.zsh

@@ -13,7 +13,7 @@ GEOMETRY_ROOT=${0:A:h}
 
 autoload -U add-zsh-hook
 
-for fun in "${GEOMETRY_ROOT}"/functions/geometry_*.zsh; do . $fun; done
+function { local fun; for fun ("${GEOMETRY_ROOT}"/functions/geometry_*.zsh(N.)) . $fun }
 
 (( $+functions[ansi] )) || ansi() { (($# - 2)) || echo -n "%F{$1}$2%f"; }