diff --git a/changes.txt b/changes.txt
--- a/changes.txt
+++ b/changes.txt
@@ -1,3 +1,13 @@
+1.0.11.4
+--------
+
+- Released Wed 24 Oct 2018 13:39:10 CEST
+- Fixed documentation (Eric Mertens).
+- Fixed stack build (Damien Couroussé).
+- Added contributing instructions.
+- Stackage support dropped. Thanks to Luke Murphy for maintaining it
+ for all this time.
+
1.0.11.3
--------
diff --git a/contributors.txt b/contributors.txt
--- a/contributors.txt
+++ b/contributors.txt
@@ -2,11 +2,13 @@
Michał Antkiewi
Francesco Ariis
+Damien Couroussé
Ben Franksen
Artyom Kazak
Anton Felix Lorenzen
Rodney Lorrimar
Francesco Mazzoli
+Eric Mertens
Simon Michael
Luca Molteni
Luke Murphy
diff --git a/doc/usr/page.rst b/doc/usr/page.rst
--- a/doc/usr/page.rst
+++ b/doc/usr/page.rst
@@ -4,7 +4,7 @@
summary: lentil issue tracker user manual
tags: lentil,issue,bug,issue tracker,bug tracker,manual
published: 2015-06-09 00:00:00
-revised: 2015-06-10 00:00:00
+revised: 2018-07-02 00:00:00
--------------------------------------------------------------------------------
@@ -46,25 +46,16 @@
::
+ cabal update # this might take a few minutes!
cabal install lentil
The executable is located in ``.cabal/bin/``; to make it available
-everywhere add this line to your ``.bashrc``
+everywhere add this line to your ``.bashrc``:
::
export PATH=$PATH:~/.cabal/bin
-If you prefer, you can use Stack:
-
-::
-
- stack install lentil
-
-Stackage mainteinership is kindly provided by `Luke Murphy`_, whom I thank!
-
-.. _`Luke Murphy`: http://lwm.github.io/
-
.. raw:: html
@@ -233,7 +224,7 @@
# lists all issues with tag containing the string "bug" and
# with "urgent" in the description
- lentil . -p bug -d urgent
+ lentil . -t bug -d urgent
As the last example highlight, if you use these options together, they
will be chained using a boolean ``AND``.
diff --git a/issues.txt b/issues.txt
--- a/issues.txt
+++ b/issues.txt
@@ -1,61 +1,14 @@
-bin/make-bins.hs
- 21 auto search (global? cpp?) version number? forse shake? [dist]
-
doc/dev/issues.txt
- 11 html report, come hlint [feature:advanced]
- 12 symlinks? [feature:intermediate]
- 13 check --output pretty, there are trailing white spaces [bug] [u:1]
- 14 sm: issue numbers is valuable [design] [request]
- 15 sm: have a way to link to discussion/history of issue [design]
- [request]
- 16 sm: 1. lentil autogenerates numbers where missing adding tags, 2.
- creates an associated numbered file in .issues/, displays
- associated notes written in those files is asked, 3. even update
- them when there is a source change. (4) these files could be
- webserved when they want something linkable. Vedi comments in
- doc/dev/issues.txt [design] [request]
- 22 chickpea, lentil's brother. Two commands, add number to numberless
- tag (#1212 or something), create a mini db with those issues, which
- automatically updated and you can even write stuff in there. O
- maybe you can even add lentil, chickpea and quinoa. Vedi more in
- doc/dev/issues.txt [design]
- 28 way to 'group' (section) output by tag [feature:advanced]
- 29 win (and mac?) builds [package] [u:2] [2017]
- 30 Henning: don't output nothing on lentil xxx.cabal (maybe add 19
+ 11 check --output pretty, there are trailing white spaces [bug] [u:1]
+ 12 win (and mac?) builds [package] [u:2] [2017]
+ 13 Henning: don't output nothing on lentil xxx.cabal (maybe add 19
skipped?) [request] [2017]
- 31 code coverage [test] [u:2]
- 32 add .lentilignore (or even .lentilconf) Michał Antkiewicz
- [feature:intermediate] [request]
- 34
- https://blog.steve.org.uk/If_line_noise_is_a_program__all_fuzzers_are_developers.html
- in lentil? [debug] [u:2]
- 35 add diff syntax (Sean Russel) [feature] [2017] [design]
- 36 allow input from stdin (Sean Russel -- see diff syntax) [feature]
- [2017] [design]
-src/Lentil/Args.hs
- 26 disambiguation optparse-applicative [feature:intermediate]
- 27 help as lentil PATH [ PATH... ] [ OPTIONS ] [feature:intermediate]
-
-src/Lentil/Export.hs
- 36 maybe use a dedicated library to format xml? [design]
-
src/Lentil/File.hs
- 53 apparently toListM is not idiomatic [refactor] [duct]
- 64 use pipes-files when released [feature:intermediate]
- 76 combine funziona su windows? [test]
+ 77 combine funziona su windows? [test]
src/Lentil/Parse/Run.hs
- 58 a function String -> [Issue]
- 81 personally i don't like when the leading character of the
- progress bar is different [feeback] [request]
- 97 sicuramente c'è un modo più elegante e breve. Ah! quando mettono le
- tuples section! [refactor] [duct]
-
-src/Lentil/Parse/Source.hs
- 173 modText is extremely ducttape [duct]
- 189 probabilmente getPosition non dovrebbe essere usato che solo per
- gli errori [duct]
+ 57 a function String -> [Issue]
src/Lentil/Parse/Syntaxes.hs
25 qptain_nemo fake multiline comments in C (i.e. // and \ at the
@@ -65,7 +18,7 @@
implement this without breaking other parsers? [bug] [design]
src/Main.hs
- 13 KSyntaxHighlighting to parse sources? [feature:intermediate]
+ 14 ignore dist dist-newstyle and common folders [feature:basic]
test/Lentil/FileSpec.hs
38 excluding files fails on MS Windows! Check why! [u:3] [bug]
diff --git a/lentil.cabal b/lentil.cabal
--- a/lentil.cabal
+++ b/lentil.cabal
@@ -1,5 +1,5 @@
name: lentil
-version: 1.0.11.3
+version: 1.0.11.4
synopsis: frugal issue tracker
description: minumum effort, cohesive issue tracker based on
ubiquitous @TODO@s and @FIXME@s conventions.
@@ -13,7 +13,7 @@
category: Development
stability: Stable
build-type: Simple
-tested-with: GHC==8.0.1, GHC==8.2.2, GHC==8.4.1
+tested-with: GHC==8.0.1, GHC==8.2.2, GHC==8.4.1, GHC==8.6.1
extra-source-files: stack.yaml,
test/test-files/lang-comm/clang.c,
test/test-files/lang-comm/haskell.hs,
diff --git a/src/Lentil/Args.hs b/src/Lentil/Args.hs
--- a/src/Lentil/Args.hs
+++ b/src/Lentil/Args.hs
@@ -23,9 +23,6 @@
-- TYPES --
-----------
--- TODO: disambiguation optparse-applicative [feature:intermediate]
--- TODO: help as lentil PATH [ PATH... ] [ OPTIONS ] [feature:intermediate]
-
data LOptions = LOptions { loInExcl :: ([FilePath], [FilePath]),
loFormat :: Format,
loFilters :: [LFilter],
diff --git a/src/Lentil/Export.hs b/src/Lentil/Export.hs
--- a/src/Lentil/Export.hs
+++ b/src/Lentil/Export.hs
@@ -33,7 +33,6 @@
" " ++ iPPDesc i ++ " " ++
tags2StringPretty (iTags i) ++ "\n"
--- TODO: maybe use a dedicated library to format xml? [design]
-- xml output
issues2Xml :: [Issue] -> String
issues2Xml is = concat ["", concatMap is2x (groupBy is), "", "\n"]
diff --git a/src/Lentil/File.hs b/src/Lentil/File.hs
--- a/src/Lentil/File.hs
+++ b/src/Lentil/File.hs
@@ -54,7 +54,6 @@
prod fl = each (zip fl [1..])
issLoop fl = issueFinder as fws (length fl) >> issLoop fl
- -- todo: [refactor] [duct] apparently toListM is not idiomatic
-- actual find function for IO ()
findFiles :: [Alias] -> [FilePath] -> [FilePath] -> IO [FilePath]
@@ -64,8 +63,6 @@
xs' "." = map (combine ".") xs -- trick to exclude on '.'
xs' _ = xs
-
- -- TODO: use pipes-files when released [feature:intermediate]
-- fp to exclude, clause (+ aliases, to include)
diff --git a/src/Lentil/Parse/Run.hs b/src/Lentil/Parse/Run.hs
--- a/src/Lentil/Parse/Run.hs
+++ b/src/Lentil/Parse/Run.hs
@@ -77,10 +77,6 @@
pbe k = CM.when (mod k 30 == 0 && t > 100)
(liftIO (perrEph $ pb k))
- -- todo: personally i don't like when the leading
- -- character of the progress bar is different [feeback]
- -- [request]
-
-- pick appropriate parser (if exists)
fp2par :: [Alias] -> Pipe FilePath (FilePath, ParSource [Comment]) IO ()
fp2par as = await >>= \fp ->
@@ -93,10 +89,10 @@
fp2comm = await >>= \(fp, p) ->
liftIO (safeRead fp) >>= \t ->
- (runParPipe p fp () t >-> -- todo: sicuramente c'è un modo più
- (await >>= \r -> -- elegante e breve. Ah! quando
- -- mettono le tuples section!
- yield (fp, r))) -- [refactor] [duct]
+ (runParPipe p fp () t >->
+ (await >>= \r ->
+
+ yield (fp, r)))
comm2Issues :: [FlagWord] -> Pipe (FilePath, Comment) [Issue] IO ()
comm2Issues fws = await >>= \(fp, (r, i)) ->
diff --git a/src/Lentil/Parse/Source.hs b/src/Lentil/Parse/Source.hs
--- a/src/Lentil/Parse/Source.hs
+++ b/src/Lentil/Parse/Source.hs
@@ -167,7 +167,6 @@
-- by newline
modText :: String -> String
modText cs = "TODO " ++ addSpace cs
- -- todo modText is extremely ducttape [duct]
addSpace :: String -> String
addSpace [] = []
@@ -183,8 +182,6 @@
rstTodoIncipit :: ParSource ()
rstTodoIncipit = fmap sourceColumn getPosition >>= \c ->
- -- todo probabilmente getPosition non dovrebbe essere usato
- -- che solo per gli errori [duct]
if c == 1
then () <$ string ".. todo::"
else parserFail "rst todo incipit: not at begin-of-line"
diff --git a/src/Main.hs b/src/Main.hs
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -12,7 +12,6 @@
import qualified System.IO as I
-- todo [feature:basic] ignore dist dist-newstyle and common folders
--- todo [feature:intermediate] KSyntaxHighlighting to parse sources?
main :: IO ()
main = I.hSetBuffering I.stderr I.NoBuffering >> -- b/c progress bar
@@ -33,7 +32,7 @@
short 'v' S.<>
help "show version and copyright info" )
where
- versionCopy = "\nlentil - frugal issue tracker, version 1.0.11.3\n\
+ versionCopy = "\nlentil - frugal issue tracker, version 1.0.11.4\n\
\(C) 2015-2018 Francesco Ariis - http://www.ariis.it\n\
\released under the GNU General Public License v3\n"
diff --git a/stack.yaml b/stack.yaml
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,3 +1,6 @@
resolver: lts-9.14
packages:
- '.'
+
+extra-deps:
+- terminal-progress-bar-0.2