taskwarrior-web 0.0.10 → 0.0.11

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+script: "rake spec"

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v0.0.11 (1/10/12)
+
+* Added annotations to task listing, complete with autolinking (turns URLs into
+  links)
+
 ## v0.0.10 (12/30/11)
 
 * Quick release to fix JSON parse error when there are no tasks.

data/Gemfile.lock

@@ -1,22 +1,33 @@
 PATH
   remote: .
   specs:
-    taskwarrior-web (0.0.10)
+    taskwarrior-web (0.0.11)
       parseconfig
+      rinku
       sinatra
       vegas
 
 GEM
   remote: http://rubygems.org/
   specs:
+    diff-lcs (1.1.3)
     parseconfig (0.5.2)
-    rack (1.3.6)
-    rack-protection (1.1.4)
+    rack (1.4.0)
+    rack-protection (1.2.0)
       rack
     rake (0.9.2.2)
-    sinatra (1.3.1)
-      rack (~> 1.3, >= 1.3.4)
-      rack-protection (~> 1.1, >= 1.1.2)
+    rinku (1.5.0)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.8.0)
+    sinatra (1.3.2)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
     tilt (1.3.3)
     vegas (0.1.8)
@@ -27,4 +38,5 @@ PLATFORMS
 
 DEPENDENCIES
   rake
+  rspec
   taskwarrior-web!

data/README.md

