toodledo 1.3.8 → 1.4.0

data/History.txt

@@ -1,3 +1,7 @@
+== 1.4.0
+
+* Added "today", "tomorrow" and "overdue" to commands, thx to afrolov.
+
 == 1.3.8
 
 * Rubygems does not allow you to publish the same version, even if yanked.  Thanks SO much.

data/README.md

@@ -59,6 +59,13 @@ for the client is as follows:
     #DueDate
     %Tags
 
+Additionally, a * _not_ followed immediately by a folder name
+indicates that the task should be starred.
+
+For adding tasks, you may specify Priority as either a word:
+top,high,medium,low,negative  or as a number: -1,0,1,2,3
+
+
 You can encase the symbol with square brackets if there is a space involved:
 
     *[Blue Sky]

data/Rakefile

@@ -26,6 +26,8 @@ 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.
+
+Check it out: http://aosekai.net/2011/09/quickly-add-new-task-to-toodledo-with-alfred/
     EOF
     gem.homepage = "http://github.com/wsargent/toodledo"
     gem.authors = ["Will Sargent"]

data/lib/toodledo/command_line/client.rb

@@ -18,6 +18,9 @@ require 'toodledo/command_line/add_command'
 # READ
 require 'toodledo/command_line/hotlist_command'
 require 'toodledo/command_line/list_tasks_command'
+require 'toodledo/command_line/list_today_command'
+require 'toodledo/command_line/list_tomorrow_command'
+require 'toodledo/command_line/list_overdue_command'
 require 'toodledo/command_line/list_tasks_by_context_command'
 require 'toodledo/command_line/list_folders_command'
 require 'toodledo/command_line/list_contexts_command'
@@ -333,7 +336,55 @@ module Toodledo
           print @formatters[:task].format(task)
         end
       end
-      
+     
+      # 
+      # Print all tasks with the due date in the given time range
+      #
+      def list_tasks_by_beforeafter(session, before, after)
+        params = { :notcomp => true }
+        if (before) 
+          params.merge!({ :before => before.strftime("%Y-%m-%d") })
+        end
+        
+        if (after)
+          params.merge!({ :after =>  after.strftime("%Y-%m-%d") })
+        end
+        
+	tasks = session.get_tasks(params)
+	for task in tasks
+          print @formatters[:task].format(task)
+        end
+      end
+
+      #
+      # Print tasks for today
+      #
+      def list_today_tasks(session, line)
+        tomorrow = Date.today + 1
+        yesterday = Date.today - 1   
+        # show us everything before tomorrow, but after yesterday.
+        list_tasks_by_beforeafter(session, tomorrow, yesterday)
+      end
+
+      #
+      # Print tasks for tomorrow
+      #
+      def list_tomorrow_tasks(session, line)
+        today = Date.today
+        twodaysfromnow = today + 2
+        # show us tasks before two days from now, but after today. 
+	list_tasks_by_beforeafter(session, twodaysfromnow, today)
+      end
+
+      #
+      # Print overdue tasks
+      #
+      def list_overdue_tasks(session, line)
+        today = Date.today
+        # show us everything before today.
+	list_tasks_by_beforeafter(session, today, nil)
+      end
+
       #
       # Prints all active tasks nested by context.
       #
@@ -385,7 +436,6 @@ module Toodledo
       # Lists the contexts.
       #
       def list_contexts(session, input)
-        params = { }
         
         contexts = session.get_contexts()
         
@@ -398,7 +448,6 @@ module Toodledo
       # Lists the folders.
       #
       def list_folders(session, input)
-        params = { }
         
         folders = session.get_folders()
         
@@ -419,13 +468,14 @@ module Toodledo
       def add_task(session, line)
         # TODO Yet again, essentially the same code as list and hotlist; Refactor        
         context = parse_context(line)
