toodledo 1.0.2 → 1.1.0

data/test/parser_helper_test.rb

@@ -1,16 +1,21 @@
+$: << File.expand_path(File.dirname(__FILE__) + "/../lib")
+
 require 'test/unit'
+require 'toodledo'
 require 'toodledo/command_line/parser_helper'
 
+
 #
 # Tests the parser helper
 #
 class ParserHelperTest < Test::Unit::TestCase
   
+  include Toodledo
   include Toodledo::CommandLine::ParserHelper
   
   def test_find_context
     
-    input = "*Folder @Context $Goal"
+    input = "blah blah blah *Folder @Context ^Goal"
     
     context = parse_context(input)
     
@@ -19,7 +24,7 @@ class ParserHelperTest < Test::Unit::TestCase
 
   def test_find_harder_context
     
-    input = "@[Harder Context] *[Harder Folder] $[Harder Goal]"
+    input = "@[Harder Context] *[Harder Folder] ^[Harder Goal] blah blah blah"
     
     context = parse_context(input)
         
@@ -27,7 +32,7 @@ class ParserHelperTest < Test::Unit::TestCase
   end
 
   def test_find_folder
-    input = "*Folder @Context $Goal"
+    input = "*Folder @Context ^Goal blah blah blah"
     
     folder = parse_folder(input)
     
@@ -36,7 +41,7 @@ class ParserHelperTest < Test::Unit::TestCase
 
   def test_find_harder_folder
     
-    input = "@[Harder Context] *[Harder Folder] $[Harder Goal]"
+    input = "Some Text @[Harder Context] *[Harder Folder] ^[Harder Goal]"
     
     folder = parse_folder(input)
     
@@ -44,7 +49,7 @@ class ParserHelperTest < Test::Unit::TestCase
   end
   
   def test_find_goal
-    input = "*Folder @Context $Goal"
+    input = "*Folder @Context ^Goal wefawef wefawefawfe"
     
     goal = parse_goal(input)
     
@@ -52,12 +57,75 @@ class ParserHelperTest < Test::Unit::TestCase
   end
   
   def test_find_harder_goal  
-    input = "@[Harder Context] *[Harder Folder] $[Harder Goal]"
+    input = "@[Harder Context] *[Harder Folder] ^[Harder Goal] Some text"
        
     goal = parse_goal(input)
        
     assert(goal == 'Harder Goal', "Value not found")
   end
   
+  def test_find_priority_with_top
+    input = "!top I AM VERY IMPORTANT!"
+       
+    priority = parse_priority(input)
+       
+    assert(priority == Priority::TOP, "Value not found")
+  end
+    
+  def test_find_priority_with_high
+    input = "!high I am high priority."
+       
+    priority = parse_priority(input)
+       
+    assert_equal(Priority::HIGH, priority, "Value not found")
+  end
+    
+  def test_find_priority_with_medium
+    input = "!medium I am medium priority."
+       
+    priority = parse_priority(input)
+       
+    assert_equal(Priority::MEDIUM, priority, "Value not found")
+  end
+  
+  def test_find_priority_with_low
+    input = "!low I am low priority."
+       
+    priority = parse_priority(input)
+       
+    assert_equal(Priority::LOW, priority, "Value not found")
+  end
+  
+  def test_find_priority_with_negative
+    input = "!negative I am negative priority."
+       
+    priority = parse_priority(input)
+       
+    assert_equal(Priority::NEGATIVE, priority, "Value not found")
+  end
+  
+  def test_find_level_with_life()
+    
+    input = 'life This is my goal'
+    level = parse_level(input)
+    
+    assert_equal(Goal::LIFE_LEVEL, level, 'level not found')
+  end
+  
+  def test_find_level_with_medium()
+    
+    input = 'medium This is my goal'
+    level = parse_level(input)
+    
+    assert_equal(Goal::MEDIUM_LEVEL, level, 'level not found')
+  end
+  
+  def test_find_level_with_short()
+    
+    input = 'short This is my goal'
+    level = parse_level(input)
+    
+    assert_equal(Goal::SHORT_LEVEL, level, 'level not found')
+  end
   
 end

data/test/session_test.rb

@@ -90,7 +90,7 @@ class SessionTest < Test::Unit::TestCase
     assert myhash[:context] == context_id
   end
   
-  def test_handle_boolean_with_string()
+  def test_handle_boolean_with_string_true()
     myhash = {}
     params = { :bool => 'true' }
     @session.handle_boolean(myhash, params, :bool)
@@ -98,7 +98,7 @@ class SessionTest < Test::Unit::TestCase
     assert myhash[:bool] == "1"
   end
   
-  def test_handle_boolean_with_string()
+  def test_handle_boolean_with_string_false()
     myhash = {}
     params = { :bool => 'false' }
     @session.handle_boolean(myhash, params, :bool)

data/test/toodledo_functional_test.rb

@@ -32,9 +32,9 @@ class ToodledoFunctionalTest < Test::Unit::TestCase
   
   # Always fails.
   # def test_get_user_id()
-  #     user_id = @session.get_user_id(@email, @password)
+  #  user_id = @session.get_user_id(@email, @password)
   #     
-  #     assert user_id == @user_id
+  #  # assert user_id == @user_id
   # end
   
   def test_add_edit_and_remove_task

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: toodledo
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors: 
 - Will Sargent
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-14 00:00:00 -08:00
+date: 2008-02-24 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.5.0
     version: 
