taskish 0.2.2 → 0.3

data/HISTORY

@@ -1,3 +1,6 @@
+2011-06-29 v0.3
+  - Can now use multiple task input files
+
 2011-06-23 v0.2.2
   - More doc fixes
 

data/README.rdoc

@@ -1,6 +1,6 @@
 = Taskish - Pending
 
-A text-based to-do list manager inspired by <TaskPaper|URL:http://www.hogbaysoftware.com/products/taskpaper>
+A text-based to-do list manager inspired by {TaskPaper}[http://www.hogbaysoftware.com/products/taskpaper].
 
 == USAGE
 
@@ -15,6 +15,9 @@ A text-based to-do list manager inspired by <TaskPaper|URL:http://www.hogbaysoft
     # Find tasks due within the next week
     taskish.due(:week)
 
+    # Find completed tasks.
+    taskish.done
+
   end
 
 == HOME PAGE

data/lib/taskish.rb

@@ -3,7 +3,7 @@ require 'taskish/version'
 
 # = Taskish - Pending
 #
-# A text-based to-do list manager inspired by <TaskPaper|URL:http://www.hogbaysoftware.com/products/taskpaper>
+# A text-based to-do list manager inspired by {TaskPaper}[http://www.hogbaysoftware.com/products/taskpaper].
 #
 # == USAGE
 #
@@ -18,6 +18,9 @@ require 'taskish/version'
 #     # Find tasks due within the next week
 #     taskish.due(:week)
 #
+#     # Find completed tasks.
+#     taskish.done
+#
 #   end
 #
 # == HOME PAGE
@@ -66,14 +69,12 @@ class Taskish
       idx += 1
       l.chomp!
       if    l =~ /^(\S.+):$/
-        #warn "PROJECT => #{ $1 }"
         if key? $1
-          warn "line ##{idx} - project '#{ $1 }' already exists; skipping"
-          project = nil
+          # warn "line ##{idx} - duplicate project '#{ $1 }'"
         else
           @data[ $1 ] = []
-          project     = $1
         end
+        project = $1
       elsif l =~ /^\s+\-\s+(.*)$/
         #warn "TASK => #{ $1 }"
         if project

data/lib/taskish/app.rb

@@ -11,7 +11,7 @@ class Taskish # :nodoc:
   #
   # Command Line:
   #
-  #   % taskish [args]
+  #   % taskish <command> <task file> [<task file N>]
   #
   # == SEE ALSO
   #
@@ -19,11 +19,11 @@ class Taskish # :nodoc:
   #
   class App
 
-    attr_reader :command, :file
+    attr_reader :command, :files
 
     def initialize
       @command  = nil
-      @file     = nil
+      @files    = nil
       yield self if block_given?
     end
 
@@ -36,7 +36,7 @@ class Taskish # :nodoc:
     def args(args)
       raise(ArgumentError, 'invalid argument(s)') if ( args.nil? || !args.kind_of?(Array) )
       @command  = args.shift
-      @file     = args.shift
+      @files    = args
       self
     end
 
@@ -53,21 +53,21 @@ class Taskish # :nodoc:
           puts "Taskish v#{ Taskish::VERSION }"
           return true
         else
-          return app.abort('no file specified') unless app.file
+          return app.abort('no file specified') unless app.files
           Taskish.new do |taskish|
+            app.files.each { |f| taskish.readlines(f) }
             case  app.command
             when  'done'
-              taskish.readlines(app.file)
+              # taskish.readlines(app.file)
               puts "DONE\n~~~~~"
               taskish.done.each { |task| puts task }
-            when  'today'
-              taskish.readlines(app.file)
-              puts "TODAY\n~~~~~"
-              taskish.due(:today).each { |task| puts task }
-            when  'week'
-              taskish.readlines(app.file)
-              puts "WEEK\n~~~~"
-              taskish.due(:week).each  { |task| puts task }
+            when  'today', 'week'
+              # taskish.readlines(app.file)
+              tasks = taskish.due( app.command.to_sym )
+              if tasks.size > 0
+                puts "#{ app.command.upcase }\n#{ '~' * app.command.length }"
+                tasks.each { |task| puts task }
+              end
             else
               return app.abort("unknown command: #{app.command}")
             end

data/lib/taskish/version.rb

@@ -1,3 +1,3 @@
 class Taskish # :nodoc:
-  VERSION = '0.2.2'
+  VERSION = '0.3'
 end

data/test/app_test.rb

@@ -28,12 +28,17 @@ class AppTest < Test::Unit::TestCase
     context 'with arguments' do
       should 'have nil args before parsing args' do
         assert_nil  @app.command
-        assert_nil  @app.file
+        assert_nil  @app.files
       end
       should 'have set args after parsing args' do
         @app.args( [ 'command', 'file' ] )
         assert_equal  'command',  @app.command
-        assert_equal  'file',     @app.file
+        assert_equal  [ 'file' ], @app.files
+      end
+      should 'have set args after parsing args' do
+        @app.args( [ 'command', 'file1', 'file2' ] )
+        assert_equal  'command',            @app.command
+        assert_equal  [ 'file1', 'file2' ], @app.files
       end
     end
 

data/test/version_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class VersionTest < Test::Unit::TestCase
 
   should 'have expected version' do
-    assert_equal '0.2.2', Taskish::VERSION
+    assert_equal '0.3', Taskish::VERSION
   end
 
 end # class VersionTest

metadata

@@ -4,9 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: "0.3"
 platform: ruby
 authors: 
 - blair christensen.
@@ -14,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-23 00:00:00 -05:00
+date: 2011-06-29 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency