Merge branch 'bram85/master' into top_command

MinchinWeb · Nov 5, 2015 · 5098a25 · 5098a25
2 parents 5eeff61 + 27104f5
commit 5098a25
Show file tree

Hide file tree

Showing 41 changed files with 105 additions and 73 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,11 +14,22 @@ matrix:
     - python: "pypy"
     - python: "pypy3"
 install:
+  - "python -m pip install pip --upgrade"
   - "pip install ."
-  - "pip install icalendar"
-  - "pip install pylint"
-script: "./run-tests.sh"
+  - "pip install .[ical]"
+  - "pip install .[test]"
+  - "pip install coveralls"
+script:
+  - "green -vvr"
+  - "python -m pylint --errors-only topydo test"
 # Cache Dependencies
+after_script:
+- if [[ $TRAVIS_PYTHON_VERSION == 3.4 ]]; then
+          coveralls;
+  fi
+- if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then
+          coveralls;
+  fi
 cache:
   directories:
     - $HOME/travis/.cache/pip

diff --git a/AUTHORS.md b/AUTHORS.md
@@ -0,0 +1,4 @@
+Main author / maintainer: Bram Schoenmakers (@bram85)
+
+For a list of contributors, please refer to the Contributors page on
+[Github](https://github.com/bram85/topydo/graphs/contributors).
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,41 @@
+0.7
+---
+
+* New subcommand: `revert`. Revert the last executed command(s). The number of
+  revisions can be tuned in the configuration file:
+
+      [topydo]
+      backup_count = 25
+
+* New feature: aliases. Aliases can be defined in the configuration file:
+
+      [aliases]
+      showall = ls -x
+
+  (thanks to @mruwek)
+* Filter based on priorities (thanks to @mruwek)
+
+      ls (A)
+      ls (<A)
+
+* `ls` has a `-n` flag to limit the number of todo items (similar to the
+  list_limit option in the configuration file:
+
+      ls -n 5
+
+* Prompt mode no longer warns about background modifications to todo.txt when a
+  read-only command is entered (e.g. `ls`).
+* Removed restriction in `edit` mode that requires keeping the same amount of
+  lines in the todo.txt file.
+* `edit` only processes the todo items when edits were actually made in the
+  editor.
+* Bugfix: not all tags were properly hidden with the `hide_tags` configuration
+  option.
+* Better PEP8 compliance (thanks to @MinchinWeb)
+* Various test/CI improvements (thanks to @MinchinWeb)
+* Support for Python 3.2 removed.
+* Many other minor improvements (a.o. thanks to @MinchinWeb)
+
 0.6
 ---
 
@@ -16,7 +54,9 @@
 ---
 
 * Remove 'ical' subcommand in favor of 'topydo ls -f ical'
-* Remove options highlight_projects_colors in favor of colorscheme options. In case you wish to disable the project/context colors, assign an empty value in the configuration file:
+* Remove options highlight_projects_colors in favor of colorscheme options. In
+  case you wish to disable the project/context colors, assign an empty value in
+  the configuration file:
 
       [colorscheme]
       project_color =

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -22,7 +22,7 @@ smoothly into topydo.
 
 * Run tests with:
 
-        ./run-tests.sh [python2|python3]
+        green
 
   Obviously, I won't accept anything that makes the tests fail. When you submit
   a Pull Request, Travis CI will automatically run all tests for various Python

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 topydo
 ======
 
-[![Build Status](https://travis-ci.org/bram85/topydo.svg?branch=master)](https://travis-ci.org/bram85/topydo) [![Join the chat at https://gitter.im/bram85/topydo](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/bram85/topydo?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=bram85&url=https://github.com/bram85/topydo&title=topydo&language=&tags=github&category=software) 
+[![Build Status](https://travis-ci.org/bram85/topydo.svg?branch=master)](https://travis-ci.org/bram85/topydo) [![Coverage Status](https://coveralls.io/repos/bram85/topydo/badge.svg?branch=master&service=github)](https://coveralls.io/github/bram85/topydo?branch=master) [![Join the chat at https://gitter.im/bram85/topydo](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/bram85/topydo?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=bram85&url=https://github.com/bram85/topydo&title=topydo&language=&tags=github&category=software) 
 
 topydo is a todo list application using the [todo.txt format][1]. It is heavily
 inspired by the [todo.txt CLI][2] by Gina Trapani. This tool is actually a

diff --git a/run-tests.sh b/run-tests.sh
diff --git a/setup.py b/setup.py
@@ -41,7 +41,9 @@ def find_version(*file_paths):
         ':python_version=="3.2"': ['backports.shutil_get_terminal_size>=1.0.0'],
         'ical': ['icalendar'],
         'prompt-toolkit': ['prompt-toolkit >= 0.53'],
-        'edit-cmd-tests': ['mock'],
+        'test': ['green', 'coverage'],
+        'test:python_version=="2.7"': ['mock'],
+        'test:python_version!="3.2"': ['pylint'],
     },
     entry_points= {
         'console_scripts': ['topydo = topydo.cli.UILoader:main'],

diff --git a/test/CommandTestCase.py → test/command_testcase.py b/test/CommandTestCase.py → test/command_testcase.py
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from test.TopydoTestCase import TopydoTest
+from test.topydo_testcase import TopydoTest
 from topydo.lib.Utils import escape_ansi
 
 

diff --git a/test/Facilities.py → test/facilities.py b/test/Facilities.py → test/facilities.py
diff --git a/test/TestAddCommand.py → test/test_add_command.py b/test/TestAddCommand.py → test/test_add_command.py
@@ -20,7 +20,7 @@
 
 from six import u
 
-from test.CommandTestCase import CommandTest
+from test.command_testcase import CommandTest
 from topydo.commands import AddCommand, ListCommand
 from topydo.lib import TodoList
 from topydo.lib.Config import config

diff --git a/test/TestAppendCommand.py → test/test_append_command.py b/test/TestAppendCommand.py → test/test_append_command.py
@@ -16,7 +16,7 @@
 
 import unittest
 
-from test.CommandTestCase import CommandTest
+from test.command_testcase import CommandTest
 from topydo.commands.AppendCommand import AppendCommand
 from topydo.lib.TodoList import TodoList
 

diff --git a/test/TestArchiveCommand.py → test/test_archive_command.py b/test/TestArchiveCommand.py → test/test_archive_command.py
@@ -16,8 +16,8 @@
 
 import unittest
 
-from test.CommandTestCase import CommandTest
-from test.Facilities import load_file_to_todolist
+from test.command_testcase import CommandTest
+from test.facilities import load_file_to_todolist
 from topydo.commands.ArchiveCommand import ArchiveCommand
 from topydo.lib.TodoList import TodoList
 

diff --git a/test/TestColors.py → test/test_colors.py b/test/TestColors.py → test/test_colors.py
@@ -18,7 +18,7 @@
 
 import unittest
 
-from test.TopydoTestCase import TopydoTest
+from test.topydo_testcase import TopydoTest
 from topydo.lib.Colors import NEUTRAL_COLOR, Colors
 from topydo.lib.Config import config
 

diff --git a/test/TestConfig.py → test/test_config.py b/test/TestConfig.py → test/test_config.py
@@ -17,7 +17,7 @@
 import unittest
 from unittest import skip
 
-from test.TopydoTestCase import TopydoTest
+from test.topydo_testcase import TopydoTest
 from topydo.lib.Config import config
 
 

diff --git a/test/TestDeleteCommand.py → test/test_delete_command.py b/test/TestDeleteCommand.py → test/test_delete_command.py
@@ -18,7 +18,7 @@
 
 from six import u
 
-from test.CommandTestCase import CommandTest
+from test.command_testcase import CommandTest
 from topydo.commands.DeleteCommand import DeleteCommand
 from topydo.lib.Config import config
 from topydo.lib.TodoList import TodoList

diff --git a/test/TestDepCommand.py → test/test_dep_command.py b/test/TestDepCommand.py → test/test_dep_command.py
@@ -16,7 +16,7 @@
 
 import unittest
 
-from test.CommandTestCase import CommandTest
+from test.command_testcase import CommandTest
 from topydo.commands.DepCommand import DepCommand
 from topydo.lib.TodoList import TodoList
 

diff --git a/test/TestDepriCommand.py → test/test_depri_command.py b/test/TestDepriCommand.py → test/test_depri_command.py
@@ -18,7 +18,7 @@
 
 from six import u
 
-from test.CommandTestCase import CommandTest
+from test.command_testcase import CommandTest
 from topydo.commands.DepriCommand import DepriCommand
 from topydo.lib.TodoList import TodoList
 

diff --git a/test/TestDoCommand.py → test/test_do_command.py b/test/TestDoCommand.py → test/test_do_command.py
@@ -19,7 +19,7 @@
 
 from six import u
 
-from test.CommandTestCase import CommandTest
+from test.command_testcase import CommandTest
 from topydo.commands.DoCommand import DoCommand
 from topydo.lib.TodoList import TodoList
 

diff --git a/test/TestEditCommand.py → test/test_edit_command.py b/test/TestEditCommand.py → test/test_edit_command.py
@@ -19,7 +19,7 @@
 
 from six import u
 
-from test.CommandTestCase import CommandTest
+from test.command_testcase import CommandTest
 from topydo.commands.EditCommand import EditCommand
 from topydo.lib.Config import config
 from topydo.lib.Todo import Todo

diff --git a/test/TestFilter.py → test/test_filter.py b/test/TestFilter.py → test/test_filter.py
@@ -19,9 +19,9 @@
 import unittest
 from datetime import date, timedelta
 
-from test.Facilities import (load_file, load_file_to_todolist,
+from test.facilities import (load_file, load_file_to_todolist,
                              todolist_to_string)
-from test.TopydoTestCase import TopydoTest
+from test.topydo_testcase import TopydoTest
 from topydo.lib import Filter
 from topydo.lib.Todo import Todo
 

diff --git a/test/TestGetSubCommand.py → test/test_get_sub_command.py b/test/TestGetSubCommand.py → test/test_get_sub_command.py
@@ -18,7 +18,7 @@
 
 from six import u
 
-from test.TopydoTestCase import TopydoTest
+from test.topydo_testcase import TopydoTest
 from topydo.Commands import get_subcommand
 from topydo.commands.AddCommand import AddCommand
 from topydo.commands.DeleteCommand import DeleteCommand

diff --git a/test/TestGraph.py → test/test_graph.py b/test/TestGraph.py → test/test_graph.py
@@ -16,7 +16,7 @@
 
 import unittest
 
-from test.TopydoTestCase import TopydoTest
+from test.topydo_testcase import TopydoTest
 from topydo.lib.Graph import DirectedGraph
 
 

diff --git a/test/TestImportance.py → test/test_importance.py b/test/TestImportance.py → test/test_importance.py
@@ -17,7 +17,7 @@
 import unittest
 from datetime import date
 
-from test.TopydoTestCase import TopydoTest
+from test.topydo_testcase import TopydoTest
 from topydo.lib.Config import config
 from topydo.lib.Importance import importance
 from topydo.lib.Todo import Todo

diff --git a/test/TestJsonPrinter.py → test/test_json_printer.py b/test/TestJsonPrinter.py → test/test_json_printer.py
@@ -16,7 +16,7 @@
 
 import unittest
 
-from test.TopydoTestCase import TopydoTest
+from test.topydo_testcase import TopydoTest
 from topydo.lib.JsonPrinter import JsonPrinter
 from topydo.lib.Todo import Todo
 

diff --git a/test/TestListCommand.py → test/test_list_command.py b/test/TestListCommand.py → test/test_list_command.py
@@ -20,8 +20,8 @@
 
 from six import u
 
-from test.CommandTestCase import CommandTest
-from test.Facilities import load_file_to_todolist
+from test.command_testcase import CommandTest
+from test.facilities import load_file_to_todolist
 from topydo.commands.ListCommand import ListCommand
 from topydo.lib.Config import config
 

diff --git a/test/TestListContextCommand.py → test/test_list_context_command.py b/test/TestListContextCommand.py → test/test_list_context_command.py
@@ -16,8 +16,8 @@
 
 import unittest
 
-from test.CommandTestCase import CommandTest
-from test.Facilities import load_file_to_todolist
+from test.command_testcase import CommandTest
+from test.facilities import load_file_to_todolist
 from topydo.commands.ListContextCommand import ListContextCommand
 
 

diff --git a/test/TestListProjectCommand.py → test/test_list_project_command.py b/test/TestListProjectCommand.py → test/test_list_project_command.py
@@ -16,8 +16,8 @@
 
 import unittest
 
-from test.CommandTestCase import CommandTest
-from test.Facilities import load_file_to_todolist
+from test.command_testcase import CommandTest
+from test.facilities import load_file_to_todolist
 from topydo.commands.ListProjectCommand import ListProjectCommand
 
 

diff --git a/test/TestPostponeCommand.py → test/test_postpone_command.py b/test/TestPostponeCommand.py → test/test_postpone_command.py
@@ -19,7 +19,7 @@
 
 from six import u
 
-from test.CommandTestCase import CommandTest
+from test.command_testcase import CommandTest
 from topydo.commands.PostponeCommand import PostponeCommand
 from topydo.lib.TodoList import TodoList
 

diff --git a/test/TestPriorityCommand.py → test/test_priority_command.py b/test/TestPriorityCommand.py → test/test_priority_command.py
@@ -18,7 +18,7 @@
 
 from six import u
 
-from test.CommandTestCase import CommandTest
+from test.command_testcase import CommandTest
 from topydo.commands.PriorityCommand import PriorityCommand
 from topydo.lib.TodoList import TodoList
 

diff --git a/test/TestRecurrence.py → test/test_recurrence.py b/test/TestRecurrence.py → test/test_recurrence.py
@@ -17,7 +17,7 @@
 import unittest
 from datetime import date, timedelta
 
-from test.TopydoTestCase import TopydoTest
+from test.topydo_testcase import TopydoTest
 from topydo.lib.Config import config
 from topydo.lib.Recurrence import NoRecurrenceException, advance_recurring_todo
 from topydo.lib.Todo import Todo

diff --git a/test/TestRelativeDate.py → test/test_relative_date.py b/test/TestRelativeDate.py → test/test_relative_date.py
@@ -17,7 +17,7 @@
 import unittest
 from datetime import date, timedelta
 
-from test.TopydoTestCase import TopydoTest
+from test.topydo_testcase import TopydoTest
 from topydo.lib.RelativeDate import relative_date_to_date
 
 

diff --git a/test/TestRevertCommand.py → test/test_revert_command.py b/test/TestRevertCommand.py → test/test_revert_command.py
@@ -23,7 +23,7 @@
 from six import u
 from uuid import uuid4
 
-from test.CommandTestCase import CommandTest
+from test.command_testcase import CommandTest
 from topydo.commands.AddCommand import AddCommand
 from topydo.commands.ArchiveCommand import ArchiveCommand
 from topydo.commands.DeleteCommand import DeleteCommand

diff --git a/test/TestSortCommand.py → test/test_sort_command.py b/test/TestSortCommand.py → test/test_sort_command.py
@@ -16,8 +16,8 @@
 
 import unittest
 
-from test.CommandTestCase import CommandTest
-from test.Facilities import load_file_to_todolist
+from test.command_testcase import CommandTest
+from test.facilities import load_file_to_todolist
 from topydo.commands.SortCommand import SortCommand
 from topydo.lib.Config import config
 

diff --git a/test/TestSorter.py → test/test_sorter.py b/test/TestSorter.py → test/test_sorter.py
@@ -16,9 +16,9 @@
 
 import unittest
 
-from test.Facilities import (load_file, load_file_to_todolist, print_view,
+from test.facilities import (load_file, load_file_to_todolist, print_view,
                              todolist_to_string)
-from test.TopydoTestCase import TopydoTest
+from test.topydo_testcase import TopydoTest
 from topydo.lib.Config import config
 from topydo.lib.Sorter import Sorter
 

diff --git a/test/TestTagCommand.py → test/test_tag_command.py b/test/TestTagCommand.py → test/test_tag_command.py
@@ -16,7 +16,7 @@
 
 import unittest
 
-from test.CommandTestCase import CommandTest
+from test.command_testcase import CommandTest
 from topydo.commands.TagCommand import TagCommand
 from topydo.lib.TodoList import TodoList