todorb 1.0.0 → 1.1.0

data/tests/rtest2.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #*******************************************************#
-#                       gentest.sh                      #
+#                       rtest2.sh                       #
 #                 written by Rahul Kumar                #
 #                    December 21, 2009                  #
 #                                                       #
@@ -70,6 +70,7 @@ do
 #   read line
    [ -z "$line" ] && { echo "bye to quit"; continue; }
    [[ "$line" = "bye" ]] && break;
+   [[ "$line" = "abort" ]] && exit 1;
    [ -n "$line" ] && history -s "$line"
 
    ## user can execute test_tick in current shell
@@ -83,16 +84,20 @@ do
       line=$( echo "$line" | sed 's/^list/t --sort-serial list/')
    fi
    if grep -q "^ls" <<< "$line"; then
-      line=$( echo "$line" | sed 's/^ls/t --sort-serial --no-colors list/')
+      line=$( echo "$line" | sed 's/^ls/t list --sort-serial --no-colors /')
    fi
    line=$(echo "$line" | sed 's/--ss /--sort-serial /')
    line=$(echo "$line" | sed 's/--nc /--no-colors /')
    #[[ "$line" = "list" ]] && line="t --sort-serial list";
    #[[ "$line" = "ls" ]] && line="t --sort-serial --no-colors list";
-   line=$(echo "$line" | sed 's/^t /todorb /')
-   echo ">>> $line" >> $out
-   eval "$line" | tee -a "$out"
-   echo "" >> $out
+   line=$(echo "$line" | sed 's~^t ~todorb  ~')
+   if [[ "$line" != "end" ]]; then
+       echo ">>> $line" >> $out
+       eval "$line" | tee -a "$out"
+       # RK since old version stopped expect on blank line I've placed this marker
+       echo ">>> end" >> $out
+   fi
+   #echo "" >> $out
 done
 
 ## generate the test case transcript

data/tests/t0001-help.sh

@@ -0,0 +1,97 @@
+#!/bin/sh
+test_description="Testing out ./t0001-help "
+. ./test-lib.sh
+
+
+
+
+test_todo_session "Testing of ./t0001-help" <<EOF
+>>> todorb help
+Usage:  [options] [subcommand [options]]
+Todo list manager
+    -v, --[no-]verbose               Run verbosely
+    -f, --file FILENAME              CSV filename
+    -d, --dir DIR                    Use TODO file in this directory
+        --show-actions               show actions 
+        --version                    Show version
+    -h, --help                       Show this message
+
+Common Usage:
+        todorb add "Text ...."
+        todorb list
+        todorb pri 1 A
+        todorb close 1 
+
+Commands are:
+   list : List tasks.	 --show-all and others
+   add : Add a task.
+   pri : Add priority to task. 
+   depri : Remove priority of task. 
+	 todorb depri <TASK>
+   delete : Delete a task. 
+	 todorb delete <TASK>
+   status : Change the status of a task. 	<STATUS> are open closed started pending hold next
+   redo : Renumbers the todo file starting 1
+   note : Add a note to a task.
+   tag : Add a tag to an item/s. 
+   archive : archive closed tasks to archive.txt
+   copyunder : Move first task under second (as a subtask). aka cu
+   addsub : Add a task under another.
+
+Aliases: 
+   a - add
+   p - pri
+   del - delete
+   cu - copyunder
+   open - ["status", "open"]
+   close - ["status", "closed"]
+
+
+See '/opt/local/bin/todorb help COMMAND' for more information on a specific command.
+>>> end
+>>> todorb --help
+Usage:  [options] [subcommand [options]]
+Todo list manager
+    -v, --[no-]verbose               Run verbosely
+    -f, --file FILENAME              CSV filename
+    -d, --dir DIR                    Use TODO file in this directory
+        --show-actions               show actions 
+        --version                    Show version
+    -h, --help                       Show this message
+
+Common Usage:
+        todorb add "Text ...."
+        todorb list
+        todorb pri 1 A
+        todorb close 1 
+
+Commands are:
+   list : List tasks.	 --show-all and others
+   add : Add a task.
+   pri : Add priority to task. 
+   depri : Remove priority of task. 
+	 todorb depri <TASK>
+   delete : Delete a task. 
+	 todorb delete <TASK>
+   status : Change the status of a task. 	<STATUS> are open closed started pending hold next
+   redo : Renumbers the todo file starting 1
+   note : Add a note to a task.
+   tag : Add a tag to an item/s. 
+   archive : archive closed tasks to archive.txt
+   copyunder : Move first task under second (as a subtask). aka cu
+   addsub : Add a task under another.
+
+Aliases: 
+   a - add
+   p - pri
+   del - delete
+   cu - copyunder
+   open - ["status", "open"]
+   close - ["status", "closed"]
+
+
+See '/opt/local/bin/todorb help COMMAND' for more information on a specific command.
+>>> end
+
+EOF
+test_done

