pomo 0.0.3 → 0.0.4

data/History.md

@@ -1,4 +1,22 @@
 
+0.0.4 / 2009-10-15
+==================
+
+  * Added / implemented selection api via Pomo::List#find
+
+0.0.3 / 2009-10-15
+==================
+
+  * Added --complete switch for `pomo list`
+  * Added --incomplete switch for `pomo list`
+  * Changed INT message; more user-friendly
+  
+0.0.2 / 2009-10-15
+==================
+
+  * Added `pomo remove all`
+  * Added `pomo complete`
+  
 0.0.1 / 2009-10-15
 ==================
 

data/Readme.md

@@ -38,12 +38,22 @@ Once you have completed the task, list again:
       √ 0. Fix IE stying issues                : 25 minutes
         1. Destroy IE                          : 25 minutes
         
+List only remaining tasks:
+    $ pomo list --incomplete
+        1. Destroy IE                          : 25 minutes
+        
+List only completed tasks:
+    $ pomo list --complete
+      √ 0. Fix IE stying issues                : 25 minutes
+        
 At any time mid-task you may terminate pomo via CTRL + C, at which time
 you may manually complete the task:
     $ pomo complete first
     $ pomo complete last
     $ pomo complete 1
-    $ pomo complete 5
+    $ pomo complete all
+    $ pomo complete incomplete
+    $ pomo complete 5..7
         
 The next time you run `pomo start` the first incomplete task will start:
     $ pomo start
@@ -60,17 +70,37 @@ You may also remove tasks
     $ pomo remove 1
     $ pomo remove 6
     $ pomo rm first
-    $ pomo rm last
+    $ pomo rm 2..5
+    $ pomo rm 1..-1
     
 View task details:
     $ pomo view first
     $ pomo view last
     $ pomo view 5
-    $ pomo view 1
+    $ pomo view 1 2 3
 
 Remove all tasks:
     $ pomo remove all
     $ pomo rm all
+    
+## Task Selection API
+
+Taken from `pomo help`:
+
+    Most of the subcommands work directly with tasks,
+    and because of this pomo provides a unified task selection api
+    shown below which can be used with most of the commands 
+    (those with [task ...] in their synopsis). 
+  
+    n          : selects a single task by index : Ex: pomo remove 1
+    [n ]+      : selects several tasks by index : Ex: pomo remove 2 8 1
+    n..n       : selects a range of tasks       : Ex: pomo remove 5..9
+    n..-n      : selects a range of tasks       : Ex: pomo remove 2..-1
+    first      : selects the first task         : Ex: pomo remove first
+    last       : selects the last task          : Ex: pomo remove last
+    complete   : selects complete tasks         : Ex: pomo remove complete
+    incomplete : selects incomplete tasks       : Ex: pomo remove incomplete
+    all        : selects all tasks              : Ex: pomo remove all
 
 ## License
 

data/bin/pomo

@@ -6,32 +6,47 @@ require 'commander/import'
 require 'pomo'
 
 program :version, Pomo::VERSION
-program :description, 'Pomodoro time management'
+program :description, "Pomodoro time management.
+    Most of the subcommands work directly with tasks, and 
+    because of this pomo provides a unified task selection api
+    shown below which can be used with most of the commands 
+    (those with [task ...] in their synopsis). 
+    
+    n          : selects a single task by index : Ex: pomo remove 1
+    [n ]+      : selects several tasks by index : Ex: pomo remove 2 8 1
+    n..n       : selects a range of tasks       : Ex: pomo remove 5..9
+    n..-n      : selects a range of tasks       : Ex: pomo remove 2..-1
+    first      : selects the first task         : Ex: pomo remove first
+    last       : selects the last task          : Ex: pomo remove last
+    complete   : selects complete tasks         : Ex: pomo remove complete
+    incomplete : selects incomplete tasks       : Ex: pomo remove incomplete
+    all        : selects all tasks              : Ex: pomo remove all
+"
+
 program :int_message, "\nTerminated pomo" \
                       "\n  * previously running tasks not marked as complete" \
                       "\n  * manually complete a task with `$ pomo complete <task>`"
 
 list = Pomo::List.new '~/.pomo'
- 
+
 command :start do |c|
-  c.syntax = 'pomo start [number] [options]'
+  c.syntax = 'pomo start [task] [options]'
   c.summary = 'Start a task'
-  c.description = 'Start a task, given the task [number] or the first task'
+  c.description = 'Start a task, given the task [task] or the first task'
   c.example 'Start the first task', 'pomo start'
   c.example 'Start the first task', 'pomo start 0'
   c.example 'Start the first task', 'pomo start first'
   c.example 'Start the fifth task', 'pomo start 5'
   c.action do |args, options|
-    if task = list.tasks.at(args.first ? args.first.to_i : 0)
+    list.find(*args) do |task, i|
       abort 'task already completed' if task.complete?
       say "Started #{task}, you have #{task.length} minutes :)"
       task.start
       list.save
+      break
     end
   end
 end
-alias_command :'start first', :start, '0'
-alias_command :'start last', :start, list.tasks.length - 1
  
 command :add do |c|
   c.syntax = 'pomo add <task> [options]'
@@ -50,74 +65,60 @@ command :add do |c|
 end
 
 command :remove do |c|
-  c.syntax = 'pomo [remove|rm] <number> [options]'
+  c.syntax = 'pomo [remove|rm] [task ...] [options]'
   c.summary = 'Remove a task'
