toodledo 1.0.1 → 1.0.2

data/History.txt

@@ -1,3 +1,11 @@
+== 1.0.2 / 2008-02-14
+
+* Fix a silly bug where whitespace wasn't stripped from edit, complete and delete.
+* Enable interactive debug, and refactor the logging to be in client, not commands.
+* Enable toodledo symbols to be anywhere in the string, not just before the task.
+* Cleaner error messages if the task id is not found.
+* Make sure failed commands exit with non-zero status.
+
 == 1.0.1 / 2008-02-11
 
 * Fix bug in client where priority filter was not being applied.

data/lib/toodledo.rb

@@ -5,7 +5,7 @@
 module Toodledo
 
   # Required for gem  
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
   
   # Returns the configuration object.
   def self.get_config()

data/lib/toodledo/command_line/add_command.rb

@@ -12,17 +12,16 @@ module Toodledo
       end
       
       def execute(args)
-        return if (args == nil)
-        
-        if (client.debug?)
-          logger = Logger.new(STDOUT)
-          logger.level = Logger::DEBUG
-        end
-        
-        Toodledo.begin(logger) do |session|            
+        return if (args == nil)                
+        Toodledo.begin(client.logger) do |session|            
           line = args.join(' ')
           client.add_task(session, line)
         end
+          
+        return 0
+      rescue ItemNotFoundError => e
+        puts e.message
+        return -1
       end      
     end
   end  

data/lib/toodledo/command_line/base_command.rb

@@ -6,17 +6,12 @@ module Toodledo
       def initialize(client, name, subtasks = false)
         super(name, subtasks)
         raise "Nil client!" if (client == nil)
-        @client = client        
+        @client = client          
       end
       
       def client
         return @client
-      end
-      
-      def logger
-        return @logger
-      end
-      
+      end      
     end
   end
 end

data/lib/toodledo/command_line/client.rb

@@ -45,6 +45,8 @@ module Toodledo
       def initialize(userconfig=CONFIG_F, opts={})
         @filters = {}
         @debug = false
+        @logger = Logger.new(STDOUT)
+        @logger.level = Logger::FATAL
         
         @userconfig = test(?e, userconfig) ? IO::read(userconfig) : CONFIG
         @userconfig = YAML.load(@userconfig).merge(opts)
@@ -56,6 +58,15 @@ module Toodledo
       
       def debug=(is_debug)
         @debug = is_debug
+        if (@debug == true)
+          @logger.level = Logger::DEBUG
+        else
+          @logger.level = Logger::FATAL
+        end
+      end
+            
+      def logger
+        return @logger
       end
             
       #
@@ -166,18 +177,7 @@ module Toodledo
           input = input.to_i
         else
           input = input.downcase
-          case input 
-          when 'negative'
-            input = Priority::NEGATIVE
-          when 'low'
-            input = Priority::LOW
-          when 'medium'
-            input = Priority::MEDIUM
-          when 'high'
-            input = Priority::HIGH
-          when 'top'
-            input = Priority::TOP
-          end
+          input = Priority.convert(input)
         end
         
         if (! Priority.valid?(input))
@@ -263,6 +263,7 @@ module Toodledo
       # but that'll come by demand.  Or patches.  Fully documented patches, mmmm.
       #
       def hotlist(session, input)
+        logger.debug("hotlist: #{input}")
         
         # See if there's input following the command.
         context = parse_context(input)
@@ -386,18 +387,24 @@ module Toodledo
       # task.  Note that you must specify the ID here.  
       #
       # edit *Action 12345
-      def edit_task(session, input)        
+      def edit_task(session, input)  
+        logger.debug("edit_task: #{input.inspect}")
+        
         context = parse_context(input)
         folder = parse_folder(input)
         goal = parse_goal(input)
         task_id = parse_remainder(input)
         
-        params = {  }
+        logger.debug("edit_task: task_id = #{task_id}")
         
         if (task_id == nil)
           task_id = ask("Task ID?: ") { |q| q.readline = true }
         end
         
+        task_id.strip!
+        
+        params = {  }
+        
         if (folder != nil)
           params.merge!({ :folder => folder })
         end
@@ -426,6 +433,8 @@ module Toodledo
           task_id = ask("Task ID?: ") { |q| q.readline = true }  
         end
         
+        task_id.strip!
+                
         params = { :completed => 1 }
         if (session.edit_task(task_id, params))
           puts "Task #{task_id} completed."
@@ -445,6 +454,8 @@ module Toodledo
           task_id = ask("Task ID?: ") { |q| q.readline = true }
         end
         
+        task_id.strip!
+        
         if (session.delete_task(task_id))
           puts "Task #{task_id} deleted."
         else

data/lib/toodledo/command_line/complete_command.rb

@@ -8,15 +8,16 @@ module Toodledo
       end
       
       def execute(args)
-        if (client.debug?)
-          logger = Logger.new(STDOUT)
-          logger.level = Logger::DEBUG
-        end
         
-        Toodledo.begin(logger) do |session|            
+        Toodledo.begin(client.logger) do |session|            
           line = args.join(' ')
           client.complete_task(session, line)
         end
+        
+        return 0
+      rescue ItemNotFoundError => e
+        puts e.message
+        return -1
       end       
     end
   end  

data/lib/toodledo/command_line/delete_command.rb

@@ -8,16 +8,16 @@ module Toodledo
         self.description = "Deletes a task from Toodledo."
       end
 
-      def execute(args)
-        if (client.debug?)
-          logger = Logger.new(STDOUT)
-          logger.level = Logger::DEBUG
-        end
-        
-        Toodledo.begin(logger) do |session|            
+      def execute(args)       
+        Toodledo.begin(client.logger) do |session|            
           line = args.join(' ')
           client.delete_task(session, line)
         end
