Release 0.2.0.0

Author: TravisCardwell

.github/workflows/ci.yml

@@ -8,17 +8,17 @@ on:
       - main
 
 jobs:
-  cabal:
+  latest-cabal:
     name: "Cabal: GHC ${{ matrix.ghc }}"
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ghc: ['8.2.2', '8.4.4', '8.6.5', '8.8.4', '8.10.2']
+        ghc: ['8.2.2', '8.4.4', '8.6.5', '8.8.4', '8.10.4', '9.0.1']
     steps:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup Haskell
-        uses: actions/setup-haskell@v1.1.3
+        uses: haskell/actions/setup@v1
         with:
           ghc-version: ${{ matrix.ghc }}
           cabal-version: latest
@@ -32,12 +32,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ghc: ['8.2.2', '8.4.4', '8.6.5', '8.8.4', '8.10.2']
+        ghc: ['8.2.2', '8.4.4', '8.6.5', '8.8.4', '8.10.4']
     steps:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup Haskell
-        uses: actions/setup-haskell@v1.1.3
+        uses: haskell/actions/setup@v1
         with:
           ghc-version: ${{ matrix.ghc }}
           cabal-version: latest
@@ -56,3 +56,22 @@ jobs:
         run: stack test --system-ghc
         env:
           STACK_YAML: stack-${{ matrix.ghc }}.yaml
+
+  cabal:
+    name: "Cabal ${{ matrix.cabal }}: GHC 8.2.2"
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        cabal: ['2.4.1.0', '3.0.0.0', '3.2.0.0', '3.4.0.0']
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup Haskell
+        uses: haskell/actions/setup@v1
+        with:
+          ghc-version: 8.2.2
+          cabal-version: ${{ matrix.cabal }}
+      - name: Build
+        run: cabal new-build --enable-tests --enable-benchmarks
+      - name: Test
+        run: cabal new-test --enable-tests

.gitignore

@@ -6,6 +6,9 @@
 *.yaml.lock
 stack-nix*
 
+# stan
+/.hie/
+
 # cabal
 cabal.project.local
 cabal.project.local~

CHANGELOG.md

@@ -24,6 +24,19 @@ following conventions:
 
 [KaC]: <https://keepachangelog.com/en/1.0.0/>
 
+## 0.2.0.0 (2021-05-27)
+
+### Breaking
+
+* Add support for `optparse-applicative` `0.16`
+
+### Non-Breaking
+
+* Add `.deb` and `.rpm` packaging
+* Add Cabal support to `Makefile`
+* Add Cabal tests to GitHub Actions
+* Add [stan](https://hackage.haskell.org/package/stan) static analysis
+
 ## 0.1.0.0 (2020-11-28)
 
 ### Breaking

LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2020 Travis Cardwell
+Copyright (c) 2020-2021 Travis Cardwell
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

LibOA.hs

@@ -2,7 +2,7 @@
 -- |
 -- Module      : LibOA
 -- Description : supplementary functions for optparse-applicative
--- Copyright   : Copyright (c) 2019-2020 Travis Cardwell
+-- Copyright   : Copyright (c) 2019-2021 Travis Cardwell
 -- License     : MIT
 --
 -- This is a collection of functions that I often use with
@@ -11,7 +11,7 @@
 -- projects as required.  If the library grows to a substantial size or others
 -- with to use it, I will reconsider.
 --
--- Revision: 2020-01-02
+-- Revision: 2021-04-04
 ------------------------------------------------------------------------------
 
 {-# LANGUAGE CPP #-}
@@ -55,12 +55,25 @@ import qualified Options.Applicative.Types as OAT
 -- This is the same as 'OA.helper' except that it has a different help
 -- message.
 helper :: OA.Parser (a -> a)
+#if MIN_VERSION_optparse_applicative (0,16,0)
+helper = OA.option helpReader $ mconcat
+    [ OA.short 'h'
+    , OA.long "help"
+    , OA.help "show this help text"
+    , OA.hidden
+    ]
+  where
+    helpReader = do
+      potentialCommand <- OAT.readerAsk
+      OA.readerAbort $ OA.ShowHelpText (Just potentialCommand)
+#else
 helper = OA.abortOption OA.ShowHelpText $ mconcat
     [ OA.short 'h'
     , OA.long "help"
     , OA.help "show help and exit"
     , OA.hidden
     ]
+#endif
 
 -- | A hidden @--version@ option that always fails, showing the version
 versioner
@@ -80,7 +93,7 @@ commands :: OA.Parser a -> [String]
 commands =
     let go _ opt = case OAT.optMain opt of
            OAT.CmdReader _ cmds _ -> reverse cmds
-           _                      -> []
+           _otherReader           -> []
     in  concat . OAC.mapParser go
 
 ------------------------------------------------------------------------------
@@ -89,6 +102,7 @@ commands =
 -- | Insert a blank line between two documents
 (<||>) :: Doc -> Doc -> Doc
 d1 <||> d2 = d1 <> Doc.line <> Doc.line <> d2
+infixr 5 <||>
 
 -- | Create a section with a title and indented body
 section :: String -> Doc -> Doc