Merge branch 'release/1.9.3'

.bin/build

@@ -57,8 +57,6 @@ stack build --work-dir "$workDir" --docker --ghc-options -O3
 LINUX_FULL_PATH=$(find "$workDir" -path "*linux*" -and -path "*bin/taskell")
 LINUX_PATH=${LINUX_FULL_PATH%"taskell"}
 
-strip "$LINUX_FULL_PATH" # remove tokens
-
 tar -czvf "releases/$1/taskell-$1_x86-64-linux.tar.gz"  --directory="$LINUX_PATH" "taskell"
 
 mkdir -p "releases/$1/taskell/DEBIAN"

.cmt

@@ -0,0 +1,25 @@
+# input parts
+{
+    "Type" = [
+        "feat",
+        "fix",
+        "docs",
+        "style",
+        "refactor",
+        "test",
+        "chore"
+    ]
+    "Body" = !@
+}
+
+# predefined messages
+{
+    r = "docs: updates Stack resolver"
+    vb = "chore: version bump"
+    readme = "docs: updates readme"
+}
+
+# output format
+${Type}: ${*}
+
+${Body}

.stylish-haskell.yaml

@@ -14,3 +14,6 @@ columns: 100
 language_extensions:
   - OverloadedStrings
   - NoImplicitPrelude
+  - TupleSections
+  - LambdaCase
+  - RankNTypes

README.md

@@ -297,14 +297,25 @@ You can edit Taskell's colour-scheme by editing `theme.ini`:
 title.fg = green
 
 ; status bar
-statusBar.bg = magenta
+statusBar.bg = blue
 statusBar.fg = black
 
 ; current list title
 titleCurrent.fg = blue
 
 ; current task
 taskCurrent.fg = magenta
+
+; subtasks
+; selected
+subtaskCurrent.fg = magenta
+; incomplete
+subtaskIncomplete.fg = blue
+; complete
+subtaskComplete.fg = yellow
+
+; disabled
+disabled.fg = yellow
 ```
 
 You can also change the background and default text colour:

app/Main.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE NoImplicitPrelude #-}
-
 module Main where
 
 import ClassyPrelude
@@ -8,10 +6,10 @@ import System.Exit (die)
 
 import Data.Time.Zones (loadLocalTZ)
 
-import App          (go)
-import Events.State (create)
-import IO.Config    (setup)
-import IO.Taskell   (IOInfo (IOInfo), Next (..), load)
+import Taskell              (go)
+import Taskell.Events.State (create)
+import Taskell.IO           (IOInfo (IOInfo), Next (..), load)
+import Taskell.IO.Config    (setup)
 
 main :: IO ()
 main = do

docs/html/_config.yml

@@ -3,7 +3,7 @@ title:        taskell
 tagline:      Command-line Kanban board/task management
 baseurl:      ""
 locale:       "en"
-version:      1.9.2
+version:      1.9.3
 destination:  _site/public
 exclude:      [deployment, Capfile, log, Gemfile, Gemfile.lock]
 

docs/html/index.md

@@ -49,8 +49,6 @@ You can install Taskell on your Mac using [Homebrew](https://brew.sh):
 brew install taskell
 ```
 
