Merge branch 'develop'

Author: robgolding

.gitignore

@@ -1,6 +1,9 @@
+.cache
 *.pyc
 *~
 tasklib.egg-info
 /dist
 /build
 docs/_build
+.project
+.coverage

.travis.yml

@@ -11,7 +11,6 @@ env:
   - TASK_VERSION=v2.4.4
   - TASK_VERSION=v2.5.0
   - TASK_VERSION=v2.5.1
-  - TASK_VERSION=2.6.0
 python:
   - "2.7"
   - "3.3"
@@ -25,8 +24,8 @@ install:
   - sudo apt-get update -qq
   - sudo apt-get install -qq build-essential cmake uuid-dev g++-4.8
   - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50
-  - git clone --recursive https://git.tasktools.org/scm/tm/task.git
-  - cd task
+  - git clone --recursive https://github.com/GothenburgBitFactory/taskwarrior
+  - cd taskwarrior
   - git checkout $TASK_VERSION
   - git clean -dfx
   - git submodule init

README.rst

@@ -30,7 +30,7 @@ Usage
 
 tasklib has a similar API to that of Django's ORM::
 
-    >>> from tasklib.task import TaskWarrior
+    >>> from tasklib import TaskWarrior
 
     >>> tw = TaskWarrior('/home/rob/.task')
     >>> tasks = tw.tasks.pending()
@@ -40,7 +40,7 @@ tasklib has a similar API to that of Django's ORM::
     ['Tidy the house']
     >>> type(tasks[0])
     <class 'tasklib.task.Task'>
-    >>> task[0].done()
+    >>> tasks[0].done()
     >>> tasks = tw.tasks.pending()
     >>> tasks
     ['Learn German']

docs/conf.py

@@ -51,9 +51,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.1.0'
+version = '1.2.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.1.0'
+release = '1.2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -2,7 +2,7 @@
 
 install_requirements = ['six>=1.4', 'pytz', 'tzlocal']
 
-version = '1.1.0'
+version = '1.2.0'
 
 try:
     import importlib

tasklib/backends.py

@@ -94,16 +94,22 @@ class TaskWarrior(Backend):
     VERSION_2_4_4 = six.u('2.4.4')
     VERSION_2_4_5 = six.u('2.4.5')
 
-    def __init__(self, data_location=None, create=True, taskrc_location='~/.taskrc'):
-        self.taskrc_location = os.path.expanduser(taskrc_location)
+    def __init__(self, data_location=None, create=True,
+                 taskrc_location=None, task_command='task',
+                 version_override=None):
+        self.taskrc_location = None
+        if taskrc_location:
+            self.taskrc_location = os.path.expanduser(taskrc_location)
 
-        # If taskrc does not exist, pass / to use defaults and avoid creating
-        # dummy .taskrc file by TaskWarrior
-        if not os.path.exists(self.taskrc_location):
-            self.taskrc_location = '/'
+            # If taskrc does not exist, pass / to use defaults and avoid creating
+            # dummy .taskrc file by TaskWarrior
+            if not os.path.exists(self.taskrc_location):
+                self.taskrc_location = '/'
+
+        self.task_command = task_command
 
         self._config = None
-        self.version = self._get_version()
+        self.version = version_override or self._get_version()
         self.overrides = {
             'confirmation': 'no',
             'dependency.confirmation': 'no',  # See TW-1483 or taskrc man page
@@ -126,8 +132,11 @@ def __init__(self, data_location=None, create=True, taskrc_location='~/.taskrc')
 
         self.tasks = TaskQuerySet(self)
 
+    def _get_task_command(self):
+        return self.task_command.split()
+
     def _get_command_args(self, args, config_override=None):
-        command_args = ['task', 'rc:{0}'.format(self.taskrc_location)]
+        command_args = self._get_task_command()
         overrides = self.overrides.copy()
         overrides.update(config_override or dict())
         for item in overrides.items():
@@ -140,7 +149,7 @@ def _get_command_args(self, args, config_override=None):
 
     def _get_version(self):
         p = subprocess.Popen(
-            ['task', '--version'],
+            self._get_task_command() + ['--version'],
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE)
         stdout, stderr = [x.decode('utf-8') for x in p.communicate()]
@@ -214,21 +223,25 @@ def format_description(self, task):
         if self.version < self.VERSION_2_4_0:
             return task._data['description']
         else:
-            return six.u("description:'{0}'").format(task._data['description'] or '')
+            return six.u("description:'{0}'").format(
+                task._data['description'] or '',
+            )
 
     def convert_datetime_string(self, value):
 
         if self.version >= self.VERSION_2_4_0:
-            # For strings, use 'task calc' to evaluate the string to datetime
+            # For strings, use 'calc' to evaluate the string to datetime
             # available since TW 2.4.0
             args = value.split()
             result = self.execute_command(['calc'] + args)
             naive = datetime.datetime.strptime(result[0], DATE_FORMAT_CALC)
             localized = local_zone.localize(naive)
         else:
-            raise ValueError("Provided value could not be converted to "
-                             "datetime, its type is not supported: {}"
-                             .format(type(value)))
+            raise ValueError(
+                'Provided value could not be converted to '
+                'datetime, its type is not supported: {}'
+                .format(type(value)),
+            )
 
         return localized
 
@@ -269,8 +282,11 @@ def execute_command(self, args, config_override=None, allow_failure=True,
             args, config_override=config_override)
         logger.debug(u' '.join(command_args))
 
+        env = os.environ.copy()
+        if self.taskrc_location:
+            env['TASKRC'] = self.taskrc_location
         p = subprocess.Popen(command_args, stdout=subprocess.PIPE,
-                             stderr=subprocess.PIPE)
+                             stderr=subprocess.PIPE, env=env)
         stdout, stderr = [x.decode('utf-8') for x in p.communicate()]
         if p.returncode and allow_failure:
             if stderr.strip():
