toodledo 1.0.2 → 1.1.0

data/History.txt

@@ -1,3 +1,19 @@
+== 1.1.0 / 2008-02-24
+
+* Add functionality to add, delete goals, contexts, and folders from client.
+* Add functionality to archive folders.
+* Add stdin command to read from pipe or redirected files
+* Add formatters for the client so it's easier to tweak line output.
+* Add proper priority support to the client (in the format !top, !high, etc.) 
+* Make filter able to take symbols.
+* Change symbol for goals from $ to ^ (was confusing when entering 'I owe $5')
+* Add unit tests for client.
+* Better error messages and explanation of toodledo setup.
+* Fix the debug command so it doesn't crash the interactive client.
+* Fixed some bugs in date processing.
+* Fixed bugs in priority handling.
+* Fixed session invalid bug on reconnect.
+
 == 1.0.2 / 2008-02-14
 
 * Fix a silly bug where whitespace wasn't stripped from edit, complete and delete.

data/Manifest.txt

@@ -1,4 +1,3 @@
-CHANGELOG
 History.txt
 Manifest.txt
 README.txt
@@ -9,22 +8,32 @@ lib/toodledo/command_line/add_command.rb
 lib/toodledo/command_line/base_command.rb
 lib/toodledo/command_line/client.rb
 lib/toodledo/command_line/complete_command.rb
+lib/toodledo/command_line/context_formatter.rb
 lib/toodledo/command_line/delete_command.rb
 lib/toodledo/command_line/edit_command.rb
+lib/toodledo/command_line/folder_formatter.rb
+lib/toodledo/command_line/goal_formatter.rb
 lib/toodledo/command_line/hotlist_command.rb
-lib/toodledo/command_line/list_command.rb
-lib/toodledo/command_line/main_command.rb
+lib/toodledo/command_line/interactive_command.rb
+lib/toodledo/command_line/list_tasks_command.rb
+lib/toodledo/command_line/list_folders_command.rb
+lib/toodledo/command_line/list_goals_command.rb
+lib/toodledo/command_line/list_tasks_command.rb
 lib/toodledo/command_line/parser_helper.rb
 lib/toodledo/command_line/setup_command.rb
+lib/toodledo/command_line/sTdin_command.rb
+lib/toodledo/command_line/task_formatter.rb
 lib/toodledo/context.rb
 lib/toodledo/folder.rb
 lib/toodledo/goal.rb
+lib/toodledo/invalid_configuration_error.rb
 lib/toodledo/item_not_found_error.rb
 lib/toodledo/priority.rb
 lib/toodledo/repeat.rb
 lib/toodledo/server_error.rb
 lib/toodledo/session.rb
 lib/toodledo/task.rb
+test/client_test.rb
 test/parser_helper_test.rb
 test/session_test.rb
 test/toodledo_functional_test.rb

data/README.txt

@@ -13,8 +13,9 @@ The client allows you to work with Toodledo from the command line. It will
 work in either interactive or command line mode.
 
 You can also use the client in your shell scripts, or use the API directly
-as part of a web application.  Want an RSS feed?  Want to have the Mac read
-out your top priority?  It can all happen.
+as part of a web application.  Custom private RSS feed?  Want to have the Mac 
+read out your top priority?  Input tasks through Quicksilver?  Print out
+tasks with a BetaBrite?  It can all happen.
 
 == FEATURES/PROBLEMS:
 
@@ -25,43 +26,50 @@ out your top priority?  It can all happen.
 * Easy configuration and automation (Quicksilver / Scripts / Automator)
 
 == SYNOPSIS:
+
+=== SETUP:
+
+The first thing you should do is open up your browser and go to:
+
+  http://www.toodledo.com/info/api_doc.php
+
+and retrieve your userid.  You will need this for setup.
+
+Then, install toodledo.  This is either 'gem install toodledo' or 
+'sudo gem install toodledo' depending on your platform.
+
+Then, type 'toodledo setup' and enter your userid and password in
+the spaces provided.  Then save the file, and you're good to go.
+
+=== COMMAND LINE:
  
