taskwarrior-web 1.0.0 → 1.0.1

data/.travis.yml

@@ -3,3 +3,7 @@ rvm:
   - 1.9.2
   - 1.9.3
 script: "rake spec"
+before_install:
+  - sudo apt-get install task
+  - cp -v /home/vagrant/builds/theunraveler/taskwarrior-web/spec/files/taskrc /home/vagrant/.taskrc
+  - mkdir /home/vagrant/.task

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v1.0.1 (4/3/12)
+
+* Added fadeOut animation to task completion.
+
 ## v1.0.0 (3/19/12)
 
 * Refactored for taskwarrior 2.0 compatibility.

data/Gemfile

@@ -3,5 +3,10 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in taskwarrior-web.gemspec
 gemspec
 
-gem 'rb-fsevent', :require => false
-gem 'growl', :require => false
+group :local do
+  gem 'rb-fsevent', :require => false
+  gem 'growl', :require => false
+  gem 'simplecov'
+  gem 'guard-rspec'
+  gem 'guard-bundler'
+end

data/README.md

@@ -33,6 +33,8 @@ The current featureset includes:
   "due".
 * If you are on a Mac and use Fluid.app, you get a dock badge showing the
   number of pending tasks.
+* Optional Basic HTTP Auth protection. To enable, set `task-web.user` and
+  `task-web.passwd` in your `.taskrc` file.
 
 ## Known Issues
 

data/config.ru

@@ -1,5 +1,3 @@
-# To use with thin 
-#  thin start -p PORT -R config.ru
 require File.join(File.dirname(__FILE__), 'lib', 'taskwarrior-web')
 
 disable :run

data/lib/taskwarrior-web/app.rb

@@ -110,7 +110,7 @@ module TaskwarriorWeb
     get '/ajax/tags/?' do
       tags = []
       TaskwarriorWeb::Task.query('status.not' => 'deleted').each do |task|
-        tags = tags + task.tags
+        tags.concat(task.tags)
       end
       tags.compact!.uniq!.to_json
     end

data/lib/taskwarrior-web/command.rb

@@ -12,7 +12,6 @@ module TaskwarriorWeb
     def initialize(command, id = nil, *args)
       @command = command if command
       @id = id if id
-      puts "@id in command.rb: #{@id}"
       @params = args.last.is_a?(::Hash) ? args.pop : {}
     end
 

data/lib/taskwarrior-web/command_builders/base.rb

@@ -31,7 +31,7 @@ module TaskwarriorWeb::CommandBuilder
         @command_string.gsub!(':id', "uuid:#{@id.to_s}")
         return self
       else
-        raise MissingTaskIDError
+        raise TaskwarriorWeb::CommandBuilder::MissingTaskIDError
       end
     end
 

data/lib/taskwarrior-web/command_builders/v1.rb

@@ -22,14 +22,13 @@ module TaskwarriorWeb::CommandBuilder::V1
       @command_string.gsub!(':id', @id.to_s)
       return self
     else
-      raise MissingTaskIDError
+      raise TaskwarriorWeb::CommandBuilder::MissingTaskIDError
     end
   end
 
   def assign_id_from_uuid
     @all_tasks ||= TaskwarriorWeb::Task.query('status.not' => [:deleted, :completed])
     @id = @all_tasks.index { |task| task.uuid == @id } + 1
-    puts "@id in v1.rb:19: #{@id}"
   end
 
 end

data/lib/taskwarrior-web/public/js/application.js