data/tests/t0002-subc_help.sh

@@ -0,0 +1,41 @@
+#!/bin/sh
+test_description="Testing out subc_help "
+. ./test-lib.sh
+
+
+
+
+test_todo_session "Testing of subc_help" <<EOF
+>>> todorb list --help
+Usage: list [options]
+List tasks.	 --show-all and others
+    -P, --project PROJECTNAME        name of project for add or list
+    -p, --priority A-Z               priority code for add or list
+    -C, --component COMPONENT        component name for add or list
+        --[no-]color, --[no-]colors  colorize listing
+    -s, --sort                       sort list on status,priority
+        --reverse                    sort list on status,priority reversed
+    -g, --grep REGEXP                filter list on pattern
+        --renumber                   renumber while listing
+        --hide-numbering             hide-numbering while listing 
+        --[no-]show-all              show all tasks (incl closed)
+        --show-arch                  show all tasks adding archived ones too
+>>> end
+>>> todorb help list
+Usage: list [options]
+List tasks.	 --show-all and others
+    -P, --project PROJECTNAME        name of project for add or list
+    -p, --priority A-Z               priority code for add or list
+    -C, --component COMPONENT        component name for add or list
+        --[no-]color, --[no-]colors  colorize listing
+    -s, --sort                       sort list on status,priority
+        --reverse                    sort list on status,priority reversed
+    -g, --grep REGEXP                filter list on pattern
+        --renumber                   renumber while listing
+        --hide-numbering             hide-numbering while listing 
+        --[no-]show-all              show all tasks (incl closed)
+        --show-arch                  show all tasks adding archived ones too
+>>> end
+
+EOF
+test_done

data/tests/t0003-add.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+test_description="Testing out add "
+. ./test-lib.sh
+
+
+
+
+test_todo_session "Testing of add" <<EOF
+>>> todorb add "Add test cases for all operations"
+Adding:
+  1	[ ] Add test cases for all operations (2009-02-13)
+>>> end
+>>> todorb add "Add complete date when closing"
+Adding:
+  2	[ ] Add complete date when closing (2009-02-13)
+>>> end
+
+EOF
+test_done

data/tests/{t0002-listing.sh → t0004-list.sh}

@@ -1,5 +1,5 @@
 #!/bin/sh
-test_description="Testing out listing "
+test_description="Testing out list "
 . ./test-lib.sh
 
 
@@ -20,8 +20,8 @@ cat > TODO2.txt <<CATEOF
   7	[ ] list: search terms with - + and = (2010-06-15)
 CATEOF
 
-test_todo_session "Testing of listing" <<EOF
->>> todorb --no-color
+test_todo_session "Testing of list" <<EOF
+>>> todorb
      3.1 [ ] hello there new a u 3 (2010-06-15) 
          3.1.1 [ ] hello there new a u 3 (2010-06-15) 
          3.1.2 [ ] hello there new a u 3 (2010-06-15) 
@@ -35,8 +35,8 @@ test_todo_session "Testing of listing" <<EOF
    7 [ ] list: search terms with - + and = (2010-06-15) 
  
  11 of 14 rows displayed from TODO2.txt 