-Toodledo has a particularly rich model of a task, and allows full GTD
-type state to be attached to them.  The client syntax for the client
-is as follows:
+You can add tasks.  The simplest form is here:
+
+  toodledo add 'This is a test'
+  
+But tasks don't have to be simple.  Toodledo has a particularly rich model of 
+a task, and allows full GTD type state to be attached to them.  The syntax 
+for the client is as follows:
 
   *Folder
   @Context
-  $Goal
+  ^Goal
+  !Priority
 
-You can encase the symbol with square brackets if there is a space
-involved:
+You can encase the symbol with square brackets if there is a space involved:
 
   *[Blue Sky]
   @[Someday / Maybe]
-  $[Write Toodledo Ruby API]
+  ^[Write Toodledo Ruby API]
+  !top
   
 Let's use the command line client to list only the tasks you have in the office:
 
   toodledo list '@Office *Action'
 
-In interactive mode, the client will also allow you to set up filters.  If you 
-type 'folder', 'context' or 'goal' with an argument, then only tasks that match 
-those criteria will be displayed.  That is, if you do this:
-
-  context Office
-  folder Action
-  list
-
-Then it produces the same results as the previous list command.
-
-You can add tasks.  The simplest form is here:
-
-  toodledo add 'This is a test'
-
 Now let's add a task with several symbols:
 
-  toodledo add '*Action @Programming $[Write Toodledo Ruby API] Write documentation'
+  toodledo add '*Action @Programming ^[Write Toodledo Ruby API] Write docs'
 
 You can also edit tasks, using the task id.  This sets the folder to Someday:
 
@@ -72,7 +80,28 @@ And finally you can complete or delete tasks, again using the task id.
   toodledo complete 15934131
   toodledo delete 15934131
 
-If you want to write your own scripts, working with Toodledo is very
+=== INTERACTIVE MODE:
+
+Toodledo also comes with an interactive mode that is used if no arguments are 
+found:
+
+  toodledo 
+  > add This is a test
+  
+You can type help at the prompt for a complete list of commands.  The client 
+makes for a nice way to enter in tasks as you think of them.
+
+The client will also allow you to set up filters.  Filters are added with
+the symbols, so in interactive mode
+
+  filter @Office *Action
+  list
+
+Then it produces the same results as:
+
+  toodledo list '@Office *Action'
+
+Finally, if you want to write your own scripts, working with Toodledo is very
 simple, since it will use the YAML config file:
 
   require 'rubygems'
@@ -102,7 +131,7 @@ this instead:
 
 * sudo gem install toodledo
 * toodledo setup (sets up the YAML file with your credentials)
-* toodledo interactive
+* toodledo
 
 == LICENSE:
 		   GNU LESSER GENERAL PUBLIC LICENSE

data/Rakefile

@@ -14,6 +14,7 @@ Hoe.new('toodledo', Toodledo::VERSION) do |p|
   p.url = 'http://rubyforge.org/projects/toodledo'
   p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
   p.rsync_args << ' --exclude=statsvn/'
+  p.test_globs = ["test/**/*_test.rb"]
   p.extra_deps = ['cmdparse', 'highline']
 end
 

data/lib/toodledo.rb

@@ -5,7 +5,7 @@
 module Toodledo
 
   # Required for gem  
-  VERSION = '1.0.2'
+  VERSION = '1.1.0'
   
   # Returns the configuration object.
   def self.get_config()
@@ -55,6 +55,7 @@ end
 
 require 'toodledo/server_error'
 require 'toodledo/item_not_found_error'
+require 'toodledo/invalid_configuration_error'
 require 'toodledo/task'
 require 'toodledo/context'
 require 'toodledo/goal'

data/lib/toodledo/command_line/add_command.rb

