Commit Graph

185 Commits

Author SHA1 Message Date
Ingo Karkat
37fcc53b26 BUG: test_todo_session with error exit doesn't work
BUG 1: didn't report non-error exit
A test that enforces a non-zero exit code via "=== N" would succeed when the command under test returned with success (0); only differing exit codes would be correctly reported.
Corrected logic so that the check for the exit code would always run, not just when the command under test failed.

BUG 2: too early evaluation of $?
In the test expression, the evaluation of $? must be deferred until the test expression itself is evaluated.
Escaping $? to prevent premature evaluation in the context of the expression definition.
2010-06-29 08:00:24 +02:00
Glyn Faulkner
e7b5841721 Generalizes the PRI_X color support to all priorities.
It allows you to assign a distinct color to any priority, not just A, B and C. Submitted to the todo.txt mailing list on 3-Jun-2010; committed on behalf of the author because there was no follow-up; cp. http://tech.groups.yahoo.com/group/todotxt/message/2619
Also committed this because it fixes a sed expression error when there are spaces in a $PRI_... variable, which occurred in my integration with Conky.
Note: This commit obsoletes and replaces the previous fix to colorization in commit 8b7e2e6aad.
Added tests for highlighting of priorities.
2010-06-21 15:25:42 +02:00
Ingo Karkat
0b16bae2e8 Merge commit 'upstream/master' 2010-06-21 12:41:24 +02:00
Ed Blackman
8b7e2e6aad Replace colorization sed scripts with ones that are more compatible with OSX
sed and NLS todo items.  They're also more consistent with other internal usage
of sed.
2010-06-10 13:20:35 +08:00
Ingo Karkat
9f03cf6847 Made verbose message of _addto() consistent with other task messages.
In verbose mode, commands first print the updated task, then summarize the change in the following line.
The add/addm/addto commands deviated from this, using "TODO: '<task>' added on line N."
This change splits this into two separate lines, obsoletes the implementation jargon of "line", and makes it easier to visually parse the message.
This is also a preparation for a possible future use of a _list()-like function, so that the updated task is processed and highlighted like the normal task output.
2010-06-10 13:20:07 +08:00
Ingo Karkat
821b9d2795 Bugfix: _list() cannot handle filter TERM starting with space.
Added proper quoting at check for search term starting with a dash.
Added tests for ls use with TERM, both with literal text and regexps. Seems that use case was missing from the tests so far.
Extra: Removed unnecessary "$@" argument to for() loop.
2010-06-10 13:20:05 +08:00
Ingo Karkat
c52d9c33af Removed unnecessary echo within echo. 2010-06-10 13:20:04 +08:00
Ingo Karkat
70b2c4ca40 Made verbose message of _addto() consistent with other task messages.
In verbose mode, commands first print the updated task, then summarize the change in the following line.
The add/addm/addto commands deviated from this, using "TODO: '<task>' added on line N."
This change splits this into two separate lines, obsoletes the implementation jargon of "line", and makes it easier to visually parse the message.
This is also a preparation for a possible future use of a _list()-like function, so that the updated task is processed and highlighted like the normal task output.
2010-06-04 16:50:09 +02:00
Ingo Karkat
69e756a2cd Bugfix: _list() cannot handle filter TERM starting with space.
Added proper quoting at check for search term starting with a dash.
Added tests for ls use with TERM, both with literal text and regexps. Seems that use case was missing from the tests so far.
Extra: Removed unnecessary "$@" argument to for() loop.
2010-06-04 16:22:15 +02:00
Ingo Karkat
52b9db310f Removed unnecessary echo within echo. 2010-06-03 22:13:17 +02:00
Ingo Karkat
8ff3a7ce4a Cleaned up terms in command error messages.
The messages now consistently use "task"; the use of "todo" is deprecated.
2010-05-27 15:48:37 +02:00
Ingo Karkat
8bddb08196 Cleaned up terms in help.
The help and messages now consistently use "task"; the use of "todo" is deprecated.
"ITEM#" is used to refer to the number of the task. This may be more consistently expressed as "TASK#". On the other hand, that could lead to more confusion between TASK (the text) and TASK# (the number).
The implementation still leaks through in the phrase "on line ITEM#"; ideally, todo.txt would abstract over the line-based textual representation.
2010-05-27 15:11:33 +02:00
Ingo Karkat
391064e4f0 Replaced "NUMBER" with "ITEM#" in help and shorthelp.
This makes the help output consistent with the syntax error messages of individual commands.
2010-05-27 14:49:07 +02:00
Ingo Karkat
d52a1a7bd2 Bugfix: Doubled help output on TTY with PAGER.
On "todo.sh help", first the long help output is printed through the pager, and
after quitting the pager the output is printed once more in full.
Didn't write a test for this, as this requires a connected terminal and cannot
be observed in the test harness.

Fix: The "exec" command has no effect inside a pipe; added an explicit "exit 0".