+        star = parse_star(line) # ctanis
         folder = parse_folder(line)
         goal = parse_goal(line)
         priority = parse_priority(line)
         date = parse_date(line)
         tag = parse_tag(line)
         title = parse_remainder(line)
-        
+
         params = {}
         if (priority != nil)
           params.merge!({ :priority => priority })
@@ -450,6 +500,10 @@ module Toodledo
         if (tag != nil)
           params.merge!({ :tag => tag })
         end
+
+        if (star)               # boolean
+          params.merge!({ :star => true })
+        end
         
         # If we got nothing but 'add' then ask for it explicitly.
         if (title == nil)
@@ -687,6 +741,9 @@ module Toodledo
         print "goals        Shows all goals"
         print "contexts     Shows all contexts"
         print "tasks        Shows tasks ('tasks *Action @Home')"
+        print "today        Shows tasks for today"
+        print "tomorrow     Shows tasks for tomorrow"
+        print "overdue      Shows overdue tasks"
         print 
         print "add          Adds task ('add *Action @Home Eat breakfast')"
         print "  folder     Adds a folder ('add folder MyFolder')"
@@ -764,6 +821,18 @@ module Toodledo
           line = clean(/^(tasks)/, input)
           list_tasks(session, line)
           
+	  when /^today/
+          line = clean(/^(today)/, input)
+          list_today_tasks(session, line)
+
+	  when /^tomorrow/
+          line = clean(/^(tomorrow)/, input)
+          list_tomorrow_tasks(session, line)
+
+	  when /^overdue/
+          line = clean(/^(overdue)/, input)
+          list_overdue_tasks(session, line)
+          
           when /^folders/
           line = clean(/^folders/, input)
           list_folders(session,line)
@@ -830,6 +899,11 @@ module Toodledo
         cmd.add_command(AddTaskCommand.new(self))
         
         cmd.add_command(ListTasksCommand.new(self))
+        
+	cmd.add_command(ListTodayCommand.new(self))
+        cmd.add_command(ListTomorrowCommand.new(self))
+        cmd.add_command(ListOverdueCommand.new(self))
+
         cmd.add_command(ListFoldersCommand.new(self))
         cmd.add_command(ListGoalsCommand.new(self))
         cmd.add_command(ListContextsCommand.new(self))

data/lib/toodledo/command_line/parser_helper.rb

@@ -16,18 +16,21 @@ module Toodledo
   
       CONTEXT_REGEXP = /\@((\w+)|\[(.*?)\])/
       
-      PRIORITY_REGEXP = /!(top|high|medium|low|negative)/
+      PRIORITY_REGEXP = /!(top|high|medium|low|negative|-1|0|1|2|3)/
       
       DATE_REGEXP = /\#(([^\[]\S*)|\[(.*?)\])/
       
       TAGS_REGEXP = /\%((\w+)|\[(.*?)\])/
       
