twdeps 0.0.2 → 0.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 65c4a0831441f978b94e806b7492a4cfb34ce0f7
+  data.tar.gz: c2ea1deb638801eac176a4c70663aef572c994fc
+SHA512:
+  metadata.gz: c034226377e9a2707b0225729dbe3ca383e321ced8e4cfdc7d63a786ddf712783b20fa0a3b371985a9c4c7dff29fe398ae60708893c5189b570d24304d982bad
+  data.tar.gz: 5bd6d1f659ef348eeb503f69cdc1278432036116474a5bc349c39b0b529576cb92b0fb142c0ad17db8ba619c84efca0dee42015d8717a8a478410fe0d8bce30d

data/.travis.yml

@@ -6,7 +6,6 @@ rvm:
 before_script:
  - mkdir ~/.task
  - echo data.location=~/.task > ~/.taskrc
- - task count
 
 before_install:
  - echo | sudo add-apt-repository ppa:ultrafredde/ppa

data/README.md

@@ -14,7 +14,7 @@ Given a set of interdependent tasks described in the TaskWarrior [tutorial](http
 
 Result:
 
-![party](/nerab/twdeps/raw/master/examples/party.png)
+![party](https://raw.github.com/nerab/twdeps/master/examples/party.png)
 
 ## Installation
 
@@ -26,16 +26,16 @@ Result:
     # See [Limitations](Limitations) below for why we need the extra task parms
     task export rc.json.array=on rc.verbose=nothing | twdeps > deps.png
   
-    # Same but spefify output format
-    task export | twdeps --format svg > deps.svg
+    # Same but specify output format
+    task export rc.json.array=on rc.verbose=nothing | twdeps --format svg > deps.svg
 
     # Create a graph from a previously exported file
-    task export > tasks.json
+    task export rc.json.array=on rc.verbose=nothing > tasks.json
     cat tasks.json | twdeps > deps.png
   
     # Display graph in browser without creating an intermediate file
     # Requires bcat to be installed
-    task export | twdeps --format svg | bcat
+    task export rc.json.array=on rc.verbose=nothing | twdeps --format svg | bcat
 
 ## Dependencies
 
@@ -45,7 +45,7 @@ The graph is generated with [ruby-graphviz](https://github.com/glejeune/Ruby-Gra
 
 ## Limitations
 
-Due to [two](http://taskwarrior.org/issues/1017) [bugs](http://taskwarrior.org/issues/1013) in JSON export, TaskWarrior 2.0 needs the command line options `rc.json.array=on` and `rc.verbose=nothing`.
+Due to [two](http://taskwarrior.org/issues/1017) [bugs](http://taskwarrior.org/issues/1013) in JSON export, TaskWarrior versions before 2.1 need the additional command line options `rc.json.array=on` and `rc.verbose=nothing`.
 
 ## Contributing
 

data/bin/twdeps

@@ -26,6 +26,7 @@ where [options] are:
 
 EOS
   opt :format, "Specify output format", :default => 'svg'
+  opt :title,  "Specify title", :default => 'Task Dependencies'
   opt :trace,  "Enable trace output", :default => false
 end
 
@@ -36,7 +37,7 @@ Trollop::die :format, "must be one of #{Graph.formats.join(', ')}" unless Graph.
 
 begin
   repo = Repository.new(ARGF.read)
-  master = Graph.new(File.basename($0)) # TODO Move this to a CommandlinePresenter
+  master = Graph.new(Presenter.new(opts[:title]))
 
   # Add all projects (will add their tasks and dependencies recursively)
   repo.projects.each do |project|

data/lib/twdeps/graph.rb

@@ -1,15 +1,5 @@
 module TaskWarrior
   module Dependencies
-    class NullPresenter
-      def attributes
-        {:label => 'Unknown', :fontcolor => 'red'}
-      end
-
-      def id
-        'null'
-      end
-    end
-
     # Builds a dependency graph
     #
     # +thing+ is added as node with all of its dependencies. A presenter is used to present the task as node label.
@@ -29,9 +19,14 @@ module TaskWarrior
 
       #
       # Build a new Graph for +thing+
-      # # TODO Accept a presenter that would default to GlobalPresenter with {:rankdir => 'BT'}
-      def initialize(name = :G, attributes = [])
-        @graph = GraphViz::new(name, attributes)
+      #
+      def initialize(presenter_or_id)
+        if presenter_or_id.respond_to?(:attributes)
+          @graph = GraphViz::new(presenter_or_id.id, presenter_or_id.attributes)
+        else
+          @graph = GraphViz::new(presenter_or_id)
+        end
+
         @dependencies = []
         @edges = []
       end
@@ -52,7 +47,7 @@ module TaskWarrior
         else
           # it's a project
           project = task_or_project
-          cluster = Graph.new(presenter(project).id, presenter(project).attributes)
+          cluster = Graph.new(presenter(project))
 
           project.tasks.each do |task|
             cluster << task
@@ -74,7 +69,7 @@ module TaskWarrior
       def create_edges(nodeA, nodes)
         nodes.each do |node|
           nodeB = find_or_create_node(node)
-          create_edge(nodeA, nodeB)
+          create_edge(nodeB, nodeA)
         end
       end
 
@@ -90,7 +85,9 @@ module TaskWarrior
         edge = [nodeA, nodeB]
         unless @edges.include?(edge) # GraphViz lacks get_edge, so we need to track existing edges ourselfes
           @edges << edge
-          @graph.add_edges(nodeA, nodeB)
+
+          # We present the edges in the sense of "nodeB depends on nodeA"
+          @graph.add_edges(nodeA, nodeB, :dir => 'back', :tooltip => "#{nodeB['label']} depends on #{nodeA['label']}")
         end
       end
 

data/lib/twdeps/null_presenter.rb

@@ -0,0 +1,11 @@
+module TaskWarrior
+  module Dependencies
+    class NullPresenter < Presenter
+      def initialize
+        super('null')
+        self.attributes = {:label => 'Unknown', :fontcolor => 'red'}
+      end
+    end
+   end
+ end
+ 

data/lib/twdeps/presenter.rb

@@ -0,0 +1,25 @@
+module TaskWarrior
+  module Dependencies
+    #
+    # Presents a thing to the graph
+    #
+    class Presenter
+      def initialize(id)
+        @id = id
+        @attributes = {:label => id, :labelloc => 'top'}
+      end
+
+      def attributes
+        @attributes
+      end
+
+      def id
+        @id
+      end
+
+      protected
+      attr_writer :id, :attributes
+    end
+   end
+ end
+ 

data/lib/twdeps/project_presenter.rb

@@ -3,17 +3,10 @@ module TaskWarrior
     #
     # Presents a project's attributes suitable for a GraphViz cluster
     #
-    class ProjectPresenter
+    class ProjectPresenter < Presenter
       def initialize(project)
-        @project = project
-      end
-      
-      def attributes
-        {:label => @project.name}
-      end
-      
-      def id
-        "cluster_#{@project.name}"
+        self.id = "cluster_#{project.name}"
+        self.attributes = {:label => project.name}
       end
     end
   end

data/lib/twdeps/task_presenter.rb

@@ -3,25 +3,17 @@ module TaskWarrior
     #
     # Presents a task's attributes suitable for a GraphViz node
     #
-    class TaskPresenter
+    class TaskPresenter < Presenter
       def initialize(task)
-        @task = task
-      end
-      
-      def attributes
-        attrs = {:label => @task.description}
-        attrs.merge!({:tooltip => "Status: #{@task.status}"})
-
-        # TODO Once we see the urgency in the JSON export, we can color-code the nodes
-        # http://taskwarrior.org/issues/973
-        # attrs.merge!({:fillcolor => 'red', :style => 'filled'})
+        self.id = task.uuid
+        self.attributes = {
+          :label => task.description,
+          :tooltip => "Status: #{task.status}"
+        }
 
-        attrs.merge!({:fontcolor => 'gray', :color => 'gray'}) if :completed == @task.status
-        attrs
-      end
-      
-      def id
-        @task.uuid
+        if :completed == task.status
+          self.attributes.merge!({:fontcolor => 'gray', :color => 'gray'})
+        end
       end
     end
   end

data/lib/twdeps/version.rb

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

data/lib/twdeps.rb

@@ -1,17 +1,13 @@
-require "twdeps/version"
-
-require "twdeps/task"
-require "twdeps/project"
-require "twdeps/tag"
-
-require "twdeps/task_mapper"
-require "twdeps/priority_mapper"
-require "twdeps/task_repository"
+require "taskwarrior"
 
+require "twdeps/version"
 require "twdeps/graph"
+require "twdeps/presenter"
 require "twdeps/task_presenter"
 require "twdeps/project_presenter"
+require "twdeps/null_presenter"
 
+# dependencies
 require "graphviz"
 require "json"
 

data/test/unit/test_graph.rb

@@ -8,7 +8,7 @@ module TaskWarrior
       def setup
         repo = TaskWarrior::Repository.new(File.read(fixture('party_taxes.json')))
 
-        plain = TaskWarrior::Dependencies::Graph.new
+        plain = TaskWarrior::Dependencies::Graph.new(self.class.name)
 
         repo.tasks.each do |task|
           plain << task
@@ -31,12 +31,12 @@ module TaskWarrior
 
       def test_edges
         assert_equal(6, @graph.edges.size)
-        assert_not_nil(@graph.edge('c992448a-f1ea-4982-8461-47f0705ff509', '6fd0ba4a-ab67-49cd-ac69-64aa999aff8a'))
-        assert_not_nil(@graph.edge('3b53178e-d5a4-45e0-afc2-1292db58a59a', '9f6f3738-1c08-4f45-8eb4-1e90864c7588'))
-        assert_not_nil(@graph.edge('9f6f3738-1c08-4f45-8eb4-1e90864c7588', 'e5a867b7-0116-457d-ba43-9ac2bee6ad2a'))
-        assert_not_nil(@graph.edge('e5a867b7-0116-457d-ba43-9ac2bee6ad2a', 'c992448a-f1ea-4982-8461-47f0705ff509'))
-        assert_not_nil(@graph.edge('c590941b-eb10-4569-bdc9-0e339f79305e', '6fd0ba4a-ab67-49cd-ac69-64aa999aff8a'))
-        assert_not_nil(@graph.edge('c590941b-eb10-4569-bdc9-0e339f79305e', 'c992448a-f1ea-4982-8461-47f0705ff509'))
+        assert_not_nil(@graph.edge('6fd0ba4a-ab67-49cd-ac69-64aa999aff8a', 'c992448a-f1ea-4982-8461-47f0705ff509'))
+        assert_not_nil(@graph.edge('9f6f3738-1c08-4f45-8eb4-1e90864c7588', '3b53178e-d5a4-45e0-afc2-1292db58a59a'))
+        assert_not_nil(@graph.edge('e5a867b7-0116-457d-ba43-9ac2bee6ad2a', '9f6f3738-1c08-4f45-8eb4-1e90864c7588'))
+        assert_not_nil(@graph.edge('c992448a-f1ea-4982-8461-47f0705ff509', 'e5a867b7-0116-457d-ba43-9ac2bee6ad2a'))
+        assert_not_nil(@graph.edge('6fd0ba4a-ab67-49cd-ac69-64aa999aff8a', 'c590941b-eb10-4569-bdc9-0e339f79305e'))
+        assert_not_nil(@graph.edge('c992448a-f1ea-4982-8461-47f0705ff509', 'c590941b-eb10-4569-bdc9-0e339f79305e'))
       end
 
       private

data/test/unit/test_presenters.rb

@@ -0,0 +1,41 @@
+require 'test_helper'
+
+module TaskWarrior
+  module Test
+    class TestPresenters < ::Test::Unit::TestCase
+      include TaskWarrior::Dependencies
+      include TaskWarrior::Test::Fixtures
+
+      def setup
+        @repo = TaskWarrior::Repository.new(File.read(fixture('party_taxes.json')))
+      end
+    
+      def test_string_presentation
+        foo = 'foo'
+        p = Presenter.new(foo)
+        assert_equal(foo, p.id)
+        assert_not_nil(p.attributes)
+        assert_equal({:label=>"foo", :labelloc=>"top"}, p.attributes)
+      end
+    
+      def test_null_presentation
+        p = NullPresenter.new
+        assert_equal('null', p.id)
+        assert_equal({:label => 'Unknown', :fontcolor => 'red'}, p.attributes)
+      end
+    
+      def test_project_presentation
+        p = ProjectPresenter.new(@repo.project('party'))
+        assert_equal('cluster_party', p.id)
+        assert_equal({:label => 'party'}, p.attributes)
+      end
+    
+      def test_task_presentation
+        uuid = '67aafe0b-ddd7-482b-9cfa-ac42c43e7559'
+        p = TaskPresenter.new(@repo[uuid])
+        assert_equal(uuid, p.id)
+        assert_equal({:label => 'Get cash from ATM', :tooltip => 'Status: pending'}, p.attributes)
+      end
+    end
+  end
+end

data/twdeps.gemspec

@@ -16,13 +16,10 @@ Gem::Specification.new do |gem|
   gem.version       = TaskWarrior::Dependencies::VERSION
 
   gem.add_dependency 'ruby-graphviz', '~> 1.0.7'
-  gem.add_dependency 'activemodel', '~> 3.2'
   gem.add_dependency 'trollop', '~> 1'
-  gem.add_development_dependency 'activesupport', '~> 3.2'
-  gem.add_development_dependency 'twtest', '~> 0.0.4'
+  gem.add_dependency 'taskwarrior', '~> 0.0.6'
+  gem.add_development_dependency 'twtest', '~> 0.0.6'
   gem.add_development_dependency 'guard-test', '~> 0.5'
   gem.add_development_dependency 'guard-bundler', '~> 1.0'
   gem.add_development_dependency 'rake', '~> 0.9'
-
-  gem.add_development_dependency 'pry'
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: twdeps
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.0.3
 platform: ruby
 authors:
 - Nicholas E. Rabenau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-06 00:00:00.000000000 Z
+date: 2013-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-graphviz
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,31 +20,13 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.7
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,47 +34,41 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: taskwarrior
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :development
+        version: 0.0.6
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: twtest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: guard-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -126,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,27 +104,10 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Takes a TaskWarrior export and emits a graph that visualizes the dependencies
   between tasks.
 email:
@@ -175,14 +128,10 @@ files:
 - examples/party.png
 - lib/twdeps.rb
 - lib/twdeps/graph.rb
-- lib/twdeps/priority_mapper.rb
-- lib/twdeps/project.rb
+- lib/twdeps/null_presenter.rb
+- lib/twdeps/presenter.rb
 - lib/twdeps/project_presenter.rb
-- lib/twdeps/tag.rb
-- lib/twdeps/task.rb
-- lib/twdeps/task_mapper.rb
 - lib/twdeps/task_presenter.rb
-- lib/twdeps/task_repository.rb
 - lib/twdeps/version.rb
 - test/fixtures/no_deps.json
 - test/fixtures/party.json
@@ -192,36 +141,30 @@ files:
 - test/integration/test_dependencies.rb
 - test/test_helper.rb
 - test/unit/test_graph.rb
-- test/unit/test_priority_mapper.rb
-- test/unit/test_project.rb
-- test/unit/test_repository.rb
-- test/unit/test_tag.rb
-- test/unit/test_tag_habtm.rb
-- test/unit/test_task.rb
+- test/unit/test_presenters.rb
 - twdeps.gemspec
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Visualizes dependencies between TaskWarrior tasks.
 test_files:
 - test/fixtures/no_deps.json
@@ -232,9 +175,4 @@ test_files:
 - test/integration/test_dependencies.rb
 - test/test_helper.rb
 - test/unit/test_graph.rb
-- test/unit/test_priority_mapper.rb
-- test/unit/test_project.rb
-- test/unit/test_repository.rb
-- test/unit/test_tag.rb
-- test/unit/test_tag_habtm.rb
-- test/unit/test_task.rb
+- test/unit/test_presenters.rb

data/lib/twdeps/priority_mapper.rb

@@ -1,9 +0,0 @@
-module TaskWarrior
-  class PriorityMapper
-    class << self
-      def map(json)
-        {'H' => :high, 'M' => :medium, 'L' => :low}[json]
-      end
-    end
-  end
-end

data/lib/twdeps/project.rb

@@ -1,33 +0,0 @@
-require 'active_model'
-
-module TaskWarrior
-  class Project
-    attr_reader :name, :tasks
-
-    include ActiveModel::Validations
-    validates :name, :presence => true
-    validate :name_may_not_contain_spaces
-
-    def initialize(name, tasks = [])
-      @name = name
-      @tasks = tasks
-      @tasks.each{|t| t.project = self}
-    end
-
-    def <<(task)
-      @tasks << task
-      task.project = self
-    end
-
-    def to_s
-      "Project #{name} (#{@tasks.size} tasks)"
-    end
-
-    private
-    def name_may_not_contain_spaces
-      if !name.blank? and name[/\s/]
-        errors.add(:name, "may not contain spaces")
-      end
-    end
-  end
-end

data/lib/twdeps/tag.rb

@@ -1,48 +0,0 @@
-require 'active_model'
-
-module TaskWarrior
-  class Tag
-    attr_reader :name
-
-    include ActiveModel::Validations
-    validates :name, :presence => true
-    validate :name_may_not_contain_spaces
-
-    def initialize(tag_or_name, tasks = [])
-      if tag_or_name.respond_to?(:name)
-        @name = tag_or_name.name
-        @tasks = tag_or_name.tasks
-      else
-        @name = tag_or_name
-        @tasks = []
-      end
-
-      tasks.each{|task|
-        self << task
-      }
-    end
-
-    def <<(task)
-      @tasks << task unless @tasks.include?(task)
-    end
-
-    def tasks
-      @tasks #.dup
-    end
-
-    def to_s
-      "Tag: #{name} (#{@tasks.size} tasks)"
-    end
-
-    def ==(other)
-      name == other.name
-    end
-
-    private
-    def name_may_not_contain_spaces
-      if !name.blank? and name[/\s/]
-        errors.add(:name, "may not contain spaces")
-      end
-    end
-  end
-end

data/lib/twdeps/task.rb

@@ -1,52 +0,0 @@
-require 'active_model'
-
-module TaskWarrior
-  class Task
-    attr_accessor :description, :id, :entry, :status, :uuid, :project, :dependencies, :parent, :children, :priority
-
-    include ActiveModel::Validations
-    validates :description, :id, :entry, :status, :uuid, :presence => true
-
-    validates :id, :numericality => { :only_integer => true, :greater_than => 0}
-
-    validates :uuid, :format => {:with => /[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}/,
-                                 :message => "'%{value}' does not match the expected format of a UUID"}
-
-    validates :status, :inclusion => {:in => [:pending, :waiting, :complete], :message => "%{value} is not a valid status"}
-
-    validates :priority, :inclusion => {
-      :in => [:high, :medium, :low],
-      :allow_nil => true,
-      :allow_blank => true,
-      :message => "%{value} is not a valid priority"
-    }
-
-    validate :entry_cannot_be_in_the_future
-
-    def initialize(description)
-      @description = description
-      @dependencies = []
-      @children = []
-      @tags = []
-    end
-
-    def tags
-      @tags
-    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/twdeps/task_mapper.rb

@@ -1,30 +0,0 @@
-module TaskWarrior
-  #
-  # A DataMapper that makes new Tasks from a JSON representation
-  #
-  class TaskMapper
-    class << self
-      def map(json)
-        Task.new(json['description']).tap{|t|
-          t.id = json['id'].to_i
-          t.uuid = json['uuid']
-          t.entry = DateTime.parse(json['entry'])
-          t.status = json['status'].to_sym
-          t.project = json['project']
-
-          if json['depends']
-            if json['depends'].respond_to?(:split)
-              t.dependencies = json['depends'].split(',')
-            else
-              t.dependencies = json['depends']
-            end
-          end
-
-          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']
-        }
-      end
-    end
-  end
-end

data/lib/twdeps/task_repository.rb

@@ -1,77 +0,0 @@
-require 'json'
-
-module TaskWarrior
-  class SimpleTag
-    attr_reader :name, :tasks
-
-    def initialize(name)
-      @name = name
-      @tasks = []
-    end
-
-    def <<(task)
-      @tasks << task unless @tasks.include?(task)
-    end
-  end
-
-  class Repository
-    def initialize(input)
-      @tasks = {}
-      @projects = Hash.new{|hash, key| hash[key] = Project.new(key)}
-      @tags = Hash.new{|hash, key| hash[key] = Tag.new(key)}
-
-      JSON.parse(input).each{|json|
-        task = TaskWarrior::TaskMapper.map(json)
-        @tasks[task.uuid] = task
-        @projects[task.project].tasks << task if task.project
-
-        # Create a new Tag object in @tags that is the value for each tag name
-        task.tags.each{|tag_name| @tags[tag_name] << task}
-      }
-
-      # Replace the uuid of each dependency with the real task
-      @tasks.each_value{|task| task.dependencies.map!{|uuid| @tasks[uuid]}}
-
-      # Replace the project property of each task with a proper Project object carrying a name and all of the project's tasks
-      @tasks.each_value{|task| task.project = @projects[task.project] if task.project}
-
-      # Add child tasks to their parent, but keep them in the global index
-      @tasks.each_value do |task|
-        if task.parent
-          parent = @tasks[task.parent]
-
-          if parent # we know the parent
-            parent.children << task
-            task.parent = parent
-          end
-        end
-      end
-    end
-
-    def tasks
-      # Do not expose child tasks directly
-      @tasks.values.reject{|t| t.parent}
-    end
-
-    # direct lookup by uuid
-    def [](uuid)
-      @tasks[uuid]
-    end
-
-    def projects
-      @projects.values
-    end
-
-    def project(name)
-      @projects[name] if @projects.has_key?(name)
-    end
-
-    def tags
-      @tags.values
-    end
-
-    def tag(name)
-      @tags[name] if @tags.has_key?(name)
-    end
-  end
-end

data/test/unit/test_priority_mapper.rb

@@ -1,27 +0,0 @@
-require 'test_helper'
-
-class TestPriorityMapper < Test::Unit::TestCase
-  def test_nil
-    assert_nil(TaskWarrior::PriorityMapper.map(nil))
-  end
-  
-  def test_empty
-    assert_nil(TaskWarrior::PriorityMapper.map(''))
-  end
-  
-  def test_low
-    assert_equal(:low, TaskWarrior::PriorityMapper.map('L'))
-  end
-  
-  def test_medium
-    assert_equal(:medium, TaskWarrior::PriorityMapper.map('M'))
-  end
-  
-  def test_high
-    assert_equal(:high, TaskWarrior::PriorityMapper.map('H'))
-  end
-  
-  def test_unknown
-    assert_nil(TaskWarrior::PriorityMapper.map('crap'))
-  end
-end

data/test/unit/test_project.rb

@@ -1,55 +0,0 @@
-require 'test_helper'
-
-class TestProject < Test::Unit::TestCase
-  include TaskWarrior::Test::Validations
-
-  def test_name
-    project = TaskWarrior::Project.new('foo')
-    assert_valid(project)
-    assert_empty(project.tasks)
-  end
-
-  def test_empty_tasks
-    project = TaskWarrior::Project.new('foo', [])
-    assert_valid(project)
-    assert_empty(project.tasks)
-  end
-
-  def test_with_tasks
-    project = TaskWarrior::Project.new('foo', [TaskWarrior::Task.new('foobar')])
-    assert_valid(project)
-    assert_equal(1, project.tasks.size)
-  end
-
-  def test_name_nil
-    project = TaskWarrior::Project.new(nil)
-    assert_invalid(project)
-  end
-
-  def test_name_empty
-    project = TaskWarrior::Project.new('')
-    assert_invalid(project)
-  end
-
-  def test_name_with_space
-    project = TaskWarrior::Project.new('foo bar')
-    assert_invalid(project)
-  end
-
-  def test_name_just_space
-    project = TaskWarrior::Project.new(' ')
-    assert_invalid(project)
-  end
-
-  def test_add_task
-    project = TaskWarrior::Project.new('foo')
-    assert_empty(project.tasks)
-    t1 = TaskWarrior::Task.new('foobar')
-    t2 = TaskWarrior::Task.new('foobaz')
-    project << t1
-    project << t2
-    assert_equal(2, project.tasks.size)
-    assert_equal(project, t1.project)
-    assert_equal(project, t2.project)
-  end
-end

data/test/unit/test_repository.rb

@@ -1,64 +0,0 @@
-require 'test_helper'
-
-class TestRepository < Test::Unit::TestCase
-  include TaskWarrior
-  include TaskWarrior::Test::Fixtures
-
-  def setup
-    @repo = Repository.new(File.read(fixture('party_taxes.json')))
-  end
-
-  def test_tags_of_task
-    atm = @repo['67aafe0b-ddd7-482b-9cfa-ac42c43e7559']
-    assert_not_nil(atm)
-    assert_equal(2, atm.tags.size)
-  end
-
-  def test_all
-    assert_equal(8, @repo.tasks.size)
-
-    one = @repo['6fd0ba4a-ab67-49cd-ac69-64aa999aff8a']
-    assert_equal('Select a free weekend in November', one.description)
-    assert_equal(:high, one.priority)
-    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)
-  end
-
-  def test_child
-    assert_equal(1, @repo['b587f364-c68e-4438-b4d6-f2af6ad62518'].children.size)
-  end
-
-  def test_parent
-    assert_equal(@repo['b587f364-c68e-4438-b4d6-f2af6ad62518'], @repo['99c9e1bb-ed75-4525-b05d-cf153a7ee1a1'].parent)
-  end
-
-  def test_projects
-    party = @repo.project('party')
-    assert_not_nil(party)
-    assert_equal(6, party.tasks.size)
-  end
-
-  def test_tags
-    tags = @repo.tags
-    assert_not_nil(tags)
-    assert_equal(2, tags.size)
-    assert(tags.include?(Tag.new('finance')))
-    assert(tags.include?(Tag.new('mall')))
-  end
-
-  def test_tasks_of_tag_finance
-    finance = @repo.tag('finance')
-    assert_not_nil(finance)
-    assert_equal(2, finance.tasks.size)
-  end
-
-  def test_tasks_of_tag_mall
-    mall = @repo.tag('mall')
-    assert_not_nil(mall)
-    assert_equal(3, mall.tasks.size)
-  end
-end

data/test/unit/test_tag.rb

@@ -1,57 +0,0 @@
-require 'test_helper'
-
-class TestTag < Test::Unit::TestCase
-  include TaskWarrior
-  include TaskWarrior::Test::Validations
-
-  def test_name
-    tag = Tag.new('foo')
-    assert_valid(tag)
-    assert_empty(tag.tasks)
-  end
-
-  def test_empty_tasks
-    tag = Tag.new('foo', [])
-    assert_valid(tag)
-    assert_empty(tag.tasks)
-  end
-
-  def test_with_tasks
-    tag = Tag.new('foo', [Task.new('foobar')])
-    assert_valid(tag)
-    assert_equal(1, tag.tasks.size)
-  end
-
-  def test_name_nil
-    tag = Tag.new(nil)
-    assert_invalid(tag)
-  end
-
-  def test_name_empty
-    tag = Tag.new('')
-    assert_invalid(tag)
-  end
-
-  def test_name_with_space
-    tag = Tag.new('foo bar')
-    assert_invalid(tag)
-  end
-
-  def test_name_just_space
-    tag = Tag.new(' ')
-    assert_invalid(tag)
-  end
-
-  def test_construction
-    foo = Tag.new('foo')
-    assert_equal(foo, Tag.new(foo))
-    assert_equal(Tag.new(foo), foo)
-  end
-
-  def test_value_object
-    f1 = Tag.new('foo')
-    f2 = Tag.new('foo')
-    assert_not_equal(f1.object_id, f2.object_id)
-    assert_equal(f1, f2)
-  end
-end

data/test/unit/test_tag_habtm.rb

@@ -1,69 +0,0 @@
-require 'test_helper'
-
-class TestTagHasAndBelongsToMany < Test::Unit::TestCase
-  include TaskWarrior::Test::Validations
-
-  def setup
-    @lookup_foo = TaskWarrior::Task.new('Lookup foo in Wikipedia')
-    @lookup_deadbeef = TaskWarrior::Task.new('Lookup deadbeef in Wikipedia')
-
-    @foo = TaskWarrior::Tag.new('foo')
-    @deadbeef = TaskWarrior::Tag.new('deadbeef')
-    @metasyntactic = TaskWarrior::Tag.new('metasyntactic')
-
-    # We need to do what the repo does - cross-reference manually.
-    @foo << @lookup_foo
-    @lookup_foo.tags << @foo
-    @lookup_foo.tags << @metasyntactic
-    
-    @deadbeef << @lookup_deadbeef
-    @lookup_deadbeef.tags << @deadbeef
-    @lookup_deadbeef.tags << @metasyntactic
-    
-    @metasyntactic << @lookup_foo
-    @metasyntactic << @lookup_deadbeef
-  end
-
-  def test_task_tagged
-    assert_equal(2, @lookup_foo.tags.size)
-    assert_equal(2, @lookup_deadbeef.tags.size)
-
-    assert_tagged_with(@lookup_foo, @foo)
-    assert_tagged_with(@lookup_foo, @metasyntactic)
-    assert_not_tagged_with(@lookup_foo, @deadbeef)
-
-    assert_not_tagged_with(@lookup_deadbeef, @foo)
-    assert_tagged_with(@lookup_deadbeef, @metasyntactic)
-    assert_tagged_with(@lookup_deadbeef, @deadbeef)
-  end
-
-  def test_tag_has_tasks
-    assert_equal(1, @foo.tasks.size)
-    assert_equal(1, @deadbeef.tasks.size)
-    assert_equal(2, @metasyntactic.tasks.size)
-
-    assert_contains_task(@deadbeef, @lookup_deadbeef)
-    assert_not_contains_task(@deadbeef, @lookup_foo)
-    assert_not_contains_task(@foo, @lookup_deadbeef)
-    assert_contains_task(@foo, @lookup_foo)
-
-    assert_contains_task(@metasyntactic, @lookup_deadbeef)
-    assert_contains_task(@metasyntactic, @lookup_foo)
-  end
-
-  def assert_tagged_with(task, tag)
-    assert(task.tags.include?(tag), "#{task} expected to be tagged with #{tag}, but it isn't.'")
-  end
-
-  def assert_not_tagged_with(task, tag)
-    assert(!task.tags.include?(tag), "#{task} expected not to be tagged with #{tag}, but it actually is.")
-  end
-
-  def assert_contains_task(tag, task)
-    assert(tag.tasks.include?(task), "#{tag} expected to contain #{task}, but it doesn't.")
-  end
-
-  def assert_not_contains_task(tag, task)
-    assert(!tag.tasks.include?(task), "#{tag} expected to not contain #{task}, but it actually does.")
-  end
-end

data/test/unit/test_task.rb

@@ -1,121 +0,0 @@
-require 'test_helper'
-require 'date'
-require 'active_support/core_ext'
-
-# TODO Add tests for dependencies
-
-class TestTask < Test::Unit::TestCase
-  include TaskWarrior::Test::Validations
-  
-  def setup
-    @task = TaskWarrior::Task.new('foobar')
-    @task.id = 1
-    @task.uuid = '66465716-b08d-41ea-8567-91b988a2bcbf'
-    @task.entry = DateTime.now
-    @task.status = :pending
-  end
-
-  def test_task_id_nil
-    @task.id = nil
-    assert_invalid(@task)
-  end
-
-  def test_task_id_0
-    @task.id = 0
-    assert_invalid(@task)
-  end
-
-  def test_task_uuid_nil
-    @task.uuid = nil
-    assert_invalid(@task)
-  end
-
-  def test_task_uuid_empty
-    @task.uuid = ''
-    assert_invalid(@task)
-  end
-
-  def test_task_uuid_wrong_format
-    @task.uuid = 'abcdefg'
-    assert_invalid(@task)
-  end
-
-  def test_task_entry_nil
-    @task.entry = nil
-    assert_invalid(@task)
-  end
-
-  def test_task_entry_empty
-    @task.entry = ''
-    assert_invalid(@task)
-  end
-
-  def test_task_entry_wrong_format
-    @task.entry = "foobar"
-    assert_invalid(@task)
-  end
-
-  def test_task_entry_future
-    @task.entry = DateTime.now.advance(:days => 1)
-    assert_invalid(@task)
-  end
-
-  def test_task_status_nil
-    @task.status = nil
-    assert_invalid(@task)
-  end
-
-  def test_task_status_empty
-    @task.status = ''
-    assert_invalid(@task)
-  end
-
-  def test_task_status_unknown_string
-    @task.status = "foobar"
-    assert_invalid(@task)
-  end
-
-  def test_task_status_unknown_symbol
-    @task.status = :foobar
-    assert_invalid(@task)
-  end
-
-  def test_task_priority_nil
-    @task.priority = nil
-    assert_valid(@task)
-  end
-
-  def test_task_priority_empty
-    @task.priority = ''
-    assert_valid(@task)
-  end
-
-  def test_task_priority_unknown_string
-    @task.priority = "foobar"
-    assert_invalid(@task)
-  end
-
-  def test_task_priority_unknown_symbol
-    @task.priority = :foobar
-    assert_invalid(@task)
-  end
-
-  def test_task_priority_high
-    @task.priority = :high
-    assert_valid(@task)
-  end
-
-  def test_task_priority_medium
-    @task.priority = :medium
-    assert_valid(@task)
-  end
-
-  def test_task_priority_low
-    @task.priority = :low
-    assert_valid(@task)
-  end
-
-  def test_task_valid
-    assert_valid(@task)
-  end
-end