refactor exceptions

src/Exception/CommandException.php

@@ -0,0 +1,98 @@
+<?php
+
+namespace DavidBadura\Taskwarrior\Exception;
+
+use Symfony\Component\Process\Process;
+
+/**
+ * @author David Badura <d.a.badura@gmail.com>
+ */
+class CommandException extends TaskwarriorException
+{
+    /**
+     * @var string
+     */
+    private $command;
+
+    /**
+     * @var int
+     */
+    private $exitCode;
+
+    /**
+     * @var string
+     */
+    private $output;
+
+    /**
+     * @var string
+     */
+    private $errorOutput;
+
+    /**
+     * @param Process $process
+     */
+    public function __construct(Process $process)
+    {
+        $this->command     = $process->getCommandLine();
+        $this->exitCode    = $process->getExitCode();
+        $this->output      = $process->getOutput();
+        $this->errorOutput = $process->getErrorOutput();
+
+        if (!$message = $this->getCleanErrorOutput()) {
+            $message = $this->output;
+        }
+
+        parent::__construct($message, $this->getExitCode());
+    }
+
+    /**
+     * @return string
+     */
+    public function getCommand()
+    {
+        return $this->command;
+    }
+
+    /**
+     * @return int
+     */
+    public function getExitCode()
+    {
+        return $this->exitCode;
+    }
+
+    /**
+     * @return string
+     */
+    public function getOutput()
+    {
+        return $this->output;
+    }
+
+    /**
+     * @return string
+     */
+    public function getErrorOutput()
+    {
+        return $this->errorOutput;
+    }
+
+    /**
+     * @return string
+     */
+    public function getCleanErrorOutput()
+    {
+        $message = '';
+
+        foreach (explode("\n", $this->errorOutput) as $line) {
+            if (strpos($line, 'Using alternate') === 0 || strpos($line, 'Configuration override') === 0) {
+                continue;
+            }
+
+            $message .= $line . "\n";
+        }
+
+        return trim($message);
+    }
+}

src/Exception/DatetimeParseException.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace DavidBadura\Taskwarrior\Exception;
+
+/**
+ * @author David Badura <d.a.badura@gmail.com>
+ */
+class DatetimeParseException extends TaskwarriorException
+{
+}

src/Exception/RecurringParseException.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace DavidBadura\Taskwarrior\Exception;
+
+/**
+ * @author David Badura <d.a.badura@gmail.com>
+ */
+class RecurringParseException extends TaskwarriorException
+{
+}

src/Exception/TaskwarriorException.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace DavidBadura\Taskwarrior\Exception;
+
+/**
+ * @author David Badura <badura@simplethings.de>
+ */
+class TaskwarriorException extends \Exception
+{
+}

src/Recurring.php

@@ -5,6 +5,8 @@
 
 namespace DavidBadura\Taskwarrior;
 
+use DavidBadura\Taskwarrior\Exception\RecurringParseException;
+
 /**
  * @author David Badura <d.a.badura@gmail.com>
  */