@@ -1,10 +1,111 @@
 
 module Toodledo  
   module CommandLine
-    class AddCommand < BaseCommand
+    
+    #
+    # Adds commands
+    #
+    class AddCommand < CmdParse::Command
+      def initialize(client)
+        super('add', true)
+        self.short_desc = 'Adds an object'
+        
+        self.add_command(AddTaskCommand.new(client), true)
+        #self.add_command(AddFolderCommand.new(client))
+        #self.add_command(AddGoalCommand.new(client))
+        #self.add_command(AddContextCommand.new(client))
+        
+      end
+      
+      def execute(args)
+        puts "hello world!"
+      end
+    end
+    
+    #
+    # Adds a folder from the command
+    #
+    class AddFolderCommand < BaseCommand
+      
+      include Toodledo::CommandLine::ParserHelper
+      
+      def initialize(client)
+        super(client, 'folder', false)
+        self.short_desc = "Add a folder"
+        self.description = "Adds a folder to Toodledo"
+      end
+      
+      def execute(args)
+        return if (args == nil)                
+        Toodledo.begin(client.logger) do |session|            
+          line = args.join(' ')
+          client.add_folder(session, line)
+        end
+          
+        return 0
+      rescue ItemNotFoundError => e
+        puts e.message
+        return -1
+      end 
+    end
+    
+    #
+    # Adds a goal from the command line
+    #
+    class AddGoalCommand < BaseCommand
       
       include Toodledo::CommandLine::ParserHelper
       
+      def initialize(client)
+        super(client, 'goal', false)
+        self.short_desc = "Add a goal"
+        self.description = "Adds a goal to Toodledo"
+      end
+      
+      def execute(args)
+        return if (args == nil)                
+        Toodledo.begin(client.logger) do |session|            
+          line = args.join(' ')
+          client.add_goal(session, line)
+        end
+          
+        return 0
+      rescue ItemNotFoundError => e
+        puts e.message
+        return -1
+      end 
+    end
+    
+    # 
+    # Adds a context from the command line
+    #
+    class AddContextCommand < BaseCommand
+     
+      def initialize(client)
+        super(client, 'context', false)
+        self.short_desc = "Adds context"
+        self.description = "Adds a context to Toodledo"
+      end
+       
+      def execute(args)
+        return if (args == nil)                
+        Toodledo.begin(client.logger) do |session|            
+          line = args.join(' ')
+          client.add_context(session, line)
+        end
+          
+        return 0
+      rescue ItemNotFoundError => e
+        puts e.message
+        return -1
+      end 
+    end
+    
+    #
+    # Adds a task from the command line.
+    #
+    class AddTaskCommand < BaseCommand
+      
       def initialize(client)
         super(client, 'add', false)
         self.short_desc = "Add a task"

data/lib/toodledo/command_line/client.rb

@@ -8,14 +8,32 @@ require 'yaml'
 require 'toodledo'
 require 'toodledo/command_line/parser_helper'
 require 'toodledo/command_line/base_command'
-require 'toodledo/command_line/main_command'
+require 'toodledo/command_line/interactive_command'
+require 'toodledo/command_line/stdin_command'
+require 'toodledo/command_line/setup_command'
+
+# CREATE
 require 'toodledo/command_line/add_command'
-require 'toodledo/command_line/list_command'
-require 'toodledo/command_line/edit_command'
+
+# READ
 require 'toodledo/command_line/hotlist_command'
+require 'toodledo/command_line/list_tasks_command'
+require 'toodledo/command_line/list_folders_command'
+require 'toodledo/command_line/list_contexts_command'
+require 'toodledo/command_line/list_goals_command'
+
+# UPDATE
+require 'toodledo/command_line/edit_command'
 require 'toodledo/command_line/complete_command'
+
+# DELETE
 require 'toodledo/command_line/delete_command'