-description: "== DESCRIPTION:  This is a Ruby API and client for http://toodledo.com, a task management  website. It implements all of the calls from Toodledo's developer API, and  provides a nice wrapper around the functionality.  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."
+description: "== DESCRIPTION:  This is a Ruby API and client for http://toodledo.com, a task management  website. It implements all of the calls from Toodledo's developer API, and  provides a nice wrapper around the functionality.  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.  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."
 email: will@tersesystems.com
 executables: 
 - toodledo
@@ -50,7 +50,6 @@ extra_rdoc_files:
 - Manifest.txt
 - README.txt
 files: 
-- CHANGELOG
 - History.txt
 - Manifest.txt
 - README.txt
@@ -61,22 +60,31 @@ files:
 - 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/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
@@ -107,5 +115,8 @@ rubygems_version: 1.0.1
 signing_key: 
 specification_version: 2
 summary: A command line client and API to Toodledo
-test_files: []
-
+test_files: 
+- test/client_test.rb
+- test/parser_helper_test.rb
+- test/session_test.rb
+- test/toodledo_functional_test.rb

data/CHANGELOG

@@ -1 +0,0 @@
-1.0.0 - initial release

data/lib/toodledo/command_line/main_command.rb

@@ -1,153 +0,0 @@
-require 'toodledo/command_line/parser_helper'
-require 'logger'
-
-module Toodledo
-  
-  module CommandLine
-    # Runs the interactive client.
-    class MainCommand < BaseCommand
-      
-      def initialize(client)
-        super(client, 'interactive', false)
-        self.short_desc = "Interactive client"
-        self.description = "The interactive command line client."        
-      end
-      
-      def execute(args)
-        Toodledo.begin(client.logger) do |session|            
-          command_loop(session)
-        end
-      end
-      
-      #
-      # Displays the help message.
-      #
-      def help()
-        puts "hotlist -- shows the hotlist\n"
-        puts "tasks -- shows tasks ('tasks $[World Peace] *MyFolder' -- filters also apply)"
-        puts "list -- does the same as tasks"
-        puts 
-        puts "add -- adds a task ('add *Action @Home Eat breakfast')"
-        puts "edit -- edits a task ('edit *Action 1134' will move 1134 to Action folder)"
-        puts "complete -- completes a task ('complete 1234')\n"
-        puts "delete -- deletes a task ('delete 1134')"
-        puts
-        puts "context -- defines a context filter on tasks"
-        puts "goal -- defines a goal filter on tasks"
-        puts "folder -- defines a folder filter on tasks\n"
-        puts "priority -- defines a priority filter on tasks\n"
-        puts "unfilter -- removes all filters on tasks\n"
-        puts
-        puts "folders -- shows all folders\n"
-        puts "goals -- shows all goals"
-        puts "contexts -- shows all contexts"
-        puts
-        puts "config -- displays the current configuration"
-        puts
-        puts "help or ? -- displays this help message\n"
-        puts "quit or exit -- Leaves the application"
-      end
-      
-      def clean(regexp, input)
-        return input.sub(regexp, '')
-      end
-      
-      def command_loop(session)
-        loop do
-          begin
-            input = ask("> ") do |q|
-              q.readline = true
-            end
-            
-            input.strip!
-            
-            case input
-              when /^help/, /^\s*\?/
-              help()
-              
-              when /^add/
-              line = clean(/^add/, input)
-              client.add_task(session, line)
-              
-              when /^edit/
-              line = clean(/^edit/, input)
-              client.edit_task(session, line)
-              
-              when /^delete/
-              line = clean(/^delete/, input)
-              client.delete_task(session, line)
-              
-              when /^hotlist/
-              line = clean(/^hotlist/, input)
-              client.hotlist(session, line)
-              
-              when /^complete/
-              line = clean(/^complete/, input)
-              client.complete_task(session, line)
-              
-              when /^tasks/, /^list/
-              line = clean(/^(tasks|list)/, input)
-              client.list_tasks(session, line)
-              
-              when /^folders/
-              line = clean(/^folders/, input)
-              client.folders(session)
-              
-              when /^goals/
-              client.goals(session)
-              
-              when /^contexts/
-              client.contexts(session)
-              
-              when /^context/
-              line = clean(/^context/, input)
-              client.set_context_filter(session, line)
-              
-              when /^folder/
-              line = clean(/^folder/, input)
-              client.set_folder_filter(session, line)
-              
-              when /^goal/
-              line = clean(/^goal/, input)
-              client.set_goal_filter(session, line)
-              
-              when /^priority/
-              line = clean(/^priority/, input)
-              client.set_priority_filter(session, line)
-              
-              when /^config/
-              client.show_config(session)
-              
-              when /^filters/
-              client.list_filters()
-              
-              when /^unfilter/
-              client.unfilter()
-              
-            when /debug/
-              client.debug = ! client.debug?
-              if (client.debug?)
-                logger.level = Logger::DEBUG
-              else
-                logger.level = Logger::FATAL
-              end
-              
-              when /^quit/, /^exit/
-              break;
-            else
-              puts "'#{input}' is not a command: type help for a list"
-            end
-          rescue Toodledo::ItemNotFoundError => infe
-            puts "Item not found: #{infe}"
-          rescue Toodledo::ServerError => se
-            puts "Server Error: #{se}"
-          rescue RuntimeError => re
-            puts "Error: #{re}"      
-          end
-        end # loop    
-      end
-      
-    end
-    
-  end
-end