-  c.description = 'Remove a task, given the task <number>'
+  c.description = 'Remove a task, given the task(s) or the first task'
   c.example 'Remove the first task', 'pomo remove first'
   c.example 'Remove the last task', 'pomo remove last'
   c.example 'Remove the fifth task', 'pomo remove 5'
-  c.example 'Remove the fifth task', 'pomo rm 5'
+  c.example 'Remove the fifth and second task', 'pomo rm 5 2'
+  c.example 'Remove a range of tasks', 'pomo rm 2..6'
+  c.example 'Remove all but the first task', 'pomo rm 2..-1'
+  c.example 'Remove all tasks', 'pomo rm all'
   c.action do |args, options|
-   list.tasks.each_with_index do |task, i|
-     if i == args.first.to_i
-       list.tasks.delete_at i
-       say "Removed #{task}"
-     end
-   end
+    list.find(*args) do |task, i|
+      list.tasks -= [task]
+      say "Removed #{task}"
+    end
    list.save
   end
 end
 alias_command :rm, :remove
-alias_command :'remove first', :remove, '0'
-alias_command :'remove last', :remove, list.tasks.length - 1
-
-command :'remove all' do |c|
-  c.syntax = 'pomo remove all'
-  c.description = 'Remove all tasks'
-  c.action do 
-   list.tasks = []
-   list.save
-   say "Tasks removed"
-  end
-end
-alias_command :'rm all', :'remove all'
 
 command :view do |c|
-  c.syntax = 'pomo view [number] [options]'
+  c.syntax = 'pomo view [task ...] [options]'
   c.summary = 'View a task'
-  c.description = 'View verbose information for the given task [number] or the first task'
+  c.description = 'View verbose information for the given task(s) or the first task'
   c.example 'View the first task', 'pomo view first'
   c.example 'View the last task', 'pomo view last'
   c.example 'View the fifth task', 'pomo view 5'
   c.action do |args, options|
-    if task = list.tasks.at(args.first ? args.first.to_i : 0)
+    list.find(*args) do |task, i|
+      say "\n"
       format = "%15s : %s\n"
       say format % ['name', task.name]
       say format % ['length', "#{task.length} minutes"]
       say format % ['description', task.description || '...']
     end
+    say "\n"
   end
 end
-alias_command :'view first', :view, '0'
-alias_command :'view last', :view, list.tasks.length - 1
 
 command :complete do |c|
-  c.syntax = 'pomo complete [number] [options]'
+  c.syntax = 'pomo complete [task ...] [options]'
   c.summary = 'Mark a task as completed'
-  c.description = 'Mark the given task [number] or the first task to complete'
+  c.description = 'Mark the given task(s) or the first task to complete'
   c.example 'Mark first task as complete', 'pomo complete first'
   c.example 'Mark last task as complete', 'pomo complete last'
   c.example 'Mark fifth task as complete', 'pomo complete 5'
   c.action do |args, options|
-    if task = list.tasks.at(args.first ? args.first.to_i : 0)
+    list.find(*args) do |task, i|
       task.complete = true
-      list.save
       say "Completed #{task}"
     end
+    list.save
   end
 end
-alias_command :'complete first', :complete, '0'
-alias_command :'complete last', :complete, list.tasks.length - 1
 
 command :list do |c|
   c.syntax = 'pomo list [options]'
@@ -126,11 +127,11 @@ command :list do |c|
   c.option '-c', '--complete', 'List only completed tasks'
   c.option '-i', '--incomplete', 'List only incompleted tasks'
   c.action do |args, options|
-   list.tasks.each_with_index do |task, i|
-     next if options.complete && !task.complete?
-     next if options.incomplete && task.complete?
-     say ' %s %2d. %-35s : %d minutes' % [task.complete? ? '√' : ' ', i, task.to_s, task.length]
-   end
+    list.tasks.each_with_index do |task, i|
+      next if options.complete && !task.complete?
+      next if options.incomplete && task.complete?
+      say ' %s %2d. %-35s : %d minutes' % [task.complete? ? '√' : ' ', i, task.to_s, task.length]
+    end
   end
 end
 

data/lib/pomo/list.rb

@@ -21,6 +21,47 @@ module Pomo
       load rescue save
     end
     
+    ##
+    # Find tasks by _args_, iterating with _block_.
+    #
+    # Supports the following:
+    #
+    #  * n
+    #  * n n n
+    #  * n..n
+    #  * n..-n
+    #  * first
+    #  * last
+    #  * incomplete
+    #  * complete[d]
+    #  * all
+    #
+    
+    def find *args, &block
+      found = []
+      found << tasks.first if args.empty?
+      if args.include? 'all'
+        found = tasks
+      elsif args.include? 'first'
+        found << tasks.first
+      elsif args.include? 'last'
+        found << tasks.last
+      elsif args.include?('complete') || args.include?('completed')
+        found = tasks.select { |task| task.complete? }
+      elsif args.include? 'incomplete'
+        found = tasks.select { |task| not task.complete? }
+      elsif args.any? { |arg| arg =~ /(\d+)\.\.(-?\d+)/ }
+        found = tasks[$1.to_i..$2.to_i]
+      else
+        tasks.each_with_index do |task, i|
+          found << task if args.any? { |a| a.to_i == i } 
+        end
+      end
+      found.each_with_index do |task, i|
+        yield task, i
+      end
+    end
+    
     ##
     # Add _task_ to the list in memory (requires saving).
     

data/lib/pomo/version.rb

@@ -1,4 +1,4 @@
 
 module Pomo
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/pomo.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pomo}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["TJ Holowaychuk"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pomo
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - TJ Holowaychuk