-
->>> todorb --no-color --show-all
+>>> end
+>>> todorb list --show-all --no-color
    1 [x] if no TODO file give proper message to add task (2010-06-14) 
    2 [x] what if no serial_number file? (2010-06-14) 
    3 [x] Add a close for status close (2010-06-14) 
@@ -53,6 +53,7 @@ test_todo_session "Testing of listing" <<EOF
    7 [ ] list: search terms with - + and = (2010-06-15) 
  
  14 of 14 rows displayed from TODO2.txt 
+>>> end
 
 EOF
 test_done

data/tests/t0005-pri.sh

@@ -0,0 +1,43 @@
+#!/bin/sh
+test_description="Testing out pri "
+. ./test-lib.sh
+
+
+cat > TODO2.txt <<CATEOF
+  1	[x] if no TODO file give proper message to add task (2010-06-14)
+  2	[x] what if no serial_number file? (2010-06-14)
+  3	[x] Add a close for status close (2010-06-14)
+    3.1	[ ] hello there new a u 3 (2010-06-15)
+        3.1.1	[ ] hello there new a u 3 (2010-06-15)
+        3.1.2	[ ] hello there new a u 3 (2010-06-15)
+        3.1.3	[ ] hello there new a u 3 (2010-06-15)
+    3.2	[ ] hello there new a u 3.2 (2010-06-15)
+        3.2.1	[ ] hello there new a u 3.2.1 (2010-06-15)
+            3.2.1.1	[ ] hello there new a u 3.2.1.1 (2010-06-15)
+  4	[ ] start rubyforge project for todorb (2010-06-14)
+  5	[ ] list: if dir given then show full path of TODO2.txt at end (2010-06-14)
+  6	[ ] allow for ENV VARS such as verbose, plain, force (2010-06-15)
+  7	[ ] list: search terms with - + and = (2010-06-15)
+CATEOF
+
+test_todo_session "Testing of pri" <<EOF
+>>> todorb pri 4 A
+   4 : [ ] start rubyforge project for todorb (2010-06-14) 
+   4 : [ ] (A) start rubyforge project for todorb (2010-06-14) 
+Changed priority of 1 task/s
+>>> end
+>>> todorb pri 5 B
+   5 : [ ] list: if dir given then show full path of TODO2.txt at end (2010-06-14) 
+   5 : [ ] (B) list: if dir given then show full path of TODO2.txt at end (2010-06-14) 
+Changed priority of 1 task/s
+>>> end
+>>> todorb pri C 6 7
+   6 : [ ] allow for ENV VARS such as verbose, plain, force (2010-06-15) 
+   6 : [ ] (C) allow for ENV VARS such as verbose, plain, force (2010-06-15) 
+   7 : [ ] list: search terms with - + and = (2010-06-15) 
+   7 : [ ] (C) list: search terms with - + and = (2010-06-15) 
+Changed priority of 2 task/s
+>>> end
+
+EOF
+test_done

data/tests/t0006-pri_sort.sh