@@ -28,15 +30,15 @@ class Recurring
 
     /**
      * @param string $recurring
-     * @throws TaskwarriorException
+     * @throws RecurringParseException
      */
     public function __construct($recurring)
     {
-        if (self::isValid($recurring)) {
+        if (!self::isValid($recurring)) {
-            $this->recurring = $recurring;
+            throw new RecurringParseException(sprintf('recurring "%s" is not valid', $recurring));
-        } else {
-            throw new TaskwarriorException();
         }
+
+        $this->recurring = $recurring;
     }
 
     /**

src/Task.php

@@ -3,6 +3,7 @@
 namespace DavidBadura\Taskwarrior;
 
 use Carbon\Carbon;
+use DavidBadura\Taskwarrior\Exception\DatetimeParseException;
 use JMS\Serializer\Annotation as JMS;
 
 /**
@@ -381,7 +382,7 @@ class Task
     /**
      * @param string|\DateTime|null $date
      * @return \DateTime|null
-     * @throws TaskwarriorException
+     * @throws DatetimeParseException
      */
     private function parseDateTime($date)
     {
@@ -404,7 +405,7 @@ class Task
             return null;
         }
 
-        throw new TaskwarriorException();
+        throw new DatetimeParseException($date);
     }
 
     /**

src/TaskManager.php

@@ -2,13 +2,14 @@
 
 namespace DavidBadura\Taskwarrior;
 
+use Carbon\Carbon;
+use DavidBadura\Taskwarrior\Exception\TaskwarriorException;
 use DavidBadura\Taskwarrior\Serializer\Handler\CarbonHandler;
 use DavidBadura\Taskwarrior\Serializer\Handler\RecurringHandler;
 use JMS\Serializer\Handler\HandlerRegistryInterface;
 use JMS\Serializer\JsonSerializationVisitor;
 use JMS\Serializer\Naming\CamelCaseNamingStrategy;
 use JMS\Serializer\Naming\SerializedNameAnnotationStrategy;
-use JMS\Serializer\SerializationContext;
 use JMS\Serializer\Serializer;
 use JMS\Serializer\SerializerBuilder;
 
@@ -133,9 +134,14 @@ class TaskManager
             return;
         }
 
+        if ($task->isRecurring()) {
+            $task->setUntil('now');
+            $this->save($task);
+        } else {
             $this->taskwarrior->delete($task->getUuid());
             $this->refresh($task);
         }
+    }
 
     /**
      * @param Task $task

src/Taskwarrior.php

@@ -2,7 +2,8 @@
 
 namespace DavidBadura\Taskwarrior;
 
-use JMS\Serializer\SerializerBuilder;
+use DavidBadura\Taskwarrior\Exception\CommandException;
+use DavidBadura\Taskwarrior\Exception\TaskwarriorException;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Process\ProcessBuilder;
 
@@ -57,7 +58,6 @@ class Taskwarrior
 
     /**
      * @param array $params
-     * @throws TaskwarriorException
      */
     public function add(array $params)
     {
@@ -76,7 +76,6 @@ class Taskwarrior
     /**
      * @param null $filter
      * @return array
-     * @throws TaskwarriorException
      */
     public function projects($filter = null)
     {
@@ -88,7 +87,6 @@ class Taskwarrior
     /**
      * @param null $filter
      * @return array
-     * @throws TaskwarriorException
      */
     public function tags($filter = null)
     {
@@ -104,6 +102,7 @@ class Taskwarrior
     /**
      * @param string $json
      * @return string
+     * @throws CommandException
      * @throws TaskwarriorException
      */
     public function import($json)
@@ -175,11 +174,7 @@ class Taskwarrior
         $process->run();
 
         if (!$process->isSuccessful()) {
-            throw new TaskwarriorException(
+            throw new CommandException($process);
-                $this->extractErrorMessage($process->getErrorOutput()),
-                $process->getExitCode(),
-                $process->getCommandLine()
-            );
         }
 
         return $process->getOutput();
@@ -187,7 +182,6 @@ class Taskwarrior
 
     /**
      * @return string
-     * @throws TaskwarriorException
      */
     public function version()
     {
@@ -266,25 +260,6 @@ class Taskwarrior
         return $builder;
     }
 
-    /**
-     * @param string $string
-     * @return string
-     */
-    private function extractErrorMessage($string)
-    {
-        $message = '';
-
-        foreach (explode("\n", $string) as $line) {
-            if (strpos($line, 'Using alternate') === 0 || strpos($line, 'Configuration override') === 0) {
-                continue;
-            }
-
-            $message .= $line . "\n";
-        }
-
-        return trim($message);
-    }
-
     /**
      * @param string $string
      * @return array

src/TaskwarriorException.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace DavidBadura\Taskwarrior;
-
-use Exception;
-
-/**
- * @author David Badura <badura@simplethings.de>
- */
-class TaskwarriorException extends \Exception
-{
-    /**
-     * @var string
-     */
-    private $command;
-
-    /**
-     * @param string    $message
-     * @param int       $code
-     * @param string    $command
-     */
-    public function __construct($message = "", $code = 0, $command = '')
-    {
-        parent::__construct($message, $code, null);
-    }
-
-    /**
-     * @return string
-     */
-    public function getCommand()
-    {
-        return $this->command;
-    }
-}

tests/RecurringTest.php

@@ -67,7 +67,7 @@ class RecurringTest extends \PHPUnit_Framework_TestCase
      */
     public function testInvalid($recur)
     {
-        $this->setExpectedException('DavidBadura\Taskwarrior\TaskwarriorException');
+        $this->setExpectedException('DavidBadura\Taskwarrior\Exception\RecurringParseException');
 
         $obj = new Recurring($recur);
     }

tests/TaskManagerTest.php

@@ -61,7 +61,7 @@ class TaskManagerTest extends \PHPUnit_Framework_TestCase
 
     public function testSaveTaskWithoutDescription()
     {
-        $this->setExpectedException('DavidBadura\Taskwarrior\TaskwarriorException');
+        $this->setExpectedException('DavidBadura\Taskwarrior\Exception\TaskwarriorException');
 
         $task = new Task();
 
@@ -547,7 +547,7 @@ class TaskManagerTest extends \PHPUnit_Framework_TestCase
 
     public function testRecurringRemoveRecurringException()
     {
-        $this->setExpectedException('DavidBadura\Taskwarrior\TaskwarriorException',
+        $this->setExpectedException('DavidBadura\Taskwarrior\Exception\TaskwarriorException',
             'You cannot remove the recurrence from a recurring task.');
 
         $task1 = new Task();
@@ -564,7 +564,7 @@ class TaskManagerTest extends \PHPUnit_Framework_TestCase
 
     public function testRecurringRemoveDueException()
     {
-        $this->setExpectedException('DavidBadura\Taskwarrior\TaskwarriorException',
+        $this->setExpectedException('DavidBadura\Taskwarrior\Exception\TaskwarriorException',
             'You cannot remove the due date from a recurring task.');
 
         $task1 = new Task();
@@ -581,7 +581,7 @@ class TaskManagerTest extends \PHPUnit_Framework_TestCase
 
     public function testRecurringWithoutDue()
     {
-        $this->setExpectedException('DavidBadura\Taskwarrior\TaskwarriorException',
+        $this->setExpectedException('DavidBadura\Taskwarrior\Exception\TaskwarriorException',
             "A recurring task must also have a 'due' date.");
 
         $task1 = new Task();
@@ -629,6 +629,29 @@ class TaskManagerTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($recur2, $task1->getRecurring());
     }
 
+    public function testRecurringDelete()
+    {
+        $this->markTestIncomplete('not working yet');
+
+        $recur1 = new Recurring(Recurring::DAILY);
+
+        $task1 = new Task();
+        $task1->setDescription('foo1');
+        $task1->setDue('tomorrow');
+        $task1->setRecurring($recur1);
+
+        $this->taskManager->save($task1);
+        $this->taskManager->clear();
+
+        $this->assertCount(1, $this->taskManager->filterAll('status:recurring'));
+
+        $this->taskManager->delete($task1);
+
+        $this->taskManager->clear();
+
+        $this->assertCount(0, $this->taskManager->filterAll('status:recurring'));
+    }
+
     public function testUntil()
     {
         $task1 = new Task();