gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'master' into 2.3.0

Browse Source 
Conflicts:
	AUTHORS
	CMakeLists.txt
	INSTALL
	NEWS
	cmake.h.in
	doc/man/task-faq.5.in
	package-config/osx/README
	scripts/utils/verify_l10n
	src/API.h
	src/Config.cpp
	src/Context.cpp
	src/DOM.cpp
	src/Hooks.cpp
	src/TransportShell.h
	src/commands/CmdDiagnostics.cpp
	src/commands/CmdShell.cpp
	src/commands/CmdVersion.cpp
	src/en-US.h
	src/shell/Readline.h
	src/wcwidth6.cpp
	test/CMakeLists.txt
	test/color.uda.t
	test/duration.t.cpp
	test/hook.on-launch.t
	test/template.t
	test/uuid.t
This commit is contained in:
Paul Beckingham
2013-04-07 17:51:24 -04:00
parent 066d2a54ad 0fb9a4e979
commit 8af0a7f3ba
548 changed files with 13752 additions and 2435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/add-ons/export-csv.pl
View File

@@ -2,7 +2,7 @@
################################################################################
## taskwarrior - a command line task list manager.
##
## Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
## Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
##
## Permission is hereby granted, free of charge, to any person obtaining a copy
## of this software and associated documentation files (the "Software"), to deal
@@ -38,7 +38,7 @@ if ($@)
}
# Use the taskwarrior 2.0+ export command to filter and return JSON
my $command = join (' ', ("env PATH=$ENV{PATH} task export", @ARGV));
my $command = join (' ', ("env PATH=$ENV{PATH} task rc.verbose=nothing rc.json.array=no export", @ARGV));
if ($command =~ /No matches/)
{
printf STDERR $command;
@@ -53,6 +53,9 @@ for my $task (split /,$/ms, qx{$command})
{
my $data = from_json ($task);
my $desc = $data->{'description'};
$desc =~ s/'/\\'/g;
print "'$data->{'uuid'}',",
"'$data->{'status'}',",
"'", (exists $data->{'tags'} ? join (' ', @{$data->{'tags'}}) : ''), "',",
@@ -65,7 +68,7 @@ for my $task (split /,$/ms, qx{$command})
"'", ($data->{'priority'} || ''), "',",
"'", ($data->{'fg'} || ''), "',",
"'", ($data->{'bg'} || ''), "',",
"'$data->{'description'}'",
"'$desc'",
"\n";
# Note that this format ignores:
@@ -74,6 +77,7 @@ for my $task (split /,$/ms, qx{$command})
# annotations
# mask
# imask
# UDAs
}
exit 0;

4
scripts/add-ons/export-html.pl
View File

@@ -2,7 +2,7 @@
################################################################################
## taskwarrior - a command line task list manager.
##
## Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
## Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
##
## Permission is hereby granted, free of charge, to any person obtaining a copy
## of this software and associated documentation files (the "Software"), to deal
@@ -38,7 +38,7 @@ if ($@)
}
# Use the taskwarrior 2.0+ export command to filter and return JSON
my $command = join (' ', ("env PATH='$ENV{PATH}' task export", @ARGV));
my $command = join (' ', ("env PATH='$ENV{PATH}' task rc.verbose=nothing rc.json.array=no export", @ARGV));
if ($command =~ /No matches/)
{
printf STDERR $command;

4
scripts/add-ons/export-ical.pl
View File

@@ -2,7 +2,7 @@
################################################################################
## taskwarrior - a command line task list manager.
##
## Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
## Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
##
## Permission is hereby granted, free of charge, to any person obtaining a copy
## of this software and associated documentation files (the "Software"), to deal
@@ -38,7 +38,7 @@ if ($@)
}
# Use the taskwarrior 2.0+ export command to filter and return JSON
my $command = join (' ', ("env PATH=$ENV{PATH} task export", @ARGV));
my $command = join (' ', ("env PATH=$ENV{PATH} task rc.verbose=nothing rc.json.array=no export", @ARGV));
if ($command =~ /No matches/)
{
printf STDERR $command;

4
scripts/add-ons/export-sql.py
View File

@@ -2,7 +2,7 @@
###############################################################################
# taskwarrior - a command line task list manager.
#
# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
# Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
@@ -141,7 +141,7 @@ def main():
""" Return a list of SQL statements. """
# Use the taskwarrior 2.0+ export command to filter and return JSON
command = "task export " + " ".join(sys.argv[1:])
command = "task rc.verbose=nothing rc.json.array=no export " + " ".join(sys.argv[1:])
# Load each task from json to a python dict
tasks = map(json.loads, commands.getoutput(command).split(",\n"))

83
scripts/add-ons/export-tsv.pl Executable file
View File

@@ -0,0 +1,83 @@
#! /usr/bin/perl
################################################################################
## taskwarrior - a command line task list manager.
##
## Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
##
## Permission is hereby granted, free of charge, to any person obtaining a copy
## of this software and associated documentation files (the "Software"), to deal
## in the Software without restriction, including without limitation the rights
## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
## copies of the Software, and to permit persons to whom the Software is
## furnished to do so, subject to the following conditions:
##
## The above copyright notice and this permission notice shall be included
## in all copies or substantial portions of the Software.
##
## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
## OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
## THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
## SOFTWARE.
##
## http://www.opensource.org/licenses/mit-license.php
##
################################################################################
use strict;
use warnings;
# Give a nice error if the (non-standard) JSON module is not installed.
eval "use JSON";
if ($@)
{
print "Error: You need to install the JSON Perl module.\n";
exit 1;
}
# Use the taskwarrior 2.0+ export command to filter and return JSON
my $command = join (' ', ("env PATH=$ENV{PATH} task rc.verbose=nothing rc.json.array=no export", @ARGV));
if ($command =~ /No matches/)
{
printf STDERR $command;
exit 1;
}
# Generate output.
print "uuid\tstatus\ttags\tentry\tstart\tdue\trecur\tend\tproject\t",
"priority\tfg\tbg\tdescription\n";
for my $task (split /,$/ms, qx{$command})
{
my $data = from_json ($task);
print "$data->{'uuid'}\t",
"$data->{'status'}\t",
(exists $data->{'tags'} ? join (' ', @{$data->{'tags'}}) : ''), "\t",
"$data->{'entry'}\t",
($data->{'start'} || ''), "\t",
($data->{'due'} || ''), "\t",
($data->{'recur'} || ''), "\t",
($data->{'end'} || ''), "\t",
($data->{'project'} || ''), "\t",
($data->{'priority'} || ''), "\t",
($data->{'fg'} || ''), "\t",
($data->{'bg'} || ''), "\t",
"$data->{'description'}",
"\n";
# Note that this format ignores:
# wait
# until
# annotations
# mask
# imask
# UDAs
}
exit 0;
################################################################################

4
scripts/add-ons/export-xml.pl
View File

@@ -2,7 +2,7 @@
################################################################################
## taskwarrior - a command line task list manager.
##
## Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
## Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
##
## Permission is hereby granted, free of charge, to any person obtaining a copy
## of this software and associated documentation files (the "Software"), to deal
@@ -38,7 +38,7 @@ if ($@)
}
# Use the taskwarrior 2.0+ export command to filter and return JSON
my $command = join (' ', ("env PATH=$ENV{PATH} task export", @ARGV));
my $command = join (' ', ("env PATH=$ENV{PATH} task rc.verbose=nothing rc.json.array=no export", @ARGV));
if ($command =~ /No matches/)
{
printf STDERR $command;

4
scripts/add-ons/export-xml.py
View File

@@ -2,7 +2,7 @@
################################################################################
## taskwarrior - a command line task list manager.
##
## Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
## Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
##
## Permission is hereby granted, free of charge, to any person obtaining a copy
## of this software and associated documentation files (the "Software"), to deal
@@ -31,7 +31,7 @@ import commands
import json
# Use the taskwarrior 2.0+ export command to filter and return JSON
command = "/usr/local/bin/task export " + " ".join (sys.argv[1:])
command = "/usr/local/bin/task rc.verbose=nothing rc.json.array=no export " + " ".join (sys.argv[1:])
# Generate output.
print "<tasks>"

4
scripts/add-ons/export-xml.rb
View File

@@ -2,7 +2,7 @@
################################################################################
## taskwarrior - a command line task list manager.
##
## Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
## Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
##
## Permission is hereby granted, free of charge, to any person obtaining a copy
## of this software and associated documentation files (the "Software"), to deal
@@ -30,7 +30,7 @@ require 'rubygems'
require 'json'
# Use the taskwarrior 2.0+ export command to filter and return JSON
lines = IO.popen("/usr/local/bin/task export " + ARGV.join(" ")).readlines
lines = IO.popen("/usr/local/bin/task rc.verbose=nothing rc.json.array=no export " + ARGV.join(" ")).readlines
# Generate output.
print "<tasks>\n"

4
scripts/add-ons/export-yad.pl
View File

@@ -2,7 +2,7 @@
################################################################################
## taskwarrior - a command line task list manager.
##
## Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
## Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
##
## Permission is hereby granted, free of charge, to any person obtaining a copy
## of this software and associated documentation files (the "Software"), to deal
@@ -38,7 +38,7 @@ if ($@)
}
# Use the taskwarrior 2.0+ export command to filter and return JSON
my $command = join (' ', ("env PATH=$ENV{PATH} task export", @ARGV));
my $command = join (' ', ("env PATH=$ENV{PATH} task rc.verbose=nothing rc.json.array=no export", @ARGV));
if ($command =~ /No matches/)
{
printf STDERR $command;

2
scripts/add-ons/export-yaml.pl
View File

@@ -2,7 +2,7 @@
################################################################################
## taskwarrior - a command line task list manager.
##
## Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
## Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
##
## Permission is hereby granted, free of charge, to any person obtaining a copy
## of this software and associated documentation files (the "Software"), to deal

2
scripts/add-ons/import-todo.sh.pl
View File

@@ -2,7 +2,7 @@
################################################################################
## taskwarrior - a command line task list manager.
##
## Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
## Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
##
## Permission is hereby granted, free of charge, to any person obtaining a copy
## of this software and associated documentation files (the "Software"), to deal

2
scripts/add-ons/import-yaml.pl
View File

@@ -2,7 +2,7 @@
################################################################################
## taskwarrior - a command line task list manager.
##
## Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
## Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
##
## Permission is hereby granted, free of charge, to any person obtaining a copy
## of this software and associated documentation files (the "Software"), to deal

4
scripts/add-ons/update-holidays.pl
View File

@@ -2,7 +2,7 @@
################################################################################
## taskwarrior - a command line task list manager.
##
## Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
## Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
##
## Permission is hereby granted, free of charge, to any person obtaining a copy
## of this software and associated documentation files (the "Software"), to deal
@@ -190,7 +190,7 @@ if (open my $fh, '>:utf8', $file)
"# ${url_current}\n",
"# ${url_next}\n",
"#\n",
"# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.\n",
"# Copyright 2006-2013, Paul Beckingham, Federico Hernandez.\n",
"#\n",
"# Permission is hereby granted, free of charge, to any person obtaining a copy\n",
"# of this software and associated documentation files (the \"Software\"), to deal\n",

40
scripts/bash/task.sh
View File

@@ -2,7 +2,7 @@
# bash completion support for taskwarrior
# taskwarrior - a command line task list manager.
#
# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
# Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
@@ -62,10 +62,6 @@ _task_get_config() {
$taskcommand _config
}
_task_offer_dependencies() {
COMPREPLY=( $(compgen -W "$($taskcommand _ids)" -- ${cur/*:/}) )
}
_task_offer_priorities() {
COMPREPLY=( $(compgen -W "L M H" -- ${cur/*:/}) )
}
@@ -94,17 +90,11 @@ _task()
abbrev_min=$($taskcommand show | grep "abbreviation.minimum" | awk {'print $2'})
commands_aliases=$(echo $($taskcommand _commands; $taskcommand _aliases) | tr " " "\n"|sort|tr "\n" " ")
opts="$commands_aliases $($taskcommand _ids) $($taskcommand _columns)"
opts="$commands_aliases $($taskcommand _columns)"
case "${prev}" in
:)
case "${prev2}" in
dep|depe|depen|depend|depends)
if [ ${#prev2} -ge $abbrev_min ]; then
_task_offer_dependencies
fi
return 0
;;
pri|prior|priori|priorit|priority)
if [ ${#prev2} -ge $abbrev_min ]; then
_task_offer_priorities
@@ -117,6 +107,15 @@ _task()
fi
return 0
;;
rc)
# not activated when only "rc:" but is activated if anything after "rc:"
_filedir
return 0
;;
rc.data.location)
_filedir -d
return 0
;;
esac
;;
*)
@@ -127,12 +126,6 @@ _task()
;;
:)
case "${prev}" in
dep|depe|depen|depend|depends)
if [ ${#prev} -ge $abbrev_min ]; then
_task_offer_dependencies
fi
return 0
;;
pri|prior|priori|priorit|priority)
if [ ${#prev} -ge $abbrev_min ]; then
_task_offer_priorities
@@ -145,6 +138,17 @@ _task()
fi
return 0
;;
rc)
# activated only when "rc:"
cur="" # otherwise ":" is passed.
_filedir
return 0
;;
rc.data.location)
cur=""
_filedir -d
return 0
;;
esac
;;
+*)

2
scripts/fish/task.fish
View File

@@ -12,7 +12,7 @@
# * Tags
# * Attribute names and modifiers
#
# Copyright 2009 - 2012 Mick Koch <kchmck@gmail.com>
# Copyright 2009 - 2013 Mick Koch <kchmck@gmail.com>
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal

2
scripts/utils/verify_strings
View File

@@ -2,7 +2,7 @@
################################################################################
## taskwarrior - a command line task list manager.
##
## Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
## Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
##
## Permission is hereby granted, free of charge, to any person obtaining a copy
## of this software and associated documentation files (the "Software"), to deal

2
scripts/vim/README
View File

@@ -53,7 +53,7 @@ You should then be ready to go.
---
All four above mentioned files are
Copyright 2009 - 2012 John Florian
Copyright 2009 - 2013 John Florian
and are available under the MIT license.
For the full text of this license, see COPYING.

2
scripts/vim/ftdetect/task.vim
View File

@@ -4,7 +4,7 @@
" Maintainer: John Florian <jflorian@doubledog.org>
" Updated: Thu Dec 10 18:28:26 EST 2009
"
" Copyright 2009 - 2012 John Florian
" Copyright 2009 - 2013 John Florian
"
" This file is available under the MIT license.
" For the full text of this license, see COPYING.

2
scripts/vim/syntax/taskdata.vim
View File

@@ -3,7 +3,7 @@
" Maintainer: John Florian <jflorian@doubledog.org>
" Updated: Wed Jul 8 19:46:20 EDT 2009
"
" Copyright 2009 - 2012 John Florian
" Copyright 2009 - 2013 John Florian
"
" This file is available under the MIT license.
" For the full text of this license, see COPYING.

2
scripts/vim/syntax/taskedit.vim
View File

@@ -3,7 +3,7 @@
" Maintainer: John Florian <jflorian@doubledog.org>
" Updated: Wed Jul 8 19:46:32 EDT 2009
"
" Copyright 2009 - 2012 John Florian
" Copyright 2009 - 2013 John Florian
"
" This file is available under the MIT license.
" For the full text of this license, see COPYING.

2
scripts/vim/syntax/taskrc.vim
View File

@@ -3,7 +3,7 @@
" Maintainer: John Florian <jflorian@doubledog.org>
" Updated: Sat Feb 20 14:14:44 EST 2010
"
" Copyright 2009 - 2012 John Florian
" Copyright 2009 - 2013 John Florian
"
" This file is available under the MIT license.
" For the full text of this license, see COPYING.

2
scripts/zsh/_task
View File

@@ -3,7 +3,7 @@
#
# taskwarrior - a command line task list manager.
#
# Copyright 2010 - 2012 Johannes Schlatow
# Copyright 2010 - 2013 Johannes Schlatow
# Copyright 2009 P.C. Shyamshankar
#
# Permission is hereby granted, free of charge, to any person obtaining a copy