@@ -0,0 +1,55 @@
+#!/bin/sh
+test_description="Testing out pri_sort "
+. ./test-lib.sh
+
+
+cat > TODO2.txt <<CATEOF
+  1	[x] if no TODO file give proper message to add task (2010-06-14)
+  2	[x] what if no serial_number file? (2010-06-14)
+  3	[x] Add a close for status close (2010-06-14)
+    3.1	[ ] hello there new a u 3 (2010-06-15)
+        3.1.1	[ ] hello there new a u 3 (2010-06-15)
+        3.1.2	[ ] hello there new a u 3 (2010-06-15)
+        3.1.3	[ ] hello there new a u 3 (2010-06-15)
+    3.2	[ ] hello there new a u 3.2 (2010-06-15)
+        3.2.1	[ ] hello there new a u 3.2.1 (2010-06-15)
+            3.2.1.1	[ ] hello there new a u 3.2.1.1 (2010-06-15)
+  4	[ ] start rubyforge project for todorb (2010-06-14)
+  5	[ ] list: if dir given then show full path of TODO2.txt at end (2010-06-14)
+  6	[ ] allow for ENV VARS such as verbose, plain, force (2010-06-15)
+  7	[ ] list: search terms with - + and = (2010-06-15)
+CATEOF
+
+test_todo_session "Testing of pri_sort" <<EOF
+>>> todorb pri 4 6 B
+   4 : [ ] start rubyforge project for todorb (2010-06-14) 
+   4 : [ ] (B) start rubyforge project for todorb (2010-06-14) 
+   6 : [ ] allow for ENV VARS such as verbose, plain, force (2010-06-15) 
+   6 : [ ] (B) allow for ENV VARS such as verbose, plain, force (2010-06-15) 
+Changed priority of 2 task/s
+>>> end
+>>> todorb pri 5 7 A
+   5 : [ ] list: if dir given then show full path of TODO2.txt at end (2010-06-14) 
+   5 : [ ] (A) list: if dir given then show full path of TODO2.txt at end (2010-06-14) 
+   7 : [ ] list: search terms with - + and = (2010-06-15) 
+   7 : [ ] (A) list: search terms with - + and = (2010-06-15) 
+Changed priority of 2 task/s
+>>> end
+>>> todorb list --sort
+     3.1 [ ] hello there new a u 3 (2010-06-15) 
+         3.1.1 [ ] hello there new a u 3 (2010-06-15) 
+         3.1.2 [ ] hello there new a u 3 (2010-06-15) 
+         3.1.3 [ ] hello there new a u 3 (2010-06-15) 
+     3.2 [ ] hello there new a u 3.2 (2010-06-15) 
+         3.2.1 [ ] hello there new a u 3.2.1 (2010-06-15) 
+             3.2.1.1 [ ] hello there new a u 3.2.1.1 (2010-06-15) 
+   4 [ ] (B) start rubyforge project for todorb (2010-06-14) 
+   6 [ ] (B) allow for ENV VARS such as verbose, plain, force (2010-06-15) 
+   7 [ ] (A) list: search terms with - + and = (2010-06-15) 
+   5 [ ] (A) list: if dir given then show full path of TODO2.txt at end (2010-06-14) 
+ 
+ 11 of 14 rows displayed from TODO2.txt 
+>>> end
+
+EOF
+test_done

data/tests/t0007-status.sh