-require 'toodledo/command_line/setup_command'
+
+# FORMATTERS
+require 'toodledo/command_line/task_formatter'
+require 'toodledo/command_line/context_formatter'
+require 'toodledo/command_line/folder_formatter'
+require 'toodledo/command_line/goal_formatter'
 
 module Toodledo  
   module CommandLine
@@ -50,6 +68,12 @@ module Toodledo
         
         @userconfig = test(?e, userconfig) ? IO::read(userconfig) : CONFIG
         @userconfig = YAML.load(@userconfig).merge(opts)
+        @formatters = { 
+          :task => TaskFormatter.new,
+          :goal => GoalFormatter.new,
+          :context => ContextFormatter.new,
+          :folder => FolderFormatter.new
+        }
       end
       
       def debug?
@@ -91,113 +115,74 @@ module Toodledo
         user_id = session.user_id
         proxy = session.proxy
         
-        puts "base_url = #{base_url}"    
-        puts "user_id = #{user_id}"
-        puts "proxy = #{proxy.inspect}"
+        print "base_url = #{base_url}"    
+        print "user_id = #{user_id}"
+        print "proxy = #{proxy.inspect}"
       end
 
       # Sets the context filter.  Subsequent calls to show tasks
       # will only show tasks that have this context.
       # 
-      def set_context_filter(session, input)
-        if (input == nil)
-          input = ask("Selected context? > ") { |q| q.readline = true }
-        end
+      def set_filter(session, input)
+        logger.debug("set_filter(#{input})")
         
         input.strip!
         
-        if (input =~ /^(\d+)$/)
-          context = session.get_context_by_id(input)
-          if (context != nil)
-            @filters[:context] = context.name
-          else
-            @filters[:context] = input
-          end    
-        else
-          @filters[:context] = input
-        end
-      end 
-      
-      #
-      # Sets the folder filter.  Subsequent calls to show tasks
-      # will only show tasks that are in this folder.
-      #
-      def set_folder_filter(session, input)
-        if (input == nil)
-          input = ask("Selected folder? > ") { |q| q.readline = true }
+        context = parse_context(input)
+        if (context != nil)
+          c = session.get_context_by_name(context)
+          if (c == nil)
+            print "No such context: #{context}"
+            return
+          end
+          @filters[:context] = c
         end
         
-        input.strip!
-        
-        if (input =~ /^(\d+)$/)
-          folder = session.get_folder_by_id(input)
-          if (folder != nil)
-            @filters[:folder] = folder.name
-          else
-            @filters[:folder] = input
-          end    
-        else
-          @filters[:folder] = input
-        end
-      end
-      
-      # Sets the goal filter.  Subsequent calls to show tasks
-      # will only show tasks that have this goal.
-      #
-      def set_goal_filter(session, input)
-        if (input == nil)
-          input = ask("Selected goal? > ") { |q| q.readline = true }
+        goal = parse_goal(input)
+        if (goal != nil)
+          g = session.get_goal_by_name(goal)
+          if (g == nil)
+            print "No such goal: #{goal}"
+            return
+          end
+          @filters[:goal] = g
         end
-      
-        input.strip!
         
-        if (input =~ /^(\d+)$/)
-          goal = session.get_goal_by_id(input)
-          if (goal != nil)
-            @filters[:goal] = goal.name
-          else
-            @filters[:goal] = input
-          end    
-        else
-          @filters[:goal] = input
-        end
-      end
-      
-      # Sets the context filter.  Subsequent calls to show tasks
-      # will only show tasks that have this context.
-      #
-      def set_priority_filter(session, input)
-        if (input == nil)
-          input = ask("Selected priority? > ") { |q| q.readline = true }  
+        folder = parse_folder(input)
+        if (folder != nil)
+          f = session.get_folder_by_name(folder)
+          if (f == nil)
+            print "No such folder: #{folder}"
+          end
+          @filters[:folder] = f
         end
         