+        
+        return 0
+      rescue ItemNotFoundError => e
+        puts e.message
+        return -1
       end
     end
   end

data/lib/toodledo/command_line/edit_command.rb

@@ -10,15 +10,15 @@ module Toodledo
        end
        
       def execute(args)
-        if (client.debug?)
-          logger = Logger.new(STDOUT)
-          logger.level = Logger::DEBUG
-        end
-        
-        Toodledo.begin(logger) do |session|       
+        Toodledo.begin(client.logger) do |session|       
           line = args.join(' ')
-          client.edit_task(session, line)
+          return client.edit_task(session, line)
         end
+        
+        return 0
+      rescue ItemNotFoundError => e
+        puts e.message
+        return -1
       end
     end
   end

data/lib/toodledo/command_line/hotlist_command.rb

@@ -7,16 +7,13 @@ module Toodledo
         self.description = "Shows the hotlist in Toodledo."
       end
       
-      def execute(args)  
-        if (client.debug?)
-          logger = Logger.new(STDOUT)
-          logger.level = Logger::DEBUG
-        end
-        
-        Toodledo.begin(logger) do |session|   
+      def execute(args)        
+        Toodledo.begin(client.logger) do |session|   
           line = args.join(' ')
           client.hotlist(session, line)
         end
+        
+        return 0
       end
     end
   end 

data/lib/toodledo/command_line/list_command.rb

@@ -9,15 +9,12 @@ module Toodledo
       end
       
       def execute(args)
-        if (client.debug?)
-          logger = Logger.new(STDOUT)
-          logger.level = Logger::DEBUG
-        end
-        
-        Toodledo.begin(logger) do |session|            
+        Toodledo.begin(client.logger) do |session|            
           line = args.join(' ')
-          client.list_tasks(session, line)
+          return client.list_tasks(session, line)
         end
+        
+        return 0
       end
     end
   end

data/lib/toodledo/command_line/main_command.rb

@@ -13,13 +13,8 @@ module Toodledo
         self.description = "The interactive command line client."        
       end
       
-      def execute(args)        
-        if (client.debug?)
-          logger = Logger.new(STDOUT)
-          logger.level = Logger::DEBUG
-        end
-        
-        Toodledo.begin(logger) do |session|            
+      def execute(args)
+        Toodledo.begin(client.logger) do |session|            
           command_loop(session)
         end
       end
@@ -129,6 +124,14 @@ module Toodledo
               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

data/lib/toodledo/command_line/parser_helper.rb

@@ -36,16 +36,18 @@ module Toodledo
       end
   
       # Returns the bit after we've looked for *Folder, @Context & $Goal
-      def parse_remainder(input)    
-        biggest_pos = 0
+      def parse_remainder(line)    
+        
+        input = line
+
+        # Strip out anything that isn't folder, goal or context.
         for regexp in [ FOLDER_REGEXP, GOAL_REGEXP, CONTEXT_REGEXP]
-          match = regexp.match(input)
-          next if (match == nil)
-          re_end = match.end(0)
-          biggest_pos = re_end if (biggest_pos < re_end)
+          input = input.sub(regexp, '')
         end
     
-        return input[(biggest_pos)..input.length].strip!
+        input.strip!
+    
+        return input
       end
   
       # Strips a string of [ and ] characters

data/lib/toodledo/priority.rb

@@ -30,5 +30,22 @@ module Toodledo
       return false
     end
     
+    def self.convert(input)
+      case input 
+      when 'negative'
+        return Priority::NEGATIVE
+      when 'low'
+        return Priority::LOW
+      when 'medium'
+        return Priority::MEDIUM
+      when 'high'
+        return Priority::HIGH
+      when 'top'
+        return Priority::TOP
+      else
+        raise ArgumentError.new("Unknown priority: #{input}") 
+      end
+    end
+    
   end
 end

data/lib/toodledo/session.rb

@@ -840,7 +840,7 @@ module Toodledo
         bool = (value == true) ? '1' : '0'           
       when String
         bool = ('true' == value.downcase) ? '1' : '0' 
-      when FixNum
+      when Fixnum
         bool = (value == 1) ? '1' : '0'
       else
         bool = value

metadata

@@ -1,33 +1,54 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
-specification_version: 1
 name: toodledo
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
-date: 2008-02-11 00:00:00 -08:00
-summary: A command line client and API to Toodledo
-require_paths: 
-- lib
-email: will@tersesystems.com
-homepage: http://rubyforge.org/projects/toodledo
-rubyforge_project: toodledo
-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."
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 1.0.2
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Will Sargent
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-02-14 00:00:00 -08:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: cmdparse
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: highline
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !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."
+email: will@tersesystems.com
+executables: 
+- toodledo
+extensions: []
+
+extra_rdoc_files: 
+- History.txt
+- Manifest.txt
+- README.txt
 files: 
 - CHANGELOG
 - History.txt
@@ -59,46 +80,32 @@ files:
 - test/parser_helper_test.rb
 - test/session_test.rb
 - test/toodledo_functional_test.rb
-test_files: []
-
+has_rdoc: true
+homepage: http://rubyforge.org/projects/toodledo
+post_install_message: 
 rdoc_options: 
 - --main
 - README.txt
-extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- README.txt
-executables: 
-- toodledo
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: cmdparse
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: highline
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.5.0
-    version: 
+rubyforge_project: toodledo
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: A command line client and API to Toodledo
+test_files: []
+