@@ -0,0 +1,78 @@
+#!/bin/sh
+test_description="Testing out status "
+. ./test-lib.sh
+
+
+cat > TODO2.txt <<CATEOF
+  1	[ ] if no TODO file give proper message to add task (2010-06-14)
+  2	[ ] what if no serial_number file? (2010-06-14)
+  3	[ ] Add a close for status close (2010-06-14)
+  4	[ ] start rubyforge project for todorb (2010-06-14)
+  5	[ ] list: if dir given then show full path of TODO2.txt at end (2010-06-14)
+  6	[ ] allow for ENV VARS such as verbose, plain, force (2010-06-15)
+  7	[ ] list: search terms with - + and = (2010-06-15)
+CATEOF
+
+test_todo_session "Testing of status" <<EOF
+>>> todorb close 2
+   2 : [x] what if no serial_number file? (2010-06-14) 
+Changed 1 task/s
+>>> end
+>>> todorb
+   1 [ ] if no TODO file give proper message to add task (2010-06-14) 
+   3 [ ] Add a close for status close (2010-06-14) 
+   4 [ ] start rubyforge project for todorb (2010-06-14) 
+   5 [ ] list: if dir given then show full path of TODO2.txt at end (2010-06-14) 
+   6 [ ] allow for ENV VARS such as verbose, plain, force (2010-06-15) 
+   7 [ ] list: search terms with - + and = (2010-06-15) 
+ 
+ 6 of 7 rows displayed from TODO2.txt 
+>>> end
+>>> todorb open 2
+   2 : [ ] what if no serial_number file? (2010-06-14) 
+Changed 1 task/s
+>>> end
+>>> todorb
+   1 [ ] if no TODO file give proper message to add task (2010-06-14) 
+   2 [ ] what if no serial_number file? (2010-06-14) 
+   3 [ ] Add a close for status close (2010-06-14) 
+   4 [ ] start rubyforge project for todorb (2010-06-14) 
+   5 [ ] list: if dir given then show full path of TODO2.txt at end (2010-06-14) 
+   6 [ ] allow for ENV VARS such as verbose, plain, force (2010-06-15) 
+   7 [ ] list: search terms with - + and = (2010-06-15) 
+ 
+ 7 of 7 rows displayed from TODO2.txt 
+>>> end
+>>> todorb close 2 4
+   2 : [x] what if no serial_number file? (2010-06-14) 
+   4 : [x] start rubyforge project for todorb (2010-06-14) 
+Changed 2 task/s
+>>> end
+>>> todorb status start 3 7
+   3 : [@] Add a close for status close (2010-06-14) 
+   7 : [@] list: search terms with - + and = (2010-06-15) 
+Changed 2 task/s
+>>> end
+>>> todorb
+   1 [ ] if no TODO file give proper message to add task (2010-06-14) 
+   3 [@] Add a close for status close (2010-06-14) 
+   5 [ ] list: if dir given then show full path of TODO2.txt at end (2010-06-14) 
+   6 [ ] allow for ENV VARS such as verbose, plain, force (2010-06-15) 
+   7 [@] list: search terms with - + and = (2010-06-15) 
+ 
+ 5 of 7 rows displayed from TODO2.txt 
+>>> end
+>>> todorb list --show-all
+   1 [ ] if no TODO file give proper message to add task (2010-06-14) 
+   2 [x] what if no serial_number file? (2010-06-14) 
+   3 [@] Add a close for status close (2010-06-14) 
+   4 [x] start rubyforge project for todorb (2010-06-14) 
+   5 [ ] list: if dir given then show full path of TODO2.txt at end (2010-06-14) 
+   6 [ ] allow for ENV VARS such as verbose, plain, force (2010-06-15) 
+   7 [@] list: search terms with - + and = (2010-06-15) 
+ 
+ 7 of 7 rows displayed from TODO2.txt 
+>>> end
+
+EOF
+test_done

data/tests/t0008-addsub.sh