-        input.strip!
-        
-        if (input =~ /^(\d+)$/)
-          input = input.to_i
-        else
-          input = input.downcase
-          input = Priority.convert(input)
+        priority = parse_priority(input)
+        if (priority != nil)
+          @filters[:priority] = priority
         end
         
-        if (! Priority.valid?(input))
-          puts "Unknown priority \"#{input}\" -- (valid range is between -1..3)"          
+        if (logger)
+          logger.debug("@filters = #{@filters.inspect}")
         end
-        
-        @filters[:priority] = input
-      end
+      end 
       
       #
       # Shows all the filters.
       #
       def list_filters()        
-        if (@filters.empty?)
-          puts "No filters."
+        if (@filters == nil || @filters.empty?)
+          print "No filters."
           return
         end
         
         @filters.each do |k, v|
-          puts "#{k}: #{v}\n"
+          if (v.respond_to? :name)
+            name = v.name
+          else
+            name = v
+          end
+          print "#{k}: #{name}\n"
         end
       end
       
@@ -206,54 +191,9 @@ module Toodledo
       #
       def unfilter()
         @filters = {}
-        puts "Filters cleared.\n"
-      end
-      
-      #
-      # Shows all the folders for this user.
-      #
-      def folders(session)
-        my_folders = session.get_folders()
-        
-        my_folders.sort! do |a, b|
-          a.name <=> b.name
-        end
-        
-        for folder in my_folders
-          puts "<#{folder.server_id}> -- #{folder}\n"
-        end
-      end
-      
-      #
-      # Shows all the contexts for this user.
-      #
-      def contexts(session)
-        my_contexts = session.get_contexts()
-        
-        my_contexts.sort! do |a, b|
-          a.name <=> b.name
-        end
-        
-        for context in my_contexts
-          puts "<#{context.server_id}> -- #{context}\n"
-        end
-      end
-      
-      #
-      # Shows all the goals for this user.
-      #
-      def goals(session)
-        my_goals = session.get_goals()
-        
-        my_goals.sort! do |a, b|
-          a.level <=> b.level
-        end
-        
-        for goal in my_goals
-          puts "<#{goal.server_id}> -- #{goal}\n"
-        end
+        print "Filters cleared.\n"
       end
-      
+            
       #
       # Displays the 'hotlist' of tasks.  This shows all the uncompleted items with
       # priority set to 3 or 2.  There's no facility in the API for this, so we have
@@ -269,6 +209,7 @@ module Toodledo
         context = parse_context(input)
         folder = parse_folder(input)
         goal = parse_goal(input)
+        priority = parse_priority(input)
         
         params = { :notcomp => true }
         
@@ -285,6 +226,10 @@ module Toodledo
           params.merge!({ :goal => goal })
         end
         
+        if (priority != nil)
+          params.merge!({ :priority => priority })
+        end
+              
         tasks = session.get_tasks(params)
         
         # Highest priority first
@@ -298,7 +243,7 @@ module Toodledo
         
         for task in tasks
           if (task.priority > not_important)
-            puts "<#{task.server_id}> -- #{task}\n"
+            print @formatters[:task].format(task)
           end
         end
       end
@@ -307,6 +252,8 @@ module Toodledo
       # Lists tasks (subject to any filters that may be present).
       #
       def list_tasks(session, input)
+        logger.debug("list_tasks(#{input})")
+        
         params = { :notcomp => true }
         
         params.merge!(@filters)
@@ -315,6 +262,7 @@ module Toodledo
         context = parse_context(input)
         folder = parse_folder(input)
         goal = parse_goal(input)
+        priority = parse_priority(input)
         
         # If there are, they override what we have set.
         if (folder != nil)
@@ -329,6 +277,10 @@ module Toodledo
           params.merge!({ :goal => goal })
         end
         
+        if (priority != nil)
+          params.merge!({ :priority => priority })
+        end
+                
         tasks = session.get_tasks(params)
         
         # Highest priority first
