taskwarrior 0.0.2 → 0.0.3

data/examples/finished-early

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+
+#
+# Prints those tasks the were completed before they were due.
+#
+# Call it like
+#
+# $ task export rc.json.array=on rc.verbose=nothing | examples/finished-early
+#
+
+require 'taskwarrior'
+
+r = TaskWarrior::Repository.new(ARGF.read)
+
+selected = r.tasks.select do |t|
+  t.status == :completed && t.due_at > t.end_at if t.due_at && t.end_at
+end
+
+puts "#{selected.size} tasks completed before they were due:"
+
+selected.group_by{|t| (t.due_at - t.end_at).truncate}.sort.each{|g, tasks|
+  puts "#{g} days early:"
+  tasks.each{|t|
+  	puts "  #{t.description}"
+  }
+}

data/lib/taskwarrior/annotation.rb

@@ -0,0 +1,22 @@
+require 'active_model'
+
+module TaskWarrior
+  class Annotation
+    attr_accessor :entry, :description
+
+    include ActiveModel::Validations
+    validates :entry, :presence => true
+    validates :description, :presence => true
+
+    include TaskWarrior::Validations
+    validate :entry_cannot_be_in_the_future
+
+    def initialize(description = nil)
+      @description = description
+    end
+
+    def to_s
+      "Annotation (#{entry}): #{description}"
+    end
+  end
+end

data/lib/taskwarrior/annotation_mapper.rb

@@ -0,0 +1,14 @@
+module TaskWarrior
+  #
+  # A DataMapper that makes new annotations from a JSON representation
+  #
+  class AnnotationMapper
+    class << self
+      def map(json)
+        Annotation.new(json['description']).tap{|t|
+          t.entry = DateTime.parse(json['entry'])
+        }
+      end
+    end
+  end
+end

data/lib/taskwarrior/tag.rb

@@ -27,7 +27,7 @@ module TaskWarrior
     end
 
     def tasks
-      @tasks #.dup
+      @tasks
     end
 
     def to_s

data/lib/taskwarrior/task.rb

@@ -2,9 +2,13 @@ require 'active_model'
 
 module TaskWarrior
   class Task
-    attr_accessor :description, :id, :entry, :status, :uuid, :project, :dependencies, :parent, :children, :priority
+    attr_accessor :description, :id, :entry, :status, :uuid, 
+                  :project, :dependencies, :parent, :children, 
+                  :priority, :tags, :annotations, 
+                  :start_at, :wait_at, :end_at, :due_at
 
     include ActiveModel::Validations
+
     validates :description, :id, :entry, :status, :uuid, :presence => true
 
     validates :id, :numericality => { :only_integer => true, :greater_than => 0}
@@ -21,32 +25,20 @@ module TaskWarrior
       :message => "%{value} is not a valid priority"
     }
 
+    include TaskWarrior::Validations
     validate :entry_cannot_be_in_the_future
+    validates :start_at, :wait_at, :end_at, :due_at, :with => :must_be_date_or_nil
 
     def initialize(description)
       @description = description
       @dependencies = []
       @children = []
       @tags = []
-    end
-
-    def tags
-      @tags
+      @annotations = []
     end
 
     def to_s
       "Task '#{description}'".tap{|result| result << " <#{uuid}>" if uuid}
     end
-
-    private
-    def entry_cannot_be_in_the_future
-      begin
-        if !entry.blank? and entry > DateTime.now
-          errors.add(:entry, "can't be in the future")
-        end
-      rescue
-        errors.add(:entry, "must be comparable to DateTime")
-      end
-    end
   end
 end

data/lib/taskwarrior/task_mapper.rb

@@ -23,6 +23,11 @@ module TaskWarrior
           t.parent = json['parent'] # Children will be cross-indexed in the repository
           t.priority = PriorityMapper.map(json['priority'])
           json['tags'].each{|tag| t.tags << tag} if json['tags']
+          json['annotations'].each{|annotation| t.annotations << AnnotationMapper.map(annotation)} if json['annotations']
+          
+          %w{start wait end due}.each do |datish|
+            t.send("#{datish}_at=", DateTime.parse(json[datish])) if json[datish]
+          end
         }
       end
     end

data/lib/taskwarrior/validations.rb

@@ -0,0 +1,20 @@
+module TaskWarrior
+  module Validations
+    def must_be_date_or_nil(sym)
+      datish = self.send(sym)
+      if !(datish.nil? or datish.is_a?(DateTime))
+        errors.add(sym, "must be nil or a valid DateTime object")
+      end
+    end
+
+    def entry_cannot_be_in_the_future
+      begin
+        if !entry.blank? and entry > DateTime.now
+          errors.add(:entry, "can't be in the future")
+        end
+      rescue
+        errors.add(:entry, "must be comparable to DateTime")
+      end
+    end
+  end
+end

