Added .gitattributes to allow for git archive use on releases.

.gitattributes

@@ -0,0 +1,6 @@
+.git[ia]* export-ignore
+GEN-VERSION-FILE export-ignore
+Makefile export-ignore
+README.textile export-ignore
+VERSION-FILE export-ignore
+tests export-ignore

LICENSE

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

Makefile

@@ -13,7 +13,7 @@ VERSION-FILE: .FORCE-VERSION-FILE
 todo.sh: VERSION-FILE
 
 # For packaging
-DISTFILES := todo.cfg todo_completion
+DISTFILES := todo.cfg
 
 DISTNAME=todo.txt_cli-$(VERSION)
 dist: $(DISTFILES) todo.sh
@@ -42,7 +42,7 @@ test-pre-clean:
 aggregate-results: $(TESTS)
 
 $(TESTS): test-pre-clean
-	-cd tests && ./$(notdir $@) $(TEST_OPTIONS)
+	-cd tests && sh $(notdir $@) $(TEST_OPTIONS)
 
 test: aggregate-results
 	tests/aggregate-results.sh tests/test-results/t*-*

README.textile

@@ -21,7 +21,6 @@ h2. Quick Links
 * Original anemic release by "Gina Trapani":http://ginatrapani.org on 5/11/2006.
 * Raised to great heights by "brainy and dedicated volunteers":http://github.com/ginatrapani/todo.txt-cli/network.
 * Licensed under the "GPL":http://www.gnu.org/copyleft/gpl.html
-* "Add-on Directory":https://github.com/ginatrapani/todo.txt-cli/wiki/Todo.sh-Add-on-Directory
+* "Add-on Directory":http://wiki.github.com/ginatrapani/todo.txt-cli/todosh-add-on-directory
-https://github.com/ginatrapani/todo.txt-cli/wiki/Creating-and-Installing-Add-ons
 * "Changelog":http://wiki.github.com/ginatrapani/todo.txt-cli/todosh-changelog
 * "Known Bugs":http://github.com/ginatrapani/todo.txt-cli/issues

tests/aggregate-results.sh

@@ -1,57 +1,4 @@
-#!/bin/bash
+#!/bin/sh
-
-[ "x$TERM" != "xdumb" ] && (
-		export TERM &&
-		[ -t 1 ] &&
-		tput bold >/dev/null 2>&1 &&
-		tput setaf 1 >/dev/null 2>&1 &&
-		tput sgr0 >/dev/null 2>&1
-	) &&
-	color=t
-
-case "$1" in
---no-color)
-	color=; shift ;;
-esac
-
-if test -n "$color"; then
-	say_color () {
-		(
-		export TERM
-		case "$1" in
-			error) tput bold; tput setaf 1;; # bold red
-			skip)  tput bold; tput setaf 2;; # bold green
-			pass)  tput setaf 2;;            # green
-			info)  tput setaf 3;;            # brown
-			*) test -n "$quiet" && return;;
-		esac
-		shift
-		printf "* %s" "$*"
-		tput sgr0
-		echo
-		)
-	}
-else
-	say_color() {
-		test -z "$1" && test -n "$quiet" && return
-		shift
-		echo "* $*"
-	}
-fi
-
-get_color()
-{
-	# Only use the supplied color if there are actually instances of that
-	# type, so that a clean test run does not distract the user by the
-	# appearance of the error highlighting.
-	if [ ${1:?} -eq 0 ]
-	then
-		echo 'info'
-	else
-		echo "${2:-info}"
-	fi
-}
-
 
 fixed=0
 success=0
@@ -80,8 +27,8 @@ do
 	done <"$file"
 done
 
-say_color 'info'                           "$(printf "%-8s%d\n" fixed $fixed)"
+printf "%-8s%d\n" fixed $fixed
-say_color "$(get_color "$success" 'pass')" "$(printf "%-8s%d\n" success $success)"
+printf "%-8s%d\n" success $success
-say_color "$(get_color "$failed" 'error')" "$(printf "%-8s%d\n" failed $failed)"
+printf "%-8s%d\n" failed $failed
-say_color "$(get_color "$broken" 'error')" "$(printf "%-8s%d\n" broken $broken)"
+printf "%-8s%d\n" broken $broken
-say_color 'info'                           "$(printf "%-8s%d\n" total $total)"
+printf "%-8s%d\n" total $total

tests/t0000-config.sh

@@ -10,7 +10,7 @@ to find it somewhere else.
 
 # Remove the pre-created todo.cfg to test behavior in its absence
 rm -f todo.cfg
-echo "Fatal Error: Cannot read configuration file $HOME/.todo/config" > expect
+echo "Fatal error: Cannot read configuration file $HOME/.todo/config" > expect
 test_expect_success 'no config file' '
     todo.sh > output 2>&1 || test_cmp expect output
 '

tests/t0001-null.sh

@@ -45,8 +45,6 @@ test_expect_success 'null listpri a' '
 cat > expect <<EOF
 --
 TODO: 0 of 0 tasks shown
-DONE: 0 of 0 tasks shown
-total 0 of 0 tasks shown
 EOF
 
 test_expect_success 'null lsa' '

tests/t0002-actions.sh

@@ -1,40 +0,0 @@
-#!/bin/sh
-
-test_description='todo.sh actions.d
-
-This test just makes sure that todo.sh can locate custom actions.
-'
-. ./test-lib.sh
-
-# All the below tests will output the custom action message
-cat > expect << EOF
-TODO: foo
-EOF
-
-cat > foo << EOF
-echo "TODO: foo"
-EOF
-chmod +x foo
-
-test_expect_success 'custom action (default location 1)' '
-    mkdir .todo.actions.d
-    cp foo .todo.actions.d/
-    todo.sh foo > output;
-    test_cmp expect output && rm -rf .todo.actions.d
-'
-
-test_expect_success 'custom action (default location 2)' '
-    mkdir -p .todo/actions
-    cp foo .todo/actions/
-    todo.sh foo > output;
-    test_cmp expect output && rm -rf .todo/actions
-'
-
-test_expect_success 'custom action (env variable)' '
-    mkdir myactions
-    cp foo myactions/
-    TODO_ACTIONS_DIR=myactions todo.sh foo > output;
-    test_cmp expect output && rm -rf myactions
-'
-
-test_done

tests/t0100-code-nobacktick.sh

@@ -1,16 +0,0 @@
-#!/bin/sh
-
-test_description='no old-style backtick command substitution
-
-This test checks the todo.sh script itself for occurrences
-of old-style backtick command substitution, which should be
-replaced with $(...).
-On failure, it will print each offending line number and line.
-'
-. ./test-lib.sh
-
-test_todo_session 'no old-style backtick command substitution' <<EOF
->>> sed -n -e 's/\(^\|[ \t]\)#.*//' -e '/\`/{' -e '=;p' -e '}' "$(which todo.sh)"
-EOF
-
-test_done

tests/t1000-addlist.sh

@@ -12,8 +12,7 @@ command work, including support for filtering.
 #
 test_todo_session 'basic add/list' <<EOF
 >>> todo.sh add notice the daisies
-1 notice the daisies
+TODO: 'notice the daisies' added on line 1.
-TODO: 1 added.
 
 >>> todo.sh list
 1 notice the daisies
@@ -21,8 +20,7 @@ TODO: 1 added.
 TODO: 1 of 1 tasks shown
 
 >>> todo.sh add smell the roses
-2 smell the roses
+TODO: 'smell the roses' added on line 2.
-TODO: 2 added.
 
 >>> todo.sh list
 1 notice the daisies
@@ -48,8 +46,7 @@ EOF
 
 test_todo_session 'case-insensitive filtering' <<EOF
 >>> todo.sh add smell the uppercase Roses
-3 smell the uppercase Roses
+TODO: 'smell the uppercase Roses' added on line 3.
-TODO: 3 added.
 
 >>> todo.sh list roses
 2 smell the roses
@@ -58,56 +55,18 @@ TODO: 3 added.
 TODO: 2 of 3 tasks shown
 EOF
 