+      STAR_REGEXP = /\*\s+|\*$/
+
       # Note that level must exist at the beginning of the line
       LEVEL_REGEXP = /^(life|medium|short)/
       
       # Don't include level regexp
       REGEXP_LIST = [ 
         FOLDER_REGEXP, 
+        STAR_REGEXP,
         GOAL_REGEXP,
         CONTEXT_REGEXP, 
         PRIORITY_REGEXP,
@@ -92,6 +95,17 @@ module Toodledo
           return Toodledo::Priority::LOW
         when 'negative'
           return Toodledo::Priority::NEGATIVE
+        when '-1'
+          return Toodledo::Priority::NEGATIVE
+        when '0'
+          return Toodledo::Priority::LOW
+        when '1'
+          return Toodledo::Priority::MEDIUM
+        when '2'
+          return Toodledo::Priority::HIGH
+        when '3'
+          return Toodledo::Priority::TOP
+
         else
           return nil
         end
@@ -116,7 +130,17 @@ module Toodledo
         end
       end
   
-      # Returns the bit after we've looked for *Folder, @Context & ^Goal
+      def parse_star(input)
+        match_data = STAR_REGEXP.match(input)
+        if (match_data == nil)
+          return false
+        else
+          return true
+        end
+      end         
+
+
+      # Returns the bit after we've looked for *Folder, @Context & ^Goal & star
       def parse_remainder(line)
         input = line
 
@@ -129,6 +153,7 @@ module Toodledo
     
         return input
       end
+      
   
       # Strips a string of [ and ] characters
       def strip_brackets(inword)    

data/lib/toodledo/version.rb

@@ -2,8 +2,8 @@
 module Toodledo
   module Version
       MAJOR = 1
-      MINOR = 3
-      PATCH = 8
+      MINOR = 4
+      PATCH = 0
 
       VERSION = [MAJOR, MINOR, PATCH].compact.join('.')
     end

data/test/parser_helper_test.rb

@@ -158,4 +158,80 @@ class ParserHelperTest < Test::Unit::TestCase
     assert_equal(Goal::SHORT_LEVEL, level, 'level not found')
   end
   
-end
+  def test_find_star()
+    input = '* this is a starred task'
+    star = parse_star(input)
+    folder = parse_folder(input)
+    assert_equal(star, true)
+    assert_equal(folder, nil)
+  end
+
+  def test_find_star2()
+    input = 'this is also a starred task *'
+    star = parse_star(input)
+    folder = parse_folder(input)
+    assert_equal(star, true)
+    assert_equal(folder, nil)
+  end
+
+  def test_find_star3()
+    input = 'this is not a starred task *foo'
+    star = parse_star(input)
+    folder = parse_folder(input)
+    assert_equal(star, false)
+    assert_equal(folder, "foo")
+  end
+
+  def test_find_star4()
+    input = '* but this is not a starred task *foo'
+    star = parse_star(input)
+    folder = parse_folder(input)
+    assert_equal(star, true)
+    assert_equal(folder, "foo")
+  end
+
+  def test_find_priority_with_numbers1
+    input = "!3 I AM VERY IMPORTANT!"
+       
+    priority = parse_priority(input)
+       
+    assert(priority == Priority::TOP, "Value not found")
+  end
+
+  def test_find_priority_with_numbers2
+    input = "I AM QUITE IMPORTANT! !2"
+       
+    priority = parse_priority(input)
+       
+    assert(priority == Priority::HIGH, "Value not found")
+  end
+
+  def test_find_priority_with_numbers3
+    input = "!1 I AM KINDA IMPORTANT!"
+       
+    priority = parse_priority(input)
+       
+    assert(priority == Priority::MEDIUM, "Value not found")
+  end
+
+
+  def test_find_priority_with_numbers4
+    input = "!0 I AM NOT VERY IMPORTANT!"
+       
+    priority = parse_priority(input)
+       
+    assert(priority == Priority::LOW, "Value not found")
+  end
+
+
+  def test_find_priority_with_numbers5
+    input = "!-1 I AM MAXIMALLY UNIMPORTANT!"
+       
+    priority = parse_priority(input)
+       
+    assert(priority == Priority::NEGATIVE, "Value not found")
+  end
+
+
+
+end

data/toodledo.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{toodledo}
-  s.version = "1.3.8"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Will Sargent}]

metadata

@@ -1,85 +1,92 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: toodledo
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 1.4.0
   prerelease: 
-  segments: 
-  - 1
-  - 3
-  - 8
-  version: 1.3.8
 platform: ruby
-authors: 
+authors:
 - Will Sargent
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-28 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-06-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: cmdparse
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: highline
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: flexmock
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: flexmock
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-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
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+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.sargent@gmail.com
-executables: 
+executables:
 - toodledo
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - History.txt
 - README.md
 - Rakefile
@@ -124,36 +131,26 @@ files:
 - toodledo.gemspec
 homepage: http://github.com/wsargent/toodledo
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A command line client and API to Toodledo
 test_files: []
-