@@ -337,7 +289,66 @@ module Toodledo
         end
         
         for task in tasks  
-          puts "<#{task.server_id}> -- #{task}\n"
+          print @formatters[:task].format(task)
+        end
+      end
+      
+      #
+      # Lists the goals.  Takes an optional argument of 
+      # 'short', 'medium' or 'life'.
+      #
+      def list_goals(session, input)
+        
+        input.strip!
+        input.downcase!
+                
+        goals = session.get_goals()
+        
+        goals.sort! do |a, b|
+          a.level <=> b.level
+        end
+        
+        level_filter = nil
+        case input
+        when 'short'
+          level_filter = Goal::SHORT_LEVEL
+        when 'medium'
+          level_filter = Goal::MEDIUM_LEVEL
+        when 'life'
+          level_filter = Goal::LIFE_LEVEL
+        end
+        
+        for goal in goals
+          if (level_filter != nil && goal.level != level_filter)
+            next # skip this goal if it doesn't meet the filter
+          end
+          print @formatters[:goal].format(goal)
+        end
+      end
+      
+      #
+      # Lists the contexts.
+      #
+      def list_contexts(session, input)
+        params = { }
+        
+        contexts = session.get_contexts()
+        
+        for context in contexts
+          print @formatters[:context].format(context)
+        end
+      end
+      
+      #
+      # Lists the folders.
+      #
+      def list_folders(session, input)
+        params = { }
+        
+        folders = session.get_folders()
+        
+        for folder in folders
+          print @formatters[:folder].format(folder)
         end
       end
       
@@ -348,7 +359,7 @@ module Toodledo
       # The order of symbols does not matter, but the title must be the last thing
       # on the line.
       #
-      # add @[Deep Space] *Action $[For Great Justice] Take off every Zig
+      # add @[Deep Space] *Action ^[For Great Justice] Take off every Zig
       #
       # There is no priority handling in this method.  It may be added if there is
       # demand for it.
@@ -356,9 +367,13 @@ module Toodledo
         context = parse_context(line)
         folder = parse_folder(line)
         goal = parse_goal(line)
+        priority = parse_priority(line)
         title = parse_remainder(line)
         
-        params = { :priority => Priority::LOW }
+        params = {}
+        if (priority != nil)
+          params.merge!({ :priority => priority })
+        end
         
         if (folder != nil)
           params.merge!({ :folder => folder })
@@ -379,7 +394,61 @@ module Toodledo
         
         task_id = session.add_task(title, params)
         
-        puts "Task #{task_id} added."
+        print "Task #{task_id} added."
+      end
+      
+      def add_context(session, input)
+        
+        title = input.strip
+        
+        context_id = session.add_context(title)
+        
+        print "Context #{context_id} added."
+      end
+      
+      def add_goal(session, input)
+        input.strip!
+        
+        # Assume that a goal is short, medium or life, and
+        # don't stick a symbol on it.
+        level = parse_level(input)
+        if (level == nil)
+          level = Toodledo::Goal::SHORT_LEVEL
+        else
+          input = clean(LEVEL_REGEXP, input)
+          input.strip!
+        end
+        
+        goal_id = session.add_goal(input, level)
+        
+        print "Goal #{goal_id} added."
+      end
+      
+      def add_folder(session, input)
+        
+        title = input.strip
+        
+        folder_id = session.add_folder(title)
+        
+        print "Folder #{folder_id} added."
+      end
+      
+      #
+      # Archives a folder.
+      #
+      def archive_folder(session, line)
+        
+        line.strip!
+        
+        folder_id = line
+        params = { :archived => 1 }
+        session.edit_folder(folder_id, params)
+        
+        print "Folder #{folder_id} archived."
+      end
+      
+      def archive_goal(session, line)
+        # Not implemented!  No way to edit a goal.
       end
       
       #
