arti/zsh-autoenv
1
0
Fork 0
mirror of https://github.com/Tarrasch/zsh-autoenv.git synced 2024-11-25 16:31:00 +02:00
Code Releases Activity

Merge pull request #22 from Tarrasch/improve-and-test-zstat-integration

Browse Source 
Improve and test zstat integration
This commit is contained in:
Daniel Hahler 2015-01-26 14:08:25 +01:00
commit b3a56f449f
5 changed files with 52 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -1,4 +1,8 @@
export ZDOTDIR=${CURDIR}/tests/ZDOTDIR # Default, can be overridden using "make test ZDOTDIR=...".
ZDOTDIR:=${CURDIR}/tests/ZDOTDIR
# Export it, and make it absolute.
override export ZDOTDIR:=$(abspath $(ZDOTDIR))
test: test:
cram --shell=zsh -v tests cram --shell=zsh -v tests

34
autoenv.zsh
View File

@ -60,13 +60,23 @@ _autoenv_stack_entered_add() {
_autoenv_stack_entered_mtime[$env_file]=$(_autoenv_get_file_mtime $env_file) _autoenv_stack_entered_mtime[$env_file]=$(_autoenv_get_file_mtime $env_file)
} }
_autoenv_get_file_mtime() {
if [[ -f $1 ]]; then # zstat_mime helper, conditionally defined.
zstat +mtime $1 # Load zstat module, but only its builtin `zstat`.
else if ! zmodload -F zsh/stat b:zstat 2>/dev/null; then
echo 0 # If the module is not available, define a wrapper around `stat`, and use its
fi # terse output instead of format, which is not supported by busybox.
} # Assume '+mtime' as $1.
_autoenv_get_file_mtime() {
setopt localoptions pipefail
stat -t $1 2>/dev/null | cut -f13 -d ' ' || echo 0
}
else
_autoenv_get_file_mtime() {
zstat +mtime $1 2>/dev/null || echo 0
}
fi
# Remove an entry from the stack. # Remove an entry from the stack.
_autoenv_stack_entered_remove() { _autoenv_stack_entered_remove() {
@ -132,16 +142,6 @@ _autoenv_debug() {
} }
# }}} # }}}
# Load zstat module, but only its builtin `zstat`.
if ! zmodload -F zsh/stat b:zstat 2>/dev/null; then
# If the module is not available, define a wrapper around `stat`, and use its
# terse output instead of format, which is not supported by busybox.
# Assume '+mtime' as $1.
zstat() {
stat -t $2 | cut -f13 -d ' '
}
fi
# Generate hash pair for a given file ($1). # Generate hash pair for a given file ($1).
# A fixed hash value can be given as 2nd arg, but is used with tests only. # A fixed hash value can be given as 2nd arg, but is used with tests only.

13
tests/ZDOTDIR.invalid-module_path/.zshenv Normal file
View File

@ -0,0 +1,13 @@
# Use invalid module path for zsh, to test alternative zstat implementation.
# Pre-load zsh/parameter, where we do not have/need(?) an alternative
# implementation.
zmodload zsh/parameter
module_path=(/dev/null)
zstat() {
echo "Should not get called."
}
source ${ZDOTDIR}/../ZDOTDIR/.zshenv

4
tests/_autoenv_stack.t
View File

@ -12,6 +12,8 @@ Add existing entries.
$ mkdir -p sub/sub2 $ mkdir -p sub/sub2
$ touch -t 201401010101 sub/file $ touch -t 201401010101 sub/file
$ touch -t 201401010102 sub
$ touch -t 201401010103 sub/sub2
$ _autoenv_stack_entered_add sub $ _autoenv_stack_entered_add sub
$ _autoenv_stack_entered_add sub/file $ _autoenv_stack_entered_add sub/file
$ _autoenv_stack_entered_add sub/sub2 $ _autoenv_stack_entered_add sub/sub2
@ -26,7 +28,7 @@ Add existing entries.
sub sub/file sub/sub2 non-existing sub sub/file sub/sub2 non-existing
$ echo $_autoenv_stack_entered_mtime $ echo $_autoenv_stack_entered_mtime
0 1388538060 0 0 (glob) 1388538180 1388538060 1388538120 0
Touch the file and re-add it. Touch the file and re-add it.

14
tests/_autoenv_utils.t
View File

@ -71,3 +71,17 @@ Re-add the first one, with a new hash.
:/tmp/cramtests-*/_autoenv_utils.t/second:7bee8f3b184e1e141ff76efe369c3b8bfc50e64c:1 (glob) :/tmp/cramtests-*/_autoenv_utils.t/second:7bee8f3b184e1e141ff76efe369c3b8bfc50e64c:1 (glob)
:/tmp/cramtests-*/_autoenv_utils.t/first:65eb010197b73ddc109b7210080f97a87f53451e:1 (glob) :/tmp/cramtests-*/_autoenv_utils.t/first:65eb010197b73ddc109b7210080f97a87f53451e:1 (glob)
}}} }}}
Explicit calls to _autoenv_get_file_mtime to test alternative implementation
of _autoenv_get_file_mtime (via ZDOTDIR.invalid-module_path/).
$ _autoenv_get_file_mtime non-existing
0
$ touch -t 201401010101 file
$ _autoenv_get_file_mtime file
1388538060
$ mkdir dir
$ touch -t 201401010102 dir
$ _autoenv_get_file_mtime dir
1388538120