From 360c0b51578b105b9744271df0c0cd7b87cd3d82 Mon Sep 17 00:00:00 2001 From: DavidBadura Date: Wed, 22 Apr 2015 10:18:39 +0000 Subject: [PATCH 1/6] test build --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a28516b..1f0994d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,8 +15,6 @@ env: - PREFER_LOWEST="" before_install: - - sudo add-apt-repository ppa:ultrafredde/ppa -y - - sudo apt-get update -qq - sudo apt-get install -qq task --force-yes - task --version From c3b35517030b1d58b18f7e096db9c34db884ce7d Mon Sep 17 00:00:00 2001 From: DavidBadura Date: Wed, 22 Apr 2015 10:48:34 +0000 Subject: [PATCH 2/6] test build --- .travis.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.travis.yml b/.travis.yml index 1f0994d..7f5d845 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,16 @@ env: - PREFER_LOWEST="" before_install: + - wget http://taskwarrior.org/download/task-2.4.2.tar.gz + - gunzip task-2.4.2.tar.gz + - tar xf task-2.4.2.tar + - cd task-2.4.2 + - sudo apt-get install cmake build-essential uuid-dev libgnutls-dev libreadline6-dev - sudo apt-get install -qq task --force-yes + - sudo cmake -DCMAKE_BUILD_TYPE=release . + - sudo make + - sudo make install + - sudo ln -s /usr/local/bin/task /usr/bin/task - task --version before_script: From c741720d475ad53be3038a64ff637f70cca13cb5 Mon Sep 17 00:00:00 2001 From: DavidBadura Date: Wed, 22 Apr 2015 10:54:41 +0000 Subject: [PATCH 3/6] fix build --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7f5d845..89fdf4d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,8 +19,7 @@ before_install: - gunzip task-2.4.2.tar.gz - tar xf task-2.4.2.tar - cd task-2.4.2 - - sudo apt-get install cmake build-essential uuid-dev libgnutls-dev libreadline6-dev - - sudo apt-get install -qq task --force-yes + - sudo apt-get install cmake build-essential uuid-dev libgnutls-dev libreadline6-dev --force-yes - sudo cmake -DCMAKE_BUILD_TYPE=release . - sudo make - sudo make install From 188afd01ca5a13ceab9d5d490cda9599cf1eeae2 Mon Sep 17 00:00:00 2001 From: DavidBadura Date: Wed, 22 Apr 2015 10:59:26 +0000 Subject: [PATCH 4/6] fix build --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 89fdf4d..8f117f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,7 @@ before_install: - sudo make install - sudo ln -s /usr/local/bin/task /usr/bin/task - task --version + - cd .. before_script: - composer self-update From 9ba37c9d45b7dc052e82129b70aac771473b991a Mon Sep 17 00:00:00 2001 From: DavidBadura Date: Wed, 22 Apr 2015 11:32:43 +0000 Subject: [PATCH 5/6] fix phpunit test --- src/TaskManager.php | 28 +++++++++++++++------------- tests/TaskManagerTest.php | 7 ++++++- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/src/TaskManager.php b/src/TaskManager.php index 802dc00..876de86 100644 --- a/src/TaskManager.php +++ b/src/TaskManager.php @@ -254,19 +254,21 @@ class TaskManager */ private function edit(Task $task) { - $this->taskwarrior->modify( - [ - 'description' => $task->getDescription(), - 'project' => $task->getProject(), - 'priority' => $task->getPriority(), - 'tags' => $task->getTags(), - 'due' => $task->getDue() ? $task->getDue()->format('Ymd\THis\Z') : null, - 'wait' => $task->getWait() ? $task->getWait()->format('Ymd\THis\Z') : null, - 'until' => $task->getUntil() ? $task->getUntil()->format('Ymd\THis\Z') : null, - 'recur' => $task->getRecurring() ? $task->getRecurring()->getValue() : null, - ], - $task->getUuid() - ); + $params = [ + 'description' => $task->getDescription(), + 'project' => $task->getProject(), + 'priority' => $task->getPriority(), + 'tags' => $task->getTags(), + 'due' => $task->getDue() ? $task->getDue()->format('Ymd\THis\Z') : null, + 'wait' => $task->getWait() ? $task->getWait()->format('Ymd\THis\Z') : null, + 'until' => $task->getUntil() ? $task->getUntil()->format('Ymd\THis\Z') : null + ]; + + if ($task->getRecurring()) { + $params['recur'] = $task->getRecurring()->getValue(); + } + + $this->taskwarrior->modify($params, $task->getUuid()); } /** diff --git a/tests/TaskManagerTest.php b/tests/TaskManagerTest.php index 0dbcf66..a50a470 100644 --- a/tests/TaskManagerTest.php +++ b/tests/TaskManagerTest.php @@ -193,7 +193,10 @@ class TaskManagerTest extends \PHPUnit_Framework_TestCase $this->taskManager->save($task1); $this->assertInstanceOf('DateTime', $task1->getEntry()); - $this->assertNull($task1->getModified()); + $this->assertInstanceOf('DateTime', $task1->getModified()); + + $mod = $task1->getModified(); + sleep(1); $task1->setDescription('bar2'); @@ -201,6 +204,8 @@ class TaskManagerTest extends \PHPUnit_Framework_TestCase $this->assertInstanceOf('DateTime', $task1->getEntry()); $this->assertInstanceOf('DateTime', $task1->getModified()); + + $this->assertNotEquals($mod, $task1->getModified()); } public function testEnd() From 206b63b2178e565f6389cb682d4525901047abec Mon Sep 17 00:00:00 2001 From: DavidBadura Date: Wed, 22 Apr 2015 11:39:33 +0000 Subject: [PATCH 6/6] fix modified date --- tests/TaskManagerTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/TaskManagerTest.php b/tests/TaskManagerTest.php index a50a470..a03615d 100644 --- a/tests/TaskManagerTest.php +++ b/tests/TaskManagerTest.php @@ -196,7 +196,7 @@ class TaskManagerTest extends \PHPUnit_Framework_TestCase $this->assertInstanceOf('DateTime', $task1->getModified()); $mod = $task1->getModified(); - sleep(1); + sleep(2); $task1->setDescription('bar2');