Also simplified check for PAGER: No "exec" necessary, combining stderr and
stdout.
Also added quoting for PAGER so that it can contain spaces.
2010-05-25 13:42:04 +02:00
Ingo Karkat
15084aa4d7 Allow passing multiple items to depri, like for the do command. 2010-05-25 13:27:28 +02:00
Ingo Karkat
5876cc0437 Bugfix: depri first checks validity of item argument syntax before searching for todo.
Added testcase for the basic depriority command.
2010-05-25 13:08:27 +02:00
Ingo Karkat
370abbbf36 Aligned short help for "do" with correct long help text. 2010-05-25 10:23:07 +02:00
Ingo Karkat
97eaa24b06 Corrected typo in comment. 2010-05-25 10:15:53 +02:00
Ingo Karkat
9e5e6aef39 Printing usage message if no ITEM# given to "todo.sh do". 2010-05-25 10:10:09 +02:00
Ingo Karkat
edac86a94d Aligned "todo.sh do" usage message with existing support of passing multiple numbers. 2010-05-25 09:44:22 +02:00
Yujie Wu
2a65615c7a Added a case for the fixed replace command. v2.6.0 v2.6 2010-05-08 08:52:59 +08:00
Yujie Wu
d7e194b09d Fixed bug for replace command. 2010-05-08 08:52:59 +08:00
Jared Cordasco
a4ab8a808a Tab fixes. 2010-04-16 06:12:00 +08:00
Gina Trapani
e395ac78d8 Fix line endings 2010-03-26 12:55:55 -07:00
Paul Mansfield
6fc2d81919 Bugfix: Old versions of bash do not have =~
Versions of bash before 3.0 do not have =~ syntax to match on a regex.
Changed to using a simple grep -c test instead.
Fixes issues with osx and Solaris 9 and before.
2010-02-23 23:05:03 +00:00
Jared Cordasco
b6467eaa64 Updated _list() output to match updated addto. Adjusted tests to match.
- _list() now shows the capitalized filename in place of 'TODO:'.
  For example, listing garden.txt produces a output prefixed by 'GARDEN:'
  This eliminates the ' from $FILE' part of the _list() output. All tests
  were adjusted to match this new output.
2010-01-12 14:42:02 -05:00
Jared Cordasco
2d3820394a Refactored various add functionality to one function. Added tests.
- 'add' and 'addm' now 'addto' with $TODO_FILE instead of user supplied file

- 'addto' now shows the capitalized filename in place of 'TODO:'.
  For example, adding to garden.txt produces a output prefixed by 'GARDEN:'
  (Probably the most controversial part of this commit and up for
  discussion. If kept, the 'listfile' output should be made to match.
  Note that this convention would then minimize standard output by
  dropping the file name.)

- All existing add/addm/add-date tests pass. Two new test sequences were
  added to test 'addto' and 'listfile' functionality.

- A space/tab nuissance was cleared up in the tests/README file.
2010-01-10 01:16:11 -05:00
Jared Cordasco
394c4c748a Correctly fixed regexp quoting issue for bash v3.1.x and v3.2.x.
See: http://stackoverflow.com/questions/218156/bash-regex-with-quotes
2010-01-06 21:05:22 -05:00
Jared Cordasco
4c76f04a82 Merge branch 'master' into personal_opts (w/ spacing corrections) 2010-01-05 23:26:08 -06:00
Gina Trapani
bf537934d7 Removed vim plugin; should be in separate repo for addons v2.5.0 v2.5 2010-01-05 20:54:14 -08:00
Jared Cordasco
2bb14eb9bc Consolidated TODOTXT_VERBOSE tests. 2010-01-05 15:45:36 -05:00
Jared Cordasco
99511169c3 Fixed erroneous hide/show comments. 2010-01-05 15:38:24 -05:00
Jared Cordasco
acc881f0dd Faster here document outputs. (Help/Usage messages) 2010-01-05 15:33:34 -05:00
Jared Cordasco
d337933fd9 Changed odd tabs to spaces. 2010-01-05 15:33:34 -05:00
Jared Cordasco
0a7e6337b2 Quoting regexp to parse properly. 2010-01-04 17:01:29 -05:00
Brian Phillips
0e326067e3 fixed tabs/spaces, also set height on new window 2009-12-03 13:14:13 -06:00
Brian Phillips
f6cf3fe76f fixed auto-complete function name for contexts 2009-12-02 15:55:59 -06:00
Brian Phillips
20e04d5a4d more 'silent' additions 2009-12-02 15:38:46 -06:00
Brian Phillips
9c56d2137a added 'silent' to a bunch of calls 2009-12-02 15:26:32 -06:00
Brian Phillips
ceed8bf841 more tweaks 2009-12-02 15:17:12 -06:00
Brian Phillips
b8ced51a22 added some additional mappings, plus a project context 2009-12-02 14:37:36 -06:00
Brian Phillips
9a56bdd4ed vim support! (first cut, anyway) 2009-12-02 12:09:51 -06:00
Brian Phillips
9b580acf14 support PAGER pipe for help output 2009-12-02 08:55:46 -06:00
Paul Mansfield
0d5904658e Portability fixes
* Removed last echo -e instances, no support in OSX
2009-09-21 03:17:10 +01:00
Paul Mansfield
97866082e6 Small change for addm test case.
* Seems echo -e isn't multiplatform compatible. Using >> for append
  instead.
2009-09-17 23:52:43 +01:00
Mike West
5f9fd4c759 Bug Fix: tasks whose ID begins with '0' ought to be ignored.
*   Fixed regex in `_list` to exclude lines that begin with whitespace,
    as the ' ' => '0' replacement hadn't yet been performed.

*   Added test cases to `t1300-ls.sh` to check for this condition.
2009-09-14 21:21:25 +02:00
Gina Trapani
5a49f4b5d5 Merge branch 'the1ts/addm' 2009-09-08 11:58:04 -07:00
Gina Trapani
f8e6a8d69d Merge branch 'the1ts/master' 2009-09-08 11:57:20 -07:00
Paul Mansfield
2983917f25 whitespace fix 2009-09-06 19:05:46 +01:00
Paul Mansfield
7a87077dfc Added new action addm
This allows addition of multiple todo items by sending multiple lines.
2009-09-06 18:53:31 +01:00