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

Merge pull request #1140 from jacg/amt-redirect-issue-457

Browse Source 
fix parsing of < and > in add-on commands (#457)
This commit is contained in:
Simon Michael 2019-12-08 10:18:00 -08:00 committed by GitHub
commit 63aec5ef56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 49 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hledger-lib/Hledger/Utils/String.hs
View File

@ -111,7 +111,7 @@ underline s = s' ++ replicate (length s) '-' ++ "\n"
-- | Double-quote this string if it contains whitespace, single quotes -- | Double-quote this string if it contains whitespace, single quotes
-- or double-quotes, escaping the quotes as needed. -- or double-quotes, escaping the quotes as needed.
quoteIfNeeded :: String -> String quoteIfNeeded :: String -> String
quoteIfNeeded s | any (`elem` s) (quotechars++whitespacechars) = "\"" ++ escapeDoubleQuotes s ++ "\"" quoteIfNeeded s | any (`elem` s) (quotechars++whitespacechars++redirectchars) = "\"" ++ escapeDoubleQuotes s ++ "\""
| otherwise = s | otherwise = s
-- | Single-quote this string if it contains whitespace or double-quotes. -- | Single-quote this string if it contains whitespace or double-quotes.
-- No good for strings containing single quotes. -- No good for strings containing single quotes.
@ -119,9 +119,10 @@ singleQuoteIfNeeded :: String -> String
singleQuoteIfNeeded s | any (`elem` s) whitespacechars = "'"++s++"'" singleQuoteIfNeeded s | any (`elem` s) whitespacechars = "'"++s++"'"
| otherwise = s | otherwise = s
quotechars, whitespacechars :: [Char] quotechars, whitespacechars, redirectchars :: [Char]
quotechars = "'\"" quotechars = "'\""
whitespacechars = " \t\n\r" whitespacechars = " \t\n\r"
redirectchars = "<>"
escapeDoubleQuotes :: String -> String escapeDoubleQuotes :: String -> String
escapeDoubleQuotes = regexReplace "\"" "\"" escapeDoubleQuotes = regexReplace "\"" "\""

49
tests/addons/addons.test
View File

@ -4,22 +4,49 @@
# they always run the first hledger executable in PATH # they always run the first hledger executable in PATH
# 1. flags after an add-command are handled by the add-on # 1. flags after an add-command are handled by the add-on
PATH=$PATH:. hledger addon --help $ PATH=$PATH:. hledger addon --help
>>> /hledger-addon/ > /hledger-addon/
>>>=0 >=0
# 2. add-on flags which are not also defined in the main executable are a problem # 2. add-on flags which are not also defined in the main executable are a problem
PATH=$PATH:. hledger addon --addonflag $ PATH=$PATH:. hledger addon --addonflag
>>>2 /Unknown flag: --addonflag/ >2 /Unknown flag: --addonflag/
>>>=1 >=1
# 3. hledger main executable ignores anything after -- (and hides the -- from the add-on) # 3. hledger main executable ignores anything after -- (and hides the -- from the add-on)
PATH=$PATH:. hledger addon --help -- --addonflag $ PATH=$PATH:. hledger addon --help -- --addonflag
>>> /hledger-addon/ > /hledger-addon/
>>>=0 >=0
# TODO how to reliably ensure no addons but still find the hledger executable ? # TODO how to reliably ensure no addons but still find the hledger executable ?
# 4. having no addons shouldn't break the commands list # 4. having no addons shouldn't break the commands list
# PATH= ~/.local/bin/stack exec -- hledger # $ PATH= ~/.local/bin/stack exec -- hledger
#>>>=0 # >=0
# ############################ issue 457 #####################################
# #
# These tests are commented out, as they are not working properly. See: #
# https://github.com/simonmichael/hledger/pull/1140#issuecomment-562793255 #
# #
# # 5. test for `>` in https://github.com/simonmichael/hledger/issues/457 #
# # note a shelltest already provides one level of quoting, so amt:>0 not 'amt:>0' #
# # #
# $ hledger -f - ui amt:>0 #
# >2 !/could not parse/ #
# >=1 #
# #
# # 6. test for `<` in https://github.com/simonmichael/hledger/issues/457 #
# $ hledger -f - ui amt:<0 #
# >2 !/could not parse/ #
# >=1 #
# #
# # 7. test for `>=` in https://github.com/simonmichael/hledger/issues/457 #
# $ hledger -f - ui amt:>=0 #
# >2 !/could not parse/ #
# >=1 #
# #
# # 8. test for `<=` in https://github.com/simonmichael/hledger/issues/457 #
# $ hledger -f - ui amt:<=0 #
# >2 !/could not parse/ #
# >=1 #
# ##################################################################################

16
tests/rewrite.test
View File

@ -142,14 +142,14 @@ hledger rewrite -f- assets:bank and 'amt:<0' --add-posting 'expenses:fee $5' -
2016/01/01 withdraw ; modified: 2016/01/01 withdraw ; modified:
assets:cash $20 assets:cash $20
assets:bank assets:bank
expenses:fee $5 ; generated-posting: = assets:bank and amt:<0 expenses:fee $5 ; generated-posting: = assets:bank and "amt:<0"
assets:bank $-5 ; generated-posting: = assets:bank and amt:<0 assets:bank $-5 ; generated-posting: = assets:bank and "amt:<0"
2016/01/02 withdraw ; modified: 2016/01/02 withdraw ; modified:
assets:cash assets:cash
assets:bank $-30 assets:bank $-30
expenses:fee $5 ; generated-posting: = assets:bank and amt:<0 expenses:fee $5 ; generated-posting: = assets:bank and "amt:<0"
assets:bank $-5 ; generated-posting: = assets:bank and amt:<0 assets:bank $-5 ; generated-posting: = assets:bank and "amt:<0"
>>>2 >>>2
>>>=0 >>>=0
@ -240,14 +240,14 @@ hledger rewrite --diff -f- assets:bank and 'amt:<0' --add-posting 'expenses:fee
+2016/01/01 withdraw ; modified: +2016/01/01 withdraw ; modified:
assets:cash $20 assets:cash $20
assets:bank assets:bank
+ expenses:fee $5 ; generated-posting: = assets:bank and amt:<0 + expenses:fee $5 ; generated-posting: = assets:bank and "amt:<0"
+ assets:bank $-5 ; generated-posting: = assets:bank and amt:<0 + assets:bank $-5 ; generated-posting: = assets:bank and "amt:<0"
@@ -5,3 +7,5 @@ @@ -5,3 +7,5 @@
-2016/01/02 withdraw -2016/01/02 withdraw
+2016/01/02 withdraw ; modified: +2016/01/02 withdraw ; modified:
assets:cash assets:cash
assets:bank $-30 assets:bank $-30
+ expenses:fee $5 ; generated-posting: = assets:bank and amt:<0 + expenses:fee $5 ; generated-posting: = assets:bank and "amt:<0"
+ assets:bank $-5 ; generated-posting: = assets:bank and amt:<0 + assets:bank $-5 ; generated-posting: = assets:bank and "amt:<0"
>>>2 >>>2
>>>=0 >>>=0