From 6657fab031cb9df15fe89c29d1314099f1f5d258 Mon Sep 17 00:00:00 2001
From: Aerex <noamfo@aerex.me>
Date: Sat, 1 Dec 2018 23:07:36 -0600
Subject: [PATCH] refactor: rename Taskwarrior folder TW

---
 src/CalendarProcessor.php                         | 9 ++++-----
 src/Config.php                                    | 4 ++--
 src/Plugin.php                                    | 4 ++--
 src/{Taskwarrior => TW}/Commands/IStrategy.php    | 0
 src/{Taskwarrior => TW}/Commands/TodoStrategy.php | 0
 src/{Taskwarrior => TW}/Task.php                  | 3 +--
 src/{Taskwarrior => TW}/Taskwarrior.php           | 2 +-
 src/{Taskwarrior => TW}/TaskwarriorManager.php    | 8 ++++----
 8 files changed, 14 insertions(+), 16 deletions(-)
 rename src/{Taskwarrior => TW}/Commands/IStrategy.php (100%)
 rename src/{Taskwarrior => TW}/Commands/TodoStrategy.php (100%)
 rename src/{Taskwarrior => TW}/Task.php (99%)
 rename src/{Taskwarrior => TW}/Taskwarrior.php (96%)
 rename src/{Taskwarrior => TW}/TaskwarriorManager.php (88%)

diff --git a/src/CalendarProcessor.php b/src/CalendarProcessor.php
index 8b20f18..8bc0e3f 100644
--- a/src/CalendarProcessor.php
+++ b/src/CalendarProcessor.php
@@ -1,7 +1,7 @@
 <?php
 
 namespace Aerex\TaskwarriorPlugin;
-use Aerex\TaskwarriorPlugin\Taskwarrior\TaskwarriorManager;
+use Aerex\TaskwarriorPlugin\TW\TaskwarriorManager;
 use Sabre\VObject\Component\VTodo;
 
 /**
@@ -18,14 +18,12 @@ class CalendarProcessor
 
   public function importTask(VTodo $Todo){
 
-       if($this->taskwarriorManager->exists($Todo->UID)){
+       if($this->taskwarriorManager->taskExists($Todo->UID)){
          $this->taskwarriorManager->updateTask($Todo);
        }
 
-
        try {
-         $this->taskwarriorManager->addTask($Todo);
-
+         return $this->taskwarriorManager->addTask($Todo);
        } catch(Exception $e){
          echo $e->getMessage();
          throw $e;
@@ -42,3 +40,4 @@ class CalendarProcessor
 
 ?>
 
+
diff --git a/src/Config.php b/src/Config.php
index 7d1bd36..4927bcc 100644
--- a/src/Config.php
+++ b/src/Config.php
@@ -2,8 +2,8 @@
 
 namespace Aerex\TaskwarriorPlugin;
 
-use Aerex\TaskwarriorPlugin\Taskwarrior\Taskwarrior;
-use Aerex\TaskwarriorPlugin\Taskwarrior\TaskwarriorManager; 
+use Aerex\TaskwarriorPlugin\TW\Taskwarrior;
+use Aerex\TaskwarriorPlugin\TW\TaskwarriorManager; 
 
 class Config {
 
diff --git a/src/Plugin.php b/src/Plugin.php
index 6a9b8e5..29f4ca8 100644
--- a/src/Plugin.php
+++ b/src/Plugin.php
@@ -10,8 +10,8 @@ use Sabre\Xml\ParseException;
 use Sabre\DAV\ServerPlugin;
 use Sabre\DAV\Server;
 use Aerex\TaskwarriorPlugin\CalendarProcessor;
-use Aerex\TaskwarriorPlugin\Taskwarrior\Taskwarrior;
-use Aerex\TaskwarriorPlugin\Taskwarrior\TaskwarriorManager;
+use Aerex\TaskwarriorPlugin\TW\Taskwarrior;
+use Aerex\TaskwarriorPlugin\TW\TaskwarriorManager;
 use Aerex\TaskwarriorPlugin\Config;
 
 /**
diff --git a/src/Taskwarrior/Commands/IStrategy.php b/src/TW/Commands/IStrategy.php
similarity index 100%
rename from src/Taskwarrior/Commands/IStrategy.php
rename to src/TW/Commands/IStrategy.php
diff --git a/src/Taskwarrior/Commands/TodoStrategy.php b/src/TW/Commands/TodoStrategy.php
similarity index 100%
rename from src/Taskwarrior/Commands/TodoStrategy.php
rename to src/TW/Commands/TodoStrategy.php
diff --git a/src/Taskwarrior/Task.php b/src/TW/Task.php
similarity index 99%
rename from src/Taskwarrior/Task.php
rename to src/TW/Task.php
index db35247..026ac1f 100644
--- a/src/Taskwarrior/Task.php
+++ b/src/TW/Task.php
@@ -1,7 +1,6 @@
-
 <?php
 
-namespace Aerex\TaskwarriorPlugin\Taskwarrior;
+namespace Aerex\TaskwarriorPlugin\TW;
 use Zend\Validator\Uuid;
 use Carbon\Carbon;
 use Sabre\VObject\Component\VTodo;
diff --git a/src/Taskwarrior/Taskwarrior.php b/src/TW/Taskwarrior.php
similarity index 96%
rename from src/Taskwarrior/Taskwarrior.php
rename to src/TW/Taskwarrior.php
index a4af1a3..c6c301a 100644
--- a/src/Taskwarrior/Taskwarrior.php
+++ b/src/TW/Taskwarrior.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Aerex\TaskwarriorPlugin\Taskwarrior;
+namespace Aerex\TaskwarriorPlugin\TW;
 use Symfony\Component\Process\Process;
 use Aerex\TaskwarriorPlugin\Commands\IStrategy;
 use Aerex\TaskwarriorPlugin\Config;
diff --git a/src/Taskwarrior/TaskwarriorManager.php b/src/TW/TaskwarriorManager.php
similarity index 88%
rename from src/Taskwarrior/TaskwarriorManager.php
rename to src/TW/TaskwarriorManager.php
index 3d1e1b4..4acfb04 100644
--- a/src/Taskwarrior/TaskwarriorManager.php
+++ b/src/TW/TaskwarriorManager.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Aerex\TaskwarriorPlugin\Taskwarrior;
+namespace Aerex\TaskwarriorPlugin\TW;
 
-use Aerex\TaskwarriorPlugin\Taskwarrior\Taskwarrior;
-use Aerex\TaskwarriorPlugin\Taskwarrior\Task;
-use Aerex\TaskwarriorPlugin\Taskwarrior\Commands\TodoStrategy;
+use Aerex\TaskwarriorPlugin\TW\Taskwarrior;
+use Aerex\TaskwarriorPlugin\TW\Task;
+use Aerex\TaskwarriorPlugin\TW\Commands\TodoStrategy;
 use Sabre\VObject\Component\VTodo;
 
 class TaskwarriorManager  {