feat(tw): Applied timezone to datetimes that are not given in local time

lib/Configs/ConfigBuilder.php

@@ -6,6 +6,7 @@ use Symfony\Component\Config\Definition\ConfigurationInterface;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\Processor;
 use Symfony\Component\Yaml\Yaml;
+use Carbon\CarbonTimeZone;
 
 class ConfigBuilder implements ConfigurationInterface {
   private $configs = [];
@@ -24,20 +25,32 @@ class ConfigBuilder implements ConfigurationInterface {
     $treeBuilder = new TreeBuilder();
     $rootNode = $treeBuilder->root('configs');
     $ref = $rootNode->children()
-        ->arrayNode('logger')
+        ->arrayNode('general')
-          ->canBeEnabled()
               ->children()
-                ->scalarNode('file')->end()
+                ->arrayNode('logger')
-                ->scalarNode('level')
+                  ->canBeEnabled()
-                  ->defaultValue('ERROR')
+                  ->children()
-                  ->validate()
+                    ->scalarNode('file')->end()
-                    ->IfNotInArray(['DEBUG', 'INFO', 'NOTICE', 'WARNING', 'ERROR', 'CRITICAL', 'ALERT', 'EMERGENCY'])
+                    ->scalarNode('level')
-                      ->thenInvalid('Invalid log level %s')
+                      ->defaultValue('ERROR')
-                  ->end()
+                      ->validate()
-                ->end()
+                        ->IfNotInArray(['DEBUG', 'INFO', 'NOTICE', 'WARNING', 'ERROR', 'CRITICAL', 'ALERT', 'EMERGENCY'])
-              ->end()
+                        ->thenInvalid('Invalid log level %s')
-            ->end();
+                      ->end() 
-    
+                    ->end() 
+                  ->end() 
+                ->end() 
+                ->scalarNode('timezone')
+                  ->defaultValue('UTC')
+                    ->validate()
+                      ->IfNotInArray(CarbonTimeZone::listIdentifiers())
+                      ->thenInvalid('Invalid timezone identifier %s')
+                    ->end() 
+                  ->end() 
+                ->end() 
+              ->end() 
+            ->arrayNode('storages')
+                ->children();
     foreach ($this->configs as $config) {
       $ref = $ref->append($config->get());
     }

lib/Console.php

@@ -25,7 +25,7 @@ class Console extends AbstractConsole {
     if (isset($input)) {
       $input = $this->convertToString($input);
     }
-    $process = new Process(implode(' ', $stdin), $input, $envs);
+    $process = new Process(implode(' ', $stdin), null, $envs, $input);
     $process->inheritEnvironmentVariables();
 
     try {

lib/StorageManager.php

@@ -38,7 +38,7 @@ class StorageManager {
     if (!isset($this->configs)) {
       throw new \Exception('StorageManger was not initialize or configs are not defined'); 
     }
-    foreach ($this->configs as $key => $value) {
+    foreach ($this->configs['storages'] as $key => $value) {
       $storage = $this->storages[$key];
       if (!isset($storage)){
         throw new \Exception();

lib/Storages/Taskwarrior.php

@@ -5,6 +5,7 @@ namespace Aerex\BaikalStorage\Storages;
 use Sabre\VObject\Component\VCalendar as Calendar;
 use Aerex\BaikalStorage\Logger;
 use Carbon\Carbon;
+use Carbon\CarbonTimeZone;
 
 class Taskwarrior implements IStorage {
 
@@ -12,11 +13,13 @@ class Taskwarrior implements IStorage {
   private $tasks = [];
   private $configs;
   private $logger;
+  private $tz;
 
   public function __construct($console, $configs) {
     $this->console = $console;
     $this->configs = $configs['taskwarrior'];
     $this->logger = new Logger($configs, 'Taskwarrior');
+    $this->tz = new CarbonTimeZone($configs['general']['timezone']);
   }
 
   public function getConfig() {
@@ -26,9 +29,9 @@ class Taskwarrior implements IStorage {
   public function refresh() {
     $output = $this->console->execute('task', ['sync'], null, 
       ['TASKRC' => $this->configs['taskrc'],'TASKDATA' => $this->configs['taskdata']]);
-      $tasks = json_decode($this->console->execute('task', ['export'], null,
+      $this->tasks = json_decode($this->console->execute('task', ['export'], null,
         ['TASKRC' => $this->configs['taskrc'], 'TASKDATA' => $this->configs['taskdata']]), true);
-      foreach ($tasks as $task) {
+      foreach ($this->tasks as $task) {
         if (isset($task['uid'])) {
           $this->tasks[$task['uid']] = $task;
         }
@@ -51,19 +54,19 @@ class Taskwarrior implements IStorage {
     }
 
     if (isset($vtodo->DTSTAMP)){
-      $task['entry'] = new Carbon($vtodo->DTSTAMP->getDateTime()->format(\DateTime::W3C));
+      $task['entry'] = new Carbon($vtodo->DTSTAMP->getDateTime()->format(\DateTime::W3C), $this->tz);
     } 
 
     if (isset($vtodo->DTSTART)) {
-      $task['start'] = new Carbon($vtodo->DTSTART->getDateTime()->format(\DateTime::W3C));
+      $task['start'] = new Carbon($vtodo->DTSTART->getDateTime()->format(\DateTime::W3C), $this->tz);
     }
 
     if (isset($vtodo->DTEND)){
-      $task['end'] = new Carbon($vtodo->DTEND->getDateTime()->format(\DateTime::W3C));
+      $task['end'] = new Carbon($vtodo->DTEND->getDateTime()->format(\DateTime::W3C), $this->tz);
     }
 
     if (isset($vtodo->{'LAST-MODIFIED'})) {
-      $task['modified'] = new Carbon($vtodo->{'LAST-MODIFIED'}->getDateTime()->format(\DateTime::W3C));
+      $task['modified'] = new Carbon($vtodo->{'LAST-MODIFIED'}->getDateTime()->format(\DateTime::W3C), $this->tz);
     }
 
     if (isset($vtodo->PRIORITY)) {
@@ -99,13 +102,13 @@ class Taskwarrior implements IStorage {
         case 'COMPLETED':
           $task['status'] = 'completed';
           if (!isset($task['end'])) {
-            $task['end'] = new Carbon($vtodo->DTSTAMP->getDateTime()->format(\DateTime::W3C));
+            $task['end'] = new Carbon($vtodo->DTSTAMP->getDateTime()->format(\DateTime::W3C), $this->tz);
           }
           break;
         case 'CANCELED':
           $task['status'] = 'deleted';
           if (!isset($task['end'])) {
-            $task['end'] = new Carbon($vtodo->DTSTAMP->getDateTime()->format(\DateTime::W3C));
+            $task['end'] = new Carbon($vtodo->DTSTAMP->getDateTime()->format(\DateTime::W3C), $this->tz);
           }
           break;
       }

tests/Configs/ConfigTest.php

@@ -13,18 +13,21 @@ class ConfigTest extends TestCase {
 
   public $mockConfigBuilder;
 
-  public function testLoggerConfigs() {
+  public function testGeneralLoggerConfigs() {
     $configs = new ConfigBuilder(__DIR__ . '/Fixtures/LoggerConfig.yaml');
     $contents = $configs->loadYaml();
     $this->assertEquals(sizeof($contents), 1);
-    $this->assertArrayHasKey('logger', $contents, 'config missing logger property');
+    $this->assertArrayHasKey('general', $contents, 'config missing general config');
-    $this->assertArrayHasKey('file', $contents['logger'], 'config missing logger.file property');
+    $generalConfigs = $contents['general'];
-    $this->assertEquals($contents['logger']['file'], '/home/user/logger.yaml');
+    $this->assertArrayHasKey('logger', $generalConfigs, 'general config is missing logger property');
-    $this->assertArrayHasKey('level', $contents['logger'], 'config missing logger.level property');
+    $this->assertArrayHasKey('file', $generalConfigs['logger'], 'general logger config missing file property');
-    $this->assertEquals($contents['logger']['level'], 'ERROR', 'ERROR is not set as default logger level');
+    $this->assertEquals($generalConfigs['logger']['file'], '/home/user/logger.yaml');
-    $this->assertArrayHasKey('enabled', $contents['logger'], 'config missing logger.enabled property');
+    $this->assertArrayHasKey('level', $generalConfigs['logger'], 'general logger config missing level property');
-    $this->assertTrue($contents['logger']['enabled']);
+    $this->assertEquals($generalConfigs['logger']['level'], 'ERROR', 'ERROR is not set as default logger level');
-
+    $this->assertArrayHasKey('enabled', $generalConfigs['logger'], 'general config logger enabled property is missing');
+    $this->assertTrue($generalConfigs['logger']['enabled']);
+    $this->assertArrayHasKey('timezone', $generalConfigs, 'general config is missing timezone property');
+    $this->assertEquals($generalConfigs['timezone'], 'UTC', 'UTC is not set as default timezone');
   }
 
   public function testTaskwarriorConfig() {
@@ -32,19 +35,15 @@ class ConfigTest extends TestCase {
     $configs->add(new TaskwarriorConfig());
     $contents = $configs->loadYaml();
     $this->assertEquals(sizeof($contents), 2);
-    $this->assertArrayHasKey('logger', $contents, 'config missing logger property');
+    $this->assertArrayHasKey('storages', $contents, 'storages config missing');
-    $this->assertArrayHasKey('file', $contents['logger'], 'config missing logger.file property');
+    $this->assertArrayHasKey('taskwarrior', $contents['storages'], 'storage config missing taskwarrior property');
-    $this->assertArrayHasKey('level', $contents['logger'], 'config missing logger.level property');
+    $taskwarriorConfigs = $contents['storages']['taskwarrior'];
-    $this->assertArrayHasKey('enabled', $contents['logger'], 'config missing logger.enabled property');
+    $this->assertArrayHasKey('taskrc', $taskwarriorConfigs, 'taskwarrior config is missing taskrc property');
-    $this->assertArrayHasKey('taskwarrior', $contents, 'config missing taskwarrior property');
+    $this->assertEquals($taskwarriorConfigs['taskrc'], '/home/aerex/.taskrc');
-    $this->assertArrayHasKey('taskrc', $contents['taskwarrior'], 'config missing taskwarrior.taskrc property');
+    $this->assertArrayHasKey('taskdata', $taskwarriorConfigs, 'taskwarrior config is missing taskdata property');
-    $this->assertEquals($contents['taskwarrior']['taskrc'], '/home/aerex/.taskrc');
+    $this->assertEquals($taskwarriorConfigs['taskdata'], '/home/aerex/.task');
-    $this->assertArrayHasKey('taskdata', $contents['taskwarrior'], 'config missing taskwarrior.taskdata property');
+    $this->assertArrayHasKey('project_tag_suffix', $taskwarriorConfigs, 'taskwarrior config is missing project_tag_suffix property');
-    $this->assertEquals($contents['taskwarrior']['taskdata'], '/home/aerex/.task');
+    $this->assertEquals($taskwarriorConfigs['project_tag_suffix'], 'project_');
-    $this->assertArrayHasKey('project_tag_suffix', $contents['taskwarrior'], 'config missing taskwarrior.taskdata property');
-    $this->assertEquals($contents['taskwarrior']['project_tag_suffix'], 'project_');
   }
-
-
 }
 

tests/Configs/Fixtures/LoggerConfig.yaml

@@ -1,2 +1,3 @@
-logger:
+general:
-  file: /home/user/logger.yaml
+  logger:
+    file: /home/user/logger.yaml

tests/Configs/Fixtures/TaskwarriorConfig.yaml

@@ -1,7 +1,10 @@
-logger:
+general:
-  file: /home/aerex/baikal-storage-plugin.log
+  logger:
-  level: DEBUG
+    file: /home/aerex/baikal-storage-plugin.log
-taskwarrior:
+    level: DEBUG
-  taskdata: /home/aerex/.task
+  timezone: 'America/Denver'
-  taskrc: /home/aerex/.taskrc
+storages:
-  project_tag_suffix: project_
+  taskwarrior:
+    taskdata: /home/aerex/.task
+    taskrc: /home/aerex/.taskrc
+    project_tag_suffix: project_