data/lib/taskwarrior/version.rb

@@ -1,3 +1,3 @@
 module TaskWarrior
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/taskwarrior.rb

@@ -1,12 +1,16 @@
 require "taskwarrior/version"
 
+require "taskwarrior/validations"
+
+require "taskwarrior/repository"
 require "taskwarrior/task"
 require "taskwarrior/project"
 require "taskwarrior/tag"
-require "taskwarrior/repository"
+require "taskwarrior/annotation"
+
 require "taskwarrior/task_mapper"
 require "taskwarrior/priority_mapper"
+require "taskwarrior/annotation_mapper"
 
 module TaskWarrior
-  # Your code goes here...
 end

data/test/unit/test_annotation.rb

@@ -0,0 +1,53 @@
+require 'test_helper'
+require 'date'
+require 'active_support/core_ext'
+
+class TestAnnotation < Test::Unit::TestCase
+  include TaskWarrior::Test::Validations
+  
+  def setup
+    @annotation = TaskWarrior::Annotation.new
+
+    @annotation.description = 'foo bar'
+    @annotation.entry = DateTime.now
+  end
+
+  def test_description
+    assert_equal('foo bar', @annotation.description)
+    assert_valid(@annotation)
+  end
+
+  def test_description_nil
+    @annotation.description = nil
+    assert_invalid(@annotation)
+  end
+
+  def test_description_empty
+    @annotation.description = ''
+    assert_invalid(@annotation)
+  end
+
+  def test_entry_nil
+    @annotation.entry = nil
+    assert_invalid(@annotation)
+  end
+
+  def test_entry_empty
+    @annotation.entry = ''
+    assert_invalid(@annotation)
+  end
+
+  def test_entry_wrong_format
+    @annotation.entry = "foobar"
+    assert_invalid(@annotation)
+  end
+
+  def test_entry_future
+    @annotation.entry = DateTime.now.advance(:days => 1)
+    assert_invalid(@annotation)
+  end
+
+  def test_valid
+    assert_valid(@annotation)
+  end
+end

data/test/unit/test_repository.rb

@@ -23,9 +23,9 @@ class TestRepository < Test::Unit::TestCase
     assert_equal('party', one.project.name)
     assert_equal(:pending, one.status)
 
-#    assert_equal(1, one.annotations.size)
-#    assert_equal(DateTime.new('20120629T191534Z'), one.annotations.first.entry)
-#    assert_equal('the 13th looks good', one.annotations.first.entry.description)
+    assert_equal(1, one.annotations.size)
+    assert_equal(DateTime.parse('20120629T191534Z'), one.annotations.first.entry)
+    assert_equal('the 13th looks good', one.annotations.first.description)
   end
 
   def test_child

data/test/unit/test_tag_habtm.rb

@@ -11,7 +11,7 @@ class TestTagHasAndBelongsToMany < Test::Unit::TestCase
     @deadbeef = TaskWarrior::Tag.new('deadbeef')
     @metasyntactic = TaskWarrior::Tag.new('metasyntactic')
 
-    # We need to do what the repo does - cross-reference manually.
+    # Cross-reference manually like the repo does
     @foo << @lookup_foo
     @lookup_foo.tags << @foo
     @lookup_foo.tags << @metasyntactic

data/test/unit/test_task.rb

@@ -15,107 +15,171 @@ class TestTask < Test::Unit::TestCase
     @task.status = :pending
   end
 
-  def test_task_id_nil
+  def test_id_nil
     @task.id = nil
     assert_invalid(@task)
   end
 
-  def test_task_id_0
+  def test_id_0
     @task.id = 0
     assert_invalid(@task)
   end
 
-  def test_task_uuid_nil
+  def test_uuid_nil
     @task.uuid = nil
     assert_invalid(@task)
   end
 
-  def test_task_uuid_empty
+  def test_uuid_empty
     @task.uuid = ''
     assert_invalid(@task)
   end
 
-  def test_task_uuid_wrong_format
+  def test_uuid_wrong_format
     @task.uuid = 'abcdefg'
     assert_invalid(@task)
   end
 
-  def test_task_entry_nil
+  def test_description
+    assert_equal('foobar', @task.description)
+    assert_valid(@task)
+  end
+
+  def test_description_nil
+    @task.description = nil
+    assert_invalid(@task)
+  end
+
+  def test_description_empty
+    @task.description = ''
+    assert_invalid(@task)
+  end
+
+  def test_entry_nil
     @task.entry = nil
     assert_invalid(@task)
   end
 