@@ -0,0 +1,78 @@
+#!/bin/sh
+test_description="Testing out addsub "
+. ./test-lib.sh
+
+
+cat > TODO2.txt <<CATEOF
+  1	[ ] if no TODO file give proper message to add task (2010-06-14)
+  2	[ ] what if no serial_number file? (2010-06-14)
+  3	[ ] Add a close for status close (2010-06-14)
+  4	[ ] start rubyforge project for todorb (2010-06-14)
+  5	[ ] list: if dir given then show full path of TODO2.txt at end (2010-06-14)
+  6	[ ] allow for ENV VARS such as verbose, plain, force (2010-06-15)
+  7	[ ] list: search terms with - + and = (2010-06-15)
+CATEOF
+
+test_todo_session "Testing of addsub" <<EOF
+>>> todorb addsub 1 "create serial_number file"
+Adding:
+    1.1	[ ] create serial_number file (2009-02-13)
+>>> end
+>>> todorb
+   1 [ ] if no TODO file give proper message to add task (2010-06-14) 
+     1.1 [ ] create serial_number file (2009-02-13) 
+   2 [ ] what if no serial_number file? (2010-06-14) 
+   3 [ ] Add a close for status close (2010-06-14) 
+   4 [ ] start rubyforge project for todorb (2010-06-14) 
+   5 [ ] list: if dir given then show full path of TODO2.txt at end (2010-06-14) 
+   6 [ ] allow for ENV VARS such as verbose, plain, force (2010-06-15) 
+   7 [ ] list: search terms with - + and = (2010-06-15) 
+ 
+ 8 of 8 rows displayed from TODO2.txt 
+>>> end
+>>> todorb addsub 1 "reset serial file when doing redo"
+Adding:
+    1.2	[ ] reset serial file when doing redo (2009-02-13)
+>>> end
+>>> todorb addsub 1.1 "update serial file"
+Adding:
+        1.1.1	[ ] update serial file (2009-02-13)
+>>> end
+>>> todorb
+   1 [ ] if no TODO file give proper message to add task (2010-06-14) 
+     1.1 [ ] create serial_number file (2009-02-13) 
+         1.1.1 [ ] update serial file (2009-02-13) 
+     1.2 [ ] reset serial file when doing redo (2009-02-13) 
+   2 [ ] what if no serial_number file? (2010-06-14) 
+   3 [ ] Add a close for status close (2010-06-14) 
+   4 [ ] start rubyforge project for todorb (2010-06-14) 
+   5 [ ] list: if dir given then show full path of TODO2.txt at end (2010-06-14) 
+   6 [ ] allow for ENV VARS such as verbose, plain, force (2010-06-15) 
+   7 [ ] list: search terms with - + and = (2010-06-15) 
+ 
+ 10 of 10 rows displayed from TODO2.txt 
+>>> end
+>>> todorb close 1
+   1 : [x] if no TODO file give proper message to add task (2010-06-14) 
+     1.1 : [x] create serial_number file (2009-02-13) 
+         1.1.1 : [x] update serial file (2009-02-13) 
+     1.2 : [x] reset serial file when doing redo (2009-02-13) 
+Changed 4 task/s
+>>> end
+>>> todorb list --show-all
+   1 [x] if no TODO file give proper message to add task (2010-06-14) 
+     1.1 [x] create serial_number file (2009-02-13) 
+         1.1.1 [x] update serial file (2009-02-13) 
+     1.2 [x] reset serial file when doing redo (2009-02-13) 
+   2 [ ] what if no serial_number file? (2010-06-14) 
+   3 [ ] Add a close for status close (2010-06-14) 
+   4 [ ] start rubyforge project for todorb (2010-06-14) 
+   5 [ ] list: if dir given then show full path of TODO2.txt at end (2010-06-14) 
+   6 [ ] allow for ENV VARS such as verbose, plain, force (2010-06-15) 
+   7 [ ] list: search terms with - + and = (2010-06-15) 
+ 
+ 10 of 10 rows displayed from TODO2.txt 
+>>> end
+
+EOF
+test_done

data/tests/t0009-del.sh

@@ -0,0 +1,43 @@
+#!/bin/sh
+test_description="Testing out del "
+. ./test-lib.sh
+
+
+cat > TODO2.txt <<CATEOF
+  1	[x] if no TODO file give proper message to add task (2010-06-14)
+  2	[x] what if no serial_number file? (2010-06-14)
+  3	[x] Add a close for status close (2010-06-14)
+    3.1	[ ] hello there new a u 3 (2010-06-15)
+        3.1.1	[ ] hello there new a u 3 (2010-06-15)
+        3.1.2	[ ] hello there new a u 3 (2010-06-15)
+        3.1.3	[ ] hello there new a u 3 (2010-06-15)
+    3.2	[ ] hello there new a u 3.2 (2010-06-15)
+        3.2.1	[ ] hello there new a u 3.2.1 (2010-06-15)
+            3.2.1.1	[ ] hello there new a u 3.2.1.1 (2010-06-15)
+  4	[ ] start rubyforge project for todorb (2010-06-14)
+  5	[ ] list: if dir given then show full path of TODO2.txt at end (2010-06-14)
+  6	[ ] allow for ENV VARS such as verbose, plain, force (2010-06-15)
+  7	[ ] list: search terms with - + and = (2010-06-15)
+CATEOF
+
+test_todo_session "Testing of del" <<EOF
+>>> todorb del --force 4 5 6
+  4 [ ] start rubyforge project for todorb (2010-06-14)
+  5 [ ] list: if dir given then show full path of TODO2.txt at end (2010-06-14)
+  6 [ ] allow for ENV VARS such as verbose, plain, force (2010-06-15)
+Deleted 3 task/s
+>>> end
+>>> todorb del --force --recursive 3
+  3 [x] Add a close for status close (2010-06-14)
+    3.1 [ ] hello there new a u 3 (2010-06-15)
+        3.1.1 [ ] hello there new a u 3 (2010-06-15)
+        3.1.2 [ ] hello there new a u 3 (2010-06-15)
+        3.1.3 [ ] hello there new a u 3 (2010-06-15)
+    3.2 [ ] hello there new a u 3.2 (2010-06-15)
+        3.2.1 [ ] hello there new a u 3.2.1 (2010-06-15)
+            3.2.1.1 [ ] hello there new a u 3.2.1.1 (2010-06-15)
+Deleted 8 task/s
+>>> end
+
+EOF
+test_done