-test_todo_session 'add with symbols' <<EOF
+test_todo_session 'add with &' <<EOF
->>> todo.sh add "~@#$%^&*()-_=+[{]}|;:',<.>/?"
+>>> todo.sh add "dig the garden & water the flowers"
-4 ~@#$%^&*()-_=+[{]}|;:',<.>/?
+TODO: 'dig the garden & water the flowers' added on line 4.
-TODO: 4 added.
-
->>> todo.sh add '\`!\\"'
-5 \`!\\"
-TODO: 5 added.
 
 >>> todo.sh list
+4 dig the garden & water the flowers
 1 notice the daisies
 2 smell the roses
 3 smell the uppercase Roses
-5 \`!\\"
-4 ~@#$%^&*()-_=+[{]}|;:',<.>/?
 --
-TODO: 5 of 5 tasks shown
+TODO: 4 of 4 tasks shown
-EOF
 
-#
-# Advanced add
-#
-
-cat /dev/null > todo.txt
-test_todo_session 'add with spaces' <<EOF
->>> todo.sh add "notice the   three   spaces"
-1 notice the   three   spaces
-TODO: 1 added.
-
->>> todo.sh add notice how the   spaces    get lost
-2 notice how the spaces get lost
-TODO: 2 added.
-
->>> todo.sh list
-2 notice how the spaces get lost
-1 notice the   three   spaces
---
-TODO: 2 of 2 tasks shown
-EOF
-
-cat /dev/null > todo.txt
-test_todo_session 'add with CR' <<EOF
->>> todo.sh add "smell the
-Carriage Return"
-1 smell the Carriage Return
-TODO: 1 added.
-
->>> todo.sh list
-1 smell the Carriage Return
---
 EOF
 
 test_done

tests/t1010-add-date.sh

@@ -12,8 +12,7 @@ a date to each item.
 #
 test_todo_session 'cmd line first day' <<EOF
 >>> todo.sh -t add notice the daisies
-1 2009-02-13 notice the daisies
+TODO: '2009-02-13 notice the daisies' added on line 1.
-TODO: 1 added.
 
 >>> todo.sh list
 1 2009-02-13 notice the daisies
@@ -21,28 +20,11 @@ TODO: 1 added.
 TODO: 1 of 1 tasks shown
 EOF
 
-test_todo_session 'cmd line first day with priority' <<EOF
->>> todo.sh -pt add '(A) notice the daisies'
-2 (A) 2009-02-13 notice the daisies
-TODO: 2 added.
-
->>> todo.sh -p list
-2 (A) 2009-02-13 notice the daisies
-1 2009-02-13 notice the daisies
---
-TODO: 2 of 2 tasks shown
-
->>> todo.sh -npf del 2
-2 (A) 2009-02-13 notice the daisies
-TODO: 2 deleted.
-EOF
-
 test_tick
 
 test_todo_session 'cmd line second day' <<EOF
 >>> todo.sh -t add smell the roses
-2 2009-02-14 smell the roses
+TODO: '2009-02-14 smell the roses' added on line 2.
-TODO: 2 added.
 
 >>> todo.sh list
 1 2009-02-13 notice the daisies
@@ -55,8 +37,7 @@ test_tick
 
 test_todo_session 'cmd line third day' <<EOF
 >>> todo.sh -t add mow the lawn
-3 2009-02-15 mow the lawn
+TODO: '2009-02-15 mow the lawn' added on line 3.
-TODO: 3 added.
 
 >>> todo.sh list
 1 2009-02-13 notice the daisies
@@ -74,8 +55,7 @@ test_tick 3600
 
 test_todo_session 'config file third day' <<EOF
 >>> todo.sh add take out the trash
-4 2009-02-15 take out the trash
+TODO: '2009-02-15 take out the trash' added on line 4.
-TODO: 4 added.
 
 >>> todo.sh list
 1 2009-02-13 notice the daisies

tests/t1020-addtolistfile.sh

@@ -13,15 +13,13 @@ commands work, including support for filtering.
 test_todo_session 'nonexistant file' <<EOF
 >>> todo.sh addto garden.txt notice the daisies
 TODO: Destination file $HOME/garden.txt does not exist.
-=== 1
 EOF
 
 touch "$HOME/garden.txt"
 
 test_todo_session 'basic addto/listfile' <<EOF
 >>> todo.sh addto garden.txt notice the daisies
-1 notice the daisies
+GARDEN: 'notice the daisies' added on line 1.
-GARDEN: 1 added.
 
 >>> todo.sh listfile garden.txt
 1 notice the daisies
@@ -29,8 +27,7 @@ GARDEN: 1 added.
 GARDEN: 1 of 1 tasks shown
 
 >>> todo.sh addto garden.txt smell the roses
-2 smell the roses
+GARDEN: 'smell the roses' added on line 2.
-GARDEN: 2 added.
 
 >>> todo.sh listfile garden.txt
 1 notice the daisies
@@ -39,24 +36,6 @@ GARDEN: 2 added.
 GARDEN: 2 of 2 tasks shown
 EOF
 
-#
-# List available files
-#
-test_todo_session 'list available files' <<EOF
->>> todo.sh listfile
-Files in the todo.txt directory:
-done.txt
-garden.txt
-report.txt
-todo.txt
-
->>> TODOTXT_VERBOSE=0 todo.sh listfile
-done.txt
-garden.txt
-report.txt
-todo.txt
-EOF
-
 #
 # Filter
 #
@@ -74,8 +53,7 @@ EOF
 
 test_todo_session 'case-insensitive filtering' <<EOF
 >>> todo.sh addto garden.txt smell the uppercase Roses
-3 smell the uppercase Roses
+GARDEN: 'smell the uppercase Roses' added on line 3.
-GARDEN: 3 added.
 
 >>> todo.sh listfile garden.txt roses
 2 smell the roses
@@ -86,8 +64,7 @@ EOF
 
 test_todo_session 'addto with &' <<EOF
 >>> todo.sh addto garden.txt "dig the garden & water the flowers"
-4 dig the garden & water the flowers
+GARDEN: 'dig the garden & water the flowers' added on line 4.
-GARDEN: 4 added.
 
 >>> todo.sh listfile garden.txt 
 4 dig the garden & water the flowers

tests/t1030-addto-date.sh

@@ -14,8 +14,7 @@ touch "$HOME/garden.txt"
 #
 test_todo_session 'cmd line first day' <<EOF
 >>> todo.sh -t addto garden.txt notice the daisies
-1 2009-02-13 notice the daisies
+GARDEN: '2009-02-13 notice the daisies' added on line 1.
-GARDEN: 1 added.
 
 >>> todo.sh listfile garden.txt
 1 2009-02-13 notice the daisies
@@ -27,8 +26,7 @@ test_tick
 
 test_todo_session 'cmd line second day' <<EOF
 >>> todo.sh -t addto garden.txt smell the roses
-2 2009-02-14 smell the roses
+GARDEN: '2009-02-14 smell the roses' added on line 2.
-GARDEN: 2 added.
 
 >>> todo.sh listfile garden.txt
 1 2009-02-13 notice the daisies
@@ -41,8 +39,7 @@ test_tick
 
 test_todo_session 'cmd line third day' <<EOF
 >>> todo.sh -t addto garden.txt mow the lawn
-3 2009-02-15 mow the lawn
+GARDEN: '2009-02-15 mow the lawn' added on line 3.
-GARDEN: 3 added.
 
 >>> todo.sh listfile garden.txt
 1 2009-02-13 notice the daisies
@@ -60,8 +57,7 @@ test_tick 3600
 
 test_todo_session 'config file third day' <<EOF
 >>> todo.sh addto garden.txt take out the trash
-4 2009-02-15 take out the trash
+GARDEN: '2009-02-15 take out the trash' added on line 4.
-GARDEN: 4 added.
 
 >>> todo.sh listfile garden.txt
 1 2009-02-13 notice the daisies

tests/t1100-replace.sh

@@ -19,9 +19,9 @@ EOF
 
 test_todo_session 'basic replace' <<EOF
 >>> todo.sh replace 1 "smell the cows"
-1 notice the daisies
+1: notice the daisies
-TODO: Replaced task with:
+replaced with
-1 smell the cows
+1: smell the cows
 
 >>> todo.sh list
 1 smell the cows
@@ -29,9 +29,9 @@ TODO: Replaced task with:
 TODO: 1 of 1 tasks shown
 
 >>> todo.sh replace 1 smell the roses
-1 smell the cows
+1: smell the cows
-TODO: Replaced task with:
+replaced with
-1 smell the roses
+1: smell the roses
 
 >>> todo.sh list
 1 smell the roses
@@ -45,123 +45,44 @@ grow some corn
 thrash some hay
 chase the chickens
 EOF
+test_todo_session 'replace in multi-item file' <<EOF
+>>> todo.sh replace 1 smell the cheese
+1: smell the cows
+replaced with
+1: smell the cheese
+
+>>> todo.sh replace 3 jump on hay
+3: thrash some hay
+replaced with
+3: jump on hay
+
+>>> todo.sh replace 4 collect the eggs
+4: chase the chickens
+replaced with
+4: collect the eggs
+EOF
+
+test_todo_session 'replace with priority' <<EOF
+>>> todo.sh pri 4 a
+4: (A) collect the eggs
+TODO: 4 prioritized (A).
+
+>>> todo.sh replace 4 "collect the bread"
+4: (A) collect the eggs
+replaced with
+4: (A) collect the bread
+EOF
+test_todo_session 'replace with &' << EOF
+>>> todo.sh replace 3 "thrash the hay & thresh the wheat"
+3: jump on hay
+replaced with 
+3: thrash the hay & thresh the wheat
+EOF
+
 test_todo_session 'replace error' << EOF
 >>> todo.sh replace 10 "hej!"
 === 1
-TODO: No task 10.
+10: No such todo.
-EOF
-
-test_todo_session 'replace in multi-item file' <<EOF
->>> todo.sh replace 1 smell the cheese
-1 smell the cows
-TODO: Replaced task with:
-1 smell the cheese
-
->>> todo.sh replace 3 jump on hay
-3 thrash some hay
-TODO: Replaced task with:
-3 jump on hay
-
->>> todo.sh replace 4 collect the eggs
-4 chase the chickens
-TODO: Replaced task with:
-4 collect the eggs
-EOF
-
-echo '(A) collect the eggs' > todo.txt
-test_todo_session 'replace with priority' <<EOF
->>> todo.sh replace 1 "collect the bread"
-1 (A) collect the eggs
-TODO: Replaced task with:
-1 (A) collect the bread
-
->>> todo.sh replace 1 collect the eggs
-1 (A) collect the bread
-TODO: Replaced task with:
-1 (A) collect the eggs
-EOF
-
-echo 'jump on hay' > todo.txt
-test_todo_session 'replace with &' << EOF
->>> todo.sh replace 1 "thrash the hay & thrash the wheat"
-1 jump on hay
-TODO: Replaced task with:
-1 thrash the hay & thrash the wheat
-EOF
-
-echo 'jump on hay' > todo.txt
-test_todo_session 'replace with spaces' <<EOF
->>> todo.sh replace 1 "notice the   three   spaces"
-1 jump on hay
-TODO: Replaced task with:
-1 notice the   three   spaces
-EOF
-
-cat > todo.txt <<EOF
-smell the cows
-grow some corn
-thrash some hay
-chase the chickens
-EOF
-test_todo_session 'replace with symbols' <<EOF
->>> todo.sh replace 1 "~@#$%^&*()-_=+[{]}|;:',<.>/?"
-1 smell the cows
-TODO: Replaced task with:
-1 ~@#$%^&*()-_=+[{]}|;:',<.>/?
-
->>> todo.sh replace 2 '\`!\\"'
-2 grow some corn
-TODO: Replaced task with:
-2 \`!\\"
-
->>> todo.sh list
-4 chase the chickens
-3 thrash some hay
-2 \`!\\"
-1 ~@#$%^&*()-_=+[{]}|;:',<.>/?
---
-TODO: 4 of 4 tasks shown
-EOF
-
-cat /dev/null > todo.txt
-test_todo_session 'replace handling prepended date on add' <<EOF
->>> todo.sh -t add "new task"
-1 2009-02-13 new task
-TODO: 1 added.
-
->>> todo.sh replace 1 this is just a new one
-1 2009-02-13 new task
-TODO: Replaced task with:
-1 2009-02-13 this is just a new one
-
->>> todo.sh replace 1 2010-07-04 this also has a new date
-1 2009-02-13 this is just a new one
-TODO: Replaced task with:
-1 2010-07-04 this also has a new date
-EOF
-
-cat /dev/null > todo.txt
-test_todo_session 'replace handling priority and prepended date on add' <<EOF
->>> todo.sh -t add "new task"
-1 2009-02-13 new task
-TODO: 1 added.
-
->>> todo.sh pri 1 A
-1 (A) 2009-02-13 new task
-TODO: 1 prioritized (A).
-
->>> todo.sh replace 1 this is just a new one
-1 (A) 2009-02-13 new task
-TODO: Replaced task with:
-1 (A) 2009-02-13 this is just a new one
-EOF
-
-echo '(A) 2009-02-13 this is just a new one' > todo.txt
-test_todo_session 'replace with prepended date replaces existing date' <<EOF
->>> todo.sh replace 1 2010-07-04 this also has a new date
-1 (A) 2009-02-13 this is just a new one
-TODO: Replaced task with:
-1 (A) 2010-07-04 this also has a new date
 EOF
 
 test_done

tests/t1200-pri.sh

@@ -25,7 +25,7 @@ test_todo_session 'basic priority' <<EOF
 TODO: 3 of 3 tasks shown
 
 >>> todo.sh pri 1 B
-1 (B) smell the uppercase Roses +flowers @outside
+1: (B) smell the uppercase Roses +flowers @outside
 TODO: 1 prioritized (B).
 
 >>> todo.sh list
@@ -43,7 +43,7 @@ TODO: 3 of 3 tasks shown
 TODO: 3 of 3 tasks shown
 
 >>> todo.sh pri 2 C
-2 (C) notice the sunflowers
+2: (C) notice the sunflowers
 TODO: 2 prioritized (C).
 
 >>> todo.sh -p list
@@ -53,34 +53,9 @@ TODO: 2 prioritized (C).
 --
 TODO: 3 of 3 tasks shown
 
->>> todo.sh add "smell the coffee +wakeup"
-4 smell the coffee +wakeup
-TODO: 4 added.
-
->>> todo.sh -p list
-1 (B) smell the uppercase Roses +flowers @outside
-2 (C) notice the sunflowers
-4 smell the coffee +wakeup
-3 stop
---
-TODO: 4 of 4 tasks shown
-EOF
-
-test_todo_session 'priority error' <<EOF
->>> todo.sh pri 10 B
-=== 1
-TODO: No task 10.
-EOF
-
-cat > todo.txt <<EOF
-(B) smell the uppercase Roses +flowers @outside
-(C) notice the sunflowers
-stop
-EOF
-test_todo_session 'reprioritize' <<EOF
 >>> todo.sh pri 2 A
-2 (A) notice the sunflowers
+2: (A) notice the sunflowers
-TODO: 2 re-prioritized from (C) to (A).
+TODO: 2 prioritized (A).
 
 >>> todo.sh -p list
 2 (A) notice the sunflowers
@@ -90,14 +65,25 @@ TODO: 2 re-prioritized from (C) to (A).
 TODO: 3 of 3 tasks shown
 
 >>> todo.sh pri 2 a
+2: (A) notice the sunflowers
+TODO: 2 prioritized (A).
+
+>>> todo.sh -p listpri
 2 (A) notice the sunflowers
-TODO: 2 already prioritized (A).
+1 (B) smell the uppercase Roses +flowers @outside
+--
+TODO: 2 of 3 tasks shown
+
+>>> todo.sh add "smell the coffee +wakeup"
+TODO: 'smell the coffee +wakeup' added on line 4.
 
 >>> todo.sh -p list
 2 (A) notice the sunflowers
 1 (B) smell the uppercase Roses +flowers @outside
+4 smell the coffee +wakeup
 3 stop
 --
-TODO: 3 of 3 tasks shown
+TODO: 4 of 4 tasks shown
 EOF
+
 test_done

tests/t1250-listpri.sh

@@ -1,95 +0,0 @@
-#!/bin/sh
-
-test_description='list priority functionality
-'
-. ./test-lib.sh
-
-cat > todo.txt <<EOF
-(B) smell the uppercase Roses +flowers @outside
-(C) notice the sunflowers
-stop
-EOF
-test_todo_session 'basic listpri' <<EOF
->>> todo.sh listpri A
---
-TODO: 0 of 3 tasks shown
-
->>> todo.sh -p listpri c
-2 (C) notice the sunflowers
---
-TODO: 1 of 3 tasks shown
-EOF
-
-test_todo_session 'listpri highlighting' <<EOF
->>> todo.sh listpri
-1 (B) smell the uppercase Roses +flowers @outside
-2 (C) notice the sunflowers
---
-TODO: 2 of 3 tasks shown
-EOF
-
-cat > todo.txt <<EOF
-(B) smell the uppercase Roses +flowers @outside
-(C) notice the sunflowers
-(m)others will notice this
-(n) not a prioritized task
-notice the (C)opyright
-EOF
-test_todo_session 'listpri filtering priorities' <<EOF
->>> todo.sh -p listpri
-1 (B) smell the uppercase Roses +flowers @outside
-2 (C) notice the sunflowers
---
-TODO: 2 of 5 tasks shown
-
->>> todo.sh -p listpri b
-1 (B) smell the uppercase Roses +flowers @outside
---
-TODO: 1 of 5 tasks shown
-
->>> todo.sh -p listpri c
-2 (C) notice the sunflowers
---
-TODO: 1 of 5 tasks shown
-
->>> todo.sh -p listpri m
---
-TODO: 0 of 5 tasks shown
-
->>> todo.sh -p listpri n
---
-TODO: 0 of 5 tasks shown
-EOF
-
-cat > todo.txt <<EOF
-(B) ccc xxx this line should be third.
-ccc xxx this line should be third.
-(A) aaa zzz this line should be first.
-aaa zzz this line should be first.
-(B) bbb yyy this line should be second.
-bbb yyy this line should be second.
-EOF
-test_todo_session 'listpri filtering of TERM' <<EOF
->>> todo.sh -p listpri "should be"
-3 (A) aaa zzz this line should be first.
-5 (B) bbb yyy this line should be second.
-1 (B) ccc xxx this line should be third.
---
-TODO: 3 of 6 tasks shown
-
->>> todo.sh -p listpri a "should be"
-3 (A) aaa zzz this line should be first.
---
-TODO: 1 of 6 tasks shown
-
->>> todo.sh -p listpri b second
-5 (B) bbb yyy this line should be second.
---
-TODO: 1 of 6 tasks shown
-
->>> todo.sh -p listpri x "should be"
---
-TODO: 0 of 6 tasks shown
-EOF
-
-test_done

tests/t1260-listprj.sh

@@ -1,42 +0,0 @@
-#!/bin/sh
-
-test_description='list project functionality
-'
-. ./test-lib.sh
-
-cat > todo.txt <<EOF
-(B) smell the uppercase Roses +roses @outside +shared
-(C) notice the sunflowers +sunflowers @garden +shared +landscape
-stop
-EOF
-test_todo_session 'basic listproj' <<EOF
->>> todo.sh listproj
-+landscape
-+roses
-+shared
-+sunflowers
-EOF
-
-test_todo_session 'listproj with context' <<EOF
->>> todo.sh listproj @garden
-+landscape
-+shared
-+sunflowers
-EOF
-
-TEST_TODO_CUSTOM=todo-custom.cfg
-cat todo.cfg > "$TEST_TODO_CUSTOM"
-cat >> "$TEST_TODO_CUSTOM" <<'EOF'
-export DEFAULT='</color>'
-export PRI_B='<color type=green>'
-export PRI_C='<color type=blue>'
-export TODOTXT_FINAL_FILTER='grep -i roses'
-EOF
-test_todo_session 'listproj with context special cases' <<EOF
->>> todo.sh -+ -d "$TEST_TODO_CUSTOM" listproj @garden
-+landscape
-+shared
-+sunflowers
-EOF
-
-test_done

tests/t1300-ls.sh

@@ -53,116 +53,6 @@ test_todo_session 'checking TODOTXT_FINAL_FILTER' <<EOF
 TODO: 3 of 3 tasks shown
 EOF
 
-#
-# check the custom hiding
-#
-test_todo_session 'checking HIDE_CUSTOM_SUBSTITUTION' <<EOF
->>> HIDE_CUSTOM_SUBSTITUTION='[tT]h' todo.sh ls
-2 aaa zzz is line should be first.
-3 bbb yyy is line should be second.
-1 ccc xxx is line should be ird.
---
-TODO: 3 of 3 tasks shown
-EOF
-
-#
-# check the filtering of TERM
-#
-test_todo_session 'checking filtering of TERM' <<EOF
->>> todo.sh ls second
-3 bbb yyy this line should be second.
---
-TODO: 1 of 3 tasks shown
-
->>> todo.sh ls "should be f"
-2 aaa zzz this line should be first.
---
-TODO: 1 of 3 tasks shown
-
->>> todo.sh ls " zzz"
-2 aaa zzz this line should be first.
---
-TODO: 1 of 3 tasks shown
-EOF
-
-#
-# check negative filtering via -TERM
-#
-test_todo_session 'checking negative filtering via -TERM' <<EOF
->>> todo.sh ls -second
-2 aaa zzz this line should be first.
-1 ccc xxx this line should be third.
---
-TODO: 2 of 3 tasks shown
-
->>> todo.sh ls "-should be f"
-3 bbb yyy this line should be second.
-1 ccc xxx this line should be third.
---
-TODO: 2 of 3 tasks shown
-
->>> todo.sh ls "- zzz"
-3 bbb yyy this line should be second.
-1 ccc xxx this line should be third.
---
-TODO: 2 of 3 tasks shown
-EOF
-
-#
-# check the filtering of TERM with regexp
-#
-test_todo_session 'checking filtering of TERM with regexp' <<EOF
->>> todo.sh ls "ir[ds]"
-2 aaa zzz this line should be first.
-1 ccc xxx this line should be third.
---
-TODO: 2 of 3 tasks shown
-
->>> todo.sh ls "f.*t"
-2 aaa zzz this line should be first.
---
-TODO: 1 of 3 tasks shown
-
->>> todo.sh ls "ir[ds]" xxx
-1 ccc xxx this line should be third.
---
-TODO: 1 of 3 tasks shown
-EOF
-
-#
-# check the filtering of TERM containing characters that are special to the
-# shell, like variables, quotes, and multiple subsequent spaces.
-#
-cat > todo.txt <<'EOF'
-earn some pennies
-earn some $$
-earn some "money"
-get money from O'Brian
-just get   money!
-EOF
-test_todo_session 'checking filtering of special characters' <<'EOF'
->>> todo.sh ls '$$'
-2 earn some $$
---
-TODO: 1 of 5 tasks shown
-
->>> todo.sh ls '"money"'
-3 earn some "money"
---
-TODO: 1 of 5 tasks shown
-
->>> todo.sh ls "O'Brian"
-4 get money from O'Brian
---
-TODO: 1 of 5 tasks shown
-
->>> todo.sh ls "get   money"
-5 just get   money!
---
-TODO: 1 of 5 tasks shown
-EOF
-
-
 #
 # check the x command line option
 #
@@ -211,7 +101,7 @@ cat > todo.txt <<EOF
 (D) @con02 +prj03 -- Some project 03 task, pri D
 (D) @con02 +prj04 -- Some project 04 task, pri D
 @con01 +prj01 -- Some project 01 task, no priority
-@con01 +prj02 -- Some project(S) 02 task, no priority
+@con01 +prj02 -- Some project 02 task, no priority
 @con02 +prj03 -- Some project 03 task, no priorty
 @con02 +prj04 -- Some project 04 task, no priority
 EOF
@@ -234,7 +124,7 @@ test_todo_session 'plain mode option' <<EOF
 15 (D) @con02 +prj03 -- Some project 03 task, pri D
 16 (D) @con02 +prj04 -- Some project 04 task, pri D
 17 @con01 +prj01 -- Some project 01 task, no priority
-18 @con01 +prj02 -- Some project(S) 02 task, no priority
+18 @con01 +prj02 -- Some project 02 task, no priority
 19 @con02 +prj03 -- Some project 03 task, no priorty
 20 @con02 +prj04 -- Some project 04 task, no priority
 --
@@ -258,7 +148,7 @@ TODO: 20 of 20 tasks shown
 15 (D) @con02 +prj03 -- Some project 03 task, pri D
 16 (D) @con02 +prj04 -- Some project 04 task, pri D
 17 @con01 +prj01 -- Some project 01 task, no priority
-18 @con01 +prj02 -- Some project(S) 02 task, no priority
+18 @con01 +prj02 -- Some project 02 task, no priority
 19 @con02 +prj03 -- Some project 03 task, no priorty
 20 @con02 +prj04 -- Some project 04 task, no priority
 --
@@ -286,7 +176,7 @@ cat > todo.txt <<EOF
 (D) @con02 +prj03 -- Some project 03 task, pri D
 (D) @con02 +prj04 -- Some project 04 task, pri D
 @con01 +prj01 -- Some project 01 task, no priority
-@con01 +prj02 -- Some project(S) 02 task, no priority
+@con01 +prj02 -- Some project 02 task, no priority
 @con02 +prj03 -- Some project 03 task, no priorty
 @con02 +prj04 -- Some project 04 task, no priority
 EOF
@@ -309,7 +199,7 @@ test_todo_session 'context, project, and priority suppression' <<EOF
 15 (D) @con02 +prj03 -- Some project 03 task, pri D
 16 (D) @con02 +prj04 -- Some project 04 task, pri D
 17 @con01 +prj01 -- Some project 01 task, no priority
-18 @con01 +prj02 -- Some project(S) 02 task, no priority
+18 @con01 +prj02 -- Some project 02 task, no priority
 19 @con02 +prj03 -- Some project 03 task, no priorty
 20 @con02 +prj04 -- Some project 04 task, no priority
 --
@@ -325,7 +215,7 @@ TODO: 20 of 20 tasks shown
 13 (D) @con01 +prj01 -- Some project 01 task, pri D
 14 (D) @con01 +prj02 -- Some project 02 task, pri D
 17 @con01 +prj01 -- Some project 01 task, no priority
-18 @con01 +prj02 -- Some project(S) 02 task, no priority
+18 @con01 +prj02 -- Some project 02 task, no priority
 --
 TODO: 10 of 20 tasks shown
 
@@ -339,7 +229,7 @@ TODO: 10 of 20 tasks shown
 13 @con01 +prj01 -- Some project 01 task, pri D
 14 @con01 +prj02 -- Some project 02 task, pri D
 17 @con01 +prj01 -- Some project 01 task, no priority
-18 @con01 +prj02 -- Some project(S) 02 task, no priority
+18 @con01 +prj02 -- Some project 02 task, no priority
 --
 TODO: 10 of 20 tasks shown
 
@@ -353,7 +243,7 @@ TODO: 10 of 20 tasks shown
 13 (D) @con01 -- Some project 01 task, pri D
 14 (D) @con01 -- Some project 02 task, pri D
 17 @con01 -- Some project 01 task, no priority
-18 @con01 -- Some project(S) 02 task, no priority
+18 @con01 -- Some project 02 task, no priority
 --
 TODO: 10 of 20 tasks shown
 
@@ -367,7 +257,7 @@ TODO: 10 of 20 tasks shown
 13 (D) +prj01 -- Some project 01 task, pri D
 14 (D) +prj02 -- Some project 02 task, pri D
 17 +prj01 -- Some project 01 task, no priority
-18 +prj02 -- Some project(S) 02 task, no priority
+18 +prj02 -- Some project 02 task, no priority
 --
 TODO: 10 of 20 tasks shown
 
@@ -381,7 +271,7 @@ TODO: 10 of 20 tasks shown
 13 +prj01 -- Some project 01 task, pri D
 14 +prj02 -- Some project 02 task, pri D
 17 +prj01 -- Some project 01 task, no priority
-18 +prj02 -- Some project(S) 02 task, no priority
+18 +prj02 -- Some project 02 task, no priority
 --
 TODO: 10 of 20 tasks shown
 
@@ -395,7 +285,7 @@ TODO: 10 of 20 tasks shown
 13 (D) @con01 +prj01 -- Some project 01 task, pri D
 14 (D) @con01 +prj02 -- Some project 02 task, pri D
 17 @con01 +prj01 -- Some project 01 task, no priority
-18 @con01 +prj02 -- Some project(S) 02 task, no priority
+18 @con01 +prj02 -- Some project 02 task, no priority
 --
 TODO: 10 of 20 tasks shown
 
@@ -409,7 +299,7 @@ TODO: 10 of 20 tasks shown
 13 -- Some project 01 task, pri D
 14 -- Some project 02 task, pri D
 17 -- Some project 01 task, no priority
-18 -- Some project(S) 02 task, no priority
+18 -- Some project 02 task, no priority
 --
 TODO: 10 of 20 tasks shown
 EOF

tests/t1330-ls-highlighting.sh

@@ -1,185 +0,0 @@
-#!/bin/sh
-#
-
-test_description='list highlighting
-
-This test checks the highlighting (with colors) of prioritized tasks.
-'
-. ./test-lib.sh
-
-TEST_TODO_=todo.cfg
-
-#
-# check the highlighting of prioritized tasks
-#
-cat > todo.txt <<EOF
-(A) @con01 +prj01 -- Some project 01 task, pri A
-(B) @con02 +prj02 -- Some project 02 task, pri B
-(C) @con01 +prj01 -- Some project 01 task, pri C
-(D) @con02 +prj02 -- Some project 02 task, pri D
-(E) @con01 +prj01 -- Some project 01 task, pri E
-(Z) @con02 +prj02 -- Some project 02 task, pri Z
-@con01 +prj01 -- Some project 01 task, no priority
-@con02 +prj02 -- Some project 02 task, no priority
-EOF
-test_todo_session 'default highlighting' <<EOF
->>> todo.sh ls
-1 (A) @con01 +prj01 -- Some project 01 task, pri A
-2 (B) @con02 +prj02 -- Some project 02 task, pri B
-3 (C) @con01 +prj01 -- Some project 01 task, pri C
-4 (D) @con02 +prj02 -- Some project 02 task, pri D
-5 (E) @con01 +prj01 -- Some project 01 task, pri E
-6 (Z) @con02 +prj02 -- Some project 02 task, pri Z
-7 @con01 +prj01 -- Some project 01 task, no priority
-8 @con02 +prj02 -- Some project 02 task, no priority
---
-TODO: 8 of 8 tasks shown
-EOF
-
-#
-# check changing the color definitions into something other than ANSI color
-# escape sequences
-#
-TEST_TODO_CUSTOM=todo-custom.cfg
-cat todo.cfg > "$TEST_TODO_CUSTOM"
-cat >> "$TEST_TODO_CUSTOM" <<'EOF'
-export YELLOW='${color yellow}'
-export GREEN='${color green}'
-export LIGHT_BLUE='${color LightBlue}'
-export WHITE='${color white}'
-export DEFAULT='${color}'
-export PRI_A=$YELLOW
-export PRI_B=$GREEN
-export PRI_C=$LIGHT_BLUE
-export PRI_X=$WHITE
-EOF
-test_todo_session 'customized highlighting' <<'EOF'
->>> todo.sh -d "$TEST_TODO_CUSTOM" ls
-${color yellow}1 (A) @con01 +prj01 -- Some project 01 task, pri A${color}
-${color green}2 (B) @con02 +prj02 -- Some project 02 task, pri B${color}
-${color LightBlue}3 (C) @con01 +prj01 -- Some project 01 task, pri C${color}
-${color white}4 (D) @con02 +prj02 -- Some project 02 task, pri D${color}
-${color white}5 (E) @con01 +prj01 -- Some project 01 task, pri E${color}
-${color white}6 (Z) @con02 +prj02 -- Some project 02 task, pri Z${color}
-7 @con01 +prj01 -- Some project 01 task, no priority
-8 @con02 +prj02 -- Some project 02 task, no priority
---
-TODO: 8 of 8 tasks shown
-EOF
-
-#
-# check defining highlightings for more priorities than the default A, B, C
-#
-TEST_TODO_ADDITIONAL=todo-additional.cfg
-cat todo.cfg > "$TEST_TODO_ADDITIONAL"
-cat >> "$TEST_TODO_ADDITIONAL" <<'EOF'
-export PRI_E=$BROWN
-export PRI_Z=$LIGHT_PURPLE
-EOF
-test_todo_session 'additional highlighting pri E+Z' <<'EOF'
->>> todo.sh -d "$TEST_TODO_ADDITIONAL" ls
-1 (A) @con01 +prj01 -- Some project 01 task, pri A
-2 (B) @con02 +prj02 -- Some project 02 task, pri B
-3 (C) @con01 +prj01 -- Some project 01 task, pri C
-4 (D) @con02 +prj02 -- Some project 02 task, pri D
-5 (E) @con01 +prj01 -- Some project 01 task, pri E
-6 (Z) @con02 +prj02 -- Some project 02 task, pri Z
-7 @con01 +prj01 -- Some project 01 task, no priority
-8 @con02 +prj02 -- Some project 02 task, no priority
---
-TODO: 8 of 8 tasks shown
-EOF
-
-# check changing the fallback highlighting for undefined priorities
-#
-TEST_TODO_PRI_X=todo-pri-x.cfg
-cat todo.cfg > "$TEST_TODO_PRI_X"
-cat >> "$TEST_TODO_PRI_X" <<'EOF'
-export PRI_X=$BROWN
-EOF
-test_todo_session 'different highlighting for pri X' <<'EOF'
->>> todo.sh -d "$TEST_TODO_PRI_X" ls
-1 (A) @con01 +prj01 -- Some project 01 task, pri A
-2 (B) @con02 +prj02 -- Some project 02 task, pri B
-3 (C) @con01 +prj01 -- Some project 01 task, pri C
-4 (D) @con02 +prj02 -- Some project 02 task, pri D
-5 (E) @con01 +prj01 -- Some project 01 task, pri E
-6 (Z) @con02 +prj02 -- Some project 02 task, pri Z
-7 @con01 +prj01 -- Some project 01 task, no priority
-8 @con02 +prj02 -- Some project 02 task, no priority
---
-TODO: 8 of 8 tasks shown
-EOF
-
-# check highlighting of done (but not yet archived) tasks
-#
-cat > todo.txt <<EOF
-(A) smell the uppercase Roses +flowers @outside
-remove1
-notice the sunflowers
-remove2
-stop
-EOF
-test_todo_session 'highlighting of done tasks' <<EOF
->>> todo.sh -a do 2
-2 x 2009-02-13 remove1
-TODO: 2 marked as done.
-
->>> todo.sh list
-1 (A) smell the uppercase Roses +flowers @outside
-3 notice the sunflowers
-4 remove2
-5 stop
-2 x 2009-02-13 remove1
---
-TODO: 5 of 5 tasks shown
-
->>> todo.sh -a do 4
-4 x 2009-02-13 remove2
-TODO: 4 marked as done.
-
->>> todo.sh list
-1 (A) smell the uppercase Roses +flowers @outside
-3 notice the sunflowers
-5 stop
-2 x 2009-02-13 remove1
-4 x 2009-02-13 remove2
---
-TODO: 5 of 5 tasks shown
-EOF
-
-# check highlighting with hidden contexts/projects
-#
-cat > todo.txt <<EOF
-(A) +project at the beginning, with priority
-(B) with priority, ending in a +project
-(C) @context at the beginning, with priority
-(Z) with priority, ending in a @context
-EOF
-test_todo_session 'highlighting with hidden contexts/projects' <<EOF
->>> todo.sh -+ -@ list
-1 (A) at the beginning, with priority
-2 (B) with priority, ending in a
-3 (C) at the beginning, with priority
-4 (Z) with priority, ending in a
---
-TODO: 4 of 4 tasks shown
-EOF
-
-# check that priorities are only matched at the start of the task
-#
-cat > todo.txt <<EOF
-(D) some prioritized task
-not prioritized
-should not be seen as PRIORITIZE(D) task
-EOF
-test_todo_session 'highlighting priority position' <<EOF
->>> todo.sh ls
-1 (D) some prioritized task
-2 not prioritized
-3 should not be seen as PRIORITIZE(D) task
---
-TODO: 3 of 3 tasks shown
-EOF
-
-test_done

tests/t1340-listescapes.sh

@@ -1,65 +0,0 @@
-#!/bin/bash
-#
-
-test_description='list with escape sequences
-
-This test checks listing of tasks that have embedded escape sequences in them.
-'
-. ./test-lib.sh
-
-#
-# check aborted list output on \c escape sequence
-#
-cat > todo.txt <<'EOF'
-first todo
-second todo run C:\WINDOWS\sysnative\cscript.exe
-third todo
-EOF
-
-test_todo_session 'aborted list output on backslash-c' <<'EOF'
->>> todo.sh ls
-1 first todo
-2 second todo run C:\WINDOWS\sysnative\cscript.exe
-3 third todo
---
-TODO: 3 of 3 tasks shown
-
->>> todo.sh ls 2
-2 second todo run C:\WINDOWS\sysnative\cscript.exe
---
-TODO: 1 of 3 tasks shown
-EOF
-
-#
-# check various escape sequences
-#
-cat > todo.txt <<'EOF'
-first todo with \\, \a and \t
-second todo with \r\n line break
-third todo with \x42\x55\x47 and \033[0;31m color codes \033[0;30m
-EOF
-
-test_todo_session 'various escape sequences' <<'EOF'
->>> todo.sh ls
-1 first todo with \\, \a and \t
-2 second todo with \r\n line break
-3 third todo with \x42\x55\x47 and \033[0;31m color codes \033[0;30m
---
-TODO: 3 of 3 tasks shown
-EOF
-
-#
-# check embedding of actual color sequence
-#
-cat > todo.txt <<'EOF'
-A task with  actual color 
-EOF
-
-test_todo_session 'embedding of actual color sequence' <<'EOF'
->>> todo.sh ls
-1 A task with  actual color 
---
-TODO: 1 of 1 tasks shown
-EOF
-
-test_done

tests/t1350-listall.sh

@@ -1,150 +0,0 @@
-#!/bin/sh
-
-test_description='listall functionality
-'
-. ./test-lib.sh
-
-cat > todo.txt <<EOF
-smell the uppercase Roses +flowers @outside
-x 2011-08-08 tend the garden @outside
-notice the sunflowers
-x 2011-12-26 go outside +wakeup
-(A) stop
-EOF
-cat > done.txt <<EOF
-x 2011-12-01 eat breakfast
-x 2011-12-05 smell the coffee +wakeup
-EOF
-
-test_todo_session 'basic listall' <<EOF
->>> todo.sh -p listall
-5 (A) stop
-3 notice the sunflowers
-1 smell the uppercase Roses +flowers @outside
-2 x 2011-08-08 tend the garden @outside
-0 x 2011-12-01 eat breakfast
-0 x 2011-12-05 smell the coffee +wakeup
-4 x 2011-12-26 go outside +wakeup
---
-TODO: 5 of 5 tasks shown
-DONE: 2 of 2 tasks shown
-total 7 of 7 tasks shown
-EOF
-
-test_todo_session 'listall highlighting' <<EOF
->>> todo.sh listall
-5 (A) stop
-3 notice the sunflowers
-1 smell the uppercase Roses +flowers @outside
-2 x 2011-08-08 tend the garden @outside
-0 x 2011-12-01 eat breakfast
-0 x 2011-12-05 smell the coffee +wakeup
-4 x 2011-12-26 go outside +wakeup
---
-TODO: 5 of 5 tasks shown
-DONE: 2 of 2 tasks shown
-total 7 of 7 tasks shown
-EOF
-
-test_todo_session 'listall nonverbose' <<EOF
->>> TODOTXT_VERBOSE=0 todo.sh -p listall
-5 (A) stop
-3 notice the sunflowers
-1 smell the uppercase Roses +flowers @outside
-2 x 2011-08-08 tend the garden @outside
-0 x 2011-12-01 eat breakfast
-0 x 2011-12-05 smell the coffee +wakeup
-4 x 2011-12-26 go outside +wakeup
-EOF
-
-test_todo_session 'listall filtering' <<EOF
->>> todo.sh -p listall @outside
-1 smell the uppercase Roses +flowers @outside
-2 x 2011-08-08 tend the garden @outside
---
-TODO: 2 of 5 tasks shown
-DONE: 0 of 2 tasks shown
-total 2 of 7 tasks shown
-
->>> todo.sh -p listall the
-3 notice the sunflowers
-1 smell the uppercase Roses +flowers @outside
-2 x 2011-08-08 tend the garden @outside
-0 x 2011-12-05 smell the coffee +wakeup
---
-TODO: 3 of 5 tasks shown
-DONE: 1 of 2 tasks shown
-total 4 of 7 tasks shown
-
->>> todo.sh -p listall breakfast
-0 x 2011-12-01 eat breakfast
---
-TODO: 0 of 5 tasks shown
-DONE: 1 of 2 tasks shown
-total 1 of 7 tasks shown
-
->>> todo.sh -p listall doesnotmatch
---
-TODO: 0 of 5 tasks shown
-DONE: 0 of 2 tasks shown
-total 0 of 7 tasks shown
-EOF
-
-cat >> done.txt <<EOF
-x 2010-01-01 old task 1
-x 2010-01-01 old task 2
-x 2010-01-01 old task 3
-x 2010-01-01 old task 4
-EOF
-test_todo_session 'listall number width' <<EOF
->>> todo.sh -p listall
-5 (A) stop
-3 notice the sunflowers
-1 smell the uppercase Roses +flowers @outside
-0 x 2010-01-01 old task 1
-0 x 2010-01-01 old task 2
-0 x 2010-01-01 old task 3
-0 x 2010-01-01 old task 4
-2 x 2011-08-08 tend the garden @outside
-0 x 2011-12-01 eat breakfast
-0 x 2011-12-05 smell the coffee +wakeup
-4 x 2011-12-26 go outside +wakeup
---
-TODO: 5 of 5 tasks shown
-DONE: 6 of 6 tasks shown
-total 11 of 11 tasks shown
-
->>> TODOTXT_VERBOSE=0 todo.sh add new task 1
-
->>> TODOTXT_VERBOSE=0 todo.sh add new task 2
-
->>> TODOTXT_VERBOSE=0 todo.sh add new task 3
-
->>> TODOTXT_VERBOSE=0 todo.sh add new task 4
-
->>> TODOTXT_VERBOSE=0 todo.sh add new task 5
-
->>> todo.sh -p listall
-05 (A) stop
-06 new task 1
-07 new task 2
-08 new task 3
-09 new task 4
-10 new task 5
-03 notice the sunflowers
-01 smell the uppercase Roses +flowers @outside
-00 x 2010-01-01 old task 1
-00 x 2010-01-01 old task 2
-00 x 2010-01-01 old task 3
-00 x 2010-01-01 old task 4
-02 x 2011-08-08 tend the garden @outside
-00 x 2011-12-01 eat breakfast
-00 x 2011-12-05 smell the coffee +wakeup
-04 x 2011-12-26 go outside +wakeup
---
-TODO: 10 of 10 tasks shown
-DONE: 6 of 6 tasks shown
-total 16 of 16 tasks shown
-EOF
-
-test_done

tests/t1400-prepend.sh

@@ -31,7 +31,7 @@ TODO: 3 of 3 tasks shown
 TODO: 3 of 3 tasks shown
 
 >>> todo.sh prepend 2 test
-2 test notice the sunflowers
+2: test notice the sunflowers
 
 >>> todo.sh -p list
 1 (B) smell the uppercase Roses +flowers @outside
@@ -41,7 +41,7 @@ TODO: 3 of 3 tasks shown
 TODO: 3 of 3 tasks shown
 
 >>> todo.sh prepend 1 test
-1 (B) test smell the uppercase Roses +flowers @outside
+1: (B) test smell the uppercase Roses +flowers @outside
 
 >>> todo.sh -p list
 1 (B) test smell the uppercase Roses +flowers @outside
@@ -54,69 +54,7 @@ EOF
 
 test_todo_session 'prepend with &' <<EOF
 >>> todo.sh prepend 3 "no running & jumping now"
-3 no running & jumping now stop
+3: no running & jumping now stop
-EOF
-
-echo 'jump on hay' > todo.txt
-test_todo_session 'prepend with spaces' <<EOF
->>> todo.sh prepend 1 "notice the   three   spaces and"
-1 notice the   three   spaces and jump on hay
-EOF
-
-cat > todo.txt <<EOF
-smell the cows
-grow some corn
-thrash some hay
-chase the chickens
-EOF
-test_todo_session 'prepend with symbols' <<EOF
->>> todo.sh prepend 1 "~@#$%^&*()-_=+[{]}|;:',<.>/?"
-1 ~@#$%^&*()-_=+[{]}|;:',<.>/? smell the cows
-
->>> todo.sh prepend 2 '\`!\\"'
-2 \`!\\" grow some corn
-
->>> todo.sh list
-4 chase the chickens
-3 thrash some hay
-2 \`!\\" grow some corn
-1 ~@#$%^&*()-_=+[{]}|;:',<.>/? smell the cows
---
-TODO: 4 of 4 tasks shown
-EOF
-
-cat /dev/null > todo.txt
-test_todo_session 'prepend handling prepended date on add' <<EOF
->>> todo.sh -t add "new task"
-1 2009-02-13 new task
-TODO: 1 added.
-
->>> todo.sh prepend 1 "this is just a"
-1 2009-02-13 this is just a new task
-EOF
-
-cat /dev/null > todo.txt
-test_todo_session 'prepend handling priority and prepended date on add' <<EOF
->>> todo.sh -t add "new task"
-1 2009-02-13 new task
-TODO: 1 added.
-
->>> todo.sh pri 1 A
-1 (A) 2009-02-13 new task
-TODO: 1 prioritized (A).
-
->>> todo.sh prepend 1 "this is just a"
-1 (A) 2009-02-13 this is just a new task
-EOF
-
-cat /dev/null > todo.txt
-test_todo_session 'prepend with prepended date keeps both' <<EOF
->>> todo.sh -t add "new task"
-1 2009-02-13 new task
-TODO: 1 added.
-
->>> todo.sh prepend 1 "2010-07-04 this is just a"
-1 2009-02-13 2010-07-04 this is just a new task
 EOF
 
 test_done

tests/t1500-do.sh

@@ -8,13 +8,7 @@ test_description='do functionality
 
 test_todo_session 'do usage' <<EOF
 >>> todo.sh do B B
-usage: todo.sh do ITEM#[, ITEM#, ITEM#, ...]
+usage: todo.sh do ITEM#
-=== 1
-EOF
-
-test_todo_session 'do missing ITEM#' <<EOF
->>> todo.sh do
-usage: todo.sh do ITEM#[, ITEM#, ITEM#, ...]
 === 1
 EOF
 
@@ -41,9 +35,9 @@ test_todo_session 'basic do' <<EOF
 TODO: 7 of 7 tasks shown
 
 >>> todo.sh do 7,6
-7 x 2009-02-13 remove4
+7: x 2009-02-13 remove4
 TODO: 7 marked as done.
-6 x 2009-02-13 remove3
+6: x 2009-02-13 remove3
 TODO: 6 marked as done.
 x 2009-02-13 remove3
 x 2009-02-13 remove4
@@ -59,9 +53,9 @@ TODO: $HOME/todo.txt archived.
 TODO: 5 of 5 tasks shown
 
 >>> todo.sh do 5 4
-5 x 2009-02-13 remove2
+5: x 2009-02-13 remove2
 TODO: 5 marked as done.
-4 x 2009-02-13 remove1
+4: x 2009-02-13 remove1
 TODO: 4 marked as done.
 x 2009-02-13 remove1
 x 2009-02-13 remove2
@@ -77,10 +71,10 @@ EOF
 
 test_todo_session 'fail multiple do attempts' <<EOF
 >>> todo.sh -a do 3
-3 x 2009-02-13 stop
+3: x 2009-02-13 stop
 TODO: 3 marked as done.
 
 >>> todo.sh -a do 3
-TODO: 3 is already marked done.
+3 is already marked done
 EOF
 test_done

tests/t1550-done.sh

@@ -0,0 +1,52 @@
+#!/bin/sh
+
+test_description='done functionality
+'
+. ./test-lib.sh
+
+#DATE=`date '+%Y-%m-%d'`
+
+test_todo_session 'done usage' <<EOF
+>>> export TODOTXT_FORCE=1
+
+>>> todo.sh done
+usage: todo.sh done "TODO ITEM"
+=== 1
+EOF
+
+cat > todo.txt <<EOF
+stop
+remove1
+remove2
+remove3
+remove4
+EOF
+
+test_todo_session 'basic done' <<EOF
+>>> todo.sh lsa
+2 remove1
+3 remove2
+4 remove3
+5 remove4
+1 stop
+--
+TODO: 5 of 5 tasks shown
+
+>>> todo.sh done smell the uppercase Roses
+TODO: 'smell the uppercase Roses' marked as done.
+
+>>> todo.sh done notice the sunflowers
+TODO: 'notice the sunflowers' marked as done.
+
+>>> todo.sh lsa
+2 remove1
+3 remove2
+4 remove3
+5 remove4
+1 stop
+7 x 2009-02-13 notice the sunflowers
+6 x 2009-02-13 smell the uppercase Roses
+--
+TODO: 7 of 7 tasks shown
+EOF
+test_done

tests/t1600-append.sh

@@ -17,15 +17,9 @@ test_todo_session 'append usage' <<EOF
 usage: todo.sh append ITEM# "TEXT TO APPEND"
 EOF
 
-test_todo_session 'append error' << EOF
->>> todo.sh append 10 "hej!"
-=== 1
-TODO: No task 10.
-EOF
-
 test_todo_session 'basic append' <<EOF
 >>> todo.sh append 1 "smell the roses"
-1 notice the daisies smell the roses
+1: notice the daisies smell the roses
 
 >>> todo.sh list
 1 notice the daisies smell the roses
@@ -35,7 +29,7 @@ EOF
 
 test_todo_session 'basic append with &' <<EOF
 >>> todo.sh append 1 "see the wasps & bees"
-1 notice the daisies smell the roses see the wasps & bees
+1: notice the daisies smell the roses see the wasps & bees
 
 >>> todo.sh list
 1 notice the daisies smell the roses see the wasps & bees
@@ -43,61 +37,11 @@ test_todo_session 'basic append with &' <<EOF
 TODO: 1 of 1 tasks shown
 EOF
 
-echo 'jump on hay' > todo.txt
-test_todo_session 'append with spaces' <<EOF
->>> todo.sh append 1 "and notice the   three   spaces"
-1 jump on hay and notice the   three   spaces
-EOF
 
-cat > todo.txt <<EOF
+test_todo_session 'append error' << EOF
-smell the cows
+>>> todo.sh append 10 "hej!"
-grow some corn
+=== 1
-thrash some hay
+10: No such todo.
-chase the chickens
-EOF
-test_todo_session 'append with symbols' <<EOF
->>> todo.sh append 1 "~@#$%^&*()-_=+[{]}|;:',<.>/?"
-1 smell the cows ~@#$%^&*()-_=+[{]}|;:',<.>/?
-
->>> todo.sh append 2 '\`!\\"'
-2 grow some corn \`!\\"
-
->>> todo.sh list
-4 chase the chickens
-2 grow some corn \`!\\"
-1 smell the cows ~@#$%^&*()-_=+[{]}|;:',<.>/?
-3 thrash some hay
---
-TODO: 4 of 4 tasks shown
-EOF
-
-cat > todo.txt <<EOF
-notice the daisies
-EOF
-test_todo_session 'append of current sentence' <<EOF
->>> todo.sh append 1 ", lilies and roses"
-1 notice the daisies, lilies and roses
-
->>> todo.sh append 1 "; see the wasps"
-1 notice the daisies, lilies and roses; see the wasps
-
->>> todo.sh append 1 "& bees"
-1 notice the daisies, lilies and roses; see the wasps & bees
-EOF
-
-cp todo.cfg special-delimiters.cfg
-cat >> special-delimiters.cfg <<EOF
-export SENTENCE_DELIMITERS='*,.:;&'
-EOF
-test_todo_session 'append of current sentence SENTENCE_DELIMITERS' <<EOF
->>> todo.sh -d special-delimiters.cfg append 1 "&beans"
-1 notice the daisies, lilies and roses; see the wasps & bees&beans
-
->>> todo.sh -d special-delimiters.cfg append 1 "%foo"
-1 notice the daisies, lilies and roses; see the wasps & bees&beans %foo
-
->>> todo.sh -d special-delimiters.cfg append 1 "*2"
-1 notice the daisies, lilies and roses; see the wasps & bees&beans %foo*2
 EOF
 
 test_done

tests/t1700-depri.sh

@@ -1,97 +0,0 @@
-#!/bin/sh
-
-test_description='basic depriority functionality
-'
-. ./test-lib.sh
-
-test_todo_session 'depriority usage' <<EOF
->>> todo.sh depri B B
-usage: todo.sh depri ITEM#[, ITEM#, ITEM#, ...]
-=== 1
-EOF
-
-test_todo_session 'depriority nonexistant item' <<EOF
->>> todo.sh depri 42
-TODO: No task 42.
-=== 1
-EOF
-
-cat > todo.txt <<EOF
-(B) smell the uppercase Roses +flowers @outside
-(A) notice the sunflowers
-stop
-EOF
-test_todo_session 'basic depriority' <<EOF
->>> todo.sh -p list
-2 (A) notice the sunflowers
-1 (B) smell the uppercase Roses +flowers @outside
-3 stop
---
-TODO: 3 of 3 tasks shown
-
->>> todo.sh depri 1
-1 smell the uppercase Roses +flowers @outside
-TODO: 1 deprioritized.
-
->>> todo.sh -p list
-2 (A) notice the sunflowers
-1 smell the uppercase Roses +flowers @outside
-3 stop
---
-TODO: 3 of 3 tasks shown
-EOF
-
-cat > todo.txt <<EOF
-(B) smell the uppercase Roses +flowers @outside
-(A) notice the sunflowers
-(C) stop
-EOF
-test_todo_session 'multiple depriority' <<EOF
->>> todo.sh -p list
-2 (A) notice the sunflowers
-1 (B) smell the uppercase Roses +flowers @outside
-3 (C) stop
---
-TODO: 3 of 3 tasks shown
-
->>> todo.sh depri 3 2
-3 stop
-TODO: 3 deprioritized.
-2 notice the sunflowers
-TODO: 2 deprioritized.
-
->>> todo.sh -p list
-1 (B) smell the uppercase Roses +flowers @outside
-2 notice the sunflowers
-3 stop
---
-TODO: 3 of 3 tasks shown
-EOF
-
-cat > todo.txt <<EOF
-(B) smell the uppercase Roses +flowers @outside
-(A) notice the sunflowers
-stop
-EOF
-test_todo_session 'depriority of unprioritized task' <<EOF
->>> todo.sh -p list
-2 (A) notice the sunflowers
-1 (B) smell the uppercase Roses +flowers @outside
-3 stop
---
-TODO: 3 of 3 tasks shown
-
->>> todo.sh depri 3 2
-TODO: 3 is not prioritized.
-2 notice the sunflowers
-TODO: 2 deprioritized.
-
->>> todo.sh -p list
-1 (B) smell the uppercase Roses +flowers @outside
-2 notice the sunflowers
-3 stop
---
-TODO: 3 of 3 tasks shown
-EOF
-
-test_done

tests/t1800-del.sh

@@ -1,153 +0,0 @@
-#!/bin/sh
-
-test_description='basic del functionality
-'
-. ./test-lib.sh
-
-test_todo_session 'del usage' <<EOF
->>> todo.sh del B
-usage: todo.sh del ITEM# [TERM]
-=== 1
-EOF
-
-test_todo_session 'del nonexistant item' <<EOF
->>> todo.sh -f del 42
-TODO: No task 42.
-=== 1
-
->>> todo.sh -f del 42 Roses
-TODO: No task 42.
-=== 1
-EOF
-
-cat > todo.txt <<EOF
-(B) smell the uppercase Roses +flowers @outside
-(A) notice the sunflowers
-stop
-EOF
-test_todo_session 'basic del' <<EOF
->>> todo.sh -p list
-2 (A) notice the sunflowers
-1 (B) smell the uppercase Roses +flowers @outside
-3 stop
---
-TODO: 3 of 3 tasks shown
-
->>> todo.sh -f del 1
-1 (B) smell the uppercase Roses +flowers @outside
-TODO: 1 deleted.
-
->>> todo.sh -p list
-2 (A) notice the sunflowers
-3 stop
---
-TODO: 2 of 2 tasks shown
-EOF
-
-cat > todo.txt <<EOF
-(B) smell the uppercase Roses +flowers @outside
-(A) notice the sunflowers
-stop
-EOF
-test_todo_session 'del preserving line numbers' <<EOF
->>> todo.sh -f del 1
-1 (B) smell the uppercase Roses +flowers @outside
-TODO: 1 deleted.
-
->>> todo.sh -f del 1
-TODO: No task 1.
-=== 1
-
->>> todo.sh add A new task
-4 A new task
-TODO: 4 added.
-
->>> todo.sh -p list
-2 (A) notice the sunflowers
-4 A new task
-3 stop
---
-TODO: 3 of 3 tasks shown
-
->>> todo.sh -f -n del 2
-2 (A) notice the sunflowers
-TODO: 2 deleted.
-
->>> todo.sh add Another new task
-3 Another new task
-TODO: 3 added.
-
->>> todo.sh -p list
-2 A new task
-3 Another new task
-1 stop
---
-TODO: 3 of 3 tasks shown
-EOF
-
-cat > todo.txt <<EOF
-(B) smell the uppercase Roses +flowers @outside
-(A) notice the sunflowers
-(C) stop
-EOF
-test_todo_session 'basic del TERM' <<EOF
->>> todo.sh -p list
-2 (A) notice the sunflowers
-1 (B) smell the uppercase Roses +flowers @outside
-3 (C) stop
---
-TODO: 3 of 3 tasks shown
-
->>> todo.sh del 1 uppercase
-1 (B) smell the uppercase Roses +flowers @outside
-TODO: Removed 'uppercase' from task.
-1 (B) smell the Roses +flowers @outside
-
->>> todo.sh -p list
-2 (A) notice the sunflowers
-1 (B) smell the Roses +flowers @outside
-3 (C) stop
---
-TODO: 3 of 3 tasks shown
-
->>> todo.sh del 1 "the Roses"
-1 (B) smell the Roses +flowers @outside
-TODO: Removed 'the Roses' from task.
-1 (B) smell +flowers @outside
-
->>> todo.sh del 1 m
-1 (B) smell +flowers @outside
-TODO: Removed 'm' from task.
-1 (B) sell +flowers @outside
-
->>> todo.sh del 1 @outside
-1 (B) sell +flowers @outside
-TODO: Removed '@outside' from task.
-1 (B) sell +flowers
-
->>> todo.sh del 1 sell
-1 (B) sell +flowers
-TODO: Removed 'sell' from task.
-1 (B) +flowers
-EOF
-
-cat > todo.txt <<EOF
-(B) smell the uppercase Roses +flowers @outside
-(A) notice the sunflowers
-(C) stop
-EOF
-test_todo_session 'del nonexistant TERM' <<EOF
->>> todo.sh del 1 dung
-1 (B) smell the uppercase Roses +flowers @outside
-TODO: 'dung' not found; no removal done.
-=== 1
-
->>> todo.sh -p list
-2 (A) notice the sunflowers
-1 (B) smell the uppercase Roses +flowers @outside
-3 (C) stop
---
-TODO: 3 of 3 tasks shown
-EOF
-
-test_done

tests/t1900-archive.sh

@@ -1,35 +0,0 @@
-#!/bin/sh
-
-test_description='archive functionality
-
-Ensure we can archive items successfully.
-'
-. ./test-lib.sh
-
-cat > todo.txt <<EOF
-one
-two
-three
-one
-x done
-four
-EOF
-
-test_todo_session 'archive with duplicates' <<EOF
->>> todo.sh archive
-x done
-TODO: $HOME/todo.txt archived.
-EOF
-
-test_todo_session 'list after archive' <<EOF
->>> todo.sh ls
-5 four
-1 one
-4 one
-3 three
-2 two
---
-TODO: 5 of 5 tasks shown
-EOF
-
-test_done

tests/t1910-deduplicate.sh

@@ -1,103 +0,0 @@
-#!/bin/sh
-
-test_description='deduplicate functionality
-
-Ensure we can deduplicate items successfully.
-'
-. ./test-lib.sh
-
-cat > todo.txt <<EOF
-duplicated
-two
-x done
-duplicated
-double task
-double task
-three
-EOF
-
-test_todo_session 'deduplicate and preserve line numbers' <<EOF
->>> todo.sh deduplicate
-TODO: 2 duplicate task(s) removed
-
->>> todo.sh -p ls
-5 double task
-1 duplicated
-7 three
-2 two
-3 x done
---
-TODO: 5 of 5 tasks shown
-EOF
-
-test_todo_session 'deduplicate without duplicates' <<EOF
->>> todo.sh deduplicate
-TODO: No duplicate tasks found
-EOF
-
-cat > todo.txt <<EOF
-duplicated
-two
-x done
-duplicated
-double task
-double task
-three
-EOF
-test_todo_session 'deduplicate and delete lines' <<EOF
->>> todo.sh -n deduplicate
-TODO: 2 duplicate task(s) removed
-
->>> todo.sh -p ls
-4 double task
-1 duplicated
-5 three
-2 two
-3 x done
---
-TODO: 5 of 5 tasks shown
-EOF
-
-cat > todo.txt <<EOF
-one
-duplicated
-three
-duplicated
-duplicated
-six
-duplicated
-EOF
-test_todo_session 'deduplicate more than two occurrences' <<EOF
->>> todo.sh deduplicate
-TODO: 3 duplicate task(s) removed
-
->>> todo.sh -p ls
-2 duplicated
-1 one
-6 six
-3 three
---
-TODO: 4 of 4 tasks shown
-EOF
-
-cat > todo.txt <<EOF
-normal task
-a bold task
-something else
-a bold task
-something more
-EOF
-test_todo_session 'deduplicate with non-printable duplicates' <<EOF
->>> todo.sh deduplicate
-TODO: 1 duplicate task(s) removed
-
->>> todo.sh -p ls
-2 a bold task
-1 normal task
-3 something else
-5 something more
---
-TODO: 4 of 4 tasks shown
-EOF
-
-test_done

tests/t1950-report.sh

@@ -1,96 +0,0 @@
-#!/bin/sh
-
-test_description='report functionality
-
-This test checks the reporting and the format of the report file.
-'
-. ./test-lib.sh
-
-cat > todo.txt <<EOF
-(B) smell the uppercase Roses +flowers @outside
-stop and think
-smell the coffee +wakeup
-make the coffee +wakeup
-visit http://example.com
-EOF
-
-test_todo_session 'create new report' <<EOF
->>> todo.sh report
-TODO: $HOME/todo.txt archived.
-2009-02-13T04:40:00 5 0
-TODO: Report file updated.
-
->>> todo.sh -p list
-1 (B) smell the uppercase Roses +flowers @outside
-4 make the coffee +wakeup
-3 smell the coffee +wakeup
-2 stop and think
-5 visit http://example.com
---
-TODO: 5 of 5 tasks shown
-EOF
-
-test_todo_session 'report of done tasks' <<EOF
->>> todo.sh -A do 3
-3 x 2009-02-13 smell the coffee +wakeup
-TODO: 3 marked as done.
-x 2009-02-13 smell the coffee +wakeup
-TODO: $HOME/todo.txt archived.
-
->>> todo.sh report
-TODO: $HOME/todo.txt archived.
-2009-02-13T04:40:00 4 1
-TODO: Report file updated.
-
->>> todo.sh -p list
-1 (B) smell the uppercase Roses +flowers @outside
-3 make the coffee +wakeup
-2 stop and think
-4 visit http://example.com
---
-TODO: 4 of 4 tasks shown
-EOF
-
-test_todo_session 'report performs archiving' <<EOF
->>> todo.sh -a do 3
-3 x 2009-02-13 make the coffee +wakeup
-TODO: 3 marked as done.
-
->>> todo.sh report
-x 2009-02-13 make the coffee +wakeup
-TODO: $HOME/todo.txt archived.
-2009-02-13T04:40:00 3 2
-TODO: Report file updated.
-
->>> todo.sh -p list
-1 (B) smell the uppercase Roses +flowers @outside
-2 stop and think
-3 visit http://example.com
---
-TODO: 3 of 3 tasks shown
-
->>> todo.sh -p listfile done.txt
-2 x 2009-02-13 make the coffee +wakeup
-1 x 2009-02-13 smell the coffee +wakeup
---
-DONE: 2 of 2 tasks shown
-EOF
-
-test_todo_session 'report is unchanged when no changes' <<EOF
->>> cat report.txt
-2009-02-13T04:40:00 5 0
-2009-02-13T04:40:00 4 1
-2009-02-13T04:40:00 3 2
-
->>> todo.sh report
-TODO: $HOME/todo.txt archived.
-2009-02-13T04:40:00 3 2
-TODO: Report file is up-to-date.
-
->>> cat report.txt
-2009-02-13T04:40:00 5 0
-2009-02-13T04:40:00 4 1
-2009-02-13T04:40:00 3 2
-EOF
-
-test_done

tests/t2000-multiline.sh

@@ -6,9 +6,9 @@ test_description='Multi-line functionality'
 
 ## Replace test
 # Create the expected file
-echo "1 smell the cheese
+echo "1: smell the cheese
-TODO: Replaced task with:
+replaced with
-1 eat apples eat oranges drink milk">$HOME/expect.multi
+1: eat apples eat oranges drink milk">$HOME/expect.multi
 
 test_expect_success 'multiline squash item replace' '
 (
@@ -33,8 +33,7 @@ fi
 
 ## Add test
 # Create the expected file
-echo "2 eat apples eat oranges drink milk
+echo "TODO: 'eat apples eat oranges drink milk' added on line 2.">$HOME/expect.multi
-TODO: 2 added.">$HOME/expect.multi
 
 test_expect_success 'multiline squash item add' '
 (
@@ -59,7 +58,7 @@ fi
 
 ## Append test
 # Create the expected file
-echo "1 smell the cheese eat apples eat oranges drink milk">$HOME/expect.multi
+echo "1: smell the cheese eat apples eat oranges drink milk">$HOME/expect.multi
 
 test_expect_success 'multiline squash item append' '
 (
@@ -84,7 +83,7 @@ fi
 
 ## Prepend test
 # Create the expected file
-echo "1 eat apples eat oranges drink milk smell the cheese">$HOME/expect.multi
+echo "1: eat apples eat oranges drink milk smell the cheese">$HOME/expect.multi
 
 test_expect_success 'multiline squash item prepend' '
 (
@@ -109,12 +108,9 @@ fi
 
 ## Multiple line addition
 # Create the expected file
-echo "2 eat apples
+echo "TODO: 'eat apples' added on line 2." > $HOME/expect.multi
-TODO: 2 added." > $HOME/expect.multi
+echo "TODO: 'eat oranges' added on line 3." >>$HOME/expect.multi
-echo "3 eat oranges
+echo "TODO: 'drink milk' added on line 4." >> $HOME/expect.multi
-TODO: 3 added." >>$HOME/expect.multi
-echo "4 drink milk
-TODO: 4 added." >> $HOME/expect.multi
 
 test_expect_success 'actual multiline add' '
 (

tests/t8000-actions.sh

@@ -1,57 +0,0 @@
-#!/bin/sh
-
-test_description='custom actions functionality
-
-This test covers the contract between todo.sh and custom actions.
-'
-. ./test-lib.sh
-
-unset TODO_ACTIONS_DIR
-mkdir .todo.actions.d
-make_action()
-{
-	cat > ".todo.actions.d/$1" <<- EOF
-	#!/bin/bash
-	echo "custom action $1"
-EOF
-chmod +x ".todo.actions.d/$1"
-}
-
-make_action "foo"
-test_todo_session 'executable action' <<EOF
->>> todo.sh foo
-custom action foo
-EOF
-
-chmod -x .todo.actions.d/foo
-# On Cygwin, clearing the executable flag may have no effect, as the Windows ACL
-# may still grant execution rights. In this case, we skip the test.
-if [ -x .todo.actions.d/foo ]; then
-    SKIP_TESTS="${SKIP_TESTS}${SKIP_TESTS+ }t8000.2"
-fi
-test_todo_session 'nonexecutable action' <<EOF
->>> todo.sh foo
-Usage: todo.sh [-fhpantvV] [-d todo_config] action [task_number] [task_description]
-Try 'todo.sh -h' for more information.
-=== 1
-EOF
-
-make_action "ls"
-test_todo_session 'overriding built-in action' <<EOF
->>> todo.sh ls
-custom action ls
-
->>> todo.sh command ls
---
-TODO: 0 of 0 tasks shown
-EOF
-
-make_action "bad"
-echo "exit 42" >> .todo.actions.d/bad
-test_todo_session 'failing action' <<EOF
->>> todo.sh bad
-custom action bad
-=== 42
-EOF
-
-test_done

tests/t9999-testsuite_example.sh

@@ -36,7 +36,7 @@ TODO: 2 of 4 tasks shown
 TODO: 1 of 4 tasks shown
 
 >>> todo.sh -a do 2
-2 x 2009-02-13 notice the sunflowers
+2: x 2009-02-13 notice the sunflowers
 TODO: 2 marked as done.
 
 >>> todo.sh -p list
@@ -48,8 +48,7 @@ TODO: 2 marked as done.
 TODO: 4 of 4 tasks shown
 
 >>> todo.sh add "make the coffee +wakeup"
-5 make the coffee +wakeup
+TODO: 'make the coffee +wakeup' added on line 5.
-TODO: 5 added.
 
 >>> todo.sh -p list coffee
 5 make the coffee +wakeup
@@ -58,8 +57,7 @@ TODO: 5 added.
 TODO: 2 of 5 tasks shown
 
 >>> todo.sh add "visit http://example.com"
-6 visit http://example.com
+TODO: 'visit http://example.com' added on line 6.
-TODO: 6 added.
 
 >>> todo.sh -p list
 1 (B) smell the uppercase Roses +flowers @outside
@@ -85,16 +83,20 @@ TODO: $HOME/todo.txt archived.
 TODO: 5 of 5 tasks shown
 
 >>> todo.sh report
-TODO: $HOME/todo.txt archived.
-2009-02-13T04:40:00 5 1
 TODO: Report file updated.
+2009-02-13-04:40:00 5 1
+
+>>> todo.sh report
+TODO: Report file updated.
+2009-02-13-04:40:00 5 1
+2009-02-13-04:40:00 5 1
 
 >>> todo.sh append g a
 usage: todo.sh append ITEM# "TEXT TO APPEND"
 === 1
 
 >>> todo.sh append 2 and think
-2 stop and think
+2: stop and think
 
 >>> todo.sh -p list
 1 (B) smell the uppercase Roses +flowers @outside
@@ -106,7 +108,7 @@ usage: todo.sh append ITEM# "TEXT TO APPEND"
 TODO: 5 of 5 tasks shown
 
 >>> todo.sh append 10 "hej!"
-TODO: No task 10.
+10: No such todo.
 === 1
 
 >>> todo.sh -p list
@@ -119,7 +121,7 @@ TODO: No task 10.
 TODO: 5 of 5 tasks shown
 
 >>> todo.sh do 10
-TODO: No task 10.
+10: No such todo.
 === 1
 
 >>> todo.sh -p list
@@ -132,8 +134,7 @@ TODO: No task 10.
 TODO: 5 of 5 tasks shown
 
 >>> todo.sh add "the coffee +wakeup"
-6 the coffee +wakeup
+TODO: 'the coffee +wakeup' added on line 6.
-TODO: 6 added.
 
 >>> todo.sh -p list
 1 (B) smell the uppercase Roses +flowers @outside
@@ -146,7 +147,7 @@ TODO: 6 added.
 TODO: 6 of 6 tasks shown
 
 >>> todo.sh prepend 6 "make"
-6 make the coffee +wakeup
+6: make the coffee +wakeup
 
 >>> todo.sh -p list
 1 (B) smell the uppercase Roses +flowers @outside

tests/test-lib.sh

@@ -12,10 +12,8 @@ done,*)
 *' --tee '*|*' --va'*)
 	mkdir -p test-results
 	BASE=test-results/$(basename "$0" .sh)
-	(
+	(TEST_TEE_STARTED=done ${SHELL-sh} "$0" "$@" 2>&1;
-	    TEST_TEE_STARTED=done ${SHELL-sh} "$0" "$@" 2>&1;
+	 echo $? > $BASE.exit) | tee $BASE.out
-	    echo $? > $BASE.exit
-	) | tee $BASE.out
 	test "$(cat $BASE.exit)" = 0
 	exit
 	;;
@@ -180,7 +178,7 @@ test_failure_ () {
 	test_failure=$(($test_failure + 1))
 	say_color error "FAIL $test_count: $1"
 	shift
-	echo "$@"
+	echo "$@" | sed -e 's/^/	/'
 	test "$immediate" = "" || { trap - EXIT; exit 1; }
 }
 
@@ -199,9 +197,8 @@ test_debug () {
 }
 
 test_run_ () {
-	eval > output 2>&1 "$1"
+	eval >&3 2>&4 "$1"
 	eval_ret="$?"
-	cat >&3 output
 	return 0
 }
 
@@ -261,57 +258,6 @@ test_expect_success () {
 	echo >&3 ""
 }
 
-test_expect_output () {
-	test "$#" = 2 ||
-	error "bug in the test script: not 2 parameters to test-expect-output"
-	if ! test_skip "$@"
-	then
-		say >&3 "expecting success and output: $2"
-		test_run_ "$2"
-		if [ "$?" = 0 -a "$eval_ret" = 0 ]
-		then
-			cmp_output=$(test_cmp expect output)
-			if [ "$?" = 0 ]
-			then
-				test_ok_ "$1"
-			else
-				test_failure_ "$@" "
-$cmp_output"
-			fi
-		else
-			test_failure_ "$@"
-		fi
-	fi
-	echo >&3 ""
-}
-
-test_expect_code_and_output () {
-	test "$#" = 3 ||
-	error "bug in the test script: not 3 parameters to test-expect-code-and-output"
-	if ! test_skip "$@"
-	then
-		say >&3 "expecting exit code $1 and output: $3"
-		test_run_ "$3"
-		if [ "$?" = 0 -a "$eval_ret" = "$1" ]
-		then
-			cmp_output=$(test_cmp expect output)
-			if [ "$?" = 0 ]
-			then
-				test_ok_ "$2"
-			else
-				test_failure_ "$2" "$3" "
-$cmp_output"
-			fi
-		else
-			cmp_output=$(test_cmp expect output)
-			test_failure_ "$2" "$3" "
-* expected exit code $1, actual ${eval_ret}${cmp_output:+
-}${cmp_output}"
-		fi
-	fi
-	echo >&3 ""
-}
-
 test_expect_code () {
 	test "$#" = 3 ||
 	error "bug in the test script: not 3 parameters to test-expect-code"
@@ -323,8 +269,7 @@ test_expect_code () {
 		then
 			test_ok_ "$2"
 		else
-			test_failure_ "$2" "$3" "
+			test_failure_ "$@"
-* expected exit code $1, actual ${eval_ret}"
 		fi
 	fi
 	echo >&3 ""
@@ -582,7 +527,7 @@ test_todo_session () {
     cmd=""
     status=0
     > expect
-    while read -r line
+    while read line
     do
 	case $line in
 	">>> "*)
@@ -595,9 +540,9 @@ test_todo_session () {
 	"")
 	    if [ ! -z "$cmd" ]; then
 		if [ $status = 0 ]; then
-		    test_expect_output "$1 $subnum" "$cmd"
+		    test_expect_success "$1 $subnum" "$cmd > output && test_cmp expect output"
 		else
-		    test_expect_code_and_output "$status" "$1 $subnum" "$cmd"
+		    test_expect_success "$1 $subnum" "$cmd > output || test $? = $status && test_cmp expect output"
 		fi
 
 		subnum=$(($subnum + 1))
@@ -607,15 +552,15 @@ test_todo_session () {
 	    fi
 	    ;;
 	*)
-	    echo "$line" >> expect
+	    echo $line >> expect
 	    ;;
 	esac
     done
     if [ ! -z "$cmd" ]; then
 	if [ $status = 0 ]; then
-	    test_expect_output "$1 $subnum" "$cmd"
+	    test_expect_success "$1 $subnum" "$cmd > output && test_cmp expect output"
 	else
-	    test_expect_code_and_output "$status" "$1 $subnum" "$cmd"
+	    test_expect_success "$1 $subnum" "$cmd > output || test $? = $status && test_cmp expect output"
 	fi
     fi
 }

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="C:/Documents and Settings/gina/My Documents"
 
 # Your todo/done/report.txt locations
 export TODO_FILE="$TODO_DIR/todo.txt"
@@ -17,13 +17,8 @@ export TMP_FILE="$TODO_DIR/todo.tmp"
 
 # === COLOR MAP ===
 
-## Text coloring and formatting is done by inserting ANSI escape codes.
+## If you have re-mapped your color codes, you may need to
-## If you have re-mapped your color codes, or use the todo.txt
-## output in another output system (like Conky), you may need to
 ## over-ride by uncommenting and editing these defaults.
-## If you change any of these here, you also need to uncomment
-## the defaults in the COLORS section below. Otherwise, todo.txt
-## will still use the defaults!
 
 # export BLACK='\\033[0;30m'
 # export RED='\\033[0;31m'
@@ -43,25 +38,16 @@ export TMP_FILE="$TODO_DIR/todo.tmp"
 # export WHITE='\\033[1;37m'
 # export DEFAULT='\\033[0m'
 
-# === COLORS ===
+# === PRIORITY COLORS ===
 
+## Priorities can be any upper-case letter.
+## Colors are supported for the first three.
 ## Uncomment and edit to override these defaults.
-## Reference the constants from the color map above,
+
-## or use $NONE to disable highlighting.
-#
-# Priorities can be any upper-case letter.
-# A,B,C are highlighted; you can add coloring for more.
-#
 # export PRI_A=$YELLOW        # color for A priority
 # export PRI_B=$GREEN         # color for B priority
 # export PRI_C=$LIGHT_BLUE    # color for C priority
-# export PRI_D=...            # define your own
+# export PRI_X=$WHITE         # color for rest of them
-# export PRI_X=$WHITE         # color unless explicitly defined
-
-# There is highlighting for tasks that have been done,
-# but haven't been archived yet.
-#
-# export COLOR_DONE=$LIGHT_GREY
 
 # === BEHAVIOR ===
 

todo_completion

@@ -1,79 +0,0 @@
-#!/bin/bash source-this-script
-[ "$BASH_VERSION" ] || return
-
-_todo()
-{
-    local cur prev opts
-    COMPREPLY=()
-    cur="${COMP_WORDS[COMP_CWORD]}"
-    prev="${COMP_WORDS[COMP_CWORD-1]}"
-
-    local -r OPTS="-@ -@@ -+ -++ -d -f -h -p -P -PP -a -n -t -v -vv -V -x"
-    local -r COMMANDS="\
-        add a addto addm append app archive command del  \
-        rm depri dp do help list ls listall lsa listcon  \
-        lsc listfile lf listpri lsp listproj lsprj move \
-        mv prepend prep pri p replace report shorthelp"
-
-    # Add custom commands from add-ons, if installed.
-    # TODO: Filter for executable flag of files found in $TODO_ACTIONS_DIR.
-    local allCommands="$COMMANDS $('ls' "${TODO_ACTIONS_DIR:-$HOME/.todo.actions.d}/" 2>/dev/null)"
-
-    local completions
-    if [ $COMP_CWORD -eq 1 ]; then
-        completions="$allCommands $OPTS"
-    elif [[ $COMP_CWORD -gt 2 && ( \
-        "${COMP_WORDS[COMP_CWORD-2]}" =~ ^(move|mv)$ || \
-        "${COMP_WORDS[COMP_CWORD-3]}" =~ ^(move|mv)$ ) ]]; then
-        # "move ITEM# DEST [SRC]" has file arguments on positions 2 and 3.
-        completions=$(TODOTXT_VERBOSE=0 todo.sh command listfile)
-    else
-        case "$prev" in
-            command)
-                completions=$COMMANDS;;
-            addto|listfile|lf)
-                completions=$(TODOTXT_VERBOSE=0 todo.sh command listfile);;
-            -*) completions="$allCommands $OPTS";;
-            *)  case "$cur" in
-                    +*) completions=$(TODOTXT_VERBOSE=0 todo.sh command listproj);;
-                    @*) completions=$(TODOTXT_VERBOSE=0 todo.sh command listcon);;
-                    *)  if [[ "$cur" =~ ^[0-9]+$ ]]; then
-                            # Remove the (padded) task number; we prepend the
-                            # user-provided $cur instead.
-                            # Remove the timestamp prepended by the -t option,
-                            # and the done date (for done tasks); there's no
-                            # todo.txt option for that yet.
-                            # But keep priority and "x"; they're short and may
-                            # provide useful context.
-                            # Remove any trailing whitespace; the Bash
-                            # completion inserts a trailing space itself.
-                            # Finally, limit the output to a single line just as
-                            # a safety check of the ls action output.
-                            local todo=$( \
-                                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/' \
-                                    -e 's/\([xX] \)\([0-9]\{2,4\}-[0-9]\{2\}-[0-9]\{2\} \)\{1,2\}/\1/' \
-                                    -e 's/[[:space:]]*$//' \
-                                    -e '1q' \
-                            )
-                            # Append task text as a shell comment. This
-                            # completion can be a safety check before a
-                            # destructive todo.txt operation.
-                            [ "$todo" ] && COMPREPLY[0]="$cur # $todo"
-                            return 0
-                        else
-                            return 0
-                        fi
-                        ;;
-                esac
-                ;;
-        esac
-    fi
-
-    COMPREPLY=( $( compgen -W "$completions" -- $cur ))
-    return 0
-}
-complete -F _todo todo.sh
-# If you define an alias (e.g. "t") to todo.sh, you need to explicitly enable
-# completion for it, too:
-#complete -F _todo t