@@ -3,6 +3,8 @@
 A lightweight, Sinatra-based web interface for the
 wonderful [Taskwarrior](http://taskwarrior.org/) todo application.
 
+[![Build Status](https://secure.travis-ci.org/theunraveler/taskwarrior-web.png)](http://travis-ci.org/theunraveler/taskwarrior-web)
+
 ## Installation
 
 `gem install taskwarrior-web`

data/Rakefile

@@ -1,2 +1,7 @@
 require 'bundler'
+require 'rspec/core/rake_task'
+
 Bundler::GemHelper.install_tasks
+RSpec::Core::RakeTask.new(:spec)
+
+

data/lib/taskwarrior-web/app.rb

@@ -5,6 +5,7 @@ require 'erb'
 require 'parseconfig'
 require 'json'
 require 'time'
+require 'rinku'
 
 module TaskwarriorWeb
   class App < Sinatra::Base
@@ -47,6 +48,10 @@ module TaskwarriorWeb
         end
       end
 
+      def auto_link(text)
+        Rinku.auto_link(text, :all, 'target="_blank"')
+      end
+
       def subnav(type)
         case type
           when 'tasks' then

data/lib/taskwarrior-web/runner.rb

@@ -0,0 +1,12 @@
+module TaskwarriorWeb
+  class Runner
+
+    TASK_BIN = 'task'
+
+    def self.run(command)
+      command = TASK_BIN + " #{command}"
+      `#{command}`
+    end
+
+  end
+end

data/lib/taskwarrior-web/task.rb

@@ -1,3 +1,5 @@
+require 'taskwarrior-web/runner'
+
 module TaskwarriorWeb
   
   #################
@@ -5,10 +7,9 @@ module TaskwarriorWeb
   #################
   class Task
 
-    TASK_BIN = 'task'
-
     attr_accessor :id, :entry, :project, :priority, :uuid, :description, :status,
-                  :due, :start, :end, :tags, :depends, :wait
+                  :due, :start, :end, :tags, :depends, :wait, :annotations
+    alias :annotate= :annotations=
 
     ####################################
     # MODEL METHODS FOR INDIVIDUAL TASKS
@@ -22,7 +23,7 @@ module TaskwarriorWeb
 
     def save!
       exclude = ['@description', '@tags']
-      command = TASK_BIN + ' add'
+      command = 'add'
       command << " '#{description}'"
       instance_variables.each do |ivar|
         subbed = ivar.to_s.gsub('@', '')
@@ -33,8 +34,7 @@ module TaskwarriorWeb
           command << " +#{tag}"
         end
       end
-      puts command
-      `#{command}` 
+      TaskwarriorWeb::Runner.run(command)
     end
     
     ##################################
@@ -46,15 +46,15 @@ module TaskwarriorWeb
       tasks = []
       count = 1
   
-      stdout =  TASK_BIN + ' _query'
+      command =  '_query'
       args.each do |param|
         param.each do |attr, value|
-          stdout << " #{attr.to_s}:#{value}"
+          command << " #{attr.to_s}:#{value}"
         end
       end
 
       # Process the JSON data.
-      json = `#{stdout}`
+      json = TaskwarriorWeb::Runner.run(command)
       json.strip!
       json = '[' + json + ']'
       results = json == '[No matches.]' ? [] : JSON.parse(json)
@@ -88,13 +88,13 @@ module TaskwarriorWeb
 
     # Get the number of tasks for some paramters
     def self.count(*args)
-      statement = TASK_BIN + ' count'
+      command = 'count'
       args.each do |param|
         param.each do |attr, value|
-          statement << " #{attr.to_s}:#{value}"
+          command << " #{attr.to_s}:#{value}"
         end
       end
-      return `#{statement}`.strip!
+      return TaskwarriorWeb::Runner.run(command).strip!
     end
 
     ###############################################
@@ -105,8 +105,7 @@ module TaskwarriorWeb
     # Mark a task as complete
     # TODO: Make into instance method when `task` supports finding by UUID.
     def self.complete!(task_id)
-      statement = TASK_BIN + " #{task_id} done"
-      `#{statement}`
+      TaskwarriorWeb::Runner.run("#{task_id} done")
     end
 
   end

data/lib/taskwarrior-web/version.rb

@@ -1,3 +1,3 @@
 module TaskwarriorWeb
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/spec/models/task_spec.rb

@@ -0,0 +1,17 @@
+require 'taskwarrior-web/task'
+
+describe TaskwarriorWeb::Task do
+
+  describe '#initialize' do
+    it 'should assign the passed attributes' do
+      task = TaskwarriorWeb::Task.new({:entry => 'Testing', :project => 'Project'})
+      task.entry.should eq('Testing')
+      task.project.should eq('Project')
+    end
+
+    it 'should not assign bogus attributes' do
+      task = TaskwarriorWeb::Task.new({:bogus => 'Testing'})
+      task.respond_to?(:bogus).should be_false
+    end
+  end
+end

data/taskwarrior-web.gemspec

@@ -17,8 +17,10 @@ Gem::Specification.new do |s|
   s.add_dependency('sinatra')
   s.add_dependency('parseconfig')
   s.add_dependency('vegas')
+  s.add_dependency('rinku')
 
   s.add_development_dependency('rake')
+  s.add_development_dependency('rspec')
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/views/listing.erb

@@ -19,7 +19,16 @@
             <tr class="<%= task.status %>">
               <td></td>
           <% end %>
-          <td><%= task.description %></td>
+          <td>
+            <%= task.description %>
+            <% unless task.annotations.nil? || task.annotations.empty? %>
+              <ul>
+                <% task.annotations.each do |annotation| %>
+                  <li><%= format_date(annotation['entry']) %>: <%= auto_link(annotation['description']) %></li>
+                <% end %>
+              </ul>
+            <% end %>
+          </td>
           <td><a href="/projects/<%= linkify(task.project, :project) %>"><%= task.project %></a></td>
           <td><%= format_date(task.due) unless task.due.nil? %></td>
           <td><%= task.tags.join(', ') unless task.tags.nil? %></td>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taskwarrior-web
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-30 00:00:00.000000000 Z
+date: 2012-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2151875620 !ruby/object:Gem::Requirement
+  requirement: &2160998820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151875620
+  version_requirements: *2160998820
 - !ruby/object:Gem::Dependency
   name: parseconfig
-  requirement: &2151875040 !ruby/object:Gem::Requirement
+  requirement: &2160996680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151875040
+  version_requirements: *2160996680
 - !ruby/object:Gem::Dependency
   name: vegas
-  requirement: &2151874340 !ruby/object:Gem::Requirement
+  requirement: &2161049040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,32 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151874340
+  version_requirements: *2161049040
+- !ruby/object:Gem::Dependency
+  name: rinku
+  requirement: &2161047100 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2161047100
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2151873720 !ruby/object:Gem::Requirement
+  requirement: &2161045180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2161045180
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2161043240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151873720
+  version_requirements: *2161043240
 description: This gem provides a graphical frontend for the Taskwarrior task manager.
   It is based on Sinatra.
 email:
@@ -65,6 +87,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -75,6 +98,7 @@ files:
 - lib/taskwarrior-web.rb
 - lib/taskwarrior-web/app.rb
 - lib/taskwarrior-web/config.rb
+- lib/taskwarrior-web/runner.rb
 - lib/taskwarrior-web/task.rb
 - lib/taskwarrior-web/version.rb
 - public/css/gh-buttons.css
@@ -105,6 +129,7 @@ files:
 - public/js/jquery.min.js
 - public/js/jquery.tagsinput.js
 - public/js/jquery.tipsy.js
+- spec/models/task_spec.rb
 - taskwarrior-web.gemspec
 - views/404.erb
 - views/_navigation.erb
@@ -127,7 +152,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4282270428518601001
+      hash: 3125701978170363258
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -136,11 +161,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4282270428518601001
+      hash: 3125701978170363258
 requirements: []
 rubyforge_project: taskwarrior-web
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Web frontend for taskwarrior command line task manager.
-test_files: []
+test_files:
+- spec/models/task_spec.rb