bump version

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.3.3] - 2020-01-01
+
+### Added
+
+- Add colors #4
+
 ## [0.3.2] - 2019-12-30
 
 ### Added
@@ -113,7 +119,8 @@ First release :tada:
 
 - Linux binaries
 
-[unreleased]: https://github.com/unfog-io/unfog-cli/compare/v0.3.2...HEAD
+[unreleased]: https://github.com/unfog-io/unfog-cli/compare/v0.3.3...HEAD
+[0.3.3]: https://github.com/unfog-io/unfog-cli/compare/v0.3.2...v0.3.3
 [0.3.2]: https://github.com/unfog-io/unfog-cli/compare/v0.3.1...v0.3.2
 [0.3.1]: https://github.com/unfog-io/unfog-cli/compare/v0.3.0...v0.3.1
 [0.3.0]: https://github.com/unfog-io/unfog-cli/compare/v0.2.2...v0.3.0
@@ -129,6 +136,7 @@ First release :tada:
 [#1]: https://github.com/unfog-io/unfog-cli/issues/1
 [#2]: https://github.com/unfog-io/unfog-cli/issues/2
 [#3]: https://github.com/unfog-io/unfog-cli/issues/3
+[#4]: https://github.com/unfog-io/unfog-cli/issues/4
 [#5]: https://github.com/unfog-io/unfog-cli/issues/5
 [#6]: https://github.com/unfog-io/unfog-cli/issues/6
 [#8]: https://github.com/unfog-io/unfog-cli/issues/8

package.yaml

@@ -1,5 +1,5 @@
 name:                unfog
-version:             0.3.2
+version:             0.3.3
 github:              "unfog-io/unfog-cli"
 license:             BSD3
 author:              "Clément DOUIN"

src/Query.hs

@@ -54,15 +54,8 @@ execute args state events query = do
       let fByTags = filterByTags ctx
       let fByDone = filterByDone $ "done" `elem` ctx
       let tasks = mapWithWtime now . fByTags . fByDone $ _tasks state
-      case rtype of
-        JSON -> printTasks JSON tasks
-        Text -> do
-          putStrLn $ "unfog: list" ++ if null ctx
-            then ""
-            else " [" ++ unwords ctx ++ "]"
-          putStrLn ""
-          printTasks Text tasks
-          putStrLn ""
+      let ctxStr = if null ctx then "" else " [" ++ unwords ctx ++ "]"
+      printTasks rtype ("unfog: list " ++ ctxStr) tasks
 
     ShowTask args -> do
       now <- getCurrentTime
@@ -74,7 +67,7 @@ execute args state events query = do
       let maybeTask = fByNumber . fByTags . fByDone $ _tasks state
       case maybeTask of
         Nothing   -> printErr rtype $ "show: task [" ++ show id ++ "] not found"
-        Just task -> printTask rtype $ task { _wtime = getTotalWtime now task }
+        Just task -> printTask rtype task { _wtime = getTotalWtime now task }
 
     ShowWtime args -> do
       now <- getCurrentTime
@@ -105,6 +98,6 @@ execute args state events query = do
       putStrLn "help"
       putStrLn "version"
 
-    ShowVersion           -> printVersion rtype "0.3.2"
+    ShowVersion           -> printVersion rtype "0.3.3"
 
     Error command message -> printErr rtype $ command ++ ": " ++ message

src/Response.hs

@@ -22,16 +22,20 @@ printMsg rtype msg = case rtype of
   JSON -> BL.putStr $ encode $ ResponseMsg msg
   Text -> putStrLn $ "unfog: " ++ msg
 
+printTasks :: ResponseType -> String -> [Task] -> IO ()
+printTasks rtype msg tasks = case rtype of
+  JSON -> BL.putStr $ encode $ ResponseTasks tasks
+  Text -> do
+    putStrLn msg
+    putStrLn ""
+    prettyPrintTasks tasks
+    putStrLn ""
+
 printTask :: ResponseType -> Task -> IO ()
 printTask rtype task = case rtype of
   JSON -> BL.putStr $ encode $ ResponseTask task
   Text -> prettyPrintTasks [task]
 
-printTasks :: ResponseType -> [Task] -> IO ()
-printTasks rtype tasks = case rtype of
-  JSON -> BL.putStr $ encode $ ResponseTasks tasks
-  Text -> prettyPrintTasks tasks
-
 printWtime :: ResponseType -> String -> [DailyWtime] -> IO ()
 printWtime rtype msg wtime = case rtype of
   JSON -> BL.putStr $ encode $ ResponseWtime wtime