@@ -393,6 +462,7 @@ module Toodledo
         context = parse_context(input)
         folder = parse_folder(input)
         goal = parse_goal(input)
+        priority = parse_priority(input)
         task_id = parse_remainder(input)
         
         logger.debug("edit_task: task_id = #{task_id}")
@@ -417,9 +487,13 @@ module Toodledo
           params.merge!({ :goal => goal })
         end
         
+        if (priority != nil)
+          params.merge!({ :priority => priority })
+        end
+        
         session.edit_task(task_id, params)
         
-        puts "Task #{task_id} edited."
+        print "Task #{task_id} edited."
       end
       
       # Masks the task as completed.  Uses a task id as argument.
@@ -437,12 +511,13 @@ module Toodledo
                 
         params = { :completed => 1 }
         if (session.edit_task(task_id, params))
-          puts "Task #{task_id} completed."
+          print "Task #{task_id} completed."
         else
-          puts "Task #{task_id} could not be completed!"      
+          print "Task #{task_id} could not be completed!"      
         end
       end
       
+      
       # Deletes a task, using the task id. 
       #
       # delete 123 
@@ -457,12 +532,178 @@ module Toodledo
         task_id.strip!
         
         if (session.delete_task(task_id))
-          puts "Task #{task_id} deleted."
+          print "Task #{task_id} deleted."
+        else
+          print "Task #{task_id} could not be deleted!"      
+        end
+      end
+      
+      def delete_context(session, line)
+        id = line
+        
+        id.strip!
+        
+        if (session.delete_context(id))
+          print "Context #{id} deleted."
+        else
+          print "Context #{id} could not be deleted!"      
+        end
+      end
+
+      def delete_goal(session, line)
+        id = line
+        
+        id.strip!
+        
+        if (session.delete_goal(id))
+          print "Goal #{id} deleted."
+        else
+          print "Goal #{id} could not be deleted!"      
+        end
+      end
+
+      def delete_folder(session, line)
+        id = line
+        
+        id.strip!
+        
+        if (session.delete_folder(id))
+          print "Folder #{id} deleted."
+        else
+          print "Folder #{id} could not be deleted!"      
+        end
+      end
+        
+      # Prints out a single line.
+      def print(line = nil)
+        if (line == nil)
+          puts
         else
-          puts "Task #{task_id} could not be deleted!"      
+          puts line
         end
       end
       
