mirror of
https://github.com/jorgebucaran/fisher
synced 2024-11-03 15:40:27 +00:00
aed81667c9
* Fix a critical bug in the Makefile that was incorrectly merging any existing user configuration file and the generated Fisherman configuration. Closes #21. * Fix a bug in install and uninstall that was adding plugin names to fishfiles instead of the URL when interacting with custom URLs. Probably closes #23. * Fix a bug in install, update and uninstall that was displaying an incorrect plugin count if there was at least on failure. * Fix bug in `fisher install` that causes install to fail even though it succeeds, due to `wait(1)`'s behavior of returning `1` if there is any output to standard error. Closes #20. * Fix bug in `fisher uninstall` that was removing plugins from the cache by mistake. * Add feature to Makefile to download the index for the first time in order to provide auto-complete before the user can install/update/search, actions which would case the index to be updated. * Add link to Slack [room][wharf] in README. Thanks @simnalamburt. * Add new `$fisher_timeout` configuration variable that lets you specify `curl(1)` `--max-time` option. Without this, `curl` could hang for a long time if you are in a bad connection. * Add `fisher install --link` to allow installing plugins creating a symbolic link to each of the relevant files to be copied during the install process. If you use ***`--link`*** to install a plugin that is a _path to a directory_ or file, a symbolic link to the directory will be created making local testing more convenient as you are not required to update the plugin's repository to test changes within Fisherman. If you are testing using [Fishtape][fishtape] you do not even need to reset the shell session. * Add `fisher --alias[=<command>=<alias>]` to simplify creating new aliases for `fisher` commands. Use `fisher --alias` without arguments to list the current set of aliases. Also add auto-complete for aliases to install, update or uninstall. Note that aliases are **not** persisted this way. To save your aliases use `$fisher_alias` as described in `fisher help config`. Also note that aliases are only auto-complete if you call `fisher --alias`. To auto-complete aliases saved to `$fisher_alias` you can do `fisher --alias (fisher --alias)`. * Add short options for new and old fisher flags: * `--file` → `-f` * `--list` → `-l` * `--alias` → `-a` * Improve help message for failed installs. Closes * Improve `fisher --validate` to automatically correct common misspellings, for example when installing a oh-my-fish package, one often types ohmyifsh. * ☝️ Improve auto-complete performance by extracting the implementation of the different `fisher` flags to `__fisher_*` functions. `completions/fisher.fish` relies heavily in `fisher_search` to query what plugins are available to install/update/uninstall. In this process, numerous calls to `fisher --list` and `fisher --validate`, etc., are made. Now, auto-complete does not have to pay the penalty of entering `fisher`, parsing options, etc. Closes #27. @namandistro * Improve `fisher --help` output and show up until now poorly documented ***`--list`***, ***`--file`***, etc. flags consistently. Also display available commands after `make install` to improve usability. * Improve `fisher install` so that it checks whether the plugin you are trying to install, if it is already in the cache, is a symbolic link or not, and installs it as if the `--link` flag was specified. * Improve `fisher --validate` to retrieve the absolute path to the closest directory of the given items if they are valid local paths. Related #19. * Improve install to not `git clone` local plugins if a regular `path/to/file` is given to `fisher install`. Instead, copy to the cache using `cp(1)` and if `--link` is used, create a symlink. * Improve `fisher --validate` to invalidate items with repeated `.` and `-` and allow items that begin with `/` or `./` to support installing plugins from local paths. Related #19. * Modify `fisher update` default behavior. Now this command updates Fisherman by default. Use of `--self` and `--me` is also **deprecated**. To read from the standard input use a dash `-`. For example: `fisher --list | fisher update -`. Closes #25. * Rename `--cache` to more descriptive ***`--list`***. Thanks @colstrom. * Remove `fisher --cache=base` and make it return the base names of all directories in the path by default. To get the full path use printf `printf "$fisher_cache/%s" (fisher --list)` * Rename undocumented `fisher --translate` flag (again) to `fisher --cache`. This function reads the standard input for a name, URL or local path and calculates the plugin's path relative to the cache. For a name this is simple `$fisher_cache/<name>` for an URL, retrieve the remote URL of every repository until there is a match with the given URL and return the path in the cache of that repository. Finally, if the input is a * Revert #3. The reason `getopts.fish` was in its own file originally is because @bucaran wanted a standalone, dependency free cli parser solution, arguably slightly faster than having Awk read `getopts.awk` for each use. The performance improvement is negligible at best, but `getopts` is also used by every single command and future commands and plugins are very likely to use it as well, so we so we might as well use the slightly faster version.
147 lines
4.1 KiB
Fish
147 lines
4.1 KiB
Fish
function fisher_update -d "Fisherman Update Manager"
|
|
set -l path
|
|
set -l items
|
|
set -l option self
|
|
set -l error /dev/stderr
|
|
|
|
getopts $argv | while read -l 1 2
|
|
switch "$1"
|
|
case - _
|
|
set option
|
|
set items $items $2
|
|
|
|
case index
|
|
set option index
|
|
|
|
case path
|
|
set option path
|
|
set path $2
|
|
|
|
case q quiet
|
|
set error $2
|
|
|
|
case help h
|
|
printf "usage: fisher update [<name or url> ...] [--quiet] [--help]\n\n"
|
|
|
|
printf " -q --quiet Enable quiet mode\n"
|
|
printf " -h --help Show usage help \n"
|
|
return
|
|
|
|
case \*
|
|
printf "fisher: Ahoy! '%s' is not a valid option\n" $1 >& 2
|
|
fisher_update --help >& 2
|
|
return 1
|
|
end
|
|
end
|
|
|
|
if test -z "$error"
|
|
set error /dev/null
|
|
end
|
|
|
|
switch "$option"
|
|
case path
|
|
if not test -d $path
|
|
printf "fisher: '%s' invalid path\n" $path > $error
|
|
return 1
|
|
end
|
|
|
|
wait --spin=pipe --log=$fisher_error_log "
|
|
|
|
git -C $path checkout --quiet master ^/dev/null
|
|
git -C $path pull --quiet --rebase origin master
|
|
|
|
"
|
|
|
|
case index
|
|
mkdir -p $fisher_cache
|
|
set -l index $fisher_cache/.index.tmp
|
|
|
|
if wait --spin=pipe --log=$fisher_error_log "
|
|
curl --max-time $fisher_timeout -sS $fisher_index > $index
|
|
"
|
|
mv -f $index $fisher_cache/.index
|
|
else
|
|
printf "fisher: Connection timeout. Try again.\n" > $error
|
|
end
|
|
|
|
rm -f $index
|
|
|
|
case self
|
|
set -l elapsed (date +%s)
|
|
|
|
printf "Updating >> Fisherman\n" > $error
|
|
|
|
if not fisher_update --path=$fisher_home --quiet=$error
|
|
|
|
printf "fisher: Could not update Fisherman.\n" > $error
|
|
sed -E 's/.*(error:.*)/\1/' $fisher_error_log > $error
|
|
|
|
return 1
|
|
end
|
|
|
|
printf "Done without errors (%0.fs)\n" (
|
|
math (date +%s) - $elapsed) > $error
|
|
|
|
case \*
|
|
set -l count 0
|
|
set -l index 1
|
|
set -l total (count $items)
|
|
set -l elapsed (date +%s)
|
|
|
|
if set -q items[1]
|
|
printf "%s\n" $items
|
|
else
|
|
__fisher_file -
|
|
end | __fisher_validate | __fisher_cache | while read -l path
|
|
|
|
if not test -d "$path"
|
|
switch "$path"
|
|
case file:///\*
|
|
case \*
|
|
printf "fisher: '%s' path not found\n" $path > $error
|
|
continue
|
|
end
|
|
end
|
|
|
|
set -l name (printf "%s\n" $path | __fisher_name)
|
|
|
|
printf "Updating " > $error
|
|
|
|
switch $total
|
|
case 0 1
|
|
printf ">> %s\n" $name > $error
|
|
|
|
case \*
|
|
printf "(%s of %s) >> %s\n" $index $total $name > $error
|
|
|
|
set index (math $index + 1)
|
|
end
|
|
|
|
switch "$path"
|
|
case file:///\*
|
|
case \*
|
|
if not test -L $path
|
|
if not fisher_update --path=$path --quiet=$error
|
|
sed -nE 's/.*(error|fatal): (.*)/error: \2/p
|
|
' $fisher_error_log > $error
|
|
continue
|
|
end
|
|
end
|
|
end
|
|
|
|
fisher install --quiet -- (printf "%s\n" $name | __fisher_name)
|
|
|
|
set count (math $count + 1)
|
|
end
|
|
|
|
set elapsed (math (date +%s) - $elapsed)
|
|
|
|
if test $count = 0
|
|
printf "No plugins were updated.\n" > $error
|
|
return 1
|
|
end
|
|
|
|
printf "Aye! %d plugin/s updated in %0.fs\n" > $error $count $elapsed
|
|
end
|
|
end
|