Merge branch 'release/1.5.1'

smallhadroncollider · Aug 8, 2019 · e3d1280 · e3d1280
2 parents dfbdbc9 + 7d50199
commit e3d1280
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 53 deletions.
diff --git a/.bin/build b/.bin/build
@@ -1,6 +1,3 @@
-resolver="lts-13.15"
-ghcv="8.6.4"
-
 branch=$(git rev-parse --abbrev-ref HEAD)
 
 if [ $branch != "master" ]; then
@@ -31,21 +28,21 @@ mkdir -p "releases/$1/taskell"
 # Mac
 stack build --ghc-options -O3
 
-tar -czvf "releases/$1/taskell-$1_x86-64-mac.tar.gz" --directory=".stack-work/install/x86_64-osx/$resolver/$ghcv/bin" "taskell"
+tar -czvf "releases/$1/taskell-$1_x86-64-mac.tar.gz" --directory="$(stack path --local-install-root)/bin" "taskell"
 
 
 # Linux
 stack docker pull
 stack build --docker --ghc-options -O3
 
-LINUX_DIR=$(ls .stack-work/install | grep linux)
+LINUX_PATH=$(find .stack-work -path "*linux*" -and -path "*bin/taskell")
 
-tar -czvf "releases/$1/taskell-$1_x86-64-linux.tar.gz" --directory=".stack-work/install/$LINUX_DIR/$resolver/$ghcv/bin" "taskell"
+tar -czvf "releases/$1/taskell-$1_x86-64-linux.tar.gz" $LINUX_PATH
 
 mkdir -p "releases/$1/taskell/DEBIAN"
 mkdir -p "releases/$1/taskell/usr/local/bin"
 
-cp ".stack-work/install/$LINUX_DIR/$resolver/$ghcv/bin/taskell" "releases/$1/taskell/usr/local/bin"
+cp $LINUX_PATH "releases/$1/taskell/usr/local/bin"
 
 echo "Package: taskell
 Version: $1

diff --git a/docs/html/_config.yml b/docs/html/_config.yml
@@ -3,7 +3,7 @@ title:        taskell
 tagline:      Command-line Kanban board/task management
 baseurl:      ""
 locale:       "en"
-version:      1.5.0
+version:      1.5.1
 destination:  _site/public
 exclude:      [deployment, Capfile, log, Gemfile, Gemfile.lock]
 

diff --git a/docs/html/index.md b/docs/html/index.md
@@ -256,48 +256,7 @@ subtask = "-"
 
 You can edit keyboard bindings in the `bindings.ini` config file.
 
-The default bindings are as follows:
-
-```ini
-# general
-quit = q
-undo = u
-search = /
-help = ?
-
-# navigation
-previous = k
-next = j
-left = h
-right = l
-bottom = G
-
-# new tasks
-new = a
-newAbove = O
-newBelow = o
-
-# editing tasks
-edit = e, A, i
-clear = C
-delete = D
-detail = <Enter>
-dueDate = @
-
-# moving tasks
-moveUp = K
-moveDown = J
-moveLeft = H
-moveRight = L, <Space>
-moveMenu = m
-
-# lists
-listNew = N
-listEdit = E
-listDelete = X
-listRight = >
-listLeft = <
-```
+The default bindings can be found in [`bindings.ini`](https://github.com/smallhadroncollider/taskell/blob/master/templates/bindings.ini).
 
 Available special keys: `<Space>`, `<Enter>`, `<Backspace>`, `<Left>`, `<Right>`, `<Up>`, `<Down>`
 
@@ -316,6 +275,10 @@ You can edit Taskell's colour-scheme by editing `theme.ini`:
 ; list title
 title.fg = green
 
+; status bar
+statusBar.bg = magenta
+statusBar.fg = black
+
 ; current list title
 titleCurrent.fg = blue
 

diff --git a/package.yaml b/package.yaml
@@ -1,5 +1,5 @@
 name: taskell
-version: '1.5.0.0'
+version: '1.5.1.0'
 category: Command Line Tools
 author: Mark Wales
 maintainer: mark@smallhadroncollider.com

diff --git a/roadmap.md b/roadmap.md
@@ -282,3 +282,5 @@
     > Based on the index in the full list, rather than the filtered one. So will show the task from the full list if the indexes don't happen to match.
 - Can't remove dates
 - Tidy up load functions in IO.Taskell
+- Getting stuck in INSERT mode when blank item
+- If an item isn't created, then selection gets lost
diff --git a/src/Config.hs b/src/Config.hs
@@ -9,7 +9,7 @@ import ClassyPrelude
 import Data.FileEmbed (embedFile)
 
 version :: Text
-version = "1.5.0"
+version = "1.5.1"
 
 usage :: Text
 usage = decodeUtf8 $(embedFile "templates/usage.txt")
diff --git a/src/Data/Taskell/List/Internal.hs b/src/Data/Taskell/List/Internal.hs
@@ -90,7 +90,7 @@ closest current previous next =
 bound :: Int -> List -> Int
 bound idx lst
     | idx < 0 = 0
-    | idx > count lst = count lst - 1
+    | idx >= count lst = count lst - 1
     | otherwise = idx
 
 nearest' :: Int -> Maybe Text -> List -> Maybe Int

diff --git a/test/Data/Taskell/ListNavigationTest.hs b/test/Data/Taskell/ListNavigationTest.hs
@@ -74,5 +74,8 @@ test_list =
               , testCase
                     "out of bounds with no term"
                     (assertEqual "nothing" 5 (L.nearest 50 Nothing list))
+              , testCase
+                    "out of bounds by 1 with no term"
+                    (assertEqual "nothing" 5 (L.nearest 6 Nothing list))
               ]
         ]