+      #
+      # Displays the help message.
+      #
+      def help()
+        print "hotlist      Shows the hotlist"
+        print "folders      Shows all folders"
+        print "goals        Shows all goals"
+        print "contexts     Shows all contexts"
+        print "tasks        Shows tasks ('tasks *Action @Home')"
+        print 
+        print "add          Adds task ('add *Action @Home Eat breakfast')"
+        print "  folder     Adds a folder ('add folder MyFolder')"
+        print "  context    Adds a context ('add context MyContext')"
+        print "  goal       Adds a goal ('add goal MyGoal')"
+        print "edit         Edits a task ('edit *Action 1134')"
+        print "complete     Completes a task ('complete 1234')"
+        print "delete       Deletes a task ('delete 1134')"
+        print "  folder     Deletes a folder ('delete folder 1')"
+        print "  context    Deletes a context ('delete context 2')"
+        print "  goal       Deletes a goal ('delete goal 3')"
+        print 
+        print "archive      Archives a folder ('archive 1234')"
+        print "filter       Defines filters ('filter *Action @Someday')"
+        print "unfilter     Removes all filters"
+        print "filters      Displays the list of filters"
+        print
+        print "help or ?    Displays this help message"
+        print "quit or exit Leaves the application"
+      end
+      
+      def clean(regexp, input)
+        return input.sub(regexp, '')
+      end
+      
+      def execute_command(session, input)    
+        case input
+          when /^help/, /^\s*\?/
+          help()
+          
+          when /^add/
+          line = clean(/^add/, input)
+          line.strip!
+          case line
+          when /folder/
+            add_folder(session, clean(/folder/, line))
+          when /context/
+            add_context(session, clean(/context/, line))
+          when /goal/
+            add_goal(session, clean(/goal/, line))
+          else
+            add_task(session, line)
+          end
+          
+          when /^edit/
+          line = clean(/^edit/, input)
+          edit_task(session, line)
+          
+          when /^delete/
+          line = clean(/^delete/, input)
+          line.strip!
+          case line
+          when /folder/
+            delete_folder(session, clean(/folder/, line))
+          when /context/
+            delete_context(session, clean(/context/, line))
+          when /goal/
+            delete_goal(session, clean(/goal/, line))
+          else
+            delete_task(session, line)            
+          end
+          
+          when /^archive/
+          archive_folder(session, clean(/^archive/, input))
+          
+          when /^hotlist/
+          line = clean(/^hotlist/, input)
+          hotlist(session, line)
+          
+          when /^complete/
+          line = clean(/^complete/, input)
+          complete_task(session, line)
+          
+          when /^tasks/
+          line = clean(/^(tasks)/, input)
+          list_tasks(session, line)
+          
+          when /^folders/
+          line = clean(/^folders/, input)
+          list_folders(session,line)
+          
+          when /^goals/
+          line = clean(/^goals/, input)
+          list_goals(session,line)
+          
+          when /^contexts/
+          line = clean(/^contexts/, input)
+          list_contexts(session,line)
+          
+          when /^filters/
+          list_filters()
+          
+          when /^filter/
+          line = clean(/^filter/, input)
+          set_filter(session, line)
+          
+          when /^config/
+          show_config(session)
+          
+          when /^unfilter/
+          unfilter()
+          
+          when /debug/
+          self.debug = ! self.debug?
+          
+          when /^quit/, /^exit/
+          exit 0
+        else
+          print "'#{input}' is not a command: type help for a list"
+        end
+      end
+            
       #
       # Runs the client main command.  This is what gets run from 'toodledo'.
       # Ironically doesn't do much except for set up the commands and parse
@@ -485,25 +726,40 @@ module Toodledo
           opt.separator "Global options:"
           opt.on("--debug", "Print debugging information") {|t| self.debug = true }
         end
+
+        # this is the default command if we don't receive any options.
+        cmd.add_command(InteractiveCommand.new(self), true)
         
-        cmd.add_command(MainCommand.new(self))
+        cmd.add_command(StdinCommand.new(self))
+        
+        cmd.add_command(AddTaskCommand.new(self))
+        
+        cmd.add_command(ListTasksCommand.new(self))
+        cmd.add_command(ListFoldersCommand.new(self))
+        cmd.add_command(ListGoalsCommand.new(self))
+        cmd.add_command(ListContextsCommand.new(self))
         
-        cmd.add_command(AddCommand.new(self))
-        cmd.add_command(ListCommand.new(self))
         cmd.add_command(EditCommand.new(self))
         cmd.add_command(CompleteCommand.new(self))
-        cmd.add_command(DeleteCommand.new(self))
+        cmd.add_command(DeleteTaskCommand.new(self))
         cmd.add_command(HotlistCommand.new(self))
         cmd.add_command(SetupCommand.new(self))
-        
-        # this is the default command if we don't receive any options.
-        cmd.add_command(CmdParse::HelpCommand.new, true)
+                
+        cmd.add_command(CmdParse::HelpCommand.new)
         cmd.add_command(CmdParse::VersionCommand.new)
         
         cmd.parse
         
         # Return a good exit status.
         return 0      
+      rescue InvalidConfigurationError => e
+        logger.debug(e)
+        print "The client is missing (or cannot use) the user id or password it needs to connect."
+        print "Run 'toodledo setup' and save the file to fix this."
+        return -1
+      rescue ServerError => e
+        print "The server returned a fatal error: #{e.message}"
+        return -1
       end      
     end #class    
   end