-  def test_task_entry_empty
+  def test_entry_empty
     @task.entry = ''
     assert_invalid(@task)
   end
 
-  def test_task_entry_wrong_format
+  def test_entry_wrong_format
     @task.entry = "foobar"
     assert_invalid(@task)
   end
 
-  def test_task_entry_future
+  def test_entry_future
     @task.entry = DateTime.now.advance(:days => 1)
     assert_invalid(@task)
   end
 
-  def test_task_status_nil
+  def test_status_nil
     @task.status = nil
     assert_invalid(@task)
   end
 
-  def test_task_status_empty
+  def test_status_empty
     @task.status = ''
     assert_invalid(@task)
   end
 
-  def test_task_status_unknown_string
+  def test_status_unknown_string
     @task.status = "foobar"
     assert_invalid(@task)
   end
 
-  def test_task_status_unknown_symbol
+  def test_status_unknown_symbol
     @task.status = :foobar
     assert_invalid(@task)
   end
 
-  def test_task_priority_nil
+  def test_priority_nil
     @task.priority = nil
     assert_valid(@task)
   end
 
-  def test_task_priority_empty
+  def test_priority_empty
     @task.priority = ''
     assert_valid(@task)
   end
 
-  def test_task_priority_unknown_string
+  def test_priority_unknown_string
     @task.priority = "foobar"
     assert_invalid(@task)
   end
 
-  def test_task_priority_unknown_symbol
+  def test_priority_unknown_symbol
     @task.priority = :foobar
     assert_invalid(@task)
   end
 
-  def test_task_priority_high
+  def test_priority_high
     @task.priority = :high
     assert_valid(@task)
   end
 
-  def test_task_priority_medium
+  def test_priority_medium
     @task.priority = :medium
     assert_valid(@task)
   end
 
-  def test_task_priority_low
+  def test_priority_low
     @task.priority = :low
     assert_valid(@task)
   end
 
-  def test_task_valid
+  def test_valid
+    assert_valid(@task)
+  end
+
+  def test_start_at
+    assert_datish(:start_at)
+  end
+
+  def test_wait_at
+    assert_datish(:wait_at)
+  end
+
+  def test_end_at
+    assert_datish(:end_at)
+  end
+
+  def test_due_at
+    assert_datish(:due_at)
+  end
+
+  def assert_datish(sym)
+    assert_datish_nil(sym)
+    assert_datish_empty(sym)
+    assert_datish_wrong_format(sym)
+    assert_datish_future(sym)
+    assert_datish_past(sym)
+  end
+
+  def assert_datish_nil(sym)
+    @task.send("#{sym}=", nil)
+    assert_valid(@task)
+  end
+
+  def assert_datish_empty(sym)
+    @task.send("#{sym}=", '')
+    assert_invalid(@task)
+  end
+
+  def assert_datish_wrong_format(sym)
+    @task.send("#{sym}=", "foobar")
+    assert_invalid(@task)
+  end
+
+  def assert_datish_future(sym)
+    @task.send("#{sym}=", DateTime.now.advance(:days => 1))
+    assert_valid(@task)
+  end
+
+  def assert_datish_past(sym)
+    @task.send("#{sym}=", DateTime.now.advance(:days => -1))
     assert_valid(@task)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taskwarrior
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-08 00:00:00.000000000 Z
+date: 2012-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -138,13 +138,17 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- examples/finished-early
 - lib/taskwarrior.rb
+- lib/taskwarrior/annotation.rb
+- lib/taskwarrior/annotation_mapper.rb
 - lib/taskwarrior/priority_mapper.rb
 - lib/taskwarrior/project.rb
 - lib/taskwarrior/repository.rb
 - lib/taskwarrior/tag.rb
 - lib/taskwarrior/task.rb
 - lib/taskwarrior/task_mapper.rb
+- lib/taskwarrior/validations.rb
 - lib/taskwarrior/version.rb
 - taskwarrior.gemspec
 - test/fixtures/no_deps.json
@@ -152,6 +156,7 @@ files:
 - test/fixtures/party2.json
 - test/fixtures/party_taxes.json
 - test/test_helper.rb
+- test/unit/test_annotation.rb
 - test/unit/test_priority_mapper.rb
 - test/unit/test_project.rb
 - test/unit/test_repository.rb
@@ -188,6 +193,7 @@ test_files:
 - test/fixtures/party2.json
 - test/fixtures/party_taxes.json
 - test/test_helper.rb
+- test/unit/test_annotation.rb
 - test/unit/test_priority_mapper.rb
 - test/unit/test_project.rb
 - test/unit/test_repository.rb