Replace backticks in config with $(...)

This applies e24777fa2c to todo.cfg, too, and adds a verification to the existing test. Note: Because todo.cfg is preprocessed by test-lib, we use the original config from the working copy, not the copy inside the test fixture.
Tests: Hard-code location of todo.sh.
2012-04-15 10:37:41 +02:00 · 2012-04-15 10:35:17 +02:00 · 2012-04-15 10:33:51 +02:00 · 2012-03-26 11:56:04 -07:00 · 2012-03-19 11:00:51 -05:00 · 2012-03-01 10:26:17 -08:00
4 changed files with 13 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 VERSION-FILE
 tests/test-results
 tests/trash\ directory.*
+done.txt
+report.txt
+todo.txt
--- a/tests/t0100-code-nobacktick.sh
+++ b/tests/t0100-code-nobacktick.sh
@@ -9,8 +9,15 @@ On failure, it will print each offending line number and line.
 '
 . ./test-lib.sh

+backtick_check()
+{
+    sed -n -e 's/\(^\|[ \t]\)#.*//' -e '/`/{' -e '=;p' -e '}' "$@"
+}
+
 test_todo_session 'no old-style backtick command substitution' <<EOF
->>> sed -n -e 's/\(^\|[ \t]\)#.*//' -e '/\`/{' -e '=;p' -e '}' "$(which todo.sh)"
+>>> backtick_check bin/todo.sh
+
+>>> backtick_check ../../todo.cfg
 EOF

 test_done
--- a/todo.cfg
+++ b/todo.cfg
@@ -2,7 +2,7 @@

 # Your todo.txt directory
 #export TODO_DIR="/Users/gina/Documents/todo"
-export TODO_DIR=`dirname "$0"`
+export TODO_DIR=$(dirname "$0")

 # Your todo/done/report.txt locations
 export TODO_FILE="$TODO_DIR/todo.txt"
--- a/2
+++ b/2
@@ -58,7 +58,7 @@ _todo()
                            # a safety check of the ls action output.
                            local todo=$( \
                                eval TODOTXT_VERBOSE=0 $_todo_sh '-@ -+ -p -x command ls "^ *${cur} "' | \
-                                sed -e 's/^ *[0-9]\+ //' -e 's/\((.) \)[0-9]\{2,4\}-[0-9]\{2\}-[0-9]\{2\} /\1/' \
+                                sed -e 's/^ *[0-9]\{1,\} //' -e 's/\((.) \)[0-9]\{2,4\}-[0-9]\{2\}-[0-9]\{2\} /\1/' \
                                    -e 's/\([xX] \)\([0-9]\{2,4\}-[0-9]\{2\}-[0-9]\{2\} \)\{1,2\}/\1/' \
                                    -e 's/[[:space:]]*$//' \
                                    -e '1q' \
Author	SHA1	Message	Date
Ingo Karkat	3b0309d9bc	Replace backticks in config with $(...) This applies `e24777fa2c` to todo.cfg, too, and adds a verification to the existing test. Note: Because todo.cfg is preprocessed by test-lib, we use the original config from the working copy, not the copy inside the test fixture.	2012-04-15 10:37:41 +02:00
Ingo Karkat	b21d16878f	Tests: Hard-code location of todo.sh. As todo.sh is placed by test-lib at a fixed place, avoid the lookup through which.	2012-04-15 10:35:17 +02:00
Ingo Karkat	3e82f3ca56	Tests: Extract backtick_check().	2012-04-15 10:33:51 +02:00
Gina Trapani	ebe6a403c8	Merge pull request #81 from todb-r7/master .gitignore for local data files.	2012-03-26 11:56:04 -07:00
Tod Beardsley	a6fed991e5	Ignore user data. If you run out of git checkouts, should probably ignore the todo.txt data file (and friends).	2012-03-19 11:00:51 -05:00
Gina Trapani	94f770926b	Merge pull request #80 from inkarkat/complete-enhancements Complete enhancements	2012-03-01 10:26:17 -08:00
Ingo Karkat	322f3075d2	FIX: task number completion doesn't work on OS X. The recently added tests revealed that. Because of the sed \+ bound. As in `f3fc18af6b`, fall back to the \{1,\} basic regexp.	2012-02-29 09:00:35 +01:00
Ingo Karkat	bc81db2f2b	ENH: Better completion for custom add-ons via new listaddons command. The todo_completion had the problem that it didn't consider the todo.cfg itself for the location of TODO_ACTIONS_DIR, it just tried the default location or a globally exported config value. With the injection of custom configuration now in place, we can actually delegate the listing to todo.sh itself. The added built-in "listaddons" command is used for that; it may also be helpful for troubleshooting or to find out about available add-ons. (But the help / shorthelp commands offer more information.) Additionally, completion is now more precise; only executable actions and no subdirs are listed now; this is also covered by the enhanced test. The last bonus: The custom add-on actions are now only determined when there's actually completion of commands.	2012-02-29 08:53:18 +01:00
Ingo Karkat	6259cdb6da	Add test for custom add-on action completion.	2012-02-29 08:53:17 +01:00
Ingo Karkat	f76b6d5210	Add test for todo file completion.	2012-02-29 08:53:17 +01:00
Ingo Karkat	c1ad7f3560	Add more test cases for arguments and options completion.	2012-02-29 08:53:17 +01:00
Ingo Karkat	a777b266ed	Add test for task number completion.	2012-02-29 08:53:17 +01:00
Ingo Karkat	ebce735d04	test-lib: Allow completions containing whitespace. This is necessary to test the completion of task text.	2012-02-29 08:53:17 +01:00
Ingo Karkat	e5a308eb03	test-lib: Also document test_expect_code.	2012-02-29 08:53:16 +01:00
Ingo Karkat	e600a2162b	ENH: completion can use different todo.sh locations and configurations. This was previously not supported; todo_completion always used plain todo.sh from the PATH. Now it's possible to override the used executable (and configuration used through _todo_sh, set from a completion function wrapper. Cp. http://tech.groups.yahoo.com/group/todotxt/message/4003	2012-02-29 08:53:16 +01:00
Ingo Karkat	3d0a4d0b30	test-lib: Add test_todo_custom_completion variant. This extension of test_todo_completion additionally takes the completion function to use, so that customized completions for todo.sh aliases can be tested.	2012-02-29 08:53:16 +01:00
Gina Trapani	79f428779c	Merge pull request #77 from inkarkat/complete-from-done Complete from done	2012-02-28 13:53:54 -08:00