@@ -79,19 +79,21 @@ var initAutocomplete = function() {
 var initTaskCompletion = function() {
 	$('input.complete').click(function() {
 		// Cache the checkbox in case we need to restore it.
+		var container $(this).parent();
+		var checkbox = container.html();
 		var row = $(this).closest('tr');
-		$(this).parent().html('<img src="/images/ajax-loader.gif" />');
+		container.html('<img src="/images/ajax-loader.gif" />');
 		$.ajax({
 			url: '/ajax/task-complete/' + $(this).data('task-id'),
 			type: 'POST',
 			success: function(data) {
 				var message = (data === '') ? 'Task marked as completed.' : data;
 				set_message(message, 'success');
-				row.remove();
+				row.fadeOut();
 			},
 			error: function(data) {
 				set_message('There was an error when marking the task as completed.', 'error');
-				// TODO: Re-insert the checkbox.
+				container.html(checkbox);
 			}
 		});
 	});

data/lib/taskwarrior-web/runner.rb

@@ -8,7 +8,7 @@ module TaskwarriorWeb
     def run
       @built ||= build
       to_run = "#{TASK_BIN} #{@built}"
-      puts "Final command: #{to_run}"
+      puts "Command: #{to_run}"
       `#{to_run}`
     end
 

data/spec/app/app_spec.rb

@@ -15,13 +15,33 @@ describe "My App" do
     TaskwarriorWeb::Runner.should_receive(:run).any_number_of_times.and_return('{}')
   end
 
-  describe 'GET /' do
-    it 'should redirect to /tasks/pending' do
-      get "/"
+  ['/', '/tasks'].each do |path|
+    describe "GET #{path}" do
+      it 'should redirect to /tasks/pending' do
+        get path
+        follow_redirect!
+
+        last_request.url.should =~ /tasks\/pending/
+        last_response.should be_ok
+      end
+    end
+  end
+
+  describe 'GET /projects' do
+    it 'should redirect to /projects/overview' do
+      get '/projects'
       follow_redirect!
 
-      last_request.url.should =~ /tasks\/pending/
+      last_request.url.should =~ /projects\/overview/
       last_response.should be_ok
     end
   end
+
+  describe 'GET /ajax/count' do
+    it 'should return the current pending task count' do
+      TaskwarriorWeb::Task.should_receive(:count).and_return(15)
+      get '/ajax/count'
+      last_response.body.should eq('15')
+    end
+  end
 end

data/spec/app/helpers_spec.rb

@@ -30,7 +30,36 @@ describe TaskwarriorWeb::App::Helpers do
         helpers.format_date('2012-01-11').should == '11/01/2012'
       end
     end
+  end
+
+  describe '#colorize_date' do
+    context 'when no timestamp is given' do
+      it 'should simply return' do
+        TaskwarriorWeb::Config.should_not_receive(:due)
+        helpers.colorize_date(nil)
+      end
+    end
+
+    context 'with a due setting specified' do    
+      before do
+        TaskwarriorWeb::Config.should_receive(:due).any_number_of_times.and_return(3)
+      end
 
+      it 'should return "today" when a given date is today' do
+        helpers.colorize_date(Time.now.to_s).should eq('today') 
+      end
+
+      it 'should return "overdue" when a date is before today' do
+        helpers.colorize_date(Time.at(0).to_s).should eq('overdue')
+      end
+    end
+  end
+
+  describe '#auto_link' do
+    it 'should just call Rinku.auto_link' do
+      Rinku.should_receive(:auto_link).with('hello', :all, 'target="_blank"')
+      helpers.auto_link('hello')
+    end
   end
 end
 

data/spec/files/taskrc

@@ -0,0 +1,27 @@
+# [Created by task 2.0.0 3/22/2012 16:07:48]
+# Taskwarrior program configuration file.
+# For more documentation, see http://taskwarrior.org or try 'man task', 'man task-faq',
+# 'man task-tutorial', 'man task-color', 'man task-sync' or 'man taskrc'
+
+# Here is an example of entries that use the default, override and blank values
+#   variable=foo   -- By specifying a value, this overrides the default
+#   variable=      -- By specifying no value, this means no default
+#   #variable=foo  -- By commenting out the line, or deleting it, this uses the default
+
+# Use the command 'task show' to see all defaults and overrides
+
+# Files
+data.location=/home/vagrant/.task
+
+# Color theme (uncomment one to use)
+#include /usr/local/Cellar/task/2.0.0/share/doc/task/rc/light-16.theme
+#include /usr/local/Cellar/task/2.0.0/share/doc/task/rc/light-256.theme
+#include /usr/local/Cellar/task/2.0.0/share/doc/task/rc/dark-16.theme
+#include /usr/local/Cellar/task/2.0.0/share/doc/task/rc/dark-256.theme
+#include /usr/local/Cellar/task/2.0.0/share/doc/task/rc/dark-red-256.theme
+#include /usr/local/Cellar/task/2.0.0/share/doc/task/rc/dark-green-256.theme
+#include /usr/local/Cellar/task/2.0.0/share/doc/task/rc/dark-blue-256.theme
+#include /usr/local/Cellar/task/2.0.0/share/doc/task/rc/dark-violets-256.theme
+#include /usr/local/Cellar/task/2.0.0/share/doc/task/rc/dark-yellow-green.theme
+#include /usr/local/Cellar/task/2.0.0/share/doc/task/rc/dark-gray-256.theme
+

data/spec/models/command_builders/base_spec.rb

@@ -1,6 +1,5 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 require 'taskwarrior-web/command'
-require 'ostruct'
 
 describe TaskwarriorWeb::CommandBuilder::Base do
   describe '#substitute_parts' do
@@ -8,12 +7,6 @@ describe TaskwarriorWeb::CommandBuilder::Base do
       @command = TaskwarriorWeb::Command.new(:complete, 34588)
     end
 
-    it 'should replace the :id string with the given task ID' do
-      TaskwarriorWeb::Task.should_receive(:query).and_return([OpenStruct.new(:uuid => 34588)])
-      @command.task_command.substitute_parts
-      @command.command_string.should eq('1 done')
-    end
-
     it 'should throw an error if the command has no task ID' do
       @command.id = nil
       expect { @command.substitute_parts }.to raise_error(TaskwarriorWeb::CommandBuilder::MissingTaskIDError)

data/spec/models/command_builders/v1_spec.rb

@@ -0,0 +1,21 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+require 'taskwarrior-web/command_builders/v1'
+require 'taskwarrior-web/command'
+require 'ostruct'
+
+describe TaskwarriorWeb::CommandBuilder::V1 do
+  describe '#substitute_parts' do
+    before do
+      TaskwarriorWeb::Command.class_eval do |class_name|
+        include TaskwarriorWeb::CommandBuilder::V1
+      end
+      @command = TaskwarriorWeb::Command.new(:complete, 34588)
+    end
+
+    it 'should replace the :id string with the given task ID' do
+      TaskwarriorWeb::Task.should_receive(:query).and_return([OpenStruct.new(:uuid => 34588)])
+      @command.task_command.substitute_parts
+      @command.command_string.should eq('1 done')
+    end
+  end
+end

data/spec/models/config_spec.rb

@@ -0,0 +1,14 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'taskwarrior-web/config'
+require 'ostruct'
+
+describe TaskwarriorWeb::Config do
+  describe '.property' do
+    it 'should call #get_value on the config file object' do
+      file = OpenStruct.new
+      TaskwarriorWeb::Config.should_receive(:file).and_return(file)
+      file.should_receive(:get_value).with('testing')
+      TaskwarriorWeb::Config.property('testing')
+    end
+  end
+end

data/taskwarrior-web.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "taskwarrior-web"
-  s.version     = '1.0.0'
+  s.version     = '1.0.1'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Jake Bell"]
   s.email       = ["jake@theunraveler.com"]
@@ -23,9 +23,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rake')
   s.add_development_dependency('rack-test')
   s.add_development_dependency('rspec')
-  s.add_development_dependency('simplecov')
-  s.add_development_dependency('guard-rspec')
-  s.add_development_dependency('guard-bundler')
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taskwarrior-web
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-19 00:00:00.000000000 Z
+date: 2012-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70160263316020 !ruby/object:Gem::Requirement
+  requirement: &70130852817600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70160263316020
+  version_requirements: *70130852817600
 - !ruby/object:Gem::Dependency
   name: parseconfig
-  requirement: &70160263313300 !ruby/object:Gem::Requirement
+  requirement: &70130852816500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70160263313300
+  version_requirements: *70130852816500
 - !ruby/object:Gem::Dependency
   name: vegas
-  requirement: &70160263347360 !ruby/object:Gem::Requirement
+  requirement: &70130852815980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70160263347360
+  version_requirements: *70130852815980
 - !ruby/object:Gem::Dependency
   name: rinku
-  requirement: &70160263345300 !ruby/object:Gem::Requirement
+  requirement: &70130852815260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70160263345300
+  version_requirements: *70130852815260
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70160263342060 !ruby/object:Gem::Requirement
+  requirement: &70130852814200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70160263342060
+  version_requirements: *70130852814200
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70160263340640 !ruby/object:Gem::Requirement
+  requirement: &70130852812760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70160263340640
+  version_requirements: *70130852812760
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70160263363240 !ruby/object:Gem::Requirement
+  requirement: &70130852811760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,40 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70160263363240
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: &70160263362440 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70160263362440
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: &70160263361760 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70160263361760
-- !ruby/object:Gem::Dependency
-  name: guard-bundler
-  requirement: &70160263359760 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70160263359760
+  version_requirements: *70130852811760
 description: This gem provides a graphical frontend for the Taskwarrior task manager.
   It is based on Sinatra.
 email:
@@ -188,11 +155,13 @@ files:
 - lib/taskwarrior-web/views/task_form.erb
 - spec/app/app_spec.rb
 - spec/app/helpers_spec.rb
+- spec/files/taskrc
 - spec/models/command_builder_spec.rb
 - spec/models/command_builders/base_spec.rb
 - spec/models/command_builders/v1_spec.rb
 - spec/models/command_builders/v2_spec.rb
 - spec/models/command_spec.rb
+- spec/models/config_spec.rb
 - spec/models/runner_spec.rb
 - spec/models/task_spec.rb
 - spec/spec_helper.rb
@@ -217,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1098967059428710404
+      hash: -1240316319720686914
 requirements: []
 rubyforge_project: taskwarrior-web
 rubygems_version: 1.8.11
@@ -227,11 +196,13 @@ summary: Web frontend for taskwarrior command line task manager.
 test_files:
 - spec/app/app_spec.rb
 - spec/app/helpers_spec.rb
+- spec/files/taskrc
 - spec/models/command_builder_spec.rb
 - spec/models/command_builders/base_spec.rb
 - spec/models/command_builders/v1_spec.rb
 - spec/models/command_builders/v2_spec.rb
 - spec/models/command_spec.rb
+- spec/models/config_spec.rb
 - spec/models/runner_spec.rb
 - spec/models/task_spec.rb
 - spec/spec_helper.rb