hledger-flow 0.12.3.1 → 0.12.4.0
raw patch · 4 files changed
+13/−8 lines, 4 filesPVP ok
version bump matches the API change (PVP)
API changes (from Hackage documentation)
Files
- ChangeLog.md +6/−0
- app/Main.hs +3/−4
- hledger-flow.cabal +3/−3
- src/Hledger/Flow/Reports.hs +1/−1
ChangeLog.md view
@@ -1,5 +1,11 @@ # Changelog for [hledger-flow](https://github.com/apauley/hledger-flow) +## 0.12.4.0++- Update usage of hledger to reflect updated command-line flags of hledger version 1.15+ https://github.com/apauley/hledger-flow/issues/73+- Compile with stackage lts-14.9+ ## 0.12.3.1 Fixed a bug where:
app/Main.hs view
@@ -6,7 +6,6 @@ import Prelude hiding (FilePath, putStrLn) import Options.Applicative-import Data.Semigroup ((<>)) import Hledger.Flow.Common import qualified Hledger.Flow.RuntimeOptions as RT@@ -16,7 +15,7 @@ data SubcommandParams = SubcommandParams { maybeBaseDir :: Maybe FilePath } deriving (Show) data Command = Import SubcommandParams | Report SubcommandParams deriving (Show) -data MainParams = MainParams { verbose :: Bool+data MainParams = MainParams { verbosity :: Int , hledgerPathOpt :: Maybe FilePath , showOpts :: Bool , sequential :: Bool@@ -39,7 +38,7 @@ , RT.hfVersion = versionInfo' , RT.hledgerInfo = hli , RT.sysInfo = systemInfo- , RT.verbose = verbose mainParams'+ , RT.verbose = verbosity mainParams' > 0 , RT.showOptions = showOpts mainParams' , RT.sequential = sequential mainParams' } @@ -53,7 +52,7 @@ verboseParser :: Parser MainParams verboseParser = MainParams- <$> switch (long "verbose" <> short 'v' <> help "Print more verbose output")+ <$> (length <$> many (flag' () (long "verbose" <> short 'v' <> help "Print more verbose output"))) <*> optional (optPath "hledger-path" 'H' "The full path to an hledger executable") <*> switch (long "show-options" <> help "Print the options this program will run with") <*> switch (long "sequential" <> help "Disable parallel processing")
hledger-flow.cabal view
@@ -1,13 +1,13 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.31.1.+-- This file has been generated from package.yaml by hpack version 0.31.2. -- -- see: https://github.com/sol/hpack ----- hash: bc3f43f1b0698c9441147d8c7a211cde2bfbaaa5d5366ad7b17e1479584cfe78+-- hash: 7a59c0bdbb268fed703e7d2f13e093027bc5ccb2f43d96117aa3496ea0c502b2 name: hledger-flow-version: 0.12.3.1+version: 0.12.4.0 synopsis: An hledger workflow focusing on automated statement import and classification. description: Please see the README on GitHub at <https://github.com/apauley/hledger-flow#readme> category: Finance, Console
src/Hledger/Flow/Reports.hs view
@@ -73,7 +73,7 @@ incomeStatement :: [Text] -> ReportGenerator incomeStatement sharedOptions opts ch journal reportsDir year = do- let reportArgs = ["incomestatement"] ++ sharedOptions ++ ["--cost", "--value"]+ let reportArgs = ["incomestatement"] ++ sharedOptions ++ ["--cost"] generateReport opts ch journal reportsDir year ("income-expenses" <.> "txt") reportArgs (not . T.null) balanceSheet :: [Text] -> ReportGenerator