-There are usually bottles (binaries) available. If these are not available for your computer, Homebrew will build Taskell from scratch, which can take a while, particularly on older machines. Occasionally the build fails the first time, but usually works on a second attempt.
-
 ### Debian/Ubuntu
 
 [A `.deb` package is available for Debian/Ubuntu](https://github.com/smallhadroncollider/taskell/releases). Download it and install with `dpkg -i <package-name>`. You may also need to install the `libtinfo5` package (`sudo apt install libtinfo5`).
@@ -280,6 +278,16 @@ You shouldn't try to assign the `1`-`9` keys, as it will not overwrite the defau
 
 Due dates must be input with the format `YYYY-MM-DD` or `YYYY-MM-DD HH:MM`. The date will not be accepted otherwise.
 
+You can also pass in relative times such as `1w 2d` (for 1 week and 2 days). Valid units are:
+
+- `s` (seconds)
+- `m` (minutes)
+- `h` (hours)
+- `d` (days)
+- `w` (weeks)
+
+These can be used in any combination. If the time is made up only of days and/or weeks, the due date will not include a time.
+
 By default times are stored in the Markdown file as UTC. If you would like local times (and are unlikely to open the file in lots of different timezones) then you can set `localTimes` to `true` in the `markdown` section of the [config file](#configuration). If you have this setting on and you change timezone, you'll get a diff on all your times the next time you make changes to the file.
 
 

package.yaml

@@ -1,5 +1,5 @@
 name: taskell
-version: '1.9.2.0'
+version: '1.9.3.0'
 category: Command Line Tools
 author: Mark Wales
 maintainer: [email protected]
@@ -12,50 +12,55 @@ github: smallhadroncollider/taskell
 extra-source-files:
 - README.md
 - templates/*
+- test/Taskell/IO/data/*.json
+- test/Taskell/IO/Keyboard/data/bindings.ini
 
 default-extensions:
 - OverloadedStrings
 - NoImplicitPrelude
+- TupleSections
+- LambdaCase
+- RankNTypes
 
 dependencies:
 - classy-prelude
 
 library:
   source-dirs: src
   exposed-modules:
-  - App
-  - Events.State
-  - IO.Config
-  - IO.Taskell
+  - Taskell
+  - Taskell.Events.State
+  - Taskell.IO.Config
+  - Taskell.IO
 
   # tests
-  - Data.Taskell.Date
-  - Data.Taskell.Date.RelativeParser
-  - Data.Taskell.List
-  - Data.Taskell.List.Internal
-  - Data.Taskell.Lists
-  - Data.Taskell.Lists.Internal
-  - Data.Taskell.Seq
-  - Data.Taskell.Subtask
-  - Data.Taskell.Subtask.Internal
-  - Data.Taskell.Task
-  - Data.Taskell.Task.Internal
-  - Events.Actions.Types
-  - Events.State.History
-  - Events.State.Types
-  - Events.State.Types.Mode
-  - IO.Config.Markdown
-  - IO.Markdown.Parser
-  - IO.Markdown.Serializer
-  - IO.HTTP.GitHub
-  - IO.HTTP.GitHub.Card
-  - IO.HTTP.Trello.List
-  - IO.HTTP.Trello.ChecklistItem
-  - IO.Keyboard
-  - IO.Keyboard.Parser
-  - IO.Keyboard.Types
-  - UI.Draw.Field
-  - Types
+  - Taskell.Data.Date
+  - Taskell.Data.Date.RelativeParser
+  - Taskell.Data.List
+  - Taskell.Data.List.Internal
+  - Taskell.Data.Lists
+  - Taskell.Data.Lists.Internal
+  - Taskell.Data.Seq
+  - Taskell.Data.Subtask
+  - Taskell.Data.Subtask.Internal
+  - Taskell.Data.Task
+  - Taskell.Data.Task.Internal
+  - Taskell.Events.Actions.Types
+  - Taskell.Events.State.History
+  - Taskell.Events.State.Types
+  - Taskell.Events.State.Types.Mode
+  - Taskell.IO.Config.Markdown
+  - Taskell.IO.Markdown.Parser
+  - Taskell.IO.Markdown.Serializer
+  - Taskell.IO.HTTP.GitHub
+  - Taskell.IO.HTTP.GitHub.Card
+  - Taskell.IO.HTTP.Trello.List
+  - Taskell.IO.HTTP.Trello.ChecklistItem
+  - Taskell.IO.Keyboard
+  - Taskell.IO.Keyboard.Parser
+  - Taskell.IO.Keyboard.Types
+  - Taskell.UI.Draw.Field
+  - Taskell.Types
 
   dependencies:
   - base <=5

roadmap.md

@@ -128,7 +128,6 @@
     * [ ] Selected
     * [ ] Not done
     * [ ] Done
-- Top level `Taskell` namespace
 - Add `y` to relative date parsing
 - Key binding to move to top of next/previous list
     > Should be able to not have a key defined for bottom of list
@@ -376,3 +375,4 @@
 - Add info about relative dates to Readme
 - Refactor Draw/Main to remove `if` statement
 - Refactor Config files to use applicatives
+- Top level `Taskell` namespace