data/tests/test-lib.sh

@@ -440,8 +440,10 @@ test_init_todo () {
 
 	# Install latest todo.sh
 	mkdir bin
+        # TODO: XXX 
 	#ln -s "$TEST_DIRECTORY/../todoapp.sh" bin/todoapp.sh
 	ln -s ~/bin/todorb bin/todorb
+#	ln -s ../../../lib/subcommand.rb bin/subcommand.rb
 
 	# Initialize a hack date script
 	TODO_TEST_REAL_DATE=$(which date)
@@ -530,17 +532,12 @@ test_todo_session () {
     status=0
     > expect
     #while read  line
+    # earlier the program would stop expect on a blank line which is unacceptable
+    # i pass an explicit end, since my output does have blank lines
     while IFS='' read line
     do
 	case $line in
-	">>> "*)
-	    test -z "$cmd" || error "bug in the test script: missing blank line separator in test_todo_session"
-	    cmd=${line#>>> }
-	    ;;
-	"=== "*)
-	    status=${line#=== }
-	    ;;
-	"")
+        ">>> end")
 	    if [ ! -z "$cmd" ]; then
 		if [ $status = 0 ]; then
 		    test_expect_success "$1 $subnum" "$cmd > output && test_cmp expect output"
@@ -555,8 +552,15 @@ test_todo_session () {
 		> expect
 	    fi
 	    ;;
+	">>> "*)
+	    test -z "$cmd" || error "bug in the test script: missing blank line separator in test_todo_session"
+	    cmd=${line#>>> }
+	    ;;
+	"=== "*)
+	    status=${line#=== }
+	    ;;
 	*)
-        # please note XXX that a blank line in output terminates what goes into expect !!!  See above
+        # WARNING please NOTE XXX that a blank line in output terminates what goes into expect !!!  See above
 	    echo "$line" >> expect
 	    ;;
 	esac

data/todorb.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{todorb}
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rahul Kumar"]
-  s.date = %q{2010-06-21}
+  s.date = %q{2010-06-23}
   s.default_executable = %q{todorb}
-  s.description = %q{command-line program that manages a todo list text file }
+  s.description = %q{command-line program that manages a todo list text file, incl subtasks }
   s.email = %q{sentinel1879@gmail.com}
   s.executables = ["todorb"]
   s.extra_rdoc_files = [
@@ -34,11 +34,20 @@ Gem::Specification.new do |s|
      "tests/README",
      "tests/aggregate-results.sh",
      "tests/clean.sh",
+     "tests/data.1",
+     "tests/data.2",
      "tests/dataset1.txt",
      "tests/recreate.sh",
      "tests/rtest2.sh",
-     "tests/t0001-add.sh",
-     "tests/t0002-listing.sh",
+     "tests/t0001-help.sh",
+     "tests/t0002-subc_help.sh",
+     "tests/t0003-add.sh",
+     "tests/t0004-list.sh",
+     "tests/t0005-pri.sh",
+     "tests/t0006-pri_sort.sh",
+     "tests/t0007-status.sh",
+     "tests/t0008-addsub.sh",
+     "tests/t0009-del.sh",
      "tests/test-lib.sh",
      "todorb.gemspec"
   ]
@@ -47,16 +56,19 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{todorb}
   s.rubygems_version = %q{1.3.6}
-  s.summary = %q{command-line todo list manager}
+  s.summary = %q{comprehensive command-line todo list manager with subtasks and more}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<subcommand>, [">= 0"])
     else
+      s.add_dependency(%q<subcommand>, [">= 0"])
     end
   else
+    s.add_dependency(%q<subcommand>, [">= 0"])
   end
 end