Makefile infrastructure

todo.sh: Generate version info at dist time.
When generating the distribution files, prepare todo.sh by subbing in the current version so that users will get a proper version number. Tries to detect VERSION-FILE for running from the development directory but this doesn't work well when $PWD is not the top of the git repo. Signed-off-by: Emil Sit <sit@emilsit.net>
2009-04-02 21:01:44 -07:00 · 2009-04-02 21:05:58 -04:00 · 2009-04-02 21:05:58 -04:00 · 2009-04-03 07:42:43 +08:00 · 2009-03-21 07:20:35 +08:00 · 2009-03-21 07:20:29 +08:00
7 changed files with 982 additions and 78 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+VERSION-FILE
--- a/38
+++ b/38
@@ -0,0 +1,38 @@
+#!/bin/sh
+# Based on git's GIT-VERSION-GEN.
+
+VF=VERSION-FILE
+DEF_VER=v2.2
+
+LF='
+'
+
+if test -d .git -o -f .git &&
+	VN=$(git describe --abbrev=4 HEAD 2>/dev/null) &&
+	case "$VN" in
+	*$LF*) (exit 1) ;;
+	v[0-9]*)
+		git update-index -q --refresh
+		test -z "$(git diff-index --name-only HEAD --)" ||
+		VN="$VN-dirty" ;;
+	esac
+then
+	VN=$(echo "$VN" | sed -e 's/-/./g');
+else
+	VN="$DEF_VER"
+fi
+
+VN=$(expr "$VN" : v*'\(.*\)')
+
+if test -r $VF
+then
+	VC=$(sed -e 's/^VERSION=//' <$VF)
+else
+	VC=unset
+fi
+test "$VN" = "$VC" || {
+	echo >&2 "VERSION=$VN"
+	echo "VERSION=$VN" >$VF
+}
+
+
--- a/34
+++ b/34
@@ -0,0 +1,34 @@
+#
+# Makefile for todo.txt
+#
+
+# Dynamically detect/generate version file as necessary
+# This file will define a variable called VERSION.
+.PHONY: .FORCE-VERSION-FILE
+VERSION-FILE: .FORCE-VERSION-FILE
+	@./GEN-VERSION-FILE
+-include VERSION-FILE
+
+# Maybe this will include the version in it.
+todo.sh: VERSION-FILE
+
+# For packaging
+DISTFILES := todo.cfg
+
+DISTNAME=todo.txt_cli-$(VERSION)
+dist: $(DISTFILES) todo.sh
+	mkdir -p $(DISTNAME)
+	cp -f $(DISTFILES) $(DISTNAME)/
+	sed -e 's/@DEV_VERSION@/'$(VERSION)'/' todo.sh > $(DISTNAME)/todo.sh
+	tar cf $(DISTNAME).tar $(DISTNAME)/
+	gzip -f -9 $(DISTNAME).tar
+	zip -9r $(DISTNAME).zip $(DISTNAME)/
+	rm -r $(DISTNAME)
+
+.PHONY: clean
+clean:
+	rm -f $(DISTNAME).tar.gz $(DISTNAME).zip
+
+.PHONY: test
+test:
+	@echo "TBD!"
--- a/8
+++ b/8
@@ -0,0 +1,8 @@
+    TODO.TXT Command Line Interface
+    Latest version: http://github.com/ginatrapani/todo.txt-cli/tree/master
+    First release: 5/11/2006
+    Conceived and released by: Gina Trapani (http://ginatrapani.org)
+    Contributors: http://github.com/ginatrapani/todo.txt-cli/network
+    License: GPL, http://www.gnu.org/copyleft/gpl.html
+    More information and mailing list at http://todotxt.com
+    To submit patches, fork the repository at http://github.com/ginatrapani/todo.txt-cli/tree/master
--- a/index.html
+++ b/index.html
@@ -1,78 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-
-	<title>Todo.txt CLI @ GitHub</title>
-	
-	<style type="text/css">
-		body {
-  		margin-top: 1.0em;
-  		background-color: #CCC;
-		  font-family: "helvetica"; 
-  		color: #000;
-    }
-    #container {
-      margin: 0 auto;
-      width: 700px;
-    }
-		h1 { font-size: 3.8em; color: #5b3cf6; margin-bottom: 3px; }
-		h1 .small { font-size: 0.4em; }
-		h1 a { text-decoration: none }
-		h2 { font-size: 1.5em; color: #5b3cf6; }
-    h3 { text-align: center; color: #5b3cf6; }
-    a { color: #5b3cf6; }
-    .description { font-size: 1.2em; margin-bottom: 30px; margin-top: 30px; font-style: italic;}
-    .download { float: right; }
-		pre { background: #000; color: #fff; padding: 15px;}
-    hr { border: 0; width: 80%; border-bottom: 1px solid #aaa}
-    .footer { text-align:center; padding-top:30px; font-style: italic; }
-	</style>
-	
-</head>
-
-<body>
-  <a href="http://github.com/ginatrapani/todo.txt-cli"><img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" /></a>
-  
-  <div id="container">
-
-    <div class="download">
-      <a href="http://github.com/ginatrapani/todo.txt-cli/zipball/master">
-        <img border="0" width="90" src="http://github.com/images/modules/download/zip.png"></a>
-      <a href="http://github.com/ginatrapani/todo.txt-cli/tarball/master">
-        <img border="0" width="90" src="http://github.com/images/modules/download/tar.png"></a>
-    </div>
-      
-    <h1><a href="http://github.com/ginatrapani/todo.txt-cli">Todo.txt CLI</a> </h1>
-
-    <div class="description">
-      A simple shell script for managing your todo.txt file.  See more information at <a href="http://todotxt.com">Todotxt.com</a>.
-    </div>
-
-    <h2>Contact</h2>
-<p>Join <a href="http://tech.groups.yahoo.com/group/todotxt/">the mailing list</a> for support or requests.
-<br/>      </p>
-
-
-    <h2>Download</h2>
-    <p>
-      You can download this project in either
-      <a href="http://github.com/ginatrapani/todo.txt-cli/zipball/master">zip</a> or
-      <a href="http://github.com/ginatrapani/todo.txt-cli/tarball/master">tar</a> formats.
-    </p>
-    <p>You can also clone the project with <a href="http://git-scm.com">Git</a>
-      by running:
-      <pre>$ git clone git://github.com/ginatrapani/todo.txt-cli</pre>
-    </p>
-      
-    <div class="footer">
-      get the source code on GitHub : <a href="http://github.com/ginatrapani/todo.txt-cli">ginatrapani/todo.txt-cli</a>
-    </div>
-    
-  </div>
-
-  
-</body>
-</html>
--- a/todo.cfg
+++ b/todo.cfg
@@ -0,0 +1,41 @@
+# === EDIT FILE LOCATIONS BELOW ===
+
+# Your todo.txt directory
+#export TODO_DIR="/Users/gina/Documents/todo"
+export TODO_DIR="C:/Documents and Settings/gina/My Documents"
+
+# Your todo/done/report.txt locations
+export TODO_FILE="$TODO_DIR/todo.txt"
+export DONE_FILE="$TODO_DIR/done.txt"
+export REPORT_FILE="$TODO_DIR/report.txt"
+export TMP_FILE="$TODO_DIR/todo.tmp"
+
+# == EDIT FILE LOCATIONS ABOVE ===
+
+# === COLOR MAP ===
+
+export NONE=''
+export BLACK='\\033[0;30m'
+export RED='\\033[0;31m'
+export GREEN='\\033[0;32m'
+export BROWN='\\033[0;33m'
+export BLUE='\\033[0;34m'
+export PURPLE='\\033[0;35m'
+export CYAN='\\033[0;36m'
+export LIGHT_GREY='\\033[0;37m'
+export DARK_GREY='\\033[1;30m'
+export LIGHT_RED='\\033[1;31m'
+export LIGHT_GREEN='\\033[1;32m'
+export YELLOW='\\033[1;33m'
+export LIGHT_BLUE='\\033[1;34m'
+export LIGHT_PURPLE='\\033[1;35m'
+export LIGHT_CYAN='\\033[1;36m'
+export WHITE='\\033[1;37m'
+export DEFAULT='\\033[0m'
+
+# === PRIORITY COLORS ===
+
+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_X=$WHITE   # color for rest of them
--- a/todo.sh
+++ b/todo.sh
@@ -0,0 +1,860 @@
+#! /bin/bash
+
+# NOTE:  Todo.sh requires the todo.cfg configuration file to run.
+# Place the todo.cfg file in your home directory or use the -d option for a custom location.
+
+[ -f VERSION-FILE ] && . VERSION-FILE || VERSION="@DEV_VERSION@"
+version() { sed -e 's/^    //' <<EndVersion
+        TODO.TXT Command Line Interface v$VERSION
+        
+        First release: 5/11/2006
+        Original conception by: Gina Trapani (http://ginatrapani.org)
+        Contributors: http://github.com/ginatrapani/todo.txt-cli/network
+        License: GPL, http://www.gnu.org/copyleft/gpl.html
+        More information and mailing list at http://todotxt.com
+        Code repository: http://github.com/ginatrapani/todo.txt-cli/tree/master
+EndVersion
+    exit 1
+}
+
+oneline_usage="todo.sh [-fhpantvV] [-d todo_config] action [task_number] [task_description]"
+
+usage()
+{
+    sed -e 's/^    //' <<EndUsage
+    Usage: $oneline_usage
+    Try 'todo.sh -h' for more information.
+EndUsage
+    exit 1
+}
+
+shorthelp()
+{
+    sed -e 's/^    //' <<EndHelp
+      Usage: $oneline_usage
+
+      Actions:
+        add|a "THING I NEED TO DO +project @context"
+        addto DEST "TEXT TO ADD"
+        append|app NUMBER "TEXT TO APPEND"
+        archive
+        command [ACTIONS]
+        del|rm NUMBER [TERM]
+        dp|depri NUMBER
+        do NUMBER
+        help
+        list|ls [TERM...]
+        listall|lsa [TERM...]
+        listcon|lsc
+        listfile|lf SRC [TERM...]
+        listpri|lsp [PRIORITY]
+        listproj|lsprj
+        move|mv NUMBER DEST [SRC]
+        prepend|prep NUMBER "TEXT TO PREPEND"
+        pri|p NUMBER PRIORITY
+        replace NUMBER "UPDATED TODO"
+        report
+
+      See "help" for more details.
+EndHelp
+    exit 0
+}
+
+help()
+{
+    sed -e 's/^    //' <<EndHelp
+      Usage: $oneline_usage
+
+      Actions:
+        add "THING I NEED TO DO +project @context"
+        a "THING I NEED TO DO +project @context"
+          Adds THING I NEED TO DO to your todo.txt file on its own line.
+          Project and context notation optional.
+          Quotes optional.
+
+        addto DEST "TEXT TO ADD"
+          Adds a line of text to any file located in the todo.txt directory.
+          For example, addto inbox.txt "decide about vacation"
+
+        append NUMBER "TEXT TO APPEND"
+        app NUMBER "TEXT TO APPEND"
+          Adds TEXT TO APPEND to the end of the todo on line NUMBER.
+          Quotes optional.
+
+        archive
+          Moves done items from todo.txt to done.txt and removes blank lines.
+
+        command [ACTIONS]
+          Runs the remaining arguments using only todo.sh builtins.
+          Will not call any .todo.actions.d scripts.
+
+        del NUMBER [TERM]
+        rm NUMBER [TERM]
+          Deletes the item on line NUMBER in todo.txt.
+          If term specified, deletes only the term from the line.
+
+        depri NUMBER
+        dp NUMBER
+          Deprioritizes (removes the priority) from the item
+          on line NUMBER in todo.txt.
+
+        do NUMBER
+          Marks item on line NUMBER as done in todo.txt.
+
+        help
+	  Display this help message.
+
+        list [TERM...]
+        ls [TERM...]
+          Displays all todo's that contain TERM(s) sorted by priority with line
+          numbers.  If no TERM specified, lists entire todo.txt.
+
+        listall [TERM...]
+        lsa [TERM...]
+          Displays all the lines in todo.txt AND done.txt that contain TERM(s)
+          sorted by priority with line  numbers.  If no TERM specified, lists
+          entire todo.txt AND done.txt concatenated and sorted.
+
+        listcon
+        lsc
+          Lists all the task contexts that start with the @ sign in todo.txt.
+
+        listfile SRC [TERM...]
+        lf SRC [TERM...]
+          Displays all the lines in SRC file located in the todo.txt directory,
+          sorted by priority with line  numbers.  If TERM specified, lists
+          all lines that contain TERM in SRC file.
+
+        listpri [PRIORITY]
+        lsp [PRIORITY]
+          Displays all items prioritized PRIORITY.
+          If no PRIORITY specified, lists all prioritized items.
+
+        listproj
+        lsprj
+          Lists all the projects that start with the + sign in todo.txt.
+
+        move NUMBER DEST [SRC]
+        mv NUMBER DEST [SRC]
+          Moves a line from source text file (SRC) to destination text file (DEST).
+          Both source and destination file must be located in the directory defined
+          in the configuration directory.  When SRC is not defined
+          it's by default todo.txt.
+
+        prepend NUMBER "TEXT TO PREPEND"
+        prep NUMBER "TEXT TO PREPEND"
+          Adds TEXT TO PREPEND to the beginning of the todo on line NUMBER.
+          Quotes optional.
+
+        pri NUMBER PRIORITY
+        p NUMBER PRIORITY
+          Adds PRIORITY to todo on line NUMBER.  If the item is already
+          prioritized, replaces current priority with new PRIORITY.
+          PRIORITY must be an uppercase letter between A and Z.
+
+        replace NUMBER "UPDATED TODO"
+          Replaces todo on line NUMBER with UPDATED TODO.
+
+        report
+          Adds the number of open todo's and closed done's to report.txt.
+
+
+
+      Options:
+        -@
+            Hide context names in list output. Use twice to show context
+            names (default).
+        -+
+            Hide project names in list output. Use twice to show project
+            names (default).
+        -d CONFIG_FILE
+            Use a configuration file other than the default ~/todo.cfg
+        -f
+            Forces actions without confirmation or interactive input
+        -h
+            Display a short help message
+        -p
+            Plain mode turns off colors
+        -P
+            Hide priority labels in list output. Use twice to show
+            priority labels (default).
+        -a
+            Don't auto-archive tasks automatically on completion
+        -n
+            Don't preserve line numbers; automatically remove blank lines
+            on task deletion
+        -t
+            Prepend the current date to a task automatically
+            when it's added.
+        -v
+            Verbose mode turns on confirmation messages
+        -vv
+            Extra verbose mode prints some debugging information
+        -V
+            Displays version, license and credits
+
+
+      Environment variables:
+        TODOTXT_AUTO_ARCHIVE=0          is same as option -a
+        TODOTXT_CFG_FILE=CONFIG_FILE    is same as option -d CONFIG_FILE
+        TODOTXT_FORCE=1                 is same as option -f
+        TODOTXT_PRESERVE_LINE_NUMBERS=0 is same as option -n
+        TODOTXT_PLAIN=1                 is same as option -p
+        TODOTXT_DATE_ON_ADD=1           is same as option -t
+        TODOTXT_VERBOSE=1               is same as option -v
+        TODOTXT_DEFAULT_ACTION=""       run this when called with no arguments
+EndHelp
+
+    if [ -d "$HOME/.todo.actions.d" ]
+    then
+        echo ""
+        for action in $HOME/.todo.actions.d/*
+        do
+            if [ -x $action ]
+            then
+                $action usage
+            fi
+        done
+        echo ""
+    fi
+
+
+    exit 1
+}
+
+die()
+{
+    echo "$*"
+    exit 1
+}
+
+cleanup()
+{
+    [ -f "$TMP_FILE" ] && rm "$TMP_FILE"
+    exit 0
+}
+
+archive()
+{
+    #defragment blank lines
+    sed -i.bak -e '/./!d' "$TODO_FILE"
+    [ $TODOTXT_VERBOSE -gt 0 ] && grep "^x " "$TODO_FILE"
+    grep "^x " "$TODO_FILE" >> "$DONE_FILE"
+    sed -i.bak '/^x /d' "$TODO_FILE"
+    cp "$TODO_FILE" "$TMP_FILE"
+    sed -n 'G; s/\n/&&/; /^\([ -~]*\n\).*\n\1/d; s/\n//; h; P' "$TMP_FILE" > "$TODO_FILE"
+    #[[ $TODOTXT_VERBOSE -gt 0 ]] && echo "TODO: Duplicate tasks have been removed."
+    [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO:  $TODO_FILE archived."
+    cleanup
+}
+
+
+# == PROCESS OPTIONS ==
+while getopts ":fhpnatvV+@Pd:" Option
+do
+  case $Option in
+    '@' )
+        ## HIDE_CONTEXT_NAMES starts at zero (false); increment it to one
+        ##   (true) the first time this flag is seen. Each time the flag
+        ##   is seen after that, increment it again so that an even
+        ##   number hides project names and an odd number shows project
+        ##   names.
+        : $(( HIDE_CONTEXT_NAMES++ ))
+        if [ $(( $HIDE_CONTEXT_NAMES % 2 )) -eq 0 ]
+        then
+            ## Zero or even value -- show context names
+            unset HIDE_CONTEXTS_SUBSTITUTION
+        else
+            ## One or odd value -- hide context names
+            export HIDE_CONTEXTS_SUBSTITUTION='[[:space:]]@[^[:space:]]\{1,\}'
+        fi
+        ;;
+    '+' )
+        ## HIDE_PROJECT_NAMES starts at zero (false); increment it to one
+        ##   (true) the first time this flag is seen. Each time the flag
+        ##   is seen after that, increment it again so that an even
+        ##   number hides project names and an odd number shows project
+        ##   names.
+        : $(( HIDE_PROJECT_NAMES++ ))
+        if [ $(( $HIDE_PROJECT_NAMES % 2 )) -eq 0 ]
+        then
+            ## Zero or even value -- show project names
+            unset HIDE_PROJECTS_SUBSTITUTION
+        else
+            ## One or odd value -- hide project names
+            export HIDE_PROJECTS_SUBSTITUTION='[[:space:]][+][^[:space:]]\{1,\}'
+        fi
+        ;;
+    a )
+        TODOTXT_AUTO_ARCHIVE=0
+        ;;
+    d )
+        TODOTXT_CFG_FILE=$OPTARG
+        ;;
+    f )
+        TODOTXT_FORCE=1
+        ;;
+    h )
+        shorthelp
+        ;;
+    n )
+        TODOTXT_PRESERVE_LINE_NUMBERS=0
+        ;;
+    p )
+        TODOTXT_PLAIN=1
+        ;;
+    P )
+        ## HIDE_PRIORITY_LABELS starts at zero (false); increment it to one
+        ##   (true) the first time this flag is seen. Each time the flag
+        ##   is seen after that, increment it again so that an even
+        ##   number hides project names and an odd number shows project
+        ##   names.
+        : $(( HIDE_PRIORITY_LABELS++ ))
+        if [ $(( $HIDE_PRIORITY_LABELS % 2 )) -eq 0 ]
+        then
+            ## Zero or even value -- show priority labels
+            unset HIDE_PRIORITY_SUBSTITUTION
+        else
+            ## One or odd value -- hide priority labels
+            export HIDE_PRIORITY_SUBSTITUTION="([A-Z])[[:space:]]"
+        fi
+        ;;
+    t )
+        TODOTXT_DATE_ON_ADD=1
+        ;;
+    v )
+        : $(( TODOTXT_VERBOSE++ ))
+        ;;
+    V )
+        version
+        ;;
+  esac
+done
+shift $(($OPTIND - 1))
+
+# defaults if not yet defined
+TODOTXT_VERBOSE=${TODOTXT_VERBOSE:-1}
+TODOTXT_PLAIN=${TODOTXT_PLAIN:-0}
+TODOTXT_CFG_FILE=${TODOTXT_CFG_FILE:-$HOME/todo.cfg}
+TODOTXT_FORCE=${TODOTXT_FORCE:-0}
+TODOTXT_PRESERVE_LINE_NUMBERS=${TODOTXT_PRESERVE_LINE_NUMBERS:-1}
+TODOTXT_AUTO_ARCHIVE=${TODOTXT_AUTO_ARCHIVE:-1}
+TODOTXT_DATE_ON_ADD=${TODOTXT_DATE_ON_ADD:-0}
+TODOTXT_DEFAULT_ACTION=${TODOTXT_DEFAULT_ACTION:-}
+
+[ -e "$TODOTXT_CFG_FILE" ] || {
+    CFG_FILE_ALT="$HOME/.todo.cfg"
+
+    if [ -e "$CFG_FILE_ALT" ]
+    then
+        TODOTXT_CFG_FILE="$CFG_FILE_ALT"
+    fi
+}
+
+export TODOTXT_VERBOSE TODOTXT_PLAIN TODOTXT_CFG_FILE TODOTXT_FORCE TODOTXT_PRESERVE_LINE_NUMBERS TODOTXT_AUTO_ARCHIVE TODOTXT_DATE_ON_ADD
+
+TODO_SH="$0"
+export TODO_SH
+
+# === SANITY CHECKS (thanks Karl!) ===
+[ -r "$TODOTXT_CFG_FILE" ] || die "Fatal error:  Cannot read configuration file $TODOTXT_CFG_FILE"
+
+. "$TODOTXT_CFG_FILE"
+
+ACTION=${1:-$TODOTXT_DEFAULT_ACTION}
+
+[ -z "$ACTION" ]    && usage
+[ -d "$TODO_DIR" ]  || die "Fatal Error: $TODO_DIR is not a directory"
+( cd "$TODO_DIR" )  || die "Fatal Error: Unable to cd to $TODO_DIR"
+
+[ -w "$TMP_FILE"  ] || echo -n > "$TMP_FILE" || die "Fatal Error:  Unable to write to $TMP_FILE"
+[ -f "$TODO_FILE" ] || cp /dev/null "$TODO_FILE"
+[ -f "$DONE_FILE" ] || cp /dev/null "$DONE_FILE"
+[ -f "$REPORT_FILE" ] || cp /dev/null "$REPORT_FILE"
+
+if [ $TODOTXT_PLAIN = 1 ]; then
+    PRI_A=$NONE
+    PRI_B=$NONE
+    PRI_C=$NONE
+    PRI_X=$NONE
+    DEFAULT=$NONE
+fi
+
+# === HEAVY LIFTING ===
+shopt -s extglob
+
+_list() {
+    local FILE="$1"
+    ## If the file starts with a "/" use absolute path. Otherwise, 
+    ## try to find it in either $TODO_DIR or using a relative path
+    if [ "${1:0:1}" == / ]
+    then
+        ## Absolute path
+        src="$FILE"
+    elif [ -f "$TODO_DIR/$FILE" ]
+    then
+        ## Path relative to todo.sh directory
+        src="$TODO_DIR/$1"
+    elif [ -f "$FILE" ]
+    then
+        ## Path relative to current working directory
+        src="$FILE"
+    else
+        echo "TODO: File $FILE does not exist."
+        exit 1
+    fi
+
+    ## Get our search arguments, if any
+    shift ## was file name, new $1 is first search term
+
+    ## Prefix the filter_command with the pre_filter_command
+    filter_command="${pre_filter_command:-}"
+
+    for search_term in "$@"
+    do
+        ## See if the first character of $search_term is a dash
+        if [ ${search_term:0:1} != '-' ]
+        then
+            ## First character isn't a dash: hide lines that don't match
+            ## this $search_term
+            filter_command="${filter_command:-} ${filter_command:+|} \
+                grep -i \"$search_term\" "
+        else
+            ## First character is a dash: hide lines that match this
+            ## $search_term
+            #
+            ## Remove the first character (-) before adding to our filter command
+            filter_command="${filter_command:-} ${filter_command:+|} \
+                grep -v -i \"${search_term:1}\" "
+        fi
+    done
+
+    ## If post_filter_command is set, append it to the filter_command
+    [ -n "$post_filter_command" ] && {
+        filter_command="${filter_command:-}${filter_command:+ | }${post_filter_command:-}"
+    }
+
+    ## Figure out how much padding we need to use
+    ## We need one level of padding for each power of 10 $LINES uses
+    LINES=$( sed -n '$ =' "$src" )
+    PADDING=${#LINES}
+
+    ## Number the file, then run the filter command,
+    ## then sort and mangle output some more
+    items=$(
+        sed = "$src"                                            \
+        | sed "N; s/^/     /; s/ *\(.\{$PADDING,\}\)\n/\1 /"    \
+	| grep -v "^[0-9]\+ *$"
+    )
+    if [ "${filter_command}" ]; then 
+        filtered_items=$(echo -ne "$items" | eval ${filter_command})
+    else
+        filtered_items=$items
+    fi
+    filtered_items=$(
+        echo -ne "$filtered_items"                              \
+        | sed '''
+            s/^     /00000/; 
+            s/^    /0000/;
+            s/^   /000/;
+            s/^  /00/;
+            s/^ /0/;
+          ''' \
+        | sort -f -k2                                           \
+        | sed '''
+            /^[0-9]\{'$PADDING'\} x /! {
+                s/\(.*(A).*\)/'$PRI_A'\1 '$DEFAULT'/g;
+                s/\(.*(B).*\)/'$PRI_B'\1 '$DEFAULT'/g;
+                s/\(.*(C).*\)/'$PRI_C'\1 '$DEFAULT'/g;
+                s/\(.*([D-Z]).*\)/'$PRI_X'\1 '$DEFAULT'/g;
+            }
+          '''                                                   \
+        | sed '''
+            s/'${HIDE_PRIORITY_SUBSTITUTION:-^}'//g
+            s/'${HIDE_PROJECTS_SUBSTITUTION:-^}'//g
+            s/'${HIDE_CONTEXTS_SUBSTITUTION:-^}'//g
+          '''                                                   \
+    )
+    echo -ne "$filtered_items${filtered_items:+\n}"
+
+    if [ $TODOTXT_VERBOSE -gt 0 ]; then
+        NUMTASKS=$( echo -ne "$filtered_items" | sed -n '$ =' )
+        TOTALTASKS=$( echo -ne "$items" | sed -n '$ =' )
+
+        echo "--"
+        echo "TODO: ${NUMTASKS:-0} of ${TOTALTASKS:-0} tasks shown from $FILE"
+    fi
+    if [ $TODOTXT_VERBOSE -gt 1 ]
+    then
+	echo "TODO DEBUG: Filter Command was: ${filter_command:-cat}"
+    fi
+}
+
+export -f _list
+
+# == HANDLE ACTION ==
+action=$( printf "%s\n" "$ACTION" | tr 'A-Z' 'a-z' )
+
+## If the first argument is "command", run the rest of the arguments
+## using todo.sh builtins.
+## Else, run a actions script with the name of the command if it exists
+## or fallback to using a builtin
+if [ "$action" == command ]
+then
+    ## Get rid of "command" from arguments list
+    shift
+    ## Reset action to new first argument
+    action=$( printf "%s\n" "$1" | tr 'A-Z' 'a-z' )
+elif [ -d "$HOME/.todo.actions.d" -a -x "$HOME/.todo.actions.d/$action" ]
+then
+    "$HOME/.todo.actions.d/$action" "$@"
+    cleanup
+fi
+
+## Only run if $action isn't found in .todo.actions.d
+case $action in
+"add" | "a")
+    if [[ -z "$2" && $TODOTXT_FORCE = 0 ]]; then
+        echo -n "Add: "
+        read input
+    else
+        [ -z "$2" ] && die "usage: $0 add \"TODO ITEM\""
+        shift
+        input=$*
+    fi
+
+    if [[ $TODOTXT_DATE_ON_ADD = 1 ]]; then
+        now=`date '+%Y-%m-%d'`
+        input="$now $input"
+    fi
+    echo "$input" >> "$TODO_FILE"
+    TASKNUM=$(sed -n '$ =' "$TODO_FILE")
+    [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO: '$input' added on line $TASKNUM."
+    cleanup;;
+
+"addto" )
+    [ -z "$2" ] && die "usage: $0 addto DEST \"TODO ITEM\""
+    dest="$TODO_DIR/$2"
+    [ -z "$3" ] && die "usage: $0 addto DEST \"TODO ITEM\""
+    shift
+    shift
+    input=$*
+
+    if [ -f "$dest" ]; then
+        echo "$input" >> "$dest"
+        TASKNUM=$(sed -n '$ =' "$dest")
+        [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO: '$input' added to $dest on line $TASKNUM."
+    else
+        echo "TODO:  Destination file $dest does not exist."
+    fi
+    cleanup;;
+
+"append" | "app" )
+    errmsg="usage: $0 append ITEM# \"TEXT TO APPEND\""
+    shift; item=$1; shift
+
+    [ -z "$item" ] && die "$errmsg"
+    [[ "$item" = +([0-9]) ]] || die "$errmsg"
+    todo=$(sed "$item!d" "$TODO_FILE")
+    [ -z "$todo" ] && die "$item:  No such todo."
+    if [[ -z "$1" && $TODOTXT_FORCE = 0 ]]; then
+        echo -n "Append: "
+        read input
+    else
+        input=$*
+    fi
+    if sed -i.bak $item" s|^.*|& $input|" "$TODO_FILE"; then
+        newtodo=$(sed "$item!d" "$TODO_FILE")
+        [ $TODOTXT_VERBOSE -gt 0 ] && echo "$item: $newtodo"
+    else
+        echo "TODO:  Error appending task $item."
+    fi
+    cleanup;;
+
+"archive" )
+    archive;;
+
+"del" | "rm" )
+    # replace deleted line with a blank line when TODOTXT_PRESERVE_LINE_NUMBERS is 1
+    errmsg="usage: $0 del ITEM#"
+    item=$2
+    [ -z "$item" ] && die "$errmsg"
+
+    if [ -z "$3" ]; then
+
+        [[ "$item" = +([0-9]) ]] || die "$errmsg"
+        if sed -ne "$item p" "$TODO_FILE" | grep "^."; then
+            DELETEME=$(sed "$2!d" "$TODO_FILE")
+
+            if  [ $TODOTXT_FORCE = 0 ]; then
+                echo "Delete '$DELETEME'?  (y/n)"
+                read ANSWER
+            else
+                ANSWER="y"
+            fi
+            if [ "$ANSWER" = "y" ]; then
+                if [ $TODOTXT_PRESERVE_LINE_NUMBERS = 0 ]; then
+                    # delete line (changes line numbers)
+                    sed -i.bak -e $2"s/^.*//" -e '/./!d' "$TODO_FILE"
+                else
+                    # leave blank line behind (preserves line numbers)
+                    sed -i.bak -e $2"s/^.*//" "$TODO_FILE"
+                fi
+                [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO:  '$DELETEME' deleted."
+                cleanup
+            else
+                echo "TODO:  No tasks were deleted."
+            fi
+        else
+            echo "$item: No such todo."
+        fi
+    else
+        sed -i.bak -e $item"s/$3/ /g"  "$TODO_FILE"
+        [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO:  $3 removed from $item."
+    fi ;;
+
+"depri" | "dp" )
+    item=$2
+    errmsg="usage: $0 depri ITEM#"
+
+    todo=$(sed "$item!d" "$TODO_FILE")
+    [ -z "$todo" ] && die "$item:  No such todo."
+    [[ "$item" = +([0-9]) ]] || die "$errmsg"
+
+    sed -e $item"s/^(.*) //" "$TODO_FILE" > /dev/null 2>&1
+
+    if [ "$?" -eq 0 ]; then
+        #it's all good, continue
+        sed -i.bak -e $2"s/^(.*) //" "$TODO_FILE"
+        NEWTODO=$(sed "$2!d" "$TODO_FILE")
+        [ $TODOTXT_VERBOSE -gt 0 ] && echo -e "`echo "$item: $NEWTODO"`"
+        [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO: $item deprioritized."
+        cleanup
+    else
+        die "$errmsg"
+    fi;;
+
+"do" )
+    errmsg="usage: $0 do ITEM#"
+    item=$2
+    [ -z "$item" ] && die "$errmsg"
+    [[ "$item" = +([0-9]) ]] || die "$errmsg"
+
+    todo=$(sed "$item!d" "$TODO_FILE")
+    [ -z "$todo" ] && die "$item:  No such todo."
+
+    now=`date '+%Y-%m-%d'`
+    # remove priority once item is done
+    sed -i.bak $item"s/^(.*) //" "$TODO_FILE"
+    sed -i.bak $item"s|^|&x $now |" "$TODO_FILE"
+    newtodo=$(sed "$item!d" "$TODO_FILE")
+    [ $TODOTXT_VERBOSE -gt 0 ] && echo "$item: $newtodo"
+    [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO: $item marked as done."
+
+    if [ $TODOTXT_AUTO_ARCHIVE = 1 ]; then
+        archive
+    fi
+    cleanup ;;
+
+"help" )
+    help
+    ;;
+
+"list" | "ls" )
+    shift  ## Was ls; new $1 is first search term
+    _list "$TODO_FILE" "$@"
+
+    cleanup 
+    ;;
+
+"listall" | "lsa" )
+    shift  ## Was lsa; new $1 is first search term
+
+    cat "$TODO_FILE" "$DONE_FILE" > "$TMP_FILE"
+    _list "$TMP_FILE" "$@"
+
+    cleanup 
+    ;;
+
+"listfile" | "lf" )
+    shift  ## Was listfile, next $1 is file name
+    FILE="$1"
+    shift  ## Was filename; next $1 is first search term
+
+    _list "$FILE" "$@"
+
+    cleanup 
+    ;;
+
+"listcon" | "lsc" )
+    gawk '{for(i = 1; i <= NF; i++) print $i}' "$TODO_FILE" | grep '@' | sort | uniq
+    cleanup ;;
+
+"listproj" | "lsprj" )
+    gawk '{for(i = 1; i <= NF; i++) print $i}' "$TODO_FILE" | grep '+' | sort | uniq
+    cleanup ;;
+
+
+"listpri" | "lsp" )
+    shift ## was "listpri", new $1 is priority to list
+
+    if [ "${1:-}" ]
+    then
+        ## A priority was specified
+        pri=$( printf "%s\n" "$1" | tr 'a-z' 'A-Z' | grep '^[A-Z]$' ) || {
+	    die "usage: $0 listpri PRIORITY
+	    note:  PRIORITY must a single letter from A to Z."
+        }
+    else
+        ## No priority specified; show all priority tasks
+        pri="[[:upper:]]"
+    fi
+    pri="($pri)"
+
+    _list "$TODO_FILE" "$pri"
+    ;;
+
+"move" | "mv" )
+    # replace moved line with a blank line when TODOTXT_PRESERVE_LINE_NUMBERS is 1
+    errmsg="usage: $0 mv ITEM# DEST [SRC]"
+    item=$2
+    dest="$TODO_DIR/$3"
+    src="$TODO_DIR/$4"
+
+    [ -z "$item" ] && die "$errmsg"
+    [ -z "$4" ] && src="$TODO_FILE"
+    [ -z "$dest" ] && die "$errmsg"
+
+    [[ "$item" = +([0-9]) ]] || die "$errmsg"
+
+    if [ -f "$src" ]; then
+        if [ -f "$dest" ]; then
+            if sed -ne "$item p" "$src" | grep "^."; then
+                MOVEME=$(sed "$item!d" "$src")
+                if  [ $TODOTXT_FORCE = 0 ]; then
+                    echo "Move '$MOVEME' from $src to $dest? (y/n)"
+                    read ANSWER
+                else
+                    ANSWER="y"
+                fi
+                if [ "$ANSWER" = "y" ]; then
+                    if [ $TODOTXT_PRESERVE_LINE_NUMBERS = 0 ]; then
+                        # delete line (changes line numbers)
+                        sed -i.bak -e $item"s/^.*//" -e '/./!d' "$src"
+                    else
+                        # leave blank line behind (preserves line numbers)
+                       sed -i.bak -e $item"s/^.*//" "$src"
+                    fi
+                    echo "$MOVEME" >> "$dest"
+
+                    [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO:  '$MOVEME' moved from '$src' to '$dest'."
+                    cleanup
+                else
+                    echo "TODO:  No tasks moved."
+                fi
+            else
+                echo "$item: No such item in $src."
+            fi
+        else
+            echo "TODO:  Destination file $dest does not exist."
+        fi
+    else
+        echo "TODO: Source file $src does not exist."
+    fi
+    cleanup;;
+
+"prepend" | "prep" )
+    errmsg="usage: $0 prepend ITEM# \"TEXT TO PREPEND\""
+    shift; item=$1; shift
+
+    [ -z "$item" ] && die "$errmsg"
+    [[ "$item" = +([0-9]) ]] || die "$errmsg"
+
+    todo=$(sed "$item!d" "$TODO_FILE")
+    [ -z "$todo" ] && die "$item:  No such todo."
+
+    if [[ -z "$1" && $TODOTXT_FORCE = 0 ]]; then
+        echo -n "Prepend: "
+        read input
+    else
+        input=$*
+    fi
+
+    if sed -i.bak $item" s|^.*|$input &|" "$TODO_FILE"; then
+        newtodo=$(sed "$item!d" "$TODO_FILE")
+        [ $TODOTXT_VERBOSE -gt 0 ] && echo "$item: $newtodo"
+    else
+        echo "TODO:  Error prepending task $item."
+    fi
+    cleanup;;
+
+"pri" | "p" )
+    item=$2
+    newpri=$( printf "%s\n" "$3" | tr 'a-z' 'A-Z' )
+
+    errmsg="usage: $0 pri ITEM# PRIORITY
+note:  PRIORITY must be anywhere from A to Z."
+
+    [ "$#" -ne 3 ] && die "$errmsg"
+    [[ "$item" = +([0-9]) ]] || die "$errmsg"
+    [[ "$newpri" = +([A-Z]) ]] || die "$errmsg"
+
+    sed -e $item"s/^(.*) //" -e $item"s/^/($newpri) /" "$TODO_FILE" > /dev/null 2>&1
+
+    if [ "$?" -eq 0 ]; then
+        #it's all good, continue
+        sed -i.bak -e $2"s/^(.*) //" -e $2"s/^/($newpri) /" "$TODO_FILE"
+        NEWTODO=$(sed "$2!d" "$TODO_FILE")
+        [ $TODOTXT_VERBOSE -gt 0 ] && echo -e "`echo "$item: $NEWTODO"`"
+        [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO: $item prioritized ($newpri)."
+        cleanup
+    else
+        die "$errmsg"
+    fi;;
+
+"replace" )
+    errmsg="usage: $0 replace ITEM# \"UPDATED ITEM\""
+    shift; item=$1; shift
+
+    [ -z "$item" ] && die "$errmsg"
+    [[ "$item" = +([0-9]) ]] || die "$errmsg"
+
+    todo=$(sed "$item!d" "$TODO_FILE")
+    [ -z "$todo" ] && die "$item:  No such todo."
+
+    if [[ -z "$1" && $TODOTXT_FORCE = 0 ]]; then
+        echo -n "Replacement: "
+        read input
+    else
+        input=$*
+    fi
+
+    sed -i.bak $item" s|^.*|$input|" "$TODO_FILE"
+    [ $TODOTXT_VERBOSE -gt 0 ] && NEWTODO=$(head -$item "$TODO_FILE" | tail -1)
+    [ $TODOTXT_VERBOSE -gt 0 ] && echo "replaced with"
+    [ $TODOTXT_VERBOSE -gt 0 ] && echo "$item: $NEWTODO"
+    cleanup;;
+
+"report" )
+    #archive first
+    sed '/^x /!d' "$TODO_FILE" >> "$DONE_FILE"
+    sed -i.bak '/^x /d' "$TODO_FILE"
+
+    NUMLINES=$( sed -n '$ =' "$TODO_FILE" )
+    if [ ${NUMLINES:-0} = "0" ]; then
+         echo "datetime todos dones" >> "$REPORT_FILE"
+    fi
+    #now report
+    TOTAL=$( sed -n '$ =' "$TODO_FILE" )
+    TDONE=$( sed -n '$ =' "$DONE_FILE" )
+    TECHO=$(echo $(date +%Y-%m-%d-%T); echo ' '; echo ${TOTAL:-0}; echo ' ';
+    echo ${TDONE:-0})
+    echo $TECHO >> "$REPORT_FILE"
+    [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO:  Report file updated."
+    cat "$REPORT_FILE"
+    cleanup;;
+
+* )
+    usage
+    ;;
+esac
Author	SHA1	Message	Date
$U-STARBUCK\gina$ U-STARBUCK\gina	1a6ff81e28	Makefile infrastructure	2009-04-02 21:01:44 -07:00
Emil Sit	0b3d9109de	todo.sh: Generate version info at dist time. When generating the distribution files, prepare todo.sh by subbing in the current version so that users will get a proper version number. Tries to detect VERSION-FILE for running from the development directory but this doesn't work well when $PWD is not the top of the git repo. Signed-off-by: Emil Sit <sit@emilsit.net>	2009-04-02 21:05:58 -04:00
Emil Sit	ad40ef0f18	Basic Makefile and infrastructure to support dist tarballs. Borrowing slightly from git.git, derive a VERSION-FILE from the current state of user's git working directory. The VERSION is derived relative to the latest git annotated tag object (using git-describe) and includable either in shell scripts or in Makefiles. The basic 'make dist' target generates a .tar.gz and a .zip file named by the detected version. Also include a basic clean target and dummy test target. Signed-off-by: Emil Sit <sit@emilsit.net>	2009-04-02 21:05:58 -04:00
Emil Sit	31216fe365	_list: Fix line/item counting, accounting for blank lines. If a file had blank lines or was totally empty, _list would result in an in-correct count of total items (either "" or the number of lines, instead of the number of items). This commit splits the filtering into three phases: line numbering, filtering (optional), and post-processing, and then does counting separately, if desired. Signed-off-by: Emil Sit <sit@emilsit.net> Signed-off-by: Gina Trapani <ginatrapani@gmail.com>	2009-04-03 07:42:43 +08:00
Emil Sit	7f5c8fb3e1	Add a short help message to be called for -h. Put the old help message under a "help" command. The short help message just lists the available commands and should fit on a single screen. Signed-off-by: Gina Trapani <ginatrapani@gmail.com>	2009-03-21 07:20:35 +08:00
Emil Sit	3e7b60abcd	Factor out common usage message text. Signed-off-by: Gina Trapani <ginatrapani@gmail.com>	2009-03-21 07:20:29 +08:00
Emil Sit	cc3e5f73aa	_list: Add in an extra filter to remove empty lines. The rewrite of ls functionality may have allowed blank but numbered lines to creep into the ls display. Search for such lines and exclude them. Signed-off-by: Emil Sit <sit@emilsit.net> Signed-off-by: Gina Trapani <ginatrapani@gmail.com>	2009-03-21 07:20:28 +08:00
Gina Trapani	52604ebf78	Tweaked version and contributor details	2009-03-19 18:52:47 -07:00
Gina Trapani	bbe153b9bb	Merge branch 'harding/master'	2009-03-19 18:40:10 -07:00
Gina Trapani	ec54a032cb	Removed edit action	2009-03-19 18:37:36 -07:00
David A. Harding	758cdc5551	Merge branch 'gina/master'	2009-03-19 07:10:09 -04:00
David A. Harding	02dc030225	Putting Quotes Around $TODO_TMP Suggested by Gina.	2009-03-19 07:06:07 -04:00
David A. Harding	7b769b2eea	s/[A-Z]/[[:upper:]]/	2009-03-17 19:15:27 -04:00
David A. Harding	39ee9ab045	Added -vv For Debugging Output	2009-03-17 14:07:48 -04:00
Gina Trapani	1e5902d0e2	Merge branch 'master' of git@github.com:ginatrapani/todo.txt-cli	2009-03-16 12:28:34 -05:00
Matt Brubeck	3df7497287	Add TODOTXT_DEFAULT_ACTION variable. I like to set this to "ls" so I can just run "todo.sh" (or "t") to list my tasks. Signed-off-by: Gina Trapani <ginatrapani@gmail.com>	2009-03-17 01:04:20 +08:00
David A. Harding	07bb979d43	Move Filter Command Up & Remove Extra Sort Command	2009-03-14 15:06:53 -04:00
Ed Blackman	7e04849a4f	Move filter before priority text changes, so filter doesn't match invisible text	2009-03-14 13:39:27 -04:00
David A. Harding	f8b2646b92	Don't Echo Empty Lines & Streamline Sed wc -l Syntax	2009-03-14 09:35:10 -04:00
Ed Blackman	02980ae7ee	Fix "post_hilter_command" typo	2009-03-14 01:18:42 -04:00
Ed Blackman	12bbf8fe67	Fix spacing (tabs to spaces)	2009-03-14 01:17:46 -04:00
Ed Blackman	ab78607506	Use sed line counting to replace 'wc -l'	2009-03-14 01:15:52 -04:00
David A. Harding	6be78ca5fa	Added Exclusion Syntax by Jacobo de Vera -keyword or -"key phrase" should exclude those terms from the output.	2009-03-13 22:21:48 -04:00
Ed Blackman	9ab77253db	Implement pre and post filters in _list	2009-03-13 18:17:16 -04:00
Ed Blackman	cf3c5312bf	Export _list for call by extensions	2009-03-13 17:02:31 -04:00
Ed Blackman	37a7bb0e8a	Use relative rather than absolute filename in status message	2009-03-13 16:40:55 -04:00
Ed Blackman	ed8e8e24d9	Consistent spacing for \ continuation in _list	2009-03-13 16:34:25 -04:00
David A. Harding	d6f00ca42f	Minor formatting and comments changes	2009-03-13 12:14:08 -04:00
David A. Harding	a03a3bf66b	Fixed Windows Regression, New _list Function Commit `f55f5e8b5f` introduced a known regression on Windows that prevented users from using configuration files starting with C:\. The following logic fixes this: + ## If the file starts with a "/" use absolute path. Otherwise, + ## try to find it in either $TODO_DIR or using a relative path + if [ "${1:0:1}" == / ] + then + ## Absolute path + src="$FILE" + elif [ -f "$TODO_DIR/$FILE" ] + then + ## Path relative to todo.sh directory + src="$TODO_DIR/$1" + elif [ -f "$FILE" ] + then + ## Path relative to current working directory + src="$FILE" + else + echo "TODO: File $FILE does not exist." + exit 1 + fi New _list function takes a filename and a list of search expressions. We no longer use exec to call ourselves recursively.	2009-03-13 11:59:03 -04:00
David A. Harding	448cecb91d	Simplify and Reused Code to Print ls Summary Line	2009-03-13 11:00:34 -04:00
David A. Harding	ee59233c36	Replaced Grep Loop, Fixed Sed Bug, Some Small Changes Implemented several suggestions by Jacobo de Vera: > 1. [lines 539-551]: [...] replace the for loop with simply this: > PADDING=${#LINES} > 2. [line 558]: As the script now supports a 6 digit number of tasks, > the first substitution should add 5 spaces instead of 2 > 3. [lines 606-613]: The first search item is processed before the for > loop, and the loop does the same for the rest. Wouldn't making this > more general make the code more readable? The changes for suggestion #3 let me add a new feature: when VERBOSE is enabled, the summary line prints more info -- and it prints it on every run: $ todo.sh ls "buy a" 34 Buy a portable gas can @errands +safe -- TODO: 1 of 49 tasks shown from /home/harding/var/git/todo/todo.txt Also, generalizing and centralizing the code added a small but measurable speed increase. No new known regressions were introduced.	2009-03-12 22:23:59 -04:00
David A. Harding	f55f5e8b5f	Make ls-Family Actions Use Listfile Backend Essentially, ls) shift exec "$TODO_SH" listfile "$TODO_FILE" "$@" ;; lsa) shift cat "$TODO_FILE" "$DONE_FILE" > "$TMP_FILE" exec $TODO_SH listfile "$TMP_FILE" "$@" ;; lsp) shift ## was "listpri" shift ## was priority exec $TODO_SH listfile "$TODO_FILE" "$pri" "$@" ;;; Also adds the following features: 1. Numbers are padded with up to five zeros (but only the minimum necessary), letting you list up to 999,999 tasks with the same formatting. 2. All ls-family commands hide context, priority, and project when the user sets those hide options. 3. Quoted arguments are passed on to grep as whole arguments, enabling the following: $ todo.sh ls buy a \| head -n2 34 Buy a portable gas can 22 Buy door $ todo.sh ls "buy a" 34 Buy a portable gas can 4. listfile can take an absolute path. Any filename starting with a "/" will be treated as an absolute path; any other filename will be treated as relative to $TODO_DIR. Since a leading "/" would be striped by the operating system anyway under the old code, this is fully backward compatible. Contains the following regressions: 1. The ls verbose line count messages are more generic. 2. There is no verbose line count line for lspri. 3. I don't think listfile's absolute path feature will work on Windows. If it doesn't, either this patch needs to be thrown away, listall needs to be rewritten, or (my preference) $TMP_FILE needs to set as relative to $TODO_DIR.	2009-03-12 11:52:28 -04:00
David A. Harding	d508ed9dee	Modularized Listing Sed Still more to do tomorrow.	2009-03-12 01:02:10 -04:00
Matt Brubeck	62f3313ff9	Merge branch 'master' of git://github.com/ginatrapani/todo.txt-cli	2009-03-11 16:22:27 -07:00
David A. Harding	6bc374c5f2	Revert "Set ls As the Default Action" This reverts commit `87959a8aa8`.	2009-03-11 17:54:25 -04:00
David A. Harding	87959a8aa8	Set ls As the Default Action . Suggested by mbrubeck	2009-03-11 17:42:15 -04:00
Matt Brubeck	3e9d40ebd7	'edit' plugin to open files in a text editor.	2009-03-11 11:36:23 -07:00
Matt Brubeck	6bc05000d9	Add TODOTXT_DEFAULT_ACTION variable. I like to set this to "ls" so I can just run "todo.sh" (or "t") to list my tasks.	2009-03-11 10:50:14 -07:00
David A. Harding	717f052f13	Only Reset Action When Necessary plus Comments	2009-03-09 16:19:30 -04:00
Philippe Teuwen	4ee8c332ed	Remove redundant code	2009-03-09 20:43:42 +01:00
David A. Harding	88caf44e9e	Override Overrides Using "command" New action, "command", forces todo.sh to use builtins and ignore any .todo.actions.d scripts. For example, if there is an executable .todo.actions.d/ls: ## Run .todo.actions.d/ls todo.sh ls ## Run builtin todo.sh ls todo.sh command ls This mimicks bash's behaviour: ## Use the default echo harding@ziggy:~$ echo 'foo\nbar' foo\nbar ## Alias the echo command to "echo -e" harding@ziggy:~$ alias echo='echo -e' harding@ziggy:~$ echo 'foo\nbar' foo bar ## Force bash to call the default echo command harding@ziggy:~$ command echo 'foo\nbar' foo\nbar	2009-03-09 14:10:21 -04:00
Philippe Teuwen	db66767170	Add TODOTXT_UNDEF_CUSTOM_ACTIONS for recursive call of todo.sh from actions And replace tabs by spaces. To illustrate the interest of this new variable, here is an action to replace the original add to allow a priority to be set when adding. The action itself relies on the original add, therefore the need for this new envvar. action=$1 shift [ "$action" = "usage" ] && { echo " add pri PRIORITY \"THING I NEED TO DO +project @context\"" echo " add an item and prioritize it in one step" echo "" exit } . $TODOTXT_CFG_FILE TODOTXT_UNDEF_CUSTOM_ACTIONS=1 PRIORITY=false if [ x"$1" = x"pri" -o x"$1" = x"p" ] && [[ x"$2" =~ x[a-zA-Z] ]]; then PRIORITY=$2 shift shift fi if $TODO_SH add "$@" && [ $PRIORITY != false ]; then # figure out the line of what we just added, and "do" it line=`wc -l "$TODO_FILE" \| cut -d' ' -f1` $TODO_SH pri "$line" $PRIORITY fi	2009-03-09 10:09:32 +01:00
David A. Harding	f8f8e83c40	Merge branch 'gina/master' Conflicts: todo.sh	2009-03-08 22:29:27 -04:00
Philippe Teuwen	2648bb047c	Keep it simple Signed-off-by: Gina Trapani <ginatrapani@gmail.com>	2009-03-09 08:58:32 +08:00
Philippe Teuwen	bbff2d13bb	Remove usage call and export TODOTXT_SH for action.d Signed-off-by: Gina Trapani <ginatrapani@gmail.com>	2009-03-09 08:55:28 +08:00
David A. Harding	e4c7979888	Merge branch 'gina/master' Conflicts: todo.sh	2009-03-08 20:50:27 -04:00
Ed Blackman	47c7ba75b3	Remove now-redundant export of CFG_FILE	2009-03-08 18:41:27 -04:00
Philippe Teuwen	2bd2e9f7bd	Options & environment variables: add namespace & allow for preset This patch does 2 things: - Allowing environment variables corresponding to options (e.g. VERBOSE for -v) to be predefined in the user environment instead of having to always use the corresponding option. - Adding namespace TODOTXT_ to those envvars to avoid clashes in user environment todo.action.d scripts can call recursively todo.sh and this patch preserves the options/envvars through the calls. As a bonus, now the user can export in advance one of those variables in his/her environment and it would have the same effect as using the todo.sh corresponding option. export TODOTXT_AUTO_ARCHIVE=0 is same as option -a export TODOTXT_CFG_FILE=CONFIG_FILE is same as option -d CONFIG_FILE export TODOTXT_FORCE=1 is same as option -f export TODOTXT_PRESERVE_LINE_NUMBERS=0 is same as option -n export TODOTXT_PLAIN=1 is same as option -p export TODOTXT_DATE_ON_ADD=1 is same as option -t export TODOTXT_VERBOSE=1 is same as option -v Signed-off-by: Gina Trapani <ginatrapani@gmail.com>	2009-03-09 06:28:52 +08:00
$U-STARBUCK\gina$ U-STARBUCK\gina	f37cedc7ca	Removed index.html	2009-03-08 14:47:33 -07:00
David A. Harding	7b2c9f080a	Merged In Gina's Latest	2009-03-08 12:08:04 -04:00
David A. Harding	98646a575a	Exit If .todo.actions.d Script Is Run . Suggested by Philippe Teuwen, this patch undoes a lot of the unnecessary formating changes in my previous patch.	2009-03-08 11:46:26 -04:00
David A. Harding	e6649e6293	Removed Extended Regexes from Hiding Code . Dave Hein noticed the extended regular expressions (regex) in the original patch don't work by default on Mac OS X (FreeBSD sed). Now using his suggested regex format: [[:space:]]@[^[:space:]]\{1,\} . Also changed: I misapplied part of the patch originally. That's now fixed. I expanded part of the regular expression in the list sub-expression so that I could change part of the coloring code.	2009-03-08 11:25:12 -04:00
$U-STARBUCK\gina$ U-STARBUCK\gina	eb61752708	Merge branch 'gh-pages' of git://github.com/ginatrapani/todo.txt-cli	2009-03-07 21:51:54 -08:00
Ed Blackman	5683490c0e	Export variables so that they can be easily used in actions Signed-off-by: Gina Trapani <ginatrapani@gmail.com>	2009-03-08 09:53:41 +08:00
David A. Harding	20e6892775	Run .todo.actions.d Before Builtins . Let users override default commands by creating a script in ~/.todo.actions.d/ with the same name as a default command. Idea by Don Harper and David A. Harding; patch by Harding. . The patch adds the following logic and increases the indent level for the case statement: . +if [ -d "$HOME/.todo.actions.d" -a -x "$HOME/.todo.actions.d/$action" ] +then + CFG_FILE="$CFG_FILE" "$HOME/.todo.actions.d/$action" "$@" +else + case $action in	2009-03-07 16:15:15 -05:00
David A. Harding	fd9b002ce1	Hiding Priority, Context, and Project . Adds three new switches that hide priorty, context, and project text in list output. . Changes proposed by Dave Hein. Original patch by Dave Hein. Revised patch by David A. Harding. Thread starts at http://tech.groups.yahoo.com/group/todotxt/message/1848	2009-03-07 13:05:40 -05:00
atduskgreg	7736e6b4fa	Added a note to the README to point to Gina's branch. Signed-off-by: ginatrapani <ginatrapani@gmail.com>	2009-03-07 06:30:27 +08:00
Philippe Teuwen	586abe8282	Cleaning indentation and mix of tabs/spaces, nothing else I swear ;-) Signed-off-by: ginatrapani <ginatrapani@gmail.com>	2009-03-07 06:00:08 +08:00
$U-STARBUCK\gina$ U-STARBUCK\gina	25c6505007	Shortened README	2009-03-05 17:56:56 -08:00
$U-STARBUCK\gina$ U-STARBUCK\gina	9c6efe2ed7	Version 2.1 first commit	2009-03-05 17:26:24 -08:00
$U-STARBUCK\gina$ U-STARBUCK\gina	7ecda8973b	first commit	2009-03-05 17:18:07 -08:00