slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

dev: cli: fix recent command parsing breakage; more tests

Browse Source
This commit is contained in:
Simon Michael 2024-10-14 08:26:25 -10:00
parent b71634a4ee
commit 7ac154e0b8
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hledger/Hledger/Cli.hs
View File

@ -268,7 +268,7 @@ main = withGhcDebug' $ do
-- If no command argument was provided, or if cmdargs fails because -- If no command argument was provided, or if cmdargs fails because
-- the command line contains a bad flag or wrongly present/missing flag value, -- the command line contains a bad flag or wrongly present/missing flag value,
-- cmdname will be "". -- cmdname will be "".
args = confallgenargs <> cliargswithcmdfirstwithoutclispecific args = [confcmdarg | not $ null confcmdarg] <> cliargswithcmdfirstwithoutclispecific
cmdname = stringopt "command" $ cmdargsParse "for command name" (mainmode addons) args cmdname = stringopt "command" $ cmdargsParse "for command name" (mainmode addons) args
badcmdprovided = null cmdname && not nocmdprovided badcmdprovided = null cmdname && not nocmdprovided
isaddoncmd = not (null cmdname) && cmdname `elem` addons isaddoncmd = not (null cmdname) && cmdname `elem` addons

10
hledger/test/cli/cli.test
View File

@ -154,3 +154,13 @@ $ hledger -f /dev/null --no-conf --conf nosuchfile check
$ hledger --debug -f /dev/null --conf /dev/null --no-conf >/dev/null $ hledger --debug -f /dev/null --conf /dev/null --no-conf >/dev/null
>2 /ignoring config files/ >2 /ignoring config files/
# ** 25. Having general options in a conf file doesn't break cli command parsing.
$ echo '--pretty' >$$.conf; hledger -f /dev/null --conf $$.conf files; rm -f $$.conf
/dev/null
# ** 26. An initial non-flag general argument in a conf file is used as the command.
$ echo 'files' >$$.conf; hledger stats -f /dev/null --conf $$.conf; rm -f $$.conf
# ** 27. A non-flag general argument that's not first in the conf file is note used as the command.
$ echo '--pretty files' >$$.conf; hledger stats -f /dev/null --conf $$.conf; rm -f $$.conf
> /Runtime stats/