@@ -338,8 +354,10 @@ def save_task(self, task):
             # Expected output: Created task 1.
             #                  Created task 1 (recurrence template).
             if len(id_lines) != 1 or len(id_lines[0].split(' ')) not in (3, 5):
-                raise TaskWarriorException("Unexpected output when creating "
-                                           "task: %s" % '\n'.join(id_lines))
+                raise TaskWarriorException(
+                    'Unexpected output when creating '
+                    'task: %s' % '\n'.join(id_lines),
+                )
 
             # Circumvent the ID storage, since ID is considered read-only
             identifier = id_lines[0].split(' ')[2].rstrip('.')
@@ -411,8 +429,8 @@ def valid(output):
         # If more than 1 task has been matched still, raise an exception
         if not valid(output):
             raise TaskWarriorException(
-                "Unique identifiers {0} with description: {1} matches "
-                "multiple tasks: {2}".format(
+                'Unique identifiers {0} with description: {1} matches '
+                'multiple tasks: {2}'.format(
                     task['uuid'] or task['id'], task['description'], output)
             )
 

tasklib/lazy.py

@@ -43,7 +43,7 @@ def __hash__(self):
         return self['uuid'].__hash__()
 
     def __repr__(self):
-        return "LazyUUIDTask: {0}".format(self._uuid)
+        return 'LazyUUIDTask: {0}'.format(self._uuid)
 
     def __copy__(self):
         return LazyUUIDTask(self._tw, self._uuid)
@@ -103,7 +103,7 @@ def __getattr__(self, name):
             return getattr(self, name)
 
     def __repr__(self):
-        return "LazyUUIDTaskSet([{0}])".format(', '.join(self._uuids))
+        return 'LazyUUIDTaskSet([{0}])'.format(', '.join(self._uuids))
 
     def __eq__(self, other):
         return set(t['uuid'] for t in other) == self._uuids
@@ -128,8 +128,10 @@ def __isub__(self, other):
         return self.difference_update(other)
 
     def __rsub__(self, other):
-        return LazyUUIDTaskSet(self._tw,
-            set(t['uuid'] for t in other) - self._uuids)
+        return LazyUUIDTaskSet(
+            self._tw,
+            set(t['uuid'] for t in other) - self._uuids,
+        )
 
     def __or__(self, other):
         return self.union(other)
@@ -171,20 +173,28 @@ def issuperset(self, other):
         return all([task in self for task in other])
 
     def union(self, other):
-        return LazyUUIDTaskSet(self._tw,
-            self._uuids | set(t['uuid'] for t in other))
+        return LazyUUIDTaskSet(
+            self._tw,
+            self._uuids | set(t['uuid'] for t in other),
+        )
 
     def intersection(self, other):
-        return LazyUUIDTaskSet(self._tw,
-            self._uuids & set(t['uuid'] for t in other))
+        return LazyUUIDTaskSet(
+            self._tw,
+            self._uuids & set(t['uuid'] for t in other),
+        )
 
     def difference(self, other):
-        return LazyUUIDTaskSet(self._tw,
-            self._uuids - set(t['uuid'] for t in other))
+        return LazyUUIDTaskSet(
+            self._tw,
+            self._uuids - set(t['uuid'] for t in other),
+        )
 
     def symmetric_difference(self, other):
-        return LazyUUIDTaskSet(self._tw,
-            self._uuids ^ set(t['uuid'] for t in other))
+        return LazyUUIDTaskSet(
+            self._tw,
+            self._uuids ^ set(t['uuid'] for t in other),
+        )
 
     def update(self, other):
         self._uuids |= set(t['uuid'] for t in other)