August 2017 - openSUSE Commits - openSUSE Mailing Lists

commit ghc-HDBC-session for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package ghc-HDBC-session for openSUSE:Factory checked in at 2017-08-31 20:49:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-HDBC-session (Old) and /work/SRC/openSUSE:Factory/.ghc-HDBC-session.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-HDBC-session" Thu Aug 31 20:49:57 2017 rev:3 rq:513187 version:0.1.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-HDBC-session/ghc-HDBC-session.changes 2016-10-22 13:23:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-HDBC-session.new/ghc-HDBC-session.changes 2017-08-31 20:49:58.758059371 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:07:08 UTC 2017 - psimons(a)suse.com + +- Update to version 0.1.1.1. + +------------------------------------------------------------------- Old: ---- HDBC-session-0.1.1.0.tar.gz New: ---- HDBC-session-0.1.1.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-HDBC-session.spec ++++++ --- /var/tmp/diff_new_pack.1EzteC/_old 2017-08-31 20:49:59.573944845 +0200 +++ /var/tmp/diff_new_pack.1EzteC/_new 2017-08-31 20:49:59.577944285 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-HDBC-session # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %global pkg_name HDBC-session Name: ghc-%{pkg_name} -Version: 0.1.1.0 +Version: 0.1.1.1 Release: 0 Summary: Bracketed connection for HDBC License: BSD-3-Clause ++++++ HDBC-session-0.1.1.0.tar.gz -> HDBC-session-0.1.1.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HDBC-session-0.1.1.0/HDBC-session.cabal new/HDBC-session-0.1.1.1/HDBC-session.cabal --- old/HDBC-session-0.1.1.0/HDBC-session.cabal 2016-09-09 08:21:41.000000000 +0200 +++ new/HDBC-session-0.1.1.1/HDBC-session.cabal 2017-07-17 02:51:56.000000000 +0200 @@ -1,5 +1,5 @@ name: HDBC-session -version: 0.1.1.0 +version: 0.1.1.1 synopsis: Bracketed connection for HDBC description: This package contains a base bracketed function to call close correctly against opend DB connection. @@ -8,11 +8,12 @@ license-file: LICENSE author: Kei Hibino maintainer: ex8k.hibino(a)gmail.com -copyright: Copyright (c) 2013-2016 Kei Hibino +copyright: Copyright (c) 2013-2017 Kei Hibino category: Database build-type: Simple cabal-version: >=1.10 -tested-with: GHC == 8.0.1 +tested-with: GHC == 8.2.1 + , GHC == 8.0.1, GHC == 8.0.2 , GHC == 7.10.1, GHC == 7.10.2, GHC == 7.10.3 , GHC == 7.8.1, GHC == 7.8.2, GHC == 7.8.3, GHC == 7.8.4 , GHC == 7.6.1, GHC == 7.6.2, GHC == 7.6.3

1 0

commit ghc-Glob for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package ghc-Glob for openSUSE:Factory checked in at 2017-08-31 20:49:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-Glob (Old) and /work/SRC/openSUSE:Factory/.ghc-Glob.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-Glob" Thu Aug 31 20:49:54 2017 rev:9 rq:513186 version:0.8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-Glob/ghc-Glob.changes 2017-02-03 17:37:43.580486957 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-Glob.new/ghc-Glob.changes 2017-08-31 20:49:55.622499508 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:08:13 UTC 2017 - psimons(a)suse.com + +- Update to version 0.8.0. + +------------------------------------------------------------------- Old: ---- Glob-0.7.14.tar.gz New: ---- Glob-0.8.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-Glob.spec ++++++ --- /var/tmp/diff_new_pack.vWB9Et/_old 2017-08-31 20:49:56.750341194 +0200 +++ /var/tmp/diff_new_pack.vWB9Et/_new 2017-08-31 20:49:56.770338386 +0200 @@ -19,7 +19,7 @@ %global pkg_name Glob %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.7.14 +Version: 0.8.0 Release: 0 Summary: Globbing library License: BSD-3-Clause ++++++ Glob-0.7.14.tar.gz -> Glob-0.8.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Glob-0.7.14/CHANGELOG.txt new/Glob-0.8.0/CHANGELOG.txt --- old/Glob-0.7.14/CHANGELOG.txt 2016-12-29 18:14:26.000000000 +0100 +++ new/Glob-0.8.0/CHANGELOG.txt 2017-05-27 11:33:57.000000000 +0200 @@ -1,3 +1,6 @@ +0.8.0, 2017-05-27: + Added instance IsString Pattern, thanks to Mitsutoshi Aoe. + 0.7.14, 2016-12-29: Update dependencies to allow directory-1.3. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Glob-0.7.14/Glob.cabal new/Glob-0.8.0/Glob.cabal --- old/Glob-0.7.14/Glob.cabal 2016-12-29 18:14:26.000000000 +0100 +++ new/Glob-0.8.0/Glob.cabal 2017-05-27 11:33:57.000000000 +0200 @@ -1,7 +1,7 @@ Cabal-Version: >= 1.9.2 Name: Glob -Version: 0.7.14 +Version: 0.8.0 Homepage: http://iki.fi/matti.niemenmaa/glob/ Synopsis: Globbing library Category: System diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Glob-0.7.14/System/FilePath/Glob/Base.hs new/Glob-0.8.0/System/FilePath/Glob/Base.hs --- old/Glob-0.7.14/System/FilePath/Glob/Base.hs 2016-12-29 18:14:26.000000000 +0100 +++ new/Glob-0.8.0/System/FilePath/Glob/Base.hs 2017-05-27 11:33:57.000000000 +0200 @@ -30,6 +30,7 @@ import Data.Maybe (fromMaybe) import Data.Monoid (Monoid, mappend, mempty, mconcat) import Data.Semigroup (Semigroup, (<>), sconcat, stimes) +import Data.String (IsString(fromString)) import System.FilePath ( pathSeparator, extSeparator , isExtSeparator, isPathSeparator ) @@ -163,6 +164,9 @@ mappend = (<>) mconcat = optimize . Pattern . concatMap unPattern +instance IsString Pattern where + fromString = compile + -- |Options which can be passed to the 'tryCompileWith' or 'compileWith' -- functions: with these you can selectively toggle certain features at compile -- time.

1 0

commit doctest for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package doctest for openSUSE:Factory checked in at 2017-08-31 20:49:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/doctest (Old) and /work/SRC/openSUSE:Factory/.doctest.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "doctest" Thu Aug 31 20:49:52 2017 rev:5 rq:513183 version:0.11.4 Changes: -------- --- /work/SRC/openSUSE:Factory/doctest/doctest.changes 2017-07-05 23:57:53.852803823 +0200 +++ /work/SRC/openSUSE:Factory/.doctest.new/doctest.changes 2017-08-31 20:49:52.510936276 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:07:54 UTC 2017 - psimons(a)suse.com + +- Update to version 0.11.4. + +------------------------------------------------------------------- Old: ---- doctest-0.11.3.tar.gz New: ---- doctest-0.11.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ doctest.spec ++++++ --- /var/tmp/diff_new_pack.rJN2lc/_old 2017-08-31 20:49:53.290826803 +0200 +++ /var/tmp/diff_new_pack.rJN2lc/_new 2017-08-31 20:49:53.298825680 +0200 @@ -19,7 +19,7 @@ %global pkg_name doctest %bcond_with tests Name: %{pkg_name} -Version: 0.11.3 +Version: 0.11.4 Release: 0 Summary: Test interactive Haskell examples License: MIT ++++++ doctest-0.11.3.tar.gz -> doctest-0.11.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doctest-0.11.3/doctest.cabal new/doctest-0.11.4/doctest.cabal --- old/doctest-0.11.3/doctest.cabal 2017-06-15 10:12:28.000000000 +0200 +++ new/doctest-0.11.4/doctest.cabal 2017-07-23 06:03:31.000000000 +0200 @@ -1,5 +1,5 @@ name: doctest -version: 0.11.3 +version: 0.11.4 synopsis: Test interactive Haskell examples description: The doctest program checks examples in source code comments. It is modeled after doctest for Python diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doctest-0.11.3/src/Options.hs new/doctest-0.11.4/src/Options.hs --- old/doctest-0.11.3/src/Options.hs 2017-06-15 10:12:28.000000000 +0200 +++ new/doctest-0.11.4/src/Options.hs 2017-07-23 06:03:31.000000000 +0200 @@ -1,4 +1,5 @@ {-# LANGUAGE CPP #-} +{-# LANGUAGE DeriveFunctor #-} module Options ( Result(..) , Run(..) @@ -24,12 +25,13 @@ usage :: String usage = unlines [ "Usage:" - , " doctest [ --no-magic | GHC OPTION | MODULE ]..." + , " doctest [ --fast | --no-magic | GHC OPTION | MODULE ]..." , " doctest --help" , " doctest --version" , " doctest --info" , "" , "Options:" + , " --fast disable :reload between example groups" , " --help display this help and exit" , " --version output version information and exit" , " --info output machine-readable version information and exit" @@ -55,8 +57,8 @@ , ("ghc", ghc) ]) ++ "\n]\n" -data Result = Output String | Result Run - deriving (Eq, Show) +data Result a = Output String | Result a + deriving (Eq, Show, Functor) type Warning = String @@ -64,20 +66,26 @@ runWarnings :: [Warning] , runOptions :: [String] , runMagicMode :: Bool +, runFastMode :: Bool } deriving (Eq, Show) -parseOptions :: [String] -> Result +parseOptions :: [String] -> Result Run parseOptions args | "--help" `elem` args = Output usage | "--info" `elem` args = Output info | "--version" `elem` args = Output versionInfo - | otherwise = case stripOptGhc <$> stripNoMagic args of - (magicMode, (warning, xs)) -> Result (Run (maybeToList warning) xs magicMode) + | otherwise = case fmap stripOptGhc . stripFast <$> stripNoMagic args of + (magicMode, (fastMode, (warning, xs))) -> + Result (Run (maybeToList warning) xs magicMode fastMode) stripNoMagic :: [String] -> (Bool, [String]) -stripNoMagic args = (noMagic `notElem` args, filter (/= noMagic) args) - where - noMagic = "--no-magic" +stripNoMagic = stripFlag False "--no-magic" + +stripFast :: [String] -> (Bool, [String]) +stripFast = stripFlag True "--fast" + +stripFlag :: Bool -> String -> [String] -> (Bool, [String]) +stripFlag enableIt flag args = ((flag `elem` args) == enableIt, filter (/= flag) args) stripOptGhc :: [String] -> (Maybe Warning, [String]) stripOptGhc = go diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doctest-0.11.3/src/Run.hs new/doctest-0.11.4/src/Run.hs --- old/doctest-0.11.3/src/Run.hs 2017-06-15 10:12:28.000000000 +0200 +++ new/doctest-0.11.4/src/Run.hs 2017-07-23 06:03:31.000000000 +0200 @@ -2,7 +2,7 @@ module Run ( doctest #ifdef TEST -, doctest_ +, doctestWithFastMode , Summary , expandDirs #endif @@ -43,7 +43,7 @@ doctest :: [String] -> IO () doctest args0 = case parseOptions args0 of Output s -> putStr s - Result (Run warnings args_ magicMode) -> do + Result (Run warnings args_ magicMode fastMode) -> do mapM_ (hPutStrLn stderr) warnings hFlush stderr @@ -60,7 +60,7 @@ addDistArgs <- getAddDistArgs return (addDistArgs $ packageDBArgs ++ expandedArgs) - r <- doctest_ args `E.catch` \e -> do + r <- doctestWithFastMode fastMode args `E.catch` \e -> do case fromException e of Just (UsageError err) -> do hPutStrLn stderr ("doctest: " ++ err) @@ -123,11 +123,11 @@ isSuccess :: Summary -> Bool isSuccess s = sErrors s == 0 && sFailures s == 0 -doctest_ :: [String] -> IO Summary -doctest_ args = do +doctestWithFastMode :: Bool -> [String] -> IO Summary +doctestWithFastMode fastMode args = do -- get examples from Haddock comments modules <- getDocTests args Interpreter.withInterpreter args $ \repl -> withCP65001 $ do - runModules repl modules + runModules fastMode repl modules diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doctest-0.11.3/src/Runner.hs new/doctest-0.11.4/src/Runner.hs --- old/doctest-0.11.3/src/Runner.hs 2017-06-15 10:12:28.000000000 +0200 +++ new/doctest-0.11.4/src/Runner.hs 2017-07-23 06:03:31.000000000 +0200 @@ -52,11 +52,11 @@ (Summary x1 x2 x3 x4) `mappend` (Summary y1 y2 y3 y4) = Summary (x1 + y1) (x2 + y2) (x3 + y3) (x4 + y4) -- | Run all examples from a list of modules. -runModules :: Interpreter -> [Module [Located DocTest]] -> IO Summary -runModules repl modules = do +runModules :: Bool -> Interpreter -> [Module [Located DocTest]] -> IO Summary +runModules fastMode repl modules = do isInteractive <- hIsTerminalDevice stderr ReportState _ _ s <- (`execStateT` ReportState 0 isInteractive mempty {sExamples = c}) $ do - forM_ modules $ runModule repl + forM_ modules $ runModule fastMode repl -- report final summary gets (show . reportStateSummary) >>= report @@ -107,8 +107,8 @@ liftIO (hPutStr stderr str) -- | Run all examples from given module. -runModule :: Interpreter -> Module [Located DocTest] -> Report () -runModule repl (Module module_ setup examples) = do +runModule :: Bool -> Interpreter -> Module [Located DocTest] -> Report () +runModule fastMode repl (Module module_ setup examples) = do Summary _ _ e0 f0 <- gets reportStateSummary @@ -124,9 +124,11 @@ where reload :: IO () reload = do - -- NOTE: It is important to do the :reload first! There was some odd bug - -- with a previous version of GHC (7.4.1?). - void $ Interpreter.safeEval repl ":reload" + unless fastMode $ + -- NOTE: It is important to do the :reload first! See + -- https://ghc.haskell.org/trac/ghc/ticket/5904, which results in a + -- panic on GHC 7.4.1 if you do the :reload second. + void $ Interpreter.safeEval repl ":reload" void $ Interpreter.safeEval repl $ ":m *" ++ module_ setup_ :: IO ()

1 0

commit ghc-unique for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package ghc-unique for openSUSE:Factory checked in at 2017-08-31 20:49:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-unique (Old) and /work/SRC/openSUSE:Factory/.ghc-unique.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-unique" Thu Aug 31 20:49:48 2017 rev:1 rq:514583 version:0 Changes: -------- New Changes file: --- /dev/null 2017-07-20 07:30:00.335470106 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-unique.new/ghc-unique.changes 2017-08-31 20:49:50.575207993 +0200 @@ -0,0 +1,10 @@ +------------------------------------------------------------------- +Thu Aug 3 15:38:38 UTC 2017 - psimons(a)suse.com + +- Updated with latest spec-cleaner version 0.9.8-8-geadfbbf. + +------------------------------------------------------------------- +Wed Apr 19 13:32:41 UTC 2017 - psimons(a)suse.com + +- Update to version 0 revision 1 with cabal2obs. + New: ---- ghc-unique.changes ghc-unique.spec unique-0.tar.gz unique.cabal ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-unique.spec ++++++ # # spec file for package ghc-unique # # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %global pkg_name unique Name: ghc-%{pkg_name} Version: 0 Release: 0 Summary: Fully concurrent unique identifiers License: BSD-2-Clause Group: Development/Languages/Other Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-hashable-devel BuildRequires: ghc-rpm-macros %description Fully concurrent unique identifiers. %package devel Summary: Haskell %{pkg_name} library development files Group: Development/Libraries/Other Requires: %{name} = %{version}-%{release} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} %description devel This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build %install %ghc_lib_install %post devel %ghc_pkg_recache %postun devel %ghc_pkg_recache %files -f %{name}.files %doc LICENSE %files devel -f %{name}-devel.files %doc CHANGELOG.markdown README.markdown %changelog ++++++ unique.cabal ++++++ name: unique category: Concurrency, Data version: 0 x-revision: 1 license: BSD3 cabal-version: >= 1.10 license-file: LICENSE author: Edward A. Kmett maintainer: Edward A. Kmett <ekmett(a)gmail.com> stability: experimental homepage: http://github.com/ekmett/unique/ bug-reports: http://github.com/ekmett/unique/issues copyright: Copyright (C) 2015 Edward A. Kmett synopsis: Fully concurrent unique identifiers description: Fully concurrent unique identifiers build-type: Simple extra-source-files: .travis.yml CHANGELOG.markdown README.markdown stack.yaml source-repository head type: git location: git://github.com/ekmett/unique.git library default-language: Haskell2010 hs-source-dirs: src other-extensions: CPP, MagicHash, UnboxedTuples exposed-modules: Control.Concurrent.Unique ghc-options: -Wall build-depends: base >= 4.5 && < 5, hashable >= 1.1 && < 1.3, ghc-prim

1 0

commit ghc-taggy for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package ghc-taggy for openSUSE:Factory checked in at 2017-08-31 20:49:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-taggy (Old) and /work/SRC/openSUSE:Factory/.ghc-taggy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-taggy" Thu Aug 31 20:49:45 2017 rev:2 rq:513722 version:0.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-taggy/ghc-taggy.changes 2017-03-24 01:58:23.785566250 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-taggy.new/ghc-taggy.changes 2017-08-31 20:49:46.447787356 +0200 @@ -1,0 +2,6 @@ +Tue Aug 1 15:14:00 UTC 2017 - psimons(a)suse.com + +- Apply "fix-lts-9-build.patch" from upstream to add support for + recent versions of blaze-markup. + +------------------------------------------------------------------- Old: ---- 1.cabal New: ---- fix-lts-9-build.patch taggy.cabal ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-taggy.spec ++++++ --- /var/tmp/diff_new_pack.aivjT4/_old 2017-08-31 20:49:47.883585814 +0200 +++ /var/tmp/diff_new_pack.aivjT4/_new 2017-08-31 20:49:47.911581884 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-taggy # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,7 +26,8 @@ Group: Development/Languages/Other Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal… +Patch1: fix-lts-9-build.patch BuildRequires: chrpath BuildRequires: ghc-Cabal-devel BuildRequires: ghc-attoparsec-devel @@ -89,13 +90,14 @@ %prep %setup -q -n %{pkg_name}-%{version} cp -p %{SOURCE1} %{pkg_name}.cabal +%patch1 -p1 %build %ghc_lib_build %install %ghc_lib_install -%ghc_fix_dynamic_rpath %{pkg_name} +%ghc_fix_rpath %{pkg_name}-%{version} %check %cabal_test ++++++ fix-lts-9-build.patch ++++++ >From 5456c2fa4d377f7802ec5df3d5f50c4ccab2e8ed Mon Sep 17 00:00:00 2001 From: vi <vi(a)computational.law> Date: Fri, 28 Jul 2017 19:00:23 +0200 Subject: [PATCH] Build compatability with blaze-markup 0.8.0.0. Resolves #19. Resolves #20. --- src/Text/Taggy/Renderer.hs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Text/Taggy/Renderer.hs b/src/Text/Taggy/Renderer.hs index d1d3486..a931905 100644 --- a/src/Text/Taggy/Renderer.hs +++ b/src/Text/Taggy/Renderer.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE LambdaCase, RecordWildCards, FlexibleInstances, UndecidableInstances, OverloadedStrings #-} +{-# LANGUAGE CPP, LambdaCase, RecordWildCards, FlexibleInstances, UndecidableInstances, OverloadedStrings #-} -- | -- Module : Text.Taggy.Renderer -- Copyright : (c) 2014 Alp Mestanogullari, Vikram Verma @@ -33,7 +33,13 @@ class AsMarkup a where -- | A 'Node' is convertible to 'Markup' instance AsMarkup Node where toMarkup convertEntities = \case - NodeContent text -> Content $ if convertEntities then Text text else PreEscaped (Text text) +#if MIN_VERSION_blaze_markup(0,8,0) + NodeContent text -> flip Content () $ +#else + NodeContent text -> Content $ +#endif + if convertEntities then Text text else PreEscaped (Text text) + NodeElement elmt -> toMarkup convertEntities elmt -- | An 'Element' is convertible to 'Markup' ++++++ taggy.cabal ++++++ name: taggy version: 0.2.0 x-revision: 1 synopsis: Efficient and simple HTML/XML parsing library description: /taggy/ is a simple package for parsing HTML (and should work with XML) written on top of the <http://hackage.haskell.org/package/attoparsec attoparsec> library, which makes it one of the most efficient (space and time consumption wise) on hackage. . This is the root module of /taggy/. It reexports everything from the package. See each module's docs for details about the functions and types involved in /taggy/. . While we've been testing the parser on /many/ pages, it may still be a bit rough around the edges. Let us know on <http://github.com/alpmestan/taggy/issues github> if you have any problem. . If you like to look at your HTML through various optical instruments, feel free to take a look at the companion <http://hackage.haskell.org/package/taggy-lens taggy-lens> package we've put up together. It makes HTML parsing a piece of cake. . If you want to parse a document as list of tags and go through it as some kind of stream by just picking what you need, head to "Text.Taggy.Parser" and take a look at 'Text.Taggy.Parser.taggyWith' and 'Text.Taggy.Parser.run'. . If you want to parse the document as a DOM tree and traverse it to find the information you need, use 'Text.Taggy.DOM.parseDOM'. This is especially useful when used in conjunction with <http://hackage.haskell.org/package/taggy-lens taggy-lens>. . If you build some HTML manually or just transform some existing DOM tree and want to turn it into a 'Data.Text.Lazy.Text' head to "Text.Taggy.Renderer" and look at 'Text.Taggy.Renderer.render'. homepage: http://github.com/alpmestan/taggy license: BSD3 license-file: LICENSE author: Alp Mestanogullari, Vikram Verma maintainer: alpmestan(a)gmail.com copyright: 2014 Alp Mestanogullari, Vikram Verma category: Text, Web build-type: Simple extra-source-files: html_files/*.html data-files: html_files/*.html cabal-version: >=1.10 library exposed-modules: Text.Taggy, Text.Taggy.DOM, Text.Taggy.Entities, Text.Taggy.Parser, Text.Taggy.Renderer Text.Taggy.Types other-modules: build-depends: base >=4.6 && <5, blaze-html >= 0.7, blaze-markup >= 0.6, text >= 1, attoparsec >=0.11, vector >=0.7, unordered-containers >= 0.2 hs-source-dirs: src default-language: Haskell2010 ghc-options: -Wall -O2 -fno-warn-unused-do-bind -funbox-strict-fields ghc-prof-options: -Wall -O2 -fno-warn-unused-do-bind -funbox-strict-fields -prof -auto-all executable taggy main-is: taggy.hs hs-source-dirs: example build-depends: base >=4.5 && <5, text >= 1, attoparsec >=0.12, taggy ghc-options: -Wall -O2 -fno-warn-unused-do-bind ghc-prof-options: -Wall -prof -auto-all -O2 -fno-warn-unused-do-bind -rtsopts "-with-rtsopts=-sstderr -p" default-language: Haskell2010 benchmark taggytagsoup main-is: vs-tagsoup.hs hs-source-dirs: bench ghc-options: -O2 -funbox-strict-fields type: exitcode-stdio-1.0 build-depends: base >= 4 && < 5, text >=1, attoparsec >=0.12, taggy >= 0.1, tagsoup, criterion, vector default-language: Haskell2010 test-suite unit type: exitcode-stdio-1.0 ghc-options: -Wall -O -fno-warn-unused-do-bind hs-source-dirs: src, tests/unit main-is: Spec.hs build-depends: base == 4.* , blaze-html , blaze-markup , text , hspec , hspec-attoparsec , vector , attoparsec , unordered-containers default-language: Haskell2010 test-suite integration type: exitcode-stdio-1.0 ghc-options: -Wall -O -fno-warn-unused-do-bind hs-source-dirs: src, tests/integration main-is: Main.hs build-depends: base == 4.* , blaze-html , blaze-markup , directory , text , hspec >= 1.11 , hspec-attoparsec , vector , attoparsec , unordered-containers other-modules: Paths_taggy default-language: Haskell2010

1 0

commit ghc-text-latin1 for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package ghc-text-latin1 for openSUSE:Factory checked in at 2017-08-31 20:49:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-text-latin1 (Old) and /work/SRC/openSUSE:Factory/.ghc-text-latin1.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-text-latin1" Thu Aug 31 20:49:41 2017 rev:1 rq:513680 version:0.3 Changes: -------- New Changes file: --- /dev/null 2017-07-20 07:30:00.335470106 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-text-latin1.new/ghc-text-latin1.changes 2017-08-31 20:49:41.896426226 +0200 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Wed Apr 19 13:32:39 UTC 2017 - psimons(a)suse.com + +- Update to version 0.3 with cabal2obs. + New: ---- ghc-text-latin1.changes ghc-text-latin1.spec text-latin1-0.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-text-latin1.spec ++++++ # # spec file for package ghc-text-latin1 # # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %global pkg_name text-latin1 Name: ghc-%{pkg_name} Version: 0.3 Release: 0 Summary: Latin-1 (including ASCII) utility functions License: BSD-3-Clause Group: Development/Languages/Other Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-case-insensitive-devel BuildRequires: ghc-data-checked-devel BuildRequires: ghc-hashable-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-text-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This package provides various functions over the ASCII ang Latin-1 portions of the 'Char' and 'Word8' data types. %package devel Summary: Haskell %{pkg_name} library development files Group: Development/Libraries/Other Requires: %{name} = %{version}-%{release} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} %description devel This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} %build %ghc_lib_build %install %ghc_lib_install %post devel %ghc_pkg_recache %postun devel %ghc_pkg_recache %files -f %{name}.files %defattr(-,root,root,-) %doc LICENSE %files devel -f %{name}-devel.files %defattr(-,root,root,-) %changelog

1 0

commit hledger-web for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package hledger-web for openSUSE:Factory checked in at 2017-08-31 20:48:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hledger-web (Old) and /work/SRC/openSUSE:Factory/.hledger-web.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hledger-web" Thu Aug 31 20:48:56 2017 rev:2 rq:513569 version:1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/hledger-web/hledger-web.changes 2017-04-18 13:51:34.300506048 +0200 +++ /work/SRC/openSUSE:Factory/.hledger-web.new/hledger-web.changes 2017-08-31 20:48:57.522654904 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:06:53 UTC 2017 - psimons(a)suse.com + +- Update to version 1.2 revision 1. + +------------------------------------------------------------------- Old: ---- hledger-web-1.1.tar.gz New: ---- hledger-web-1.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hledger-web.spec ++++++ --- /var/tmp/diff_new_pack.r0rnvq/_old 2017-08-31 20:48:58.386533643 +0200 +++ /var/tmp/diff_new_pack.r0rnvq/_new 2017-08-31 20:48:58.390533082 +0200 @@ -19,7 +19,7 @@ %global pkg_name hledger-web %bcond_with tests Name: %{pkg_name} -Version: 1.1 +Version: 1.2 Release: 0 Summary: Web interface for the hledger accounting tool License: GPL-3.0+ ++++++ hledger-web-1.1.tar.gz -> hledger-web-1.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hledger-web-1.1/CHANGES new/hledger-web-1.2/CHANGES --- old/hledger-web-1.1/CHANGES 2016-12-31 20:22:01.000000000 +0100 +++ new/hledger-web-1.2/CHANGES 2017-04-01 03:07:39.000000000 +0200 @@ -2,6 +2,13 @@ See also the hledger and the project change logs. +# 1.2 (2016/3/31) + +Accounts with ? in name had empty registers (fixes #498) (Bryan Richter) + +Allow megaparsec 5.2 (fixes #503) + + # 1.1 (2016/12/31) - add --host option (#429) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hledger-web-1.1/Hledger/Web/WebOptions.hs new/hledger-web-1.2/Hledger/Web/WebOptions.hs --- old/hledger-web-1.1/Hledger/Web/WebOptions.hs 2016-12-31 16:46:45.000000000 +0100 +++ new/hledger-web-1.2/Hledger/Web/WebOptions.hs 2017-03-29 17:00:51.000000000 +0200 @@ -85,7 +85,7 @@ checkWebOpts :: WebOpts -> WebOpts checkWebOpts wopts = - either optserror (const wopts) $ do + either usageError (const wopts) $ do let h = host_ wopts if any (not . (`elem` ".0123456789")) h then Left $ "--host requires an IP address, not "++show h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hledger-web-1.1/doc/hledger-web.1 new/hledger-web-1.2/doc/hledger-web.1 --- old/hledger-web-1.1/doc/hledger-web.1 2016-12-31 20:22:38.000000000 +0100 +++ new/hledger-web-1.2/doc/hledger-web.1 2017-04-01 02:53:13.000000000 +0200 @@ -1,5 +1,5 @@ -.TH "hledger\-web" "1" "December 2016" "hledger\-web 1.1" "hledger User Manuals" +.TH "hledger\-web" "1" "March 2017" "hledger\-web 1.2" "hledger User Manuals" @@ -13,8 +13,6 @@ .P .PD \f[C]hledger\ web\ \-\-\ [OPTIONS]\f[] -.PP -.PP .SH DESCRIPTION .PP hledger is a cross\-platform program for tracking money, time, or any @@ -49,18 +47,8 @@ In this mode the web app will keep running for as long as you have it open in a browser window, and will exit after two minutes of inactivity (no requests and no browser windows viewing it). -.IP -.nf -\f[C] -$\ hledger\ web -Starting\ web\ app\ on\ port\ 5000\ with\ base\ url\ http://localhost:5000 -Starting\ web\ browser\ if\ possible -Web\ app\ will\ auto\-exit\ after\ a\ few\ minutes\ with\ no\ browsers\ (or\ press\ ctrl\-c) -\f[] -.fi -.PP -With \f[C]\-\-serve\f[], it starts the web app in non\-transient mode -and logs requests to the console. +With \f[C]\-\-serve\f[], it just runs the web app without exiting, and +logs requests to the console. .PP By default the server listens on IP address 127.0.0.1, accessible only to local requests. @@ -102,19 +90,23 @@ Note: if invoking hledger\-web as a hledger subcommand, write \f[C]\-\-\f[] before options as shown above. .TP -.B \f[C]\-\-server\f[] -disable browser\-opening and auto\-exit\-on\-idle, and log all requests -to stdout +.B \f[C]\-\-serve\f[] +serve and log requests, don\[aq]t browse or auto\-exit +.RS +.RE +.TP +.B \f[C]\-\-host=IPADDR\f[] +listen on this IP address (default: 127.0.0.1) .RS .RE .TP .B \f[C]\-\-port=PORT\f[] -set the TCP port to listen on (default: 5000) +listen on this TCP port (default: 5000) .RS .RE .TP .B \f[C]\-\-base\-url=URL\f[] -set the base url (default: http://localhost:PORT) +set the base url (default: http://IPADDR:PORT) You would change this when sharing over the network, or integrating within a larger website. .RS @@ -128,57 +120,37 @@ .RS .RE .PP -hledger general options: -.TP -.B \f[C]\-h\f[] -show general usage (or after COMMAND, the command\[aq]s usage) -.RS -.RE -.TP -.B \f[C]\-\-help\f[] -show the current program\[aq]s manual as plain text (or after an add\-on -COMMAND, the add\-on\[aq]s manual) -.RS -.RE -.TP -.B \f[C]\-\-man\f[] -show the current program\[aq]s manual with man -.RS -.RE -.TP -.B \f[C]\-\-info\f[] -show the current program\[aq]s manual with info -.RS -.RE +hledger input options: .TP -.B \f[C]\-\-version\f[] -show version +.B \f[C]\-f\ FILE\ \-\-file=FILE\f[] +use a different input file. +For stdin, use \- (default: \f[C]$LEDGER_FILE\f[] or +\f[C]$HOME/.hledger.journal\f[]) .RS .RE .TP -.B \f[C]\-\-debug[=N]\f[] -show debug output (levels 1\-9, default: 1) +.B \f[C]\-\-rules\-file=RULESFILE\f[] +Conversion rules file to use when reading CSV (default: FILE.rules) .RS .RE .TP -.B \f[C]\-f\ FILE\ \-\-file=FILE\f[] -use a different input file. -For stdin, use \- +.B \f[C]\-\-alias=OLD=NEW\f[] +rename accounts named OLD to NEW .RS .RE .TP -.B \f[C]\-\-rules\-file=RULESFILE\f[] -Conversion rules file to use when reading CSV (default: FILE.rules) +.B \f[C]\-\-anon\f[] +anonymize accounts and payees .RS .RE .TP -.B \f[C]\-\-alias=OLD=NEW\f[] -display accounts named OLD as NEW +.B \f[C]\-\-pivot\ TAGNAME\f[] +use some other field/tag for account names .RS .RE .TP .B \f[C]\-I\ \-\-ignore\-assertions\f[] -ignore any failing balance assertions in the journal +ignore any failing balance assertions .RS .RE .PP @@ -266,20 +238,42 @@ .RS .RE .TP -.B \f[C]\-\-pivot\ TAG\f[] -will transform the journal before any other processing by replacing the -account name of every posting having the tag TAG with content VALUE by -the account name "TAG:VALUE". -The TAG will only match if it is a full\-length match. -The pivot will only happen if the TAG is on a posting, not if it is on -the transaction. -If the tag value is a multi:level:account:name the new account name will -be "TAG:multi:level:account:name". +.B \f[C]\-V\ \-\-value\f[] +convert amounts to their market value on the report end date (using the +most recent applicable market price, if any) .RS .RE +.PP +hledger help options: .TP -.B \f[C]\-\-anon\f[] -show anonymized accounts and payees +.B \f[C]\-h\f[] +show general usage (or after COMMAND, command usage) +.RS +.RE +.TP +.B \f[C]\-\-help\f[] +show this program\[aq]s manual as plain text (or after an add\-on +COMMAND, the add\-on\[aq]s manual) +.RS +.RE +.TP +.B \f[C]\-\-man\f[] +show this program\[aq]s manual with man +.RS +.RE +.TP +.B \f[C]\-\-info\f[] +show this program\[aq]s manual with info +.RS +.RE +.TP +.B \f[C]\-\-version\f[] +show version +.RS +.RE +.TP +.B \f[C]\-\-debug[=N]\f[] +show debug output (levels 1\-9, default: 1) .RS .RE .SH ENVIRONMENT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hledger-web-1.1/doc/hledger-web.1.info new/hledger-web-1.2/doc/hledger-web.1.info --- old/hledger-web-1.1/doc/hledger-web.1.info 2016-12-31 20:22:35.000000000 +0100 +++ new/hledger-web-1.2/doc/hledger-web.1.info 2017-04-01 02:53:10.000000000 +0200 @@ -1,77 +1,68 @@ -This is hledger-web/doc/hledger-web.1.info, produced by makeinfo -version 4.8 from stdin. +This is hledger-web.1.info, produced by makeinfo version 6.0 from stdin. -File: hledger-web.1.info, Node: Top, Up: (dir) +File: hledger-web.1.info, Node: Top, Next: OPTIONS, Up: (dir) -hledger-web(1) hledger-web 1.1 +hledger-web(1) hledger-web 1.2 ****************************** -hledger-web is hledger's web interface. It starts a simple web +hledger-web is hledger's web interface. It starts a simple web application for browsing and adding transactions, and optionally opens -it in a web browser window if possible. It provides a more user-friendly -UI than the hledger CLI or hledger-ui interface, showing more at once -(accounts, the current account register, balance charts) and allowing -history-aware data entry, interactive searching, and bookmarking. +it in a web browser window if possible. It provides a more +user-friendly UI than the hledger CLI or hledger-ui interface, showing +more at once (accounts, the current account register, balance charts) +and allowing history-aware data entry, interactive searching, and +bookmarking. hledger-web also lets you share a ledger with multiple users, or even -the public web. There is no access control, so if you need that you -should put it behind a suitable web proxy. As a small protection against -data loss when running an unprotected instance, it writes a numbered -backup of the main journal file (only ?) on every edit. +the public web. There is no access control, so if you need that you +should put it behind a suitable web proxy. As a small protection +against data loss when running an unprotected instance, it writes a +numbered backup of the main journal file (only ?) on every edit. Like hledger, it reads data from one or more files in hledger -journal, timeclock, timedot, or CSV format specified with `-f', or -`$LEDGER_FILE', or `$HOME/.hledger.journal' (on windows, perhaps -`C:/Users/USER/.hledger.journal'). For more about this see hledger(1), +journal, timeclock, timedot, or CSV format specified with '-f', or +'$LEDGER_FILE', or '$HOME/.hledger.journal' (on windows, perhaps +'C:/Users/USER/.hledger.journal'). For more about this see hledger(1), hledger_journal(5) etc. By default, hledger-web starts the web app in "transient mode" and -also opens it in your default web browser if possible. In this mode the +also opens it in your default web browser if possible. In this mode the web app will keep running for as long as you have it open in a browser window, and will exit after two minutes of inactivity (no requests and -no browser windows viewing it). - - -$ hledger web -Starting web app on port 5000 with base url http://localhost:5000 -Starting web browser if possible -Web app will auto-exit after a few minutes with no browsers (or press ctrl-c) - - With `--serve', it starts the web app in non-transient mode and logs -requests to the console. +no browser windows viewing it). With '--serve', it just runs the web +app without exiting, and logs requests to the console. By default the server listens on IP address 127.0.0.1, accessible -only to local requests. You can use `--host' to change this, eg `--host +only to local requests. You can use '--host' to change this, eg '--host 0.0.0.0' to listen on all configured addresses. - Similarly, use `--port' to set a TCP port other than 5000, eg if you + Similarly, use '--port' to set a TCP port other than 5000, eg if you are running multiple hledger-web instances. - You can use `--base-url' to change the protocol, hostname, port and + You can use '--base-url' to change the protocol, hostname, port and path that appear in hyperlinks, useful eg for integrating hledger-web -within a larger website. The default is `http://HOST:PORT/' using the -server's configured host address and TCP port (or `http://HOST' if PORT +within a larger website. The default is 'http://HOST:PORT/' using the +server's configured host address and TCP port (or 'http://HOST' if PORT is 80). - With `--file-url' you can set a different base url for static files, + With '--file-url' you can set a different base url for static files, eg for better caching or cookie-less serving on high performance websites. Note there is no built-in access control (aside from listening on -127.0.0.1 by default). So you will need to hide hledger-web behind an +127.0.0.1 by default). So you will need to hide hledger-web behind an authenticating proxy (such as apache or nginx) if you want to restrict who can see and add entries to your journal. Command-line options and arguments may be used to set an initial -filter on the data. This is not shown in the web UI, but it will be +filter on the data. This is not shown in the web UI, but it will be applied in addition to any search query entered there. With journal and timeclock files (but not CSV files, currently) the web app detects changes made by other means and will show the new data -on the next request. If a change makes the file unparseable, hledger-web -will show an error until the file has been fixed. - +on the next request. If a change makes the file unparseable, +hledger-web will show an error until the file has been fixed. * Menu: * OPTIONS:: @@ -82,129 +73,135 @@ 1 OPTIONS ********* -Note: if invoking hledger-web as a hledger subcommand, write `--' -before options as shown above. +Note: if invoking hledger-web as a hledger subcommand, write '--' before +options as shown above. -`--server' - disable browser-opening and auto-exit-on-idle, and log all - requests to stdout - -`--port=PORT' - set the TCP port to listen on (default: 5000) - -`--base-url=URL' - set the base url (default: http://localhost:PORT) You would - change this when sharing over the network, or integrating within a - larger website. +'--serve' -`--file-url=URL' - set the static files url (default: BASEURL/static). hledger-web - normally serves static files itself, but if you wanted to serve - them from another server for efficiency, you would set the url - with this. + serve and log requests, don't browse or auto-exit +'--host=IPADDR' - hledger general options: + listen on this IP address (default: 127.0.0.1) +'--port=PORT' -`-h' - show general usage (or after COMMAND, the command's usage) + listen on this TCP port (default: 5000) +'--base-url=URL' -`--help' - show the current program's manual as plain text (or after an add-on - COMMAND, the add-on's manual) + set the base url (default: http://IPADDR:PORT) You would change + this when sharing over the network, or integrating within a larger + website. +'--file-url=URL' -`--man' - show the current program's manual with man + set the static files url (default: BASEURL/static). hledger-web + normally serves static files itself, but if you wanted to serve + them from another server for efficiency, you would set the url with + this. -`--info' - show the current program's manual with info + hledger input options: -`--version' - show version +'-f FILE --file=FILE' -`--debug[=N]' - show debug output (levels 1-9, default: 1) + use a different input file. For stdin, use - (default: + '$LEDGER_FILE' or '$HOME/.hledger.journal') +'--rules-file=RULESFILE' -`-f FILE --file=FILE' - use a different input file. For stdin, use - - -`--rules-file=RULESFILE' Conversion rules file to use when reading CSV (default: FILE.rules) +'--alias=OLD=NEW' + + rename accounts named OLD to NEW +'--anon' -`--alias=OLD=NEW' - display accounts named OLD as NEW + anonymize accounts and payees +'--pivot TAGNAME' -`-I --ignore-assertions' - ignore any failing balance assertions in the journal + use some other field/tag for account names +'-I --ignore-assertions' + + ignore any failing balance assertions hledger reporting options: -`-b --begin=DATE' +'-b --begin=DATE' + include postings/txns on or after this date +'-e --end=DATE' -`-e --end=DATE' include postings/txns before this date +'-D --daily' -`-D --daily' multiperiod/multicolumn report by day +'-W --weekly' -`-W --weekly' multiperiod/multicolumn report by week +'-M --monthly' -`-M --monthly' multiperiod/multicolumn report by month +'-Q --quarterly' -`-Q --quarterly' multiperiod/multicolumn report by quarter +'-Y --yearly' -`-Y --yearly' multiperiod/multicolumn report by year +'-p --period=PERIODEXP' -`-p --period=PERIODEXP' set start date, end date, and/or reporting interval all at once (overrides the flags above) +'--date2' -`--date2' show, and match with -b/-e/-p/date:, secondary dates instead +'-C --cleared' -`-C --cleared' include only cleared postings/txns +'--pending' -`--pending' include only pending postings/txns +'-U --uncleared' -`-U --uncleared' include only uncleared (and pending) postings/txns +'-R --real' -`-R --real' include only non-virtual postings +'--depth=N' -`--depth=N' hide accounts/postings deeper than N +'-E --empty' -`-E --empty' show items with zero amount, normally hidden +'-B --cost' -`-B --cost' convert amounts to their cost at transaction time (using the transaction price, if any) +'-V --value' + + convert amounts to their market value on the report end date (using + the most recent applicable market price, if any) -`--pivot TAG' - will transform the journal before any other processing by - replacing the account name of every posting having the tag TAG - with content VALUE by the account name "TAG:VALUE". The TAG will - only match if it is a full-length match. The pivot will only - happen if the TAG is on a posting, not if it is on the - transaction. If the tag value is a multi:level:account:name the - new account name will be "TAG:multi:level:account:name". + hledger help options: -`--anon' - show anonymized accounts and payees +'-h' + + show general usage (or after COMMAND, command usage) +'--help' + + show this program's manual as plain text (or after an add-on + COMMAND, the add-on's manual) +'--man' + show this program's manual with man +'--info' + + show this program's manual with info +'--version' + + show version +'--debug[=N]' + + show debug output (levels 1-9, default: 1) Tag Table: -Node: Top90 -Node: OPTIONS3343 -Ref: #options3430 +Node: Top74 +Node: OPTIONS3156 +Ref: #options3243 End Tag Table diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hledger-web-1.1/doc/hledger-web.1.txt new/hledger-web-1.2/doc/hledger-web.1.txt --- old/hledger-web-1.1/doc/hledger-web.1.txt 2016-12-31 20:22:38.000000000 +0100 +++ new/hledger-web-1.2/doc/hledger-web.1.txt 2017-04-01 02:53:13.000000000 +0200 @@ -10,8 +10,6 @@ hledger-web [OPTIONS] hledger web -- [OPTIONS] - - DESCRIPTION hledger is a cross-platform program for tracking money, time, or any other commodity, using double-entry accounting and a simple, editable @@ -41,15 +39,8 @@ opens it in your default web browser if possible. In this mode the web app will keep running for as long as you have it open in a browser win- dow, and will exit after two minutes of inactivity (no requests and no - browser windows viewing it). - - $ hledger web - Starting web app on port 5000 with base url http://localhost:5000 - Starting web browser if possible - Web app will auto-exit after a few minutes with no browsers (or press ctrl-c) - - With --serve, it starts the web app in non-transient mode and logs - requests to the console. + browser windows viewing it). With --serve, it just runs the web app + without exiting, and logs requests to the console. By default the server listens on IP address 127.0.0.1, accessible only to local requests. You can use --host to change this, eg @@ -84,53 +75,46 @@ Note: if invoking hledger-web as a hledger subcommand, write -- before options as shown above. - --server - disable browser-opening and auto-exit-on-idle, and log all - requests to stdout + --serve + serve and log requests, don't browse or auto-exit + + --host=IPADDR + listen on this IP address (default: 127.0.0.1) --port=PORT - set the TCP port to listen on (default: 5000) + listen on this TCP port (default: 5000) --base-url=URL - set the base url (default: http://localhost:PORT) You would + set the base url (default: http://IPADDR:PORT) You would change this when sharing over the network, or integrating within a larger website. --file-url=URL set the static files url (default: BASEURL/static). hledger-web - normally serves static files itself, but if you wanted to serve - them from another server for efficiency, you would set the url + normally serves static files itself, but if you wanted to serve + them from another server for efficiency, you would set the url with this. - hledger general options: - - -h show general usage (or after COMMAND, the command's usage) - - --help show the current program's manual as plain text (or after an - add-on COMMAND, the add-on's manual) - - --man show the current program's manual with man - - --info show the current program's manual with info - - --version - show version - - --debug[=N] - show debug output (levels 1-9, default: 1) + hledger input options: -f FILE --file=FILE - use a different input file. For stdin, use - + use a different input file. For stdin, use - (default: + $LEDGER_FILE or $HOME/.hledger.journal) --rules-file=RULESFILE - Conversion rules file to use when reading CSV (default: + Conversion rules file to use when reading CSV (default: FILE.rules) --alias=OLD=NEW - display accounts named OLD as NEW + rename accounts named OLD to NEW + + --anon anonymize accounts and payees + + --pivot TAGNAME + use some other field/tag for account names -I --ignore-assertions - ignore any failing balance assertions in the journal + ignore any failing balance assertions hledger reporting options: @@ -156,7 +140,7 @@ multiperiod/multicolumn report by year -p --period=PERIODEXP - set start date, end date, and/or reporting interval all at once + set start date, end date, and/or reporting interval all at once (overrides the flags above) --date2 @@ -181,33 +165,43 @@ show items with zero amount, normally hidden -B --cost - convert amounts to their cost at transaction time (using the + convert amounts to their cost at transaction time (using the transaction price, if any) - --pivot TAG - will transform the journal before any other processing by - replacing the account name of every posting having the tag TAG - with content VALUE by the account name "TAG:VALUE". The TAG - will only match if it is a full-length match. The pivot will - only happen if the TAG is on a posting, not if it is on the - transaction. If the tag value is a multi:level:account:name the - new account name will be "TAG:multi:level:account:name". + -V --value + convert amounts to their market value on the report end date + (using the most recent applicable market price, if any) + + hledger help options: + + -h show general usage (or after COMMAND, command usage) + + --help show this program's manual as plain text (or after an add-on + COMMAND, the add-on's manual) + + --man show this program's manual with man - --anon show anonymized accounts and payees + --info show this program's manual with info + + --version + show version + + --debug[=N] + show debug output (levels 1-9, default: 1) ENVIRONMENT LEDGER_FILE The journal file path when not specified with -f. Default: - ~/.hledger.journal (on windows, perhaps C:/Users/USER/.hledger.jour- + ~/.hledger.journal (on windows, perhaps C:/Users/USER/.hledger.jour- nal). FILES - Reads data from one or more files in hledger journal, timeclock, time- - dot, or CSV format specified with -f, or $LEDGER_FILE, or - $HOME/.hledger.journal (on windows, perhaps + Reads data from one or more files in hledger journal, timeclock, time- + dot, or CSV format specified with -f, or $LEDGER_FILE, or + $HOME/.hledger.journal (on windows, perhaps C:/Users/USER/.hledger.journal). BUGS - The need to precede options with -- when invoked from hledger is awk- + The need to precede options with -- when invoked from hledger is awk- ward. -f- doesn't work (hledger-web can't read from stdin). @@ -221,7 +215,7 @@ REPORTING BUGS - Report bugs at http://bugs.hledger.org (or on the #hledger IRC channel + Report bugs at http://bugs.hledger.org (or on the #hledger IRC channel or hledger mail list) @@ -235,7 +229,7 @@ SEE ALSO - hledger(1), hledger-ui(1), hledger-web(1), hledger-api(1), + hledger(1), hledger-ui(1), hledger-web(1), hledger-api(1), hledger_csv(5), hledger_journal(5), hledger_timeclock(5), hledger_time- dot(5), ledger(1) @@ -243,4 +237,4 @@ -hledger-web 1.1 December 2016 hledger-web(1) +hledger-web 1.2 March 2017 hledger-web(1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hledger-web-1.1/hledger-web.cabal new/hledger-web-1.2/hledger-web.cabal --- old/hledger-web-1.1/hledger-web.cabal 2016-12-31 16:54:47.000000000 +0100 +++ new/hledger-web-1.2/hledger-web.cabal 2017-04-01 02:56:37.000000000 +0200 @@ -1,11 +1,9 @@ --- This file has been generated from package.yaml by hpack version 0.15.0. +-- This file has been generated from package.yaml by hpack version 0.17.0. -- -- see: https://github.com/sol/hpack name: hledger-web -version: 1.1 -stability: stable -category: Finance +version: 1.2 synopsis: Web interface for the hledger accounting tool description: This is hledger's web interface. It provides a more user-friendly and collaborative UI than the @@ -17,298 +15,300 @@ with ledger(1). hledger provides command-line, curses and web interfaces, and aims to be a reliable, practical tool for daily use. -license: GPL -license-file: LICENSE -author: Simon Michael <simon(a)joyful.com> -maintainer: Simon Michael <simon(a)joyful.com> +category: Finance +stability: stable homepage: http://hledger.org bug-reports: http://bugs.hledger.org -cabal-version: >= 1.10 -build-type: Simple +author: Simon Michael <simon(a)joyful.com> +maintainer: Simon Michael <simon(a)joyful.com> +license: GPL-3 +license-file: LICENSE tested-with: GHC==7.10.3, GHC==8.0 +build-type: Simple +cabal-version: >= 1.10 extra-source-files: - CHANGES - config/favicon.ico - config/keter.yaml - config/robots.txt - config/routes - config/settings.yml - messages/en.msg - README - static/css/bootstrap-theme.css - static/css/bootstrap-theme.css.map - static/css/bootstrap-theme.min.css - static/css/bootstrap.css - static/css/bootstrap.css.map - static/css/bootstrap.min.css - static/fonts/glyphicons-halflings-regular.eot - static/fonts/glyphicons-halflings-regular.svg - static/fonts/glyphicons-halflings-regular.ttf - static/fonts/glyphicons-halflings-regular.woff - static/hledger.css - static/hledger.js - static/js/bootstrap.js - static/js/bootstrap.min.js - static/js/excanvas.js - static/js/excanvas.min.js - static/js/jquery.cookie.js - static/js/jquery.flot.canvas.js - static/js/jquery.flot.canvas.min.js - static/js/jquery.flot.categories.js - static/js/jquery.flot.categories.min.js - static/js/jquery.flot.crosshair.js - static/js/jquery.flot.crosshair.min.js - static/js/jquery.flot.errorbars.js - static/js/jquery.flot.errorbars.min.js - static/js/jquery.flot.fillbetween.js - static/js/jquery.flot.fillbetween.min.js - static/js/jquery.flot.image.js - static/js/jquery.flot.image.min.js - static/js/jquery.flot.js - static/js/jquery.flot.min.js - static/js/jquery.flot.navigate.js - static/js/jquery.flot.navigate.min.js - static/js/jquery.flot.pie.js - static/js/jquery.flot.pie.min.js - static/js/jquery.flot.resize.js - static/js/jquery.flot.resize.min.js - static/js/jquery.flot.selection.js - static/js/jquery.flot.selection.min.js - static/js/jquery.flot.stack.js - static/js/jquery.flot.stack.min.js - static/js/jquery.flot.symbol.js - static/js/jquery.flot.symbol.min.js - static/js/jquery.flot.threshold.js - static/js/jquery.flot.threshold.min.js - static/js/jquery.flot.time.js - static/js/jquery.flot.time.min.js - static/js/jquery.flot.tooltip.js - static/js/jquery.flot.tooltip.min.js - static/js/jquery.hotkeys.js - static/js/jquery.js - static/js/jquery.min.js - static/js/jquery.url.js - static/js/typeahead.bundle.js - static/js/typeahead.bundle.min.js - templates/default-layout-wrapper.hamlet - templates/default-layout.hamlet + CHANGES + config/favicon.ico + config/keter.yaml + config/robots.txt + config/routes + config/settings.yml + messages/en.msg + README + static/css/bootstrap-theme.css + static/css/bootstrap-theme.css.map + static/css/bootstrap-theme.min.css + static/css/bootstrap.css + static/css/bootstrap.css.map + static/css/bootstrap.min.css + static/fonts/glyphicons-halflings-regular.eot + static/fonts/glyphicons-halflings-regular.svg + static/fonts/glyphicons-halflings-regular.ttf + static/fonts/glyphicons-halflings-regular.woff + static/hledger.css + static/hledger.js + static/js/bootstrap.js + static/js/bootstrap.min.js + static/js/excanvas.js + static/js/excanvas.min.js + static/js/jquery.cookie.js + static/js/jquery.flot.canvas.js + static/js/jquery.flot.canvas.min.js + static/js/jquery.flot.categories.js + static/js/jquery.flot.categories.min.js + static/js/jquery.flot.crosshair.js + static/js/jquery.flot.crosshair.min.js + static/js/jquery.flot.errorbars.js + static/js/jquery.flot.errorbars.min.js + static/js/jquery.flot.fillbetween.js + static/js/jquery.flot.fillbetween.min.js + static/js/jquery.flot.image.js + static/js/jquery.flot.image.min.js + static/js/jquery.flot.js + static/js/jquery.flot.min.js + static/js/jquery.flot.navigate.js + static/js/jquery.flot.navigate.min.js + static/js/jquery.flot.pie.js + static/js/jquery.flot.pie.min.js + static/js/jquery.flot.resize.js + static/js/jquery.flot.resize.min.js + static/js/jquery.flot.selection.js + static/js/jquery.flot.selection.min.js + static/js/jquery.flot.stack.js + static/js/jquery.flot.stack.min.js + static/js/jquery.flot.symbol.js + static/js/jquery.flot.symbol.min.js + static/js/jquery.flot.threshold.js + static/js/jquery.flot.threshold.min.js + static/js/jquery.flot.time.js + static/js/jquery.flot.time.min.js + static/js/jquery.flot.tooltip.js + static/js/jquery.flot.tooltip.min.js + static/js/jquery.hotkeys.js + static/js/jquery.js + static/js/jquery.min.js + static/js/jquery.url.js + static/js/typeahead.bundle.js + static/js/typeahead.bundle.min.js + templates/default-layout-wrapper.hamlet + templates/default-layout.hamlet data-files: - doc/hledger-web.1 - doc/hledger-web.1.info - doc/hledger-web.1.txt + doc/hledger-web.1 + doc/hledger-web.1.info + doc/hledger-web.1.txt source-repository head - type: git - location: https://github.com/simonmichael/hledger + type: git + location: https://github.com/simonmichael/hledger flag dev - default: False - description: Turn on development settings, like auto-reload templates. - manual: False + description: Turn on development settings, like auto-reload templates. + manual: False + default: False flag library-only - default: False - description: Build for use with "yesod devel" - manual: False + description: Build for use with "yesod devel" + manual: False + default: False flag oldtime - description: If building with time < 1.5, also depend on old-locale. Set automatically by cabal. - manual: False - default: False + description: If building with time < 1.5, also depend on old-locale. Set automatically by cabal. + manual: False + default: False flag threaded - default: True - description: Build with support for multithreaded execution. - manual: False + description: Build with support for multithreaded execution. + manual: False + default: True library - ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans - cpp-options: -DVERSION="1.1" + ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans + cpp-options: -DVERSION="1.2" + build-depends: + hledger-lib >= 1.2 && < 1.3 + , hledger >= 1.2 && < 1.3 + , base >=4.8 && <5 + , base-compat >=0.8.1 + , blaze-html + , blaze-markup + , bytestring + , clientsession + , cmdargs >=0.10 && <0.11 + , data-default + , directory + , filepath + , hjsmin + , http-conduit + , http-client + , HUnit + , conduit-extra >=1.1 + , safe >=0.2 + , shakespeare >=2.0 + , template-haskell + , text >=1.2 && <1.3 + , transformers + , wai + , wai-extra + , wai-handler-launch >=1.3 + , warp + , yaml + , yesod >=1.4 && <1.5 + , yesod-core + , yesod-form + , yesod-static + , json + , megaparsec >=5.0 && < 5.3 + , mtl + if (flag(dev)) || (flag(library-only)) + cpp-options: -DDEVELOPMENT + if flag(oldtime) + build-depends: + time <1.5 + , old-locale + else build-depends: - hledger-lib >= 1.1 && < 1.2 - , hledger >= 1.1 && < 1.2 - , base >=4.8 && <5 - , base-compat >=0.8.1 - , blaze-html - , blaze-markup - , bytestring - , clientsession - , cmdargs >=0.10 && <0.11 - , data-default - , directory - , filepath - , hjsmin - , http-conduit - , http-client - , HUnit - , conduit-extra >=1.1 - , safe >=0.2 - , shakespeare >=2.0 - , template-haskell - , text >=1.2 && <1.3 - , transformers - , wai - , wai-extra - , wai-handler-launch >=1.3 - , warp - , yaml - , yesod >=1.4 && <1.5 - , yesod-core - , yesod-form - , yesod-static - , json - , megaparsec >=5.0 && < 5.2 - , mtl - if (flag(dev)) || (flag(library-only)) - cpp-options: -DDEVELOPMENT - if flag(oldtime) - build-depends: - time <1.5 - , old-locale - else - build-depends: - time >=1.5 - if impl(ghc <7.6) - build-depends: - ghc-prim - exposed-modules: - Application - Foundation - Handler.AddForm - Handler.Common - Handler.JournalR - Handler.RegisterR - Handler.RootR - Handler.SidebarR - Handler.Utils - Hledger.Web - Hledger.Web.Main - Hledger.Web.WebOptions - Import - Settings - Settings.Development - Settings.StaticFiles - other-modules: - Paths_hledger_web - default-language: Haskell2010 + time >=1.5 + if impl(ghc <7.6) + build-depends: + ghc-prim + exposed-modules: + Application + Foundation + Handler.AddForm + Handler.Common + Handler.JournalR + Handler.RegisterR + Handler.RootR + Handler.SidebarR + Handler.Utils + Hledger.Web + Hledger.Web.Main + Hledger.Web.WebOptions + Import + Settings + Settings.Development + Settings.StaticFiles + other-modules: + Paths_hledger_web + default-language: Haskell2010 executable hledger-web - main-is: main.hs - hs-source-dirs: - app - ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans - cpp-options: -DVERSION="1.1" + main-is: main.hs + hs-source-dirs: + app + ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans + cpp-options: -DVERSION="1.2" + build-depends: + hledger-lib >= 1.2 && < 1.3 + , hledger >= 1.2 && < 1.3 + , base >=4.8 && <5 + , base-compat >=0.8.1 + , blaze-html + , blaze-markup + , bytestring + , clientsession + , cmdargs >=0.10 && <0.11 + , data-default + , directory + , filepath + , hjsmin + , http-conduit + , http-client + , HUnit + , conduit-extra >=1.1 + , safe >=0.2 + , shakespeare >=2.0 + , template-haskell + , text >=1.2 && <1.3 + , transformers + , wai + , wai-extra + , wai-handler-launch >=1.3 + , warp + , yaml + , yesod >=1.4 && <1.5 + , yesod-core + , yesod-form + , yesod-static + , json + , parsec >=3 + , hledger-web == 1.2 + if flag(library-only) + buildable: False + if flag(threaded) + ghc-options: -threaded + if flag(dev) + ghc-options: -O0 + if flag(dev) + cpp-options: -DDEVELOPMENT + if flag(oldtime) + build-depends: + time <1.5 + , old-locale + else + build-depends: + time >=1.5 + if impl(ghc <7.6) build-depends: - hledger-lib >= 1.1 && < 1.2 - , hledger >= 1.1 && < 1.2 - , base >=4.8 && <5 - , base-compat >=0.8.1 - , blaze-html - , blaze-markup - , bytestring - , clientsession - , cmdargs >=0.10 && <0.11 - , data-default - , directory - , filepath - , hjsmin - , http-conduit - , http-client - , HUnit - , conduit-extra >=1.1 - , safe >=0.2 - , shakespeare >=2.0 - , template-haskell - , text >=1.2 && <1.3 - , transformers - , wai - , wai-extra - , wai-handler-launch >=1.3 - , warp - , yaml - , yesod >=1.4 && <1.5 - , yesod-core - , yesod-form - , yesod-static - , json - , parsec >=3 - , hledger-web == 1.1 - if flag(library-only) - buildable: False - if flag(threaded) - ghc-options: -threaded - if flag(dev) - ghc-options: -O0 - if flag(dev) - cpp-options: -DDEVELOPMENT - if flag(oldtime) - build-depends: - time <1.5 - , old-locale - else - build-depends: - time >=1.5 - if impl(ghc <7.6) - build-depends: - ghc-prim - default-language: Haskell2010 + ghc-prim + default-language: Haskell2010 test-suite test - type: exitcode-stdio-1.0 - main-is: main.hs - other-modules: - HomeTest - TestImport - hs-source-dirs: - tests - ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans - cpp-options: -DVERSION="1.1" + type: exitcode-stdio-1.0 + main-is: main.hs + hs-source-dirs: + tests + ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans + cpp-options: -DVERSION="1.2" + build-depends: + hledger-lib >= 1.2 && < 1.3 + , hledger >= 1.2 && < 1.3 + , base >=4.8 && <5 + , base-compat >=0.8.1 + , blaze-html + , blaze-markup + , bytestring + , clientsession + , cmdargs >=0.10 && <0.11 + , data-default + , directory + , filepath + , hjsmin + , http-conduit + , http-client + , HUnit + , conduit-extra >=1.1 + , safe >=0.2 + , shakespeare >=2.0 + , template-haskell + , text >=1.2 && <1.3 + , transformers + , wai + , wai-extra + , wai-handler-launch >=1.3 + , warp + , yaml + , yesod >=1.4 && <1.5 + , yesod-core + , yesod-form + , yesod-static + , json + , hledger-web == 1.2 + , hspec + , yesod-test + if flag(oldtime) + build-depends: + time <1.5 + , old-locale + else + build-depends: + time >=1.5 + if impl(ghc <7.6) build-depends: - hledger-lib >= 1.1 && < 1.2 - , hledger >= 1.1 && < 1.2 - , base >=4.8 && <5 - , base-compat >=0.8.1 - , blaze-html - , blaze-markup - , bytestring - , clientsession - , cmdargs >=0.10 && <0.11 - , data-default - , directory - , filepath - , hjsmin - , http-conduit - , http-client - , HUnit - , conduit-extra >=1.1 - , safe >=0.2 - , shakespeare >=2.0 - , template-haskell - , text >=1.2 && <1.3 - , transformers - , wai - , wai-extra - , wai-handler-launch >=1.3 - , warp - , yaml - , yesod >=1.4 && <1.5 - , yesod-core - , yesod-form - , yesod-static - , json - , hledger-web == 1.1 - , hspec - , yesod-test - if flag(oldtime) - build-depends: - time <1.5 - , old-locale - else - build-depends: - time >=1.5 - if impl(ghc <7.6) - build-depends: - ghc-prim - default-language: Haskell2010 + ghc-prim + other-modules: + HomeTest + TestImport + default-language: Haskell2010 ++++++ hledger-web.cabal ++++++ --- /var/tmp/diff_new_pack.r0rnvq/_old 2017-08-31 20:48:58.642497714 +0200 +++ /var/tmp/diff_new_pack.r0rnvq/_new 2017-08-31 20:48:58.646497153 +0200 @@ -1,12 +1,10 @@ --- This file has been generated from package.yaml by hpack version 0.15.0. +-- This file has been generated from package.yaml by hpack version 0.17.0. -- -- see: https://github.com/sol/hpack name: hledger-web -version: 1.1 +version: 1.2 x-revision: 1 -stability: stable -category: Finance synopsis: Web interface for the hledger accounting tool description: This is hledger's web interface. It provides a more user-friendly and collaborative UI than the @@ -18,298 +16,300 @@ with ledger(1). hledger provides command-line, curses and web interfaces, and aims to be a reliable, practical tool for daily use. -license: GPL -license-file: LICENSE -author: Simon Michael <simon(a)joyful.com> -maintainer: Simon Michael <simon(a)joyful.com> +category: Finance +stability: stable homepage: http://hledger.org bug-reports: http://bugs.hledger.org -cabal-version: >= 1.10 -build-type: Simple +author: Simon Michael <simon(a)joyful.com> +maintainer: Simon Michael <simon(a)joyful.com> +license: GPL-3 +license-file: LICENSE tested-with: GHC==7.10.3, GHC==8.0 +build-type: Simple +cabal-version: >= 1.10 extra-source-files: - CHANGES - config/favicon.ico - config/keter.yaml - config/robots.txt - config/routes - config/settings.yml - messages/en.msg - README - static/css/bootstrap-theme.css - static/css/bootstrap-theme.css.map - static/css/bootstrap-theme.min.css - static/css/bootstrap.css - static/css/bootstrap.css.map - static/css/bootstrap.min.css - static/fonts/glyphicons-halflings-regular.eot - static/fonts/glyphicons-halflings-regular.svg - static/fonts/glyphicons-halflings-regular.ttf - static/fonts/glyphicons-halflings-regular.woff - static/hledger.css - static/hledger.js - static/js/bootstrap.js - static/js/bootstrap.min.js - static/js/excanvas.js - static/js/excanvas.min.js - static/js/jquery.cookie.js - static/js/jquery.flot.canvas.js - static/js/jquery.flot.canvas.min.js - static/js/jquery.flot.categories.js - static/js/jquery.flot.categories.min.js - static/js/jquery.flot.crosshair.js - static/js/jquery.flot.crosshair.min.js - static/js/jquery.flot.errorbars.js - static/js/jquery.flot.errorbars.min.js - static/js/jquery.flot.fillbetween.js - static/js/jquery.flot.fillbetween.min.js - static/js/jquery.flot.image.js - static/js/jquery.flot.image.min.js - static/js/jquery.flot.js - static/js/jquery.flot.min.js - static/js/jquery.flot.navigate.js - static/js/jquery.flot.navigate.min.js - static/js/jquery.flot.pie.js - static/js/jquery.flot.pie.min.js - static/js/jquery.flot.resize.js - static/js/jquery.flot.resize.min.js - static/js/jquery.flot.selection.js - static/js/jquery.flot.selection.min.js - static/js/jquery.flot.stack.js - static/js/jquery.flot.stack.min.js - static/js/jquery.flot.symbol.js - static/js/jquery.flot.symbol.min.js - static/js/jquery.flot.threshold.js - static/js/jquery.flot.threshold.min.js - static/js/jquery.flot.time.js - static/js/jquery.flot.time.min.js - static/js/jquery.flot.tooltip.js - static/js/jquery.flot.tooltip.min.js - static/js/jquery.hotkeys.js - static/js/jquery.js - static/js/jquery.min.js - static/js/jquery.url.js - static/js/typeahead.bundle.js - static/js/typeahead.bundle.min.js - templates/default-layout-wrapper.hamlet - templates/default-layout.hamlet + CHANGES + config/favicon.ico + config/keter.yaml + config/robots.txt + config/routes + config/settings.yml + messages/en.msg + README + static/css/bootstrap-theme.css + static/css/bootstrap-theme.css.map + static/css/bootstrap-theme.min.css + static/css/bootstrap.css + static/css/bootstrap.css.map + static/css/bootstrap.min.css + static/fonts/glyphicons-halflings-regular.eot + static/fonts/glyphicons-halflings-regular.svg + static/fonts/glyphicons-halflings-regular.ttf + static/fonts/glyphicons-halflings-regular.woff + static/hledger.css + static/hledger.js + static/js/bootstrap.js + static/js/bootstrap.min.js + static/js/excanvas.js + static/js/excanvas.min.js + static/js/jquery.cookie.js + static/js/jquery.flot.canvas.js + static/js/jquery.flot.canvas.min.js + static/js/jquery.flot.categories.js + static/js/jquery.flot.categories.min.js + static/js/jquery.flot.crosshair.js + static/js/jquery.flot.crosshair.min.js + static/js/jquery.flot.errorbars.js + static/js/jquery.flot.errorbars.min.js + static/js/jquery.flot.fillbetween.js + static/js/jquery.flot.fillbetween.min.js + static/js/jquery.flot.image.js + static/js/jquery.flot.image.min.js + static/js/jquery.flot.js + static/js/jquery.flot.min.js + static/js/jquery.flot.navigate.js + static/js/jquery.flot.navigate.min.js + static/js/jquery.flot.pie.js + static/js/jquery.flot.pie.min.js + static/js/jquery.flot.resize.js + static/js/jquery.flot.resize.min.js + static/js/jquery.flot.selection.js + static/js/jquery.flot.selection.min.js + static/js/jquery.flot.stack.js + static/js/jquery.flot.stack.min.js + static/js/jquery.flot.symbol.js + static/js/jquery.flot.symbol.min.js + static/js/jquery.flot.threshold.js + static/js/jquery.flot.threshold.min.js + static/js/jquery.flot.time.js + static/js/jquery.flot.time.min.js + static/js/jquery.flot.tooltip.js + static/js/jquery.flot.tooltip.min.js + static/js/jquery.hotkeys.js + static/js/jquery.js + static/js/jquery.min.js + static/js/jquery.url.js + static/js/typeahead.bundle.js + static/js/typeahead.bundle.min.js + templates/default-layout-wrapper.hamlet + templates/default-layout.hamlet data-files: - doc/hledger-web.1 - doc/hledger-web.1.info - doc/hledger-web.1.txt + doc/hledger-web.1 + doc/hledger-web.1.info + doc/hledger-web.1.txt source-repository head - type: git - location: https://github.com/simonmichael/hledger + type: git + location: https://github.com/simonmichael/hledger flag dev - default: False - description: Turn on development settings, like auto-reload templates. - manual: False + description: Turn on development settings, like auto-reload templates. + manual: False + default: False flag library-only - default: False - description: Build for use with "yesod devel" - manual: False + description: Build for use with "yesod devel" + manual: False + default: False flag oldtime - description: If building with time < 1.5, also depend on old-locale. Set automatically by cabal. - manual: False - default: False + description: If building with time < 1.5, also depend on old-locale. Set automatically by cabal. + manual: False + default: False flag threaded - default: True - description: Build with support for multithreaded execution. - manual: False + description: Build with support for multithreaded execution. + manual: False + default: True library - ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans - cpp-options: -DVERSION="1.1" + ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans + cpp-options: -DVERSION="1.2" + build-depends: + hledger-lib >= 1.2 && < 1.3 + , hledger >= 1.2 && < 1.3 + , base >=4.8 && <5 + , base-compat >=0.8.1 + , blaze-html + , blaze-markup + , bytestring + , clientsession + , cmdargs >=0.10 && <0.11 + , data-default + , directory + , filepath + , hjsmin + , http-conduit + , http-client + , HUnit + , conduit-extra >=1.1 + , safe >=0.2 + , shakespeare >=2.0 + , template-haskell + , text >=1.2 && <1.3 + , transformers + , wai + , wai-extra + , wai-handler-launch >=1.3 + , warp + , yaml + , yesod >=1.4 && <1.5 + , yesod-core + , yesod-form + , yesod-static + , json + , megaparsec >=5.0 && < 5.4 + , mtl + if (flag(dev)) || (flag(library-only)) + cpp-options: -DDEVELOPMENT + if flag(oldtime) + build-depends: + time <1.5 + , old-locale + else build-depends: - hledger-lib >= 1.1 && < 1.2 - , hledger >= 1.1 && < 1.2 - , base >=4.8 && <5 - , base-compat >=0.8.1 - , blaze-html - , blaze-markup - , bytestring - , clientsession - , cmdargs >=0.10 && <0.11 - , data-default - , directory - , filepath - , hjsmin - , http-conduit - , http-client - , HUnit - , conduit-extra >=1.1 - , safe >=0.2 - , shakespeare >=2.0 - , template-haskell - , text >=1.2 && <1.3 - , transformers - , wai - , wai-extra - , wai-handler-launch >=1.3 - , warp - , yaml - , yesod >=1.4 && <1.5 - , yesod-core - , yesod-form - , yesod-static - , json - , megaparsec >=5.0 && < 5.3 - , mtl - if (flag(dev)) || (flag(library-only)) - cpp-options: -DDEVELOPMENT - if flag(oldtime) - build-depends: - time <1.5 - , old-locale - else - build-depends: - time >=1.5 - if impl(ghc <7.6) - build-depends: - ghc-prim - exposed-modules: - Application - Foundation - Handler.AddForm - Handler.Common - Handler.JournalR - Handler.RegisterR - Handler.RootR - Handler.SidebarR - Handler.Utils - Hledger.Web - Hledger.Web.Main - Hledger.Web.WebOptions - Import - Settings - Settings.Development - Settings.StaticFiles - other-modules: - Paths_hledger_web - default-language: Haskell2010 + time >=1.5 + if impl(ghc <7.6) + build-depends: + ghc-prim + exposed-modules: + Application + Foundation + Handler.AddForm + Handler.Common + Handler.JournalR + Handler.RegisterR + Handler.RootR + Handler.SidebarR + Handler.Utils + Hledger.Web + Hledger.Web.Main + Hledger.Web.WebOptions + Import + Settings + Settings.Development + Settings.StaticFiles + other-modules: + Paths_hledger_web + default-language: Haskell2010 executable hledger-web - main-is: main.hs - hs-source-dirs: - app - ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans - cpp-options: -DVERSION="1.1" + main-is: main.hs + hs-source-dirs: + app + ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans + cpp-options: -DVERSION="1.2" + build-depends: + hledger-lib >= 1.2 && < 1.3 + , hledger >= 1.2 && < 1.3 + , base >=4.8 && <5 + , base-compat >=0.8.1 + , blaze-html + , blaze-markup + , bytestring + , clientsession + , cmdargs >=0.10 && <0.11 + , data-default + , directory + , filepath + , hjsmin + , http-conduit + , http-client + , HUnit + , conduit-extra >=1.1 + , safe >=0.2 + , shakespeare >=2.0 + , template-haskell + , text >=1.2 && <1.3 + , transformers + , wai + , wai-extra + , wai-handler-launch >=1.3 + , warp + , yaml + , yesod >=1.4 && <1.5 + , yesod-core + , yesod-form + , yesod-static + , json + , parsec >=3 + , hledger-web == 1.2 + if flag(library-only) + buildable: False + if flag(threaded) + ghc-options: -threaded + if flag(dev) + ghc-options: -O0 + if flag(dev) + cpp-options: -DDEVELOPMENT + if flag(oldtime) + build-depends: + time <1.5 + , old-locale + else + build-depends: + time >=1.5 + if impl(ghc <7.6) build-depends: - hledger-lib >= 1.1 && < 1.2 - , hledger >= 1.1 && < 1.2 - , base >=4.8 && <5 - , base-compat >=0.8.1 - , blaze-html - , blaze-markup - , bytestring - , clientsession - , cmdargs >=0.10 && <0.11 - , data-default - , directory - , filepath - , hjsmin - , http-conduit - , http-client - , HUnit - , conduit-extra >=1.1 - , safe >=0.2 - , shakespeare >=2.0 - , template-haskell - , text >=1.2 && <1.3 - , transformers - , wai - , wai-extra - , wai-handler-launch >=1.3 - , warp - , yaml - , yesod >=1.4 && <1.5 - , yesod-core - , yesod-form - , yesod-static - , json - , parsec >=3 - , hledger-web == 1.1 - if flag(library-only) - buildable: False - if flag(threaded) - ghc-options: -threaded - if flag(dev) - ghc-options: -O0 - if flag(dev) - cpp-options: -DDEVELOPMENT - if flag(oldtime) - build-depends: - time <1.5 - , old-locale - else - build-depends: - time >=1.5 - if impl(ghc <7.6) - build-depends: - ghc-prim - default-language: Haskell2010 + ghc-prim + default-language: Haskell2010 test-suite test - type: exitcode-stdio-1.0 - main-is: main.hs - other-modules: - HomeTest - TestImport - hs-source-dirs: - tests - ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans - cpp-options: -DVERSION="1.1" + type: exitcode-stdio-1.0 + main-is: main.hs + hs-source-dirs: + tests + ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans + cpp-options: -DVERSION="1.2" + build-depends: + hledger-lib >= 1.2 && < 1.3 + , hledger >= 1.2 && < 1.3 + , base >=4.8 && <5 + , base-compat >=0.8.1 + , blaze-html + , blaze-markup + , bytestring + , clientsession + , cmdargs >=0.10 && <0.11 + , data-default + , directory + , filepath + , hjsmin + , http-conduit + , http-client + , HUnit + , conduit-extra >=1.1 + , safe >=0.2 + , shakespeare >=2.0 + , template-haskell + , text >=1.2 && <1.3 + , transformers + , wai + , wai-extra + , wai-handler-launch >=1.3 + , warp + , yaml + , yesod >=1.4 && <1.5 + , yesod-core + , yesod-form + , yesod-static + , json + , hledger-web == 1.2 + , hspec + , yesod-test + if flag(oldtime) + build-depends: + time <1.5 + , old-locale + else + build-depends: + time >=1.5 + if impl(ghc <7.6) build-depends: - hledger-lib >= 1.1 && < 1.2 - , hledger >= 1.1 && < 1.2 - , base >=4.8 && <5 - , base-compat >=0.8.1 - , blaze-html - , blaze-markup - , bytestring - , clientsession - , cmdargs >=0.10 && <0.11 - , data-default - , directory - , filepath - , hjsmin - , http-conduit - , http-client - , HUnit - , conduit-extra >=1.1 - , safe >=0.2 - , shakespeare >=2.0 - , template-haskell - , text >=1.2 && <1.3 - , transformers - , wai - , wai-extra - , wai-handler-launch >=1.3 - , warp - , yaml - , yesod >=1.4 && <1.5 - , yesod-core - , yesod-form - , yesod-static - , json - , hledger-web == 1.1 - , hspec - , yesod-test - if flag(oldtime) - build-depends: - time <1.5 - , old-locale - else - build-depends: - time >=1.5 - if impl(ghc <7.6) - build-depends: - ghc-prim - default-language: Haskell2010 + ghc-prim + other-modules: + HomeTest + TestImport + default-language: Haskell2010

1 0

commit hledger-ui for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package hledger-ui for openSUSE:Factory checked in at 2017-08-31 20:48:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hledger-ui (Old) and /work/SRC/openSUSE:Factory/.hledger-ui.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hledger-ui" Thu Aug 31 20:48:54 2017 rev:2 rq:513568 version:1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/hledger-ui/hledger-ui.changes 2017-04-18 13:51:30.449051163 +0200 +++ /work/SRC/openSUSE:Factory/.hledger-ui.new/hledger-ui.changes 2017-08-31 20:48:55.798896864 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:07:44 UTC 2017 - psimons(a)suse.com + +- Update to version 1.2 revision 3. + +------------------------------------------------------------------- Old: ---- hledger-ui-1.1.2.tar.gz New: ---- hledger-ui-1.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hledger-ui.spec ++++++ --- /var/tmp/diff_new_pack.rjL3sQ/_old 2017-08-31 20:48:56.478801428 +0200 +++ /var/tmp/diff_new_pack.rjL3sQ/_new 2017-08-31 20:48:56.482800866 +0200 @@ -17,14 +17,14 @@ Name: hledger-ui -Version: 1.1.2 +Version: 1.2 Release: 0 Summary: Curses-style user interface for the hledger accounting tool License: GPL-3.0+ Group: Development/Languages/Other Url: https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.t… -Source1: https://hackage.haskell.org/package/%{name}-%{version}/revision/2.cabal#/%{… +Source1: https://hackage.haskell.org/package/%{name}-%{version}/revision/3.cabal#/%{… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-HUnit-devel BuildRequires: ghc-ansi-terminal-devel ++++++ hledger-ui-1.1.2.tar.gz -> hledger-ui-1.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hledger-ui-1.1.2/CHANGES new/hledger-ui-1.2/CHANGES --- old/hledger-ui-1.1.2/CHANGES 2017-01-25 20:16:23.000000000 +0100 +++ new/hledger-ui-1.2/CHANGES 2017-04-01 03:07:26.000000000 +0200 @@ -2,9 +2,18 @@ See also the hledger and project change logs. -# 1.1.2 (2017/1/25) +# 1.2 (2016/3/31) + +Fix a pattern match failure when pressing E on the transaction screen (fixes #508) + +Accounts with ? in name had empty registers (fixes #498) (Bryan Richter) + +Allow brick 0.16 (Joshua Chia) and brick 0.17/vty 0.15 (Peter Simons) + +Allow megaparsec 5.2 (fixes #503) + +Allow text-zipper 0.10 -- allow vty 0.15, brick 0.17 (#494) # 1.1.1 (2017/1/20) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hledger-ui-1.1.2/Hledger/UI/RegisterScreen.hs new/hledger-ui-1.2/Hledger/UI/RegisterScreen.hs --- old/hledger-ui-1.1.2/Hledger/UI/RegisterScreen.hs 2017-01-25 18:49:25.000000000 +0100 +++ new/hledger-ui-1.2/Hledger/UI/RegisterScreen.hs 2017-03-27 13:23:16.000000000 +0200 @@ -281,7 +281,10 @@ where (pos,f) = case listSelectedElement rsList of Nothing -> (endPos, journalFilePath j) - Just (_, RegisterScreenItem{rsItemTransaction=Transaction{tsourcepos=GenericSourcePos f l c}}) -> (Just (l, Just c),f) + Just (_, RegisterScreenItem{ + rsItemTransaction=Transaction{tsourcepos=GenericSourcePos f l c}}) -> (Just (l, Just c),f) + Just (_, RegisterScreenItem{ + rsItemTransaction=Transaction{tsourcepos=JournalSourcePos f (l,_)}}) -> (Just (l, Nothing),f) VtyEvent (EvKey (KChar 'H') []) -> continue $ regenerateScreens j d $ toggleHistorical ui VtyEvent (EvKey (KChar 'F') []) -> scrollTop >> (continue $ regenerateScreens j d $ toggleFlat ui) VtyEvent (EvKey (KChar 'Z') []) -> scrollTop >> (continue $ regenerateScreens j d $ toggleEmpty ui) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hledger-ui-1.1.2/Hledger/UI/TransactionScreen.hs new/hledger-ui-1.2/Hledger/UI/TransactionScreen.hs --- old/hledger-ui-1.1.2/Hledger/UI/TransactionScreen.hs 2017-01-11 21:09:58.000000000 +0100 +++ new/hledger-ui-1.2/Hledger/UI/TransactionScreen.hs 2017-03-27 13:23:16.000000000 +0200 @@ -128,7 +128,9 @@ VtyEvent (EvKey (KChar c) []) | c `elem` ['?'] -> continue $ setMode Help ui VtyEvent (EvKey (KChar 'E') []) -> suspendAndResume $ void (runEditor pos f) >> uiReloadJournalIfChanged copts d j ui where - (pos,f) = let GenericSourcePos f l c = tsourcepos t in (Just (l, Just c),f) + (pos,f) = case tsourcepos t of + GenericSourcePos f l c -> (Just (l, Just c),f) + JournalSourcePos f (l1,_) -> (Just (l1, Nothing),f) AppEvent (DateChange old _) | isStandardPeriod p && p `periodContainsDate` old -> continue $ regenerateScreens j d $ setReportPeriod (DayPeriod d) ui where diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hledger-ui-1.1.2/Hledger/UI/UIOptions.hs new/hledger-ui-1.2/Hledger/UI/UIOptions.hs --- old/hledger-ui-1.1.2/Hledger/UI/UIOptions.hs 2017-01-11 21:09:58.000000000 +0100 +++ new/hledger-ui-1.2/Hledger/UI/UIOptions.hs 2017-03-29 17:00:51.000000000 +0200 @@ -39,7 +39,6 @@ -- ,flagReq ["drop"] (\s opts -> Right $ setopt "drop" s opts) "N" "with --flat, omit this many leading account name components" -- ,flagReq ["format"] (\s opts -> Right $ setopt "format" s opts) "FORMATSTR" "use this custom line format" -- ,flagNone ["no-elide"] (\opts -> setboolopt "no-elide" opts) "don't compress empty parent accounts on one line" - ,flagNone ["value","V"] (setboolopt "value") "show amounts as their current market value in their default valuation commodity (accounts screen)" ] --uimode :: Mode [([Char], [Char])] @@ -81,7 +80,7 @@ checkUIOpts :: UIOpts -> UIOpts checkUIOpts opts = - either optserror (const opts) $ do + either usageError (const opts) $ do case maybestringopt "theme" $ rawopts_ $ cliopts_ opts of Just t | not $ elem t themeNames -> Left $ "invalid theme name: "++t _ -> Right () diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hledger-ui-1.1.2/doc/hledger-ui.1 new/hledger-ui-1.2/doc/hledger-ui.1 --- old/hledger-ui-1.1.2/doc/hledger-ui.1 2017-01-25 20:17:40.000000000 +0100 +++ new/hledger-ui-1.2/doc/hledger-ui.1 2017-04-01 02:53:13.000000000 +0200 @@ -1,5 +1,5 @@ -.TH "hledger\-ui" "1" "January 2017" "hledger\-ui 1.1.2" "hledger User Manuals" +.TH "hledger\-ui" "1" "March 2017" "hledger\-ui 1.2" "hledger User Manuals" @@ -63,64 +63,38 @@ show full account names, unindented .RS .RE -.TP -.B \f[C]\-V\ \-\-value\f[] -show amounts as their current market value in their default valuation -commodity (accounts screen only) -.RS -.RE .PP -hledger general options: -.TP -.B \f[C]\-h\f[] -show general usage (or after COMMAND, the command\[aq]s usage) -.RS -.RE -.TP -.B \f[C]\-\-help\f[] -show the current program\[aq]s manual as plain text (or after an add\-on -COMMAND, the add\-on\[aq]s manual) -.RS -.RE -.TP -.B \f[C]\-\-man\f[] -show the current program\[aq]s manual with man -.RS -.RE -.TP -.B \f[C]\-\-info\f[] -show the current program\[aq]s manual with info -.RS -.RE +hledger input options: .TP -.B \f[C]\-\-version\f[] -show version +.B \f[C]\-f\ FILE\ \-\-file=FILE\f[] +use a different input file. +For stdin, use \- (default: \f[C]$LEDGER_FILE\f[] or +\f[C]$HOME/.hledger.journal\f[]) .RS .RE .TP -.B \f[C]\-\-debug[=N]\f[] -show debug output (levels 1\-9, default: 1) +.B \f[C]\-\-rules\-file=RULESFILE\f[] +Conversion rules file to use when reading CSV (default: FILE.rules) .RS .RE .TP -.B \f[C]\-f\ FILE\ \-\-file=FILE\f[] -use a different input file. -For stdin, use \- +.B \f[C]\-\-alias=OLD=NEW\f[] +rename accounts named OLD to NEW .RS .RE .TP -.B \f[C]\-\-rules\-file=RULESFILE\f[] -Conversion rules file to use when reading CSV (default: FILE.rules) +.B \f[C]\-\-anon\f[] +anonymize accounts and payees .RS .RE .TP -.B \f[C]\-\-alias=OLD=NEW\f[] -display accounts named OLD as NEW +.B \f[C]\-\-pivot\ TAGNAME\f[] +use some other field/tag for account names .RS .RE .TP .B \f[C]\-I\ \-\-ignore\-assertions\f[] -ignore any failing balance assertions in the journal +ignore any failing balance assertions .RS .RE .PP @@ -208,20 +182,42 @@ .RS .RE .TP -.B \f[C]\-\-pivot\ TAG\f[] -will transform the journal before any other processing by replacing the -account name of every posting having the tag TAG with content VALUE by -the account name "TAG:VALUE". -The TAG will only match if it is a full\-length match. -The pivot will only happen if the TAG is on a posting, not if it is on -the transaction. -If the tag value is a multi:level:account:name the new account name will -be "TAG:multi:level:account:name". +.B \f[C]\-V\ \-\-value\f[] +convert amounts to their market value on the report end date (using the +most recent applicable market price, if any) .RS .RE +.PP +hledger help options: .TP -.B \f[C]\-\-anon\f[] -show anonymized accounts and payees +.B \f[C]\-h\f[] +show general usage (or after COMMAND, command usage) +.RS +.RE +.TP +.B \f[C]\-\-help\f[] +show this program\[aq]s manual as plain text (or after an add\-on +COMMAND, the add\-on\[aq]s manual) +.RS +.RE +.TP +.B \f[C]\-\-man\f[] +show this program\[aq]s manual with man +.RS +.RE +.TP +.B \f[C]\-\-info\f[] +show this program\[aq]s manual with info +.RS +.RE +.TP +.B \f[C]\-\-version\f[] +show version +.RS +.RE +.TP +.B \f[C]\-\-debug[=N]\f[] +show debug output (levels 1\-9, default: 1) .RS .RE .SH KEYS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hledger-ui-1.1.2/doc/hledger-ui.1.info new/hledger-ui-1.2/doc/hledger-ui.1.info --- old/hledger-ui-1.1.2/doc/hledger-ui.1.info 2017-01-25 20:17:40.000000000 +0100 +++ new/hledger-ui-1.2/doc/hledger-ui.1.info 2017-04-01 02:53:11.000000000 +0200 @@ -1,24 +1,22 @@ -This is hledger-ui/doc/hledger-ui.1.info, produced by makeinfo version -4.8 from stdin. +This is hledger-ui.1.info, produced by makeinfo version 6.0 from stdin. -File: hledger-ui.1.info, Node: Top, Up: (dir) +File: hledger-ui.1.info, Node: Top, Next: OPTIONS, Up: (dir) -hledger-ui(1) hledger-ui 1.1.2 -****************************** +hledger-ui(1) hledger-ui 1.2 +**************************** hledger-ui is hledger's curses-style interface, providing an efficient full-window text UI for viewing accounts and transactions, and some -limited data entry capability. It is easier than hledger's command-line +limited data entry capability. It is easier than hledger's command-line interface, and sometimes quicker and more convenient than the web interface. Like hledger, it reads data from one or more files in hledger -journal, timeclock, timedot, or CSV format specified with `-f', or -`$LEDGER_FILE', or `$HOME/.hledger.journal' (on windows, perhaps -`C:/Users/USER/.hledger.journal'). For more about this see hledger(1), +journal, timeclock, timedot, or CSV format specified with '-f', or +'$LEDGER_FILE', or '$HOME/.hledger.journal' (on windows, perhaps +'C:/Users/USER/.hledger.journal'). For more about this see hledger(1), hledger_journal(5) etc. - * Menu: * OPTIONS:: @@ -31,128 +29,129 @@ 1 OPTIONS ********* -Note: if invoking hledger-ui as a hledger subcommand, write `--' before +Note: if invoking hledger-ui as a hledger subcommand, write '--' before options as shown above. Any QUERYARGS are interpreted as a hledger search query which filters the data. -`--watch' +'--watch' + watch for data and date changes and reload automatically +'--theme=default|terminal|greenterm' -`--theme=default|terminal|greenterm' use this custom display theme +'--register=ACCTREGEX' -`--register=ACCTREGEX' start in the (first) matched account's register screen +'--change' -`--change' show period balances (changes) at startup instead of historical balances +'--flat' -`--flat' show full account names, unindented -`-V --value' - show amounts as their current market value in their default - valuation commodity (accounts screen only) - - hledger general options: - -`-h' - show general usage (or after COMMAND, the command's usage) - -`--help' - show the current program's manual as plain text (or after an add-on - COMMAND, the add-on's manual) - -`--man' - show the current program's manual with man + hledger input options: -`--info' - show the current program's manual with info +'-f FILE --file=FILE' -`--version' - show version + use a different input file. For stdin, use - (default: + '$LEDGER_FILE' or '$HOME/.hledger.journal') +'--rules-file=RULESFILE' -`--debug[=N]' - show debug output (levels 1-9, default: 1) + Conversion rules file to use when reading CSV (default: FILE.rules) +'--alias=OLD=NEW' -`-f FILE --file=FILE' - use a different input file. For stdin, use - + rename accounts named OLD to NEW +'--anon' -`--rules-file=RULESFILE' - Conversion rules file to use when reading CSV (default: FILE.rules) + anonymize accounts and payees +'--pivot TAGNAME' -`--alias=OLD=NEW' - display accounts named OLD as NEW + use some other field/tag for account names +'-I --ignore-assertions' -`-I --ignore-assertions' - ignore any failing balance assertions in the journal + ignore any failing balance assertions hledger reporting options: -`-b --begin=DATE' +'-b --begin=DATE' + include postings/txns on or after this date +'-e --end=DATE' -`-e --end=DATE' include postings/txns before this date +'-D --daily' -`-D --daily' multiperiod/multicolumn report by day +'-W --weekly' -`-W --weekly' multiperiod/multicolumn report by week +'-M --monthly' -`-M --monthly' multiperiod/multicolumn report by month +'-Q --quarterly' -`-Q --quarterly' multiperiod/multicolumn report by quarter +'-Y --yearly' -`-Y --yearly' multiperiod/multicolumn report by year +'-p --period=PERIODEXP' -`-p --period=PERIODEXP' set start date, end date, and/or reporting interval all at once (overrides the flags above) +'--date2' -`--date2' show, and match with -b/-e/-p/date:, secondary dates instead +'-C --cleared' -`-C --cleared' include only cleared postings/txns +'--pending' -`--pending' include only pending postings/txns +'-U --uncleared' -`-U --uncleared' include only uncleared (and pending) postings/txns +'-R --real' -`-R --real' include only non-virtual postings +'--depth=N' -`--depth=N' hide accounts/postings deeper than N +'-E --empty' -`-E --empty' show items with zero amount, normally hidden +'-B --cost' -`-B --cost' convert amounts to their cost at transaction time (using the transaction price, if any) +'-V --value' -`--pivot TAG' - will transform the journal before any other processing by - replacing the account name of every posting having the tag TAG - with content VALUE by the account name "TAG:VALUE". The TAG will - only match if it is a full-length match. The pivot will only - happen if the TAG is on a posting, not if it is on the - transaction. If the tag value is a multi:level:account:name the - new account name will be "TAG:multi:level:account:name". + convert amounts to their market value on the report end date (using + the most recent applicable market price, if any) -`--anon' - show anonymized accounts and payees + hledger help options: + +'-h' + + show general usage (or after COMMAND, command usage) +'--help' + + show this program's manual as plain text (or after an add-on + COMMAND, the add-on's manual) +'--man' + + show this program's manual with man +'--info' + + show this program's manual with info +'--version' + + show version +'--debug[=N]' + + show debug output (levels 1-9, default: 1) File: hledger-ui.1.info, Node: KEYS, Next: SCREENS, Prev: OPTIONS, Up: Top @@ -160,57 +159,57 @@ 2 KEYS ****** -`?' shows a help dialog listing all keys. (Some of these also appear in -the quick help at the bottom of each screen.) Press `?' again (or -`ESCAPE', or `LEFT') to close it. The following keys work on most +'?' shows a help dialog listing all keys. (Some of these also appear in +the quick help at the bottom of each screen.) Press '?' again (or +'ESCAPE', or 'LEFT') to close it. The following keys work on most screens: - The cursor keys navigate: `right' (or `enter') goes deeper, `left' -returns to the previous screen, `up'/`down'/`page up'/`page -down'/`home'/`end' move up and down through lists. Vi-style -`h'/`j'/`k'/`l' movement keys are also supported. A tip: movement speed + The cursor keys navigate: 'right' (or 'enter') goes deeper, 'left' +returns to the previous screen, 'up'/'down'/'page up'/'page +down'/'home'/'end' move up and down through lists. Vi-style +'h'/'j'/'k'/'l' movement keys are also supported. A tip: movement speed is limited by your keyboard repeat rate, to move faster you may want to -adjust it. (If you're on a mac, the Karabiner app is one way to do +adjust it. (If you're on a mac, the Karabiner app is one way to do that.) With shift pressed, the cursor keys adjust the report period, limiting the transactions to be shown (by default, all are shown). -`shift-down/up' steps downward and upward through these standard report -period durations: year, quarter, month, week, day. Then, -`shift-left/right' moves to the previous/next period. `t' sets the -report period to today. With the `--watch' option, when viewing a +'shift-down/up' steps downward and upward through these standard report +period durations: year, quarter, month, week, day. Then, +'shift-left/right' moves to the previous/next period. 't' sets the +report period to today. With the '--watch' option, when viewing a "current" period (the current day, week, month, quarter, or year), the -period will move automatically to track the current date. To set a -non-standard period, you can use `/' and a `date:' query. +period will move automatically to track the current date. To set a +non-standard period, you can use '/' and a 'date:' query. - `/' lets you set a general filter query limiting the data shown, -using the same query terms as in hledger and hledger-web. While editing -the query, you can use CTRL-a/e/d/k, BS, cursor keys; press `ENTER' to -set it, or `ESCAPE'to cancel. There are also keys for quickly adjusting + '/' lets you set a general filter query limiting the data shown, +using the same query terms as in hledger and hledger-web. While editing +the query, you can use CTRL-a/e/d/k, BS, cursor keys; press 'ENTER' to +set it, or 'ESCAPE'to cancel. There are also keys for quickly adjusting some common filters like account depth and cleared/uncleared (see -below). `BACKSPACE' or `DELETE' removes all filters, showing all +below). 'BACKSPACE' or 'DELETE' removes all filters, showing all transactions. - `ESCAPE' removes all filters and jumps back to the top screen. Or, + 'ESCAPE' removes all filters and jumps back to the top screen. Or, it cancels a minibuffer edit or help dialog in progress. - `g' reloads from the data file(s) and updates the current screen and -any previous screens. (With large files, this could cause a noticeable + 'g' reloads from the data file(s) and updates the current screen and +any previous screens. (With large files, this could cause a noticeable pause.) - `I' toggles balance assertion checking. Disabling balance assertions + 'I' toggles balance assertion checking. Disabling balance assertions temporarily can be useful for troubleshooting. - `a' runs command-line hledger's add command, and reloads the updated -file. This allows some basic data entry. + 'a' runs command-line hledger's add command, and reloads the updated +file. This allows some basic data entry. - `E' runs $HLEDGER_UI_EDITOR, or $EDITOR, or a default (`emacsclient --a "" -nw') on the journal file. With some editors (emacs, vi), the + 'E' runs $HLEDGER_UI_EDITOR, or $EDITOR, or a default ('emacsclient +-a "" -nw') on the journal file. With some editors (emacs, vi), the cursor will be positioned at the current transaction when invoked from the register and transaction screens, and at the error location (if possible) when invoked from the error screen. - `q' quits the application. + 'q' quits the application. Additional screen-specific keys are described below. @@ -233,45 +232,45 @@ 3.1 Accounts screen =================== -This is normally the first screen displayed. It lists accounts and their -balances, like hledger's balance command. By default, it shows all -accounts and their latest ending balances (including the balances of -subaccounts). if you specify a query on the command line, it shows just +This is normally the first screen displayed. It lists accounts and +their balances, like hledger's balance command. By default, it shows +all accounts and their latest ending balances (including the balances of +subaccounts). if you specify a query on the command line, it shows just the matched accounts and the balances from matched transactions. Account names are normally indented to show the hierarchy (tree mode). To see less detail, set a depth limit by pressing a number key, -`1' to `9'. `0' shows even less detail, collapsing all accounts to a -single total. `-' and `+' (or `=') decrease and increase the depth -limit. To remove the depth limit, set it higher than the maximum -account depth, or press `ESCAPE'. +'1' to '9'. '0' shows even less detail, collapsing all accounts to a +single total. '-' and '+' (or '=') decrease and increase the depth +limit. To remove the depth limit, set it higher than the maximum +account depth, or press 'ESCAPE'. - `F' toggles flat mode, in which accounts are shown as a flat list, -with their full names. In this mode, account balances exclude + 'F' toggles flat mode, in which accounts are shown as a flat list, +with their full names. In this mode, account balances exclude subaccounts, except for accounts at the depth limit (as with hledger's balance command). - `H' toggles between showing historical balances or period balances. + 'H' toggles between showing historical balances or period balances. Historical balances (the default) are ending balances at the end of the report period, taking into account all transactions before that date (filtered by the filter query if any), including transactions before the -start of the report period. In other words, historical balances are what -you would see on a bank statement for that account (unless disturbed by -a filter query). Period balances ignore transactions before the report -start date, so they show the change in balance during the report period. -They are more useful eg when viewing a time log. +start of the report period. In other words, historical balances are +what you would see on a bank statement for that account (unless +disturbed by a filter query). Period balances ignore transactions +before the report start date, so they show the change in balance during +the report period. They are more useful eg when viewing a time log. - `C' toggles cleared mode, in which uncleared transactions and -postings are not shown. `U' toggles uncleared mode, in which only + 'C' toggles cleared mode, in which uncleared transactions and +postings are not shown. 'U' toggles uncleared mode, in which only uncleared transactions/postings are shown. - `R' toggles real mode, in which virtual postings are ignored. + 'R' toggles real mode, in which virtual postings are ignored. - `Z' toggles nonzero mode, in which only accounts with nonzero + 'Z' toggles nonzero mode, in which only accounts with nonzero balances are shown (hledger-ui shows zero items by default, unlike command-line hledger). - Press `right' or `enter' to view an account's transactions register. + Press 'right' or 'enter' to view an account's transactions register. File: hledger-ui.1.info, Node: Register screen, Next: Transaction screen, Prev: Accounts screen, Up: SCREENS @@ -280,44 +279,42 @@ =================== This screen shows the transactions affecting a particular account, like -a check register. Each line represents one transaction and shows: +a check register. Each line represents one transaction and shows: - * the other account(s) involved, in abbreviated form. (If there are - both real and virtual postings, it shows only the accounts - affected by real postings.) + * the other account(s) involved, in abbreviated form. (If there are + both real and virtual postings, it shows only the accounts affected + by real postings.) * the overall change to the current account's balance; positive for an inflow to this account, negative for an outflow. * the running historical total or period total for the current - account, after the transaction. This can be toggled with `H'. - Similar to the accounts screen, the historical total is affected - by transactions (filtered by the filter query) before the report - start date, while the period total is not. If the historical total - is not disturbed by a filter query, it will be the running - historical balance you would see on a bank register for the - current account. - + account, after the transaction. This can be toggled with 'H'. + Similar to the accounts screen, the historical total is affected by + transactions (filtered by the filter query) before the report start + date, while the period total is not. If the historical total is + not disturbed by a filter query, it will be the running historical + balance you would see on a bank register for the current account. If the accounts screen was in tree mode, the register screen will include transactions from both the current account and its subaccounts. If the accounts screen was in flat mode, and a non-depth-clipped account was selected, the register screen will exclude transactions from -subaccounts. In other words, the register always shows the transactions -responsible for the period balance shown on the accounts screen. As on -the accounts screen, this can be toggled with `F'. +subaccounts. In other words, the register always shows the transactions +responsible for the period balance shown on the accounts screen. As on +the accounts screen, this can be toggled with 'F'. - `C' toggles cleared mode, in which uncleared transactions and -postings are not shown. `U' toggles uncleared mode, in which only + 'C' toggles cleared mode, in which uncleared transactions and +postings are not shown. 'U' toggles uncleared mode, in which only uncleared transactions/postings are shown. - `R' toggles real mode, in which virtual postings are ignored. + 'R' toggles real mode, in which virtual postings are ignored. - `Z' toggles nonzero mode, in which only transactions posting a + 'Z' toggles nonzero mode, in which only transactions posting a nonzero change are shown (hledger-ui shows zero items by default, unlike command-line hledger). - Press `right' (or `enter') to view the selected transaction in + Press 'right' (or 'enter') to view the selected transaction in detail. @@ -335,11 +332,11 @@ Simple transactions have two postings, but there can be more (or in certain cases, fewer). - `up' and `down' will step through all transactions listed in the -previous account register screen. In the title bar, the numbers in -parentheses show your position within that account register. They will + 'up' and 'down' will step through all transactions listed in the +previous account register screen. In the title bar, the numbers in +parentheses show your position within that account register. They will vary depending on which account register you came from (remember most -transactions appear in multiple account registers). The #N number +transactions appear in multiple account registers). The #N number preceding them is the transaction's position within the complete unfiltered journal, which is a more stable id (at least until the next reload). @@ -351,27 +348,26 @@ ================ This screen will appear if there is a problem, such as a parse error, -when you press g to reload. Once you have fixed the problem, press g -again to reload and resume normal operation. (Or, you can press escape +when you press g to reload. Once you have fixed the problem, press g +again to reload and resume normal operation. (Or, you can press escape to cancel the reload attempt.) - Tag Table: -Node: Top88 -Node: OPTIONS827 -Ref: #options926 -Node: KEYS4005 -Ref: #keys4102 -Node: SCREENS6672 -Ref: #screens6759 -Node: Accounts screen6849 -Ref: #accounts-screen6979 -Node: Register screen9017 -Ref: #register-screen9174 -Node: Transaction screen11062 -Ref: #transaction-screen11222 -Node: Error screen12089 -Ref: #error-screen12213 +Node: Top73 +Node: OPTIONS825 +Ref: #options924 +Node: KEYS3650 +Ref: #keys3747 +Node: SCREENS6335 +Ref: #screens6422 +Node: Accounts screen6512 +Ref: #accounts-screen6642 +Node: Register screen8691 +Ref: #register-screen8848 +Node: Transaction screen10737 +Ref: #transaction-screen10897 +Node: Error screen11767 +Ref: #error-screen11891 End Tag Table diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hledger-ui-1.1.2/doc/hledger-ui.1.txt new/hledger-ui-1.2/doc/hledger-ui.1.txt --- old/hledger-ui-1.1.2/doc/hledger-ui.1.txt 2017-01-25 20:17:41.000000000 +0100 +++ new/hledger-ui-1.2/doc/hledger-ui.1.txt 2017-04-01 02:53:13.000000000 +0200 @@ -50,39 +50,26 @@ --flat show full account names, unindented - -V --value - show amounts as their current market value in their default val- - uation commodity (accounts screen only) - - hledger general options: - - -h show general usage (or after COMMAND, the command's usage) - - --help show the current program's manual as plain text (or after an - add-on COMMAND, the add-on's manual) - - --man show the current program's manual with man - - --info show the current program's manual with info - - --version - show version - - --debug[=N] - show debug output (levels 1-9, default: 1) + hledger input options: -f FILE --file=FILE - use a different input file. For stdin, use - + use a different input file. For stdin, use - (default: + $LEDGER_FILE or $HOME/.hledger.journal) --rules-file=RULESFILE - Conversion rules file to use when reading CSV (default: + Conversion rules file to use when reading CSV (default: FILE.rules) --alias=OLD=NEW - display accounts named OLD as NEW + rename accounts named OLD to NEW + + --anon anonymize accounts and payees + + --pivot TAGNAME + use some other field/tag for account names -I --ignore-assertions - ignore any failing balance assertions in the journal + ignore any failing balance assertions hledger reporting options: @@ -108,7 +95,7 @@ multiperiod/multicolumn report by year -p --period=PERIODEXP - set start date, end date, and/or reporting interval all at once + set start date, end date, and/or reporting interval all at once (overrides the flags above) --date2 @@ -133,66 +120,76 @@ show items with zero amount, normally hidden -B --cost - convert amounts to their cost at transaction time (using the + convert amounts to their cost at transaction time (using the transaction price, if any) - --pivot TAG - will transform the journal before any other processing by - replacing the account name of every posting having the tag TAG - with content VALUE by the account name "TAG:VALUE". The TAG - will only match if it is a full-length match. The pivot will - only happen if the TAG is on a posting, not if it is on the - transaction. If the tag value is a multi:level:account:name the - new account name will be "TAG:multi:level:account:name". + -V --value + convert amounts to their market value on the report end date + (using the most recent applicable market price, if any) + + hledger help options: + + -h show general usage (or after COMMAND, command usage) + + --help show this program's manual as plain text (or after an add-on + COMMAND, the add-on's manual) + + --man show this program's manual with man - --anon show anonymized accounts and payees + --info show this program's manual with info + + --version + show version + + --debug[=N] + show debug output (levels 1-9, default: 1) KEYS - ? shows a help dialog listing all keys. (Some of these also appear in + ? shows a help dialog listing all keys. (Some of these also appear in the quick help at the bottom of each screen.) Press ? again (or ESCAPE, or LEFT) to close it. The following keys work on most screens: The cursor keys navigate: right (or enter) goes deeper, left returns to - the previous screen, up/down/page up/page down/home/end move up and + the previous screen, up/down/page up/page down/home/end move up and down through lists. Vi-style h/j/k/l movement keys are also supported. - A tip: movement speed is limited by your keyboard repeat rate, to move - faster you may want to adjust it. (If you're on a mac, the Karabiner + A tip: movement speed is limited by your keyboard repeat rate, to move + faster you may want to adjust it. (If you're on a mac, the Karabiner app is one way to do that.) - With shift pressed, the cursor keys adjust the report period, limiting - the transactions to be shown (by default, all are shown). - shift-down/up steps downward and upward through these standard report + With shift pressed, the cursor keys adjust the report period, limiting + the transactions to be shown (by default, all are shown). + shift-down/up steps downward and upward through these standard report period durations: year, quarter, month, week, day. Then, - shift-left/right moves to the previous/next period. t sets the report - period to today. With the --watch option, when viewing a "current" - period (the current day, week, month, quarter, or year), the period - will move automatically to track the current date. To set a non-stan- + shift-left/right moves to the previous/next period. t sets the report + period to today. With the --watch option, when viewing a "current" + period (the current day, week, month, quarter, or year), the period + will move automatically to track the current date. To set a non-stan- dard period, you can use / and a date: query. - / lets you set a general filter query limiting the data shown, using - the same query terms as in hledger and hledger-web. While editing the - query, you can use CTRL-a/e/d/k, BS, cursor keys; press ENTER to set + / lets you set a general filter query limiting the data shown, using + the same query terms as in hledger and hledger-web. While editing the + query, you can use CTRL-a/e/d/k, BS, cursor keys; press ENTER to set it, or ESCAPEto cancel. There are also keys for quickly adjusting some - common filters like account depth and cleared/uncleared (see below). + common filters like account depth and cleared/uncleared (see below). BACKSPACE or DELETE removes all filters, showing all transactions. - ESCAPE removes all filters and jumps back to the top screen. Or, it + ESCAPE removes all filters and jumps back to the top screen. Or, it cancels a minibuffer edit or help dialog in progress. - g reloads from the data file(s) and updates the current screen and any - previous screens. (With large files, this could cause a noticeable + g reloads from the data file(s) and updates the current screen and any + previous screens. (With large files, this could cause a noticeable pause.) - I toggles balance assertion checking. Disabling balance assertions + I toggles balance assertion checking. Disabling balance assertions temporarily can be useful for troubleshooting. - a runs command-line hledger's add command, and reloads the updated + a runs command-line hledger's add command, and reloads the updated file. This allows some basic data entry. - E runs $HLEDGER_UI_EDITOR, or $EDITOR, or a default (emac- + E runs $HLEDGER_UI_EDITOR, or $EDITOR, or a default (emac- sclient -a "" -nw) on the journal file. With some editors (emacs, vi), - the cursor will be positioned at the current transaction when invoked - from the register and transaction screens, and at the error location + the cursor will be positioned at the current transaction when invoked + from the register and transaction screens, and at the error location (if possible) when invoked from the error screen. q quits the application. @@ -201,42 +198,42 @@ SCREENS Accounts screen - This is normally the first screen displayed. It lists accounts and - their balances, like hledger's balance command. By default, it shows - all accounts and their latest ending balances (including the balances - of subaccounts). if you specify a query on the command line, it shows + This is normally the first screen displayed. It lists accounts and + their balances, like hledger's balance command. By default, it shows + all accounts and their latest ending balances (including the balances + of subaccounts). if you specify a query on the command line, it shows just the matched accounts and the balances from matched transactions. - Account names are normally indented to show the hierarchy (tree mode). + Account names are normally indented to show the hierarchy (tree mode). To see less detail, set a depth limit by pressing a number key, 1 to 9. 0 shows even less detail, collapsing all accounts to a single total. - - and + (or =) decrease and increase the depth limit. To remove the - depth limit, set it higher than the maximum account depth, or press + and + (or =) decrease and increase the depth limit. To remove the + depth limit, set it higher than the maximum account depth, or press ESCAPE. - F toggles flat mode, in which accounts are shown as a flat list, with - their full names. In this mode, account balances exclude subaccounts, - except for accounts at the depth limit (as with hledger's balance com- + F toggles flat mode, in which accounts are shown as a flat list, with + their full names. In this mode, account balances exclude subaccounts, + except for accounts at the depth limit (as with hledger's balance com- mand). H toggles between showing historical balances or period balances. His- - torical balances (the default) are ending balances at the end of the - report period, taking into account all transactions before that date - (filtered by the filter query if any), including transactions before - the start of the report period. In other words, historical balances - are what you would see on a bank statement for that account (unless - disturbed by a filter query). Period balances ignore transactions + torical balances (the default) are ending balances at the end of the + report period, taking into account all transactions before that date + (filtered by the filter query if any), including transactions before + the start of the report period. In other words, historical balances + are what you would see on a bank statement for that account (unless + disturbed by a filter query). Period balances ignore transactions before the report start date, so they show the change in balance during the report period. They are more useful eg when viewing a time log. - C toggles cleared mode, in which uncleared transactions and postings - are not shown. U toggles uncleared mode, in which only uncleared + C toggles cleared mode, in which uncleared transactions and postings + are not shown. U toggles uncleared mode, in which only uncleared transactions/postings are shown. R toggles real mode, in which virtual postings are ignored. - Z toggles nonzero mode, in which only accounts with nonzero balances - are shown (hledger-ui shows zero items by default, unlike command-line + Z toggles nonzero mode, in which only accounts with nonzero balances + are shown (hledger-ui shows zero items by default, unlike command-line hledger). Press right or enter to view an account's transactions register. @@ -245,62 +242,62 @@ This screen shows the transactions affecting a particular account, like a check register. Each line represents one transaction and shows: - o the other account(s) involved, in abbreviated form. (If there are - both real and virtual postings, it shows only the accounts affected + o the other account(s) involved, in abbreviated form. (If there are + both real and virtual postings, it shows only the accounts affected by real postings.) - o the overall change to the current account's balance; positive for an + o the overall change to the current account's balance; positive for an inflow to this account, negative for an outflow. o the running historical total or period total for the current account, - after the transaction. This can be toggled with H. Similar to the - accounts screen, the historical total is affected by transactions - (filtered by the filter query) before the report start date, while + after the transaction. This can be toggled with H. Similar to the + accounts screen, the historical total is affected by transactions + (filtered by the filter query) before the report start date, while the period total is not. If the historical total is not disturbed by - a filter query, it will be the running historical balance you would + a filter query, it will be the running historical balance you would see on a bank register for the current account. - If the accounts screen was in tree mode, the register screen will + If the accounts screen was in tree mode, the register screen will include transactions from both the current account and its subaccounts. - If the accounts screen was in flat mode, and a non-depth-clipped - account was selected, the register screen will exclude transactions + If the accounts screen was in flat mode, and a non-depth-clipped + account was selected, the register screen will exclude transactions from subaccounts. In other words, the register always shows the trans- - actions responsible for the period balance shown on the accounts + actions responsible for the period balance shown on the accounts screen. As on the accounts screen, this can be toggled with F. - C toggles cleared mode, in which uncleared transactions and postings - are not shown. U toggles uncleared mode, in which only uncleared + C toggles cleared mode, in which uncleared transactions and postings + are not shown. U toggles uncleared mode, in which only uncleared transactions/postings are shown. R toggles real mode, in which virtual postings are ignored. - Z toggles nonzero mode, in which only transactions posting a nonzero - change are shown (hledger-ui shows zero items by default, unlike com- + Z toggles nonzero mode, in which only transactions posting a nonzero + change are shown (hledger-ui shows zero items by default, unlike com- mand-line hledger). Press right (or enter) to view the selected transaction in detail. Transaction screen - This screen shows a single transaction, as a general journal entry, - similar to hledger's print command and journal format (hledger_jour- + This screen shows a single transaction, as a general journal entry, + similar to hledger's print command and journal format (hledger_jour- nal(5)). - The transaction's date(s) and any cleared flag, transaction code, - description, comments, along with all of its account postings are - shown. Simple transactions have two postings, but there can be more + The transaction's date(s) and any cleared flag, transaction code, + description, comments, along with all of its account postings are + shown. Simple transactions have two postings, but there can be more (or in certain cases, fewer). - up and down will step through all transactions listed in the previous - account register screen. In the title bar, the numbers in parentheses - show your position within that account register. They will vary + up and down will step through all transactions listed in the previous + account register screen. In the title bar, the numbers in parentheses + show your position within that account register. They will vary depending on which account register you came from (remember most trans- actions appear in multiple account registers). The #N number preceding them is the transaction's position within the complete unfiltered jour- nal, which is a more stable id (at least until the next reload). Error screen - This screen will appear if there is a problem, such as a parse error, - when you press g to reload. Once you have fixed the problem, press g + This screen will appear if there is a problem, such as a parse error, + when you press g to reload. Once you have fixed the problem, press g again to reload and resume normal operation. (Or, you can press escape to cancel the reload attempt.) @@ -308,17 +305,17 @@ COLUMNS The screen width to use. Default: the full terminal width. LEDGER_FILE The journal file path when not specified with -f. Default: - ~/.hledger.journal (on windows, perhaps C:/Users/USER/.hledger.jour- + ~/.hledger.journal (on windows, perhaps C:/Users/USER/.hledger.jour- nal). FILES - Reads data from one or more files in hledger journal, timeclock, time- - dot, or CSV format specified with -f, or $LEDGER_FILE, or - $HOME/.hledger.journal (on windows, perhaps + Reads data from one or more files in hledger journal, timeclock, time- + dot, or CSV format specified with -f, or $LEDGER_FILE, or + $HOME/.hledger.journal (on windows, perhaps C:/Users/USER/.hledger.journal). BUGS - The need to precede options with -- when invoked from hledger is awk- + The need to precede options with -- when invoked from hledger is awk- ward. -f- doesn't work (hledger-ui can't read from stdin). @@ -326,13 +323,13 @@ -V affects only the accounts screen. When you press g, the current and all previous screens are regenerated, - which may cause a noticeable pause with large files. Also there is no + which may cause a noticeable pause with large files. Also there is no visual indication that this is in progress. - --watch is not yet fully robust. It works well for normal usage, but - many file changes in a short time (eg saving the file thousands of - times with an editor macro) can cause problems at least on OSX. Symp- - toms include: unresponsive UI, periodic resetting of the cursor posi- + --watch is not yet fully robust. It works well for normal usage, but + many file changes in a short time (eg saving the file thousands of + times with an editor macro) can cause problems at least on OSX. Symp- + toms include: unresponsive UI, periodic resetting of the cursor posi- tion, momentary display of parse errors, high CPU usage eventually sub- siding, and possibly a small but persistent build-up of CPU usage until the program is restarted. @@ -340,7 +337,7 @@ REPORTING BUGS - Report bugs at http://bugs.hledger.org (or on the #hledger IRC channel + Report bugs at http://bugs.hledger.org (or on the #hledger IRC channel or hledger mail list) @@ -354,7 +351,7 @@ SEE ALSO - hledger(1), hledger-ui(1), hledger-web(1), hledger-api(1), + hledger(1), hledger-ui(1), hledger-web(1), hledger-api(1), hledger_csv(5), hledger_journal(5), hledger_timeclock(5), hledger_time- dot(5), ledger(1) @@ -362,4 +359,4 @@ -hledger-ui 1.1.2 January 2017 hledger-ui(1) +hledger-ui 1.2 March 2017 hledger-ui(1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hledger-ui-1.1.2/hledger-ui.cabal new/hledger-ui-1.2/hledger-ui.cabal --- old/hledger-ui-1.1.2/hledger-ui.cabal 2017-01-25 20:18:20.000000000 +0100 +++ new/hledger-ui-1.2/hledger-ui.cabal 2017-04-01 02:56:37.000000000 +0200 @@ -1,11 +1,9 @@ --- This file has been generated from package.yaml by hpack version 0.15.0. +-- This file has been generated from package.yaml by hpack version 0.17.0. -- -- see: https://github.com/sol/hpack name: hledger-ui -version: 1.1.2 -stability: stable -category: Finance, Console +version: 1.2 synopsis: Curses-style user interface for the hledger accounting tool description: This is hledger's curses-style interface. It is simpler and more convenient for browsing data than the command-line interface, @@ -17,15 +15,17 @@ with ledger(1). hledger provides command-line, curses and web interfaces, and aims to be a reliable, practical tool for daily use. -license: GPL -license-file: LICENSE -author: Simon Michael <simon(a)joyful.com> -maintainer: Simon Michael <simon(a)joyful.com> +category: Finance, Console +stability: stable homepage: http://hledger.org bug-reports: http://bugs.hledger.org -cabal-version: >= 1.10 -build-type: Simple +author: Simon Michael <simon(a)joyful.com> +maintainer: Simon Michael <simon(a)joyful.com> +license: GPL-3 +license-file: LICENSE tested-with: GHC==7.10.3, GHC==8.0 +build-type: Simple +cabal-version: >= 1.10 extra-source-files: CHANGES @@ -46,19 +46,19 @@ default: False flag threaded - default: True description: Build with support for multithreaded execution manual: False + default: True executable hledger-ui main-is: hledger-ui.hs hs-source-dirs: - . + ./. ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans - cpp-options: -DVERSION="1.1.2" + cpp-options: -DVERSION="1.2" build-depends: - hledger >= 1.1 && < 1.2 - , hledger-lib >= 1.1 && < 1.2 + hledger >= 1.2 && < 1.3 + , hledger-lib >= 1.2 && < 1.3 , ansi-terminal >= 0.6.2.3 && < 0.7 , async , base >= 4.8 && < 5 @@ -72,13 +72,13 @@ , HUnit , microlens >= 0.4 && < 0.5 , microlens-platform >= 0.2.3.1 && < 0.4 - , megaparsec >=5.0 && < 5.2 + , megaparsec >=5.0 && < 5.3 , pretty-show >=1.6.4 , process >= 1.2 , safe >= 0.2 , split >= 0.1 && < 0.3 , text >= 1.2 && < 1.3 - , text-zipper >= 0.4 && < 0.10 + , text-zipper >= 0.4 && < 0.11 , transformers , vector if os(windows) ++++++ hledger-ui.cabal ++++++ --- /var/tmp/diff_new_pack.rjL3sQ/_old 2017-08-31 20:48:56.634779533 +0200 +++ /var/tmp/diff_new_pack.rjL3sQ/_new 2017-08-31 20:48:56.634779533 +0200 @@ -1,12 +1,10 @@ --- This file has been generated from package.yaml by hpack version 0.15.0. +-- This file has been generated from package.yaml by hpack version 0.17.0. -- -- see: https://github.com/sol/hpack name: hledger-ui -version: 1.1.2 -x-revision: 2 -stability: stable -category: Finance, Console +version: 1.2 +x-revision: 3 synopsis: Curses-style user interface for the hledger accounting tool description: This is hledger's curses-style interface. It is simpler and more convenient for browsing data than the command-line interface, @@ -18,15 +16,17 @@ with ledger(1). hledger provides command-line, curses and web interfaces, and aims to be a reliable, practical tool for daily use. -license: GPL -license-file: LICENSE -author: Simon Michael <simon(a)joyful.com> -maintainer: Simon Michael <simon(a)joyful.com> +category: Finance, Console +stability: stable homepage: http://hledger.org bug-reports: http://bugs.hledger.org -cabal-version: >= 1.10 -build-type: Simple +author: Simon Michael <simon(a)joyful.com> +maintainer: Simon Michael <simon(a)joyful.com> +license: GPL-3 +license-file: LICENSE tested-with: GHC==7.10.3, GHC==8.0 +build-type: Simple +cabal-version: >= 1.10 extra-source-files: CHANGES @@ -47,19 +47,19 @@ default: False flag threaded - default: True description: Build with support for multithreaded execution manual: False + default: True executable hledger-ui main-is: hledger-ui.hs hs-source-dirs: - . + ./. ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans - cpp-options: -DVERSION="1.1.2" + cpp-options: -DVERSION="1.2" build-depends: - hledger >= 1.1 && < 1.2 - , hledger-lib >= 1.1 && < 1.2 + hledger >= 1.2 && < 1.3 + , hledger-lib >= 1.2 && < 1.3 , ansi-terminal >= 0.6.2.3 && < 0.7 , async , base >= 4.8 && < 5 @@ -73,7 +73,7 @@ , HUnit , microlens >= 0.4 && < 0.5 , microlens-platform >= 0.2.3.1 && < 0.4 - , megaparsec >=5.0 && < 5.3 + , megaparsec >=5.0 && < 5.4 , pretty-show >=1.6.4 , process >= 1.2 , safe >= 0.2 @@ -86,8 +86,8 @@ buildable: False else build-depends: - brick >= 0.12 && < 0.18 - , vty >= 5.5 && < 5.16 + brick >= 0.12 && < 0.19 + , vty >= 5.5 && < 5.17 if flag(threaded) ghc-options: -threaded if flag(oldtime)

1 0

commit hledger-api for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package hledger-api for openSUSE:Factory checked in at 2017-08-31 20:48:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hledger-api (Old) and /work/SRC/openSUSE:Factory/.hledger-api.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hledger-api" Thu Aug 31 20:48:51 2017 rev:2 rq:513567 version:1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/hledger-api/hledger-api.changes 2017-05-10 20:55:01.116737988 +0200 +++ /work/SRC/openSUSE:Factory/.hledger-api.new/hledger-api.changes 2017-08-31 20:48:54.275110755 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:07:15 UTC 2017 - psimons(a)suse.com + +- Update to version 1.2. + +------------------------------------------------------------------- Old: ---- hledger-api-1.1.tar.gz New: ---- hledger-api-1.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hledger-api.spec ++++++ --- /var/tmp/diff_new_pack.pvccwL/_old 2017-08-31 20:48:55.318964231 +0200 +++ /var/tmp/diff_new_pack.pvccwL/_new 2017-08-31 20:48:55.326963109 +0200 @@ -17,7 +17,7 @@ Name: hledger-api -Version: 1.1 +Version: 1.2 Release: 0 Summary: Web API server for the hledger accounting tool License: GPL-3.0+ ++++++ hledger-api-1.1.tar.gz -> hledger-api-1.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hledger-api-1.1/CHANGES new/hledger-api-1.2/CHANGES --- old/hledger-api-1.1/CHANGES 2016-12-31 20:22:14.000000000 +0100 +++ new/hledger-api-1.2/CHANGES 2017-04-01 03:10:27.000000000 +0200 @@ -2,6 +2,10 @@ See also the hledger and the project change logs. +# 1.2 (2016/3/31) + +see project changes at http://hledger.org/release-notes + # 1.1 (2016/12/31) - serves on 127.0.0.1 by default, --host option added (#432) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hledger-api-1.1/doc/hledger-api.1 new/hledger-api-1.2/doc/hledger-api.1 --- old/hledger-api-1.1/doc/hledger-api.1 2016-12-31 20:22:38.000000000 +0100 +++ new/hledger-api-1.2/doc/hledger-api.1 2017-04-01 02:53:13.000000000 +0200 @@ -1,5 +1,5 @@ -.TH "hledger\-api" "1" "December 2016" "hledger\-api 1.1" "hledger User Manuals" +.TH "hledger\-api" "1" "March 2017" "hledger\-api 1.2" "hledger User Manuals" @@ -12,10 +12,6 @@ .PD 0 .P .PD -\f[C]hledger\-api\ \-\-swagger\f[] -.PD 0 -.P -.PD \f[C]hledger\ api\ \-\-\ [OPTIONS]\f[] .SH DESCRIPTION .PP @@ -51,41 +47,30 @@ Note: if invoking hledger\-api as a hledger subcommand, write \f[C]\-\-\f[] before options as shown above. .TP -.B \f[C]\-d\ \-\-static\-dir=DIR\f[] -serve files from a different directory (default: \f[C]\&.\f[]) -.RS -.RE -.TP -.B \f[C]\-p\ \-\-port=PORT\f[] -use a different TCP port (default: 8001) -.RS -.RE -.TP -.B \f[C]\-\-swagger\f[] -print API docs in Swagger 2.0 format, and exit +.B \f[C]\-f\ \-\-file=FILE\f[] +use a different input file. +For stdin, use \- (default: \f[C]$LEDGER_FILE\f[] or +\f[C]$HOME/.hledger.journal\f[]) .RS .RE -.PP -hledger general options: .TP -.B \f[C]\-h\f[] -show general usage (or after COMMAND, the command\[aq]s usage) +.B \f[C]\-d\ \-\-static\-dir=DIR\f[] +serve files from a different directory (default: \f[C]\&.\f[]) .RS .RE .TP -.B \f[C]\-\-help\f[] -show the current program\[aq]s manual as plain text (or after an add\-on -COMMAND, the add\-on\[aq]s manual) +.B \f[C]\-\-host=IPADDR\f[] +listen on this IP address (default: 127.0.0.1) .RS .RE .TP -.B \f[C]\-\-man\f[] -show the current program\[aq]s manual with man +.B \f[C]\-p\ \-\-port=PORT\f[] +listen on this TCP port (default: 8001) .RS .RE .TP -.B \f[C]\-\-info\f[] -show the current program\[aq]s manual with info +.B \f[C]\-\-swagger\f[] +print API docs in Swagger 2.0 format, and exit .RS .RE .TP @@ -94,29 +79,23 @@ .RS .RE .TP -.B \f[C]\-\-debug[=N]\f[] -show debug output (levels 1\-9, default: 1) -.RS -.RE -.TP -.B \f[C]\-f\ FILE\ \-\-file=FILE\f[] -use a different input file. -For stdin, use \- +.B \f[C]\-h\f[] +show usage .RS .RE .TP -.B \f[C]\-\-rules\-file=RULESFILE\f[] -Conversion rules file to use when reading CSV (default: FILE.rules) +.B \f[C]\-\-help\f[] +show manual as plain text .RS .RE .TP -.B \f[C]\-\-alias=OLD=NEW\f[] -display accounts named OLD as NEW +.B \f[C]\-\-man\f[] +show manual with man .RS .RE .TP -.B \f[C]\-I\ \-\-ignore\-assertions\f[] -ignore any failing balance assertions in the journal +.B \f[C]\-\-info\f[] +show manual with info .RS .RE .SH ENVIRONMENT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hledger-api-1.1/doc/hledger-api.1.info new/hledger-api-1.2/doc/hledger-api.1.info --- old/hledger-api-1.1/doc/hledger-api.1.info 2016-12-31 20:22:35.000000000 +0100 +++ new/hledger-api-1.2/doc/hledger-api.1.info 2017-04-01 02:53:10.000000000 +0200 @@ -1,32 +1,30 @@ -This is hledger-api/doc/hledger-api.1.info, produced by makeinfo -version 4.8 from stdin. +This is hledger-api.1.info, produced by makeinfo version 6.0 from stdin. -File: hledger-api.1.info, Node: Top, Up: (dir) +File: hledger-api.1.info, Node: Top, Next: OPTIONS, Up: (dir) -hledger-api(1) hledger-api 1.1 +hledger-api(1) hledger-api 1.2 ****************************** hledger-api is a simple web API server, intended to support client-side -web apps operating on hledger data. It comes with a series of simple +web apps operating on hledger data. It comes with a series of simple client-side app examples, which drive its evolution. Like hledger, it reads data from one or more files in hledger -journal, timeclock, timedot, or CSV format specified with `-f', or -`$LEDGER_FILE', or `$HOME/.hledger.journal' (on windows, perhaps -`C:/Users/USER/.hledger.journal'). For more about this see hledger(1), +journal, timeclock, timedot, or CSV format specified with '-f', or +'$LEDGER_FILE', or '$HOME/.hledger.journal' (on windows, perhaps +'C:/Users/USER/.hledger.journal'). For more about this see hledger(1), hledger_journal(5) etc. The server listens on IP address 127.0.0.1, accessible only to local -requests, by default. You can change this with `--host', eg `--host -0.0.0.0' to listen on all addresses. Note there is no other access +requests, by default. You can change this with '--host', eg '--host +0.0.0.0' to listen on all addresses. Note there is no other access control, so you will need to hide hledger-api behind an authenticating -proxy if you want to restrict access. You can change the TCP port -(default: 8001) with `-p PORT'. +proxy if you want to restrict access. You can change the TCP port +(default: 8001) with '-p PORT'. - If invoked as `hledger-api --swagger', instead of starting a server + If invoked as 'hledger-api --swagger', instead of starting a server the API docs will be printed in Swagger 2.0 format. - * Menu: * OPTIONS:: @@ -37,56 +35,45 @@ 1 OPTIONS ********* -Note: if invoking hledger-api as a hledger subcommand, write `--' -before options as shown above. - -`-d --static-dir=DIR' - serve files from a different directory (default: `.') +Note: if invoking hledger-api as a hledger subcommand, write '--' before +options as shown above. -`-p --port=PORT' - use a different TCP port (default: 8001) - -`--swagger' - print API docs in Swagger 2.0 format, and exit +'-f --file=FILE' - hledger general options: + use a different input file. For stdin, use - (default: + '$LEDGER_FILE' or '$HOME/.hledger.journal') +'-d --static-dir=DIR' -`-h' - show general usage (or after COMMAND, the command's usage) + serve files from a different directory (default: '.') +'--host=IPADDR' -`--help' - show the current program's manual as plain text (or after an add-on - COMMAND, the add-on's manual) + listen on this IP address (default: 127.0.0.1) +'-p --port=PORT' -`--man' - show the current program's manual with man + listen on this TCP port (default: 8001) +'--swagger' -`--info' - show the current program's manual with info + print API docs in Swagger 2.0 format, and exit +'--version' -`--version' show version +'-h' -`--debug[=N]' - show debug output (levels 1-9, default: 1) - -`-f FILE --file=FILE' - use a different input file. For stdin, use - - -`--rules-file=RULESFILE' - Conversion rules file to use when reading CSV (default: FILE.rules) + show usage +'--help' -`--alias=OLD=NEW' - display accounts named OLD as NEW + show manual as plain text +'--man' -`-I --ignore-assertions' - ignore any failing balance assertions in the journal + show manual with man +'--info' + show manual with info Tag Table: -Node: Top90 -Node: OPTIONS1216 -Ref: #options1303 +Node: Top74 +Node: OPTIONS1220 +Ref: #options1307 End Tag Table diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hledger-api-1.1/doc/hledger-api.1.txt new/hledger-api-1.2/doc/hledger-api.1.txt --- old/hledger-api-1.1/doc/hledger-api.1.txt 2016-12-31 20:22:38.000000000 +0100 +++ new/hledger-api-1.2/doc/hledger-api.1.txt 2017-04-01 02:53:13.000000000 +0200 @@ -8,7 +8,6 @@ SYNOPSIS hledger-api [OPTIONS] - hledger-api --swagger hledger api -- [OPTIONS] DESCRIPTION @@ -41,64 +40,52 @@ Note: if invoking hledger-api as a hledger subcommand, write -- before options as shown above. + -f --file=FILE + use a different input file. For stdin, use - (default: + $LEDGER_FILE or $HOME/.hledger.journal) + -d --static-dir=DIR serve files from a different directory (default: .) + --host=IPADDR + listen on this IP address (default: 127.0.0.1) + -p --port=PORT - use a different TCP port (default: 8001) + listen on this TCP port (default: 8001) --swagger print API docs in Swagger 2.0 format, and exit - hledger general options: - - -h show general usage (or after COMMAND, the command's usage) - - --help show the current program's manual as plain text (or after an - add-on COMMAND, the add-on's manual) - - --man show the current program's manual with man - - --info show the current program's manual with info - --version show version - --debug[=N] - show debug output (levels 1-9, default: 1) - - -f FILE --file=FILE - use a different input file. For stdin, use - + -h show usage - --rules-file=RULESFILE - Conversion rules file to use when reading CSV (default: - FILE.rules) + --help show manual as plain text - --alias=OLD=NEW - display accounts named OLD as NEW + --man show manual with man - -I --ignore-assertions - ignore any failing balance assertions in the journal + --info show manual with info ENVIRONMENT LEDGER_FILE The journal file path when not specified with -f. Default: - ~/.hledger.journal (on windows, perhaps C:/Users/USER/.hledger.jour- + ~/.hledger.journal (on windows, perhaps C:/Users/USER/.hledger.jour- nal). FILES - Reads data from one or more files in hledger journal, timeclock, time- - dot, or CSV format specified with -f, or $LEDGER_FILE, or - $HOME/.hledger.journal (on windows, perhaps + Reads data from one or more files in hledger journal, timeclock, time- + dot, or CSV format specified with -f, or $LEDGER_FILE, or + $HOME/.hledger.journal (on windows, perhaps C:/Users/USER/.hledger.journal). BUGS - The need to precede options with -- when invoked from hledger is awk- + The need to precede options with -- when invoked from hledger is awk- ward. REPORTING BUGS - Report bugs at http://bugs.hledger.org (or on the #hledger IRC channel + Report bugs at http://bugs.hledger.org (or on the #hledger IRC channel or hledger mail list) @@ -112,7 +99,7 @@ SEE ALSO - hledger(1), hledger-ui(1), hledger-web(1), hledger-api(1), + hledger(1), hledger-ui(1), hledger-web(1), hledger-api(1), hledger_csv(5), hledger_journal(5), hledger_timeclock(5), hledger_time- dot(5), ledger(1) @@ -120,4 +107,4 @@ -hledger-api 1.1 December 2016 hledger-api(1) +hledger-api 1.2 March 2017 hledger-api(1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hledger-api-1.1/hledger-api.cabal new/hledger-api-1.2/hledger-api.cabal --- old/hledger-api-1.1/hledger-api.cabal 2016-12-31 16:54:47.000000000 +0100 +++ new/hledger-api-1.2/hledger-api.cabal 2017-04-01 02:56:37.000000000 +0200 @@ -1,9 +1,9 @@ --- This file has been generated from package.yaml by hpack version 0.15.0. +-- This file has been generated from package.yaml by hpack version 0.17.0. -- -- see: https://github.com/sol/hpack name: hledger-api -version: 1.1 +version: 1.2 synopsis: Web API server for the hledger accounting tool description: This is a simple web API server for hledger data. It comes with a series of simple client-side web app examples. @@ -20,11 +20,11 @@ bug-reports: http://bugs.hledger.org author: Simon Michael <simon(a)joyful.com> maintainer: Simon Michael <simon(a)joyful.com> -license: GPL +license: GPL-3 license-file: LICENSE +tested-with: GHC==7.10.3, GHC==8.0 build-type: Simple cabal-version: >= 1.10 -tested-with: GHC==7.10.3, GHC==8.0 extra-source-files: CHANGES @@ -44,10 +44,10 @@ executable hledger-api main-is: hledger-api.hs ghc-options: -threaded - cpp-options: -DVERSION="1.1" + cpp-options: -DVERSION="1.2" build-depends: - hledger-lib >= 1.1 && < 1.2 - , hledger >= 1.1 && < 1.2 + hledger-lib >= 1.2 && < 1.3 + , hledger >= 1.2 && < 1.3 , base >=4.8 && <5 , aeson , bytestring diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hledger-api-1.1/hledger-api.hs new/hledger-api-1.2/hledger-api.hs --- old/hledger-api-1.1/hledger-api.hs 2016-12-31 16:54:47.000000000 +0100 +++ new/hledger-api-1.2/hledger-api.hs 2017-04-01 02:54:20.000000000 +0200 @@ -35,12 +35,12 @@ import Hledger.Query import Hledger.Cli hiding (Reader, version) -hledgerApiVersion="1.1" +hledgerApiVersion="1.2" -- https://github.com/docopt/docopt.hs#readme doc :: Docopt doc = [docopt| -hledger-api 1.1 +hledger-api 1.2 Serves hledger data and reports as a JSON web API. @@ -50,7 +50,7 @@ hledger-api --swagger print API docs in Swagger 2.0 format hledger-api --version - hledger-api -h|--help|--info + hledger-api -h|--help|--man|--info Options: -f --file FILE use a different input file

1 0

commit hledger for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package hledger for openSUSE:Factory checked in at 2017-08-31 20:48:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hledger (Old) and /work/SRC/openSUSE:Factory/.hledger.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hledger" Thu Aug 31 20:48:48 2017 rev:2 rq:513566 version:1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/hledger/hledger.changes 2017-04-18 13:51:24.741858929 +0200 +++ /work/SRC/openSUSE:Factory/.hledger.new/hledger.changes 2017-08-31 20:48:50.899584570 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:06:44 UTC 2017 - psimons(a)suse.com + +- Update to version 1.2 revision 1. + +------------------------------------------------------------------- Old: ---- hledger-1.1.tar.gz New: ---- hledger-1.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hledger.spec ++++++ --- /var/tmp/diff_new_pack.pjFJPK/_old 2017-08-31 20:48:52.263393135 +0200 +++ /var/tmp/diff_new_pack.pjFJPK/_new 2017-08-31 20:48:52.267392574 +0200 @@ -19,7 +19,7 @@ %global pkg_name hledger %bcond_with tests Name: %{pkg_name} -Version: 1.1 +Version: 1.2 Release: 0 Summary: Command-line interface for the hledger accounting tool License: GPL-3.0+ @@ -41,6 +41,7 @@ BuildRequires: ghc-filepath-devel BuildRequires: ghc-hashable-devel BuildRequires: ghc-haskeline-devel +BuildRequires: ghc-here-devel BuildRequires: ghc-hledger-lib-devel BuildRequires: ghc-megaparsec-devel BuildRequires: ghc-mtl-compat-devel ++++++ hledger-1.1.tar.gz -> hledger-1.2.tar.gz ++++++ ++++ 12143 lines of diff (skipped) ++++++ hledger.cabal ++++++ --- /var/tmp/diff_new_pack.pjFJPK/_old 2017-08-31 20:48:52.511358329 +0200 +++ /var/tmp/diff_new_pack.pjFJPK/_new 2017-08-31 20:48:52.511358329 +0200 @@ -1,12 +1,10 @@ --- This file has been generated from package.yaml by hpack version 0.15.0. +-- This file has been generated from package.yaml by hpack version 0.17.0. -- -- see: https://github.com/sol/hpack name: hledger -version: 1.1 +version: 1.2 x-revision: 1 -stability: stable -category: Finance, Console synopsis: Command-line interface for the hledger accounting tool description: This is hledger's command-line interface. Its basic function is to read a plain text file describing @@ -18,15 +16,17 @@ with ledger(1). hledger provides command-line, curses and web interfaces, and aims to be a reliable, practical tool for daily use. -license: GPL -license-file: LICENSE -author: Simon Michael <simon(a)joyful.com> -maintainer: Simon Michael <simon(a)joyful.com> +category: Finance, Console +stability: stable homepage: http://hledger.org bug-reports: http://bugs.hledger.org -cabal-version: >= 1.10 -build-type: Simple +author: Simon Michael <simon(a)joyful.com> +maintainer: Simon Michael <simon(a)joyful.com> +license: GPL-3 +license-file: LICENSE tested-with: GHC==7.10.3, GHC==8.0 +build-type: Simple +cabal-version: >= 1.10 extra-source-files: bench/10000x1000x10.journal @@ -75,24 +75,25 @@ default: True flag threaded - default: True description: Build with support for multithreaded execution manual: False + default: True library ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans - cpp-options: -DVERSION="1.1" + cpp-options: -DVERSION="1.2" build-depends: base >=4.8 && <5 , base-compat >=0.8.1 , directory , file-embed >=0.0.10 && <0.1 , filepath + , here , pretty-show >=1.6.4 , process , temporary , tabular >=0.2 && <0.3 - , hledger-lib >= 1.1 && < 1.2 + , hledger-lib >= 1.2 && < 1.3 , bytestring , containers , unordered-containers @@ -105,7 +106,7 @@ , mtl , mtl-compat , old-time - , megaparsec >=5.0 && < 5.3 + , megaparsec >=5.0 && < 5.4 , regex-tdfa , safe >=0.2 , split >=0.1 && <0.3 @@ -145,6 +146,7 @@ Hledger.Cli.Accounts Hledger.Cli.Balance Hledger.Cli.Balancesheet + Hledger.Cli.BalanceView Hledger.Cli.Cashflow Hledger.Cli.Help Hledger.Cli.Histogram @@ -164,19 +166,20 @@ hs-source-dirs: app ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans - cpp-options: -DVERSION="1.1" + cpp-options: -DVERSION="1.2" build-depends: base >=4.8 && <5 , base-compat >=0.8.1 , directory , file-embed >=0.0.10 && <0.1 , filepath + , here , pretty-show >=1.6.4 , process , temporary , tabular >=0.2 && <0.3 - , hledger-lib >= 1.1 && < 1.2 - , hledger == 1.1 + , hledger-lib >= 1.2 && < 1.3 + , hledger == 1.2 , bytestring , containers , unordered-containers @@ -225,19 +228,20 @@ hs-source-dirs: test ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans - cpp-options: -DVERSION="1.1" + cpp-options: -DVERSION="1.2" build-depends: base >=4.8 && <5 , base-compat >=0.8.1 , directory , file-embed >=0.0.10 && <0.1 , filepath + , here , pretty-show >=1.6.4 , process , temporary , tabular >=0.2 && <0.3 - , hledger-lib >= 1.1 && < 1.2 - , hledger == 1.1 + , hledger-lib >= 1.2 && < 1.3 + , hledger == 1.2 , bytestring , containers , unordered-containers @@ -282,23 +286,23 @@ benchmark bench type: exitcode-stdio-1.0 + main-is: bench.hs hs-source-dirs: bench - main-is: bench.hs ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans - default-language: Haskell2010 build-depends: base >=4.8 && <5 , base-compat >=0.8.1 , directory , file-embed >=0.0.10 && <0.1 , filepath + , here , pretty-show >=1.6.4 , process , temporary , tabular >=0.2 && <0.3 - , hledger-lib >= 1.1 && < 1.2 - , hledger == 1.1 + , hledger-lib >= 1.2 && < 1.3 + , hledger == 1.2 , criterion , html , timeit @@ -309,3 +313,4 @@ else build-depends: time >=1.5 + default-language: Haskell2010

1 0