diff --git a/changes.txt b/changes.txt --- a/changes.txt +++ b/changes.txt @@ -1,3 +1,9 @@ +0.2.0.0 +------- + +- Released Wed 31 Aug 2016 13:19:21 CEST +- GHC 8.* compatible + 0.1.12.0 -------- diff --git a/issues.txt b/issues.txt --- a/issues.txt +++ b/issues.txt @@ -2,46 +2,47 @@ 21 auto search (global? cpp?) version number? [dist] doc/dev/issues.txt - 10 have stuff linked to haskell-platform friendly e non template + 11 have stuff linked to haskell-platform friendly e non template haskell and stuff [feature:intermediate] - 12 html report, come hlint [feature:advanced] - 13 symlinks? [feature:intermediate] - 14 check --output pretty, there are trailing white spaces [bug] [u:1] - 15 test con 7.6.3 [feature:basic] [test] - 16 linux kernel e darcs, lentil si inceppa su dei caratteri [bug] + 13 html report, come hlint [feature:advanced] + 14 symlinks? [feature:intermediate] + 15 check --output pretty, there are trailing white spaces [bug] [u:1] + 16 test con 7.6.3 [feature:basic] [test] + 17 linux kernel e darcs, lentil si inceppa su dei caratteri [bug] [2016] - 17 autoignore non-text files? (binary, images, bloom filter) [2016] - 18 da cabal a hpack [u:1] [feature:advanced] - 19 sm: issue numbers is valuable [design] [request] - 20 sm: have a way to link to discussion/history of issue [design] + 18 autoignore non-text files? (binary, images, bloom filter) [2016] + 19 da cabal a hpack [u:1] [feature:advanced] + 20 sm: issue numbers is valuable [design] [request] + 21 sm: have a way to link to discussion/history of issue [design] [request] - 21 sm: 1. lentil autogenerates numbers where missing adding tags, 2. + 22 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] - 27 chickpea, lentil's brother. Two commands, add number to numberless + 28 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] - 33 make it lazy in ouputting todos [refactor] - 34 way to 'group' (section) output by tag [feature:advanced] - 35 win (and mac?) builds [package] [u:3] [2016] - 36 Henning: don't output nothing on lentil xxx.cabal (maybe add 19 + 34 make it lazy in ouputting todos [refactor] + 35 way to 'group' (section) output by tag [feature:advanced] + 36 win (and mac?) builds [package] [u:3] [2016] + 37 Henning: don't output nothing on lentil xxx.cabal (maybe add 19 skipped?) [request] [2016] - 37 code coverage [test] - 38 add .lentilignore (or even .lentilconf) Michał Antkiewicz + 38 code coverage [test] + 39 add .lentilignore (or even .lentilconf) Michał Antkiewicz [feature:intermediate] [request] - 40 + 41 https://blog.steve.org.uk/If_line_noise_is_a_program__all_fuzzers_are_developers.html in lentil? [debug] [u:2] + 42 parsing with http://awgn.github.io/cgrep/ [test] src/Lentil/Args.hs 25 disambiguation optparse-applicative [feature:intermediate] 26 help as lentil PATH [ PATH... ] [ OPTIONS ] [feature:intermediate] - 103 uncomment and implement sorting [feature:intermediate] + 102 uncomment and implement sorting [feature:intermediate] src/Lentil/Export.hs 36 maybe use a dedicated library to format xml? [design] diff --git a/lentil.cabal b/lentil.cabal --- a/lentil.cabal +++ b/lentil.cabal @@ -1,5 +1,5 @@ name: lentil -version: 0.1.12.0 +version: 0.2.0.0 synopsis: frugal issue tracker description: minumum effort, cohesive issue tracker based on ubiquitous @TODO@s and @FIXME@s conventions. @@ -12,7 +12,7 @@ copyright: © 2015-2016 Francesco Ariis category: Development build-type: Simple -tested-with: GHC==7.10.3, GHC==7.10.1, GHC==7.8.3 +tested-with: GHC==8.0.1 extra-source-files: stack.yaml, test/test-files/lang-comm/xyz.xyz, test/test-files/lang-comm/clang.c, @@ -40,16 +40,15 @@ test/test-files/test-proj/dot-folders/_beta/foo1.hs extra-doc-files: README, changes.txt, doc/usr/page.rst, doc/usr/test.zip, issues.txt, contributors.txt -cabal-version: >=1.10 +cabal-version: >=1.24 executable lentil main-is: Main.hs - build-depends: base >=4.7 && <4.9, optparse-applicative >=0.12 && <0.13, - regex-tdfa >=1.2 && <1.3, natural-sort >=0.1 && <0.2, - parsec >=3.1 && <3.2, filepath >=1.3 && <1.5, - directory >=1.2 && <1.3, filemanip >=0.3 && <0.4, - ansi-wl-pprint >= 0.6 && < 0.7, csv >= 0.1 && < 0.2 + build-depends: base==4.9.*, optparse-applicative==0.13.*, + regex-tdfa==1.2.*, natural-sort==0.1.*, parsec==3.1.*, + filepath==1.4.*, directory==1.2.*, filemanip==0.3.*, + ansi-wl-pprint==0.6.*, csv==0.1.* other-modules: Lentil.Types, Lentil.Args, Lentil.File, Lentil.Print, Lentil.Query, Lentil.Export, Lentil.Parse.Source, Lentil.Parse.Issue Lentil.Parse.Syntaxes, @@ -62,12 +61,12 @@ ghc-options: -Wall HS-Source-Dirs: test, src main-is: Tests.hs - build-depends: base >=4.7 && <4.9, optparse-applicative >=0.12 && <0.13, - regex-tdfa >=1.2 && <1.3, natural-sort >=0.1 && <0.2, - parsec >=3.1 && <3.2, filepath >=1.3 && <1.5, - directory >=1.2 && <1.3, filemanip >=0.3 && <0.4, - ansi-wl-pprint >= 0.6 && < 0.7, hspec >=1.8, - csv >= 0.1 && < 0.2 + build-depends: base==4.9.*, optparse-applicative==0.13.*, + regex-tdfa==1.2.*, natural-sort==0.1.*, parsec==3.1.*, + filepath==1.4.*, directory==1.2.*, filemanip==0.3.*, + ansi-wl-pprint==0.6.*, csv==0.1.* + -- same as above, plus hspec + , hspec==2.2.* other-modules: Lentil.Types, Lentil.Args, Lentil.File, Lentil.Print, Lentil.Query, Lentil.Export, Lentil.Parse.Source, Lentil.Parse.Issue, Lentil.Parse.Syntaxes, diff --git a/src/Lentil/Args.hs b/src/Lentil/Args.hs --- a/src/Lentil/Args.hs +++ b/src/Lentil/Args.hs @@ -14,6 +14,7 @@ import Lentil.Helpers import Options.Applicative +import Data.Semigroup ( (<>) ) import qualified Data.Char as C import qualified Data.Maybe as M @@ -106,7 +107,7 @@ ( long "sort" <> short 's' <> metavar "[!]ORDER[,[!]ORDER ...]" <> - value [] <> + value [] <> help "sort order, comma separated (path, desc, label). \ \'!' orders in descending fashion. Check manual for \ \examples" ) diff --git a/src/Lentil/Parse/Issue.hs b/src/Lentil/Parse/Issue.hs --- a/src/Lentil/Parse/Issue.hs +++ b/src/Lentil/Parse/Issue.hs @@ -64,11 +64,6 @@ eoft :: ParIssue () eoft = optional (char '\n') *> eof - ---------------- --- PRIMITIVE -- ---------------- - -- case insensitive string, lifted from Text.ParserCombinators.Parsec.Rfc2234 ciString :: String -> ParIssue String ciString s = mapM ciChar s "case insensitive string" @@ -165,7 +160,7 @@ where vp p = try . parsecMap (const ()) $ p end = lookAhead $ choice [vp (spaces1 *> tag), vp blankline, -- \n\n or \neof - vp incipit, -- another issue + vp incipit, -- another issue vp eof] spaces1 = space *> spaces diff --git a/src/Main.hs b/src/Main.hs --- a/src/Main.hs +++ b/src/Main.hs @@ -28,7 +28,7 @@ short 'v' <> help "show version and copyright info" ) where - versionCopy = "\nlentil - frugal issue tracker, version 0.1.12.0\n\ + versionCopy = "\nlentil - frugal issue tracker, version 0.2.0.0\n\ \(C) 2015-2016 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,3 @@ -resolver: lts-5.4 +resolver: lts-6.14 packages: - '.'