From 6d18b8c0afaf7f65d474a3588a8170deea15554f Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Wed, 19 May 2010 23:20:52 +0000 Subject: [PATCH] consolidate under Hledger.Cli --- Hledger/Cli/Commands/Add.hs | 2 +- Hledger/Cli/Commands/Convert.hs | 2 +- Hledger/Cli/Commands/Web.hs | 2 +- Hledger/Cli/Main.hs | 6 +++--- Hledger/Cli/Options.hs | 2 +- Hledger/{ => Cli}/Tests.hs | 4 ++-- Hledger/{ => Cli}/Utils.hs | 2 +- Hledger/{ => Cli}/Version.hs | 2 +- Makefile | 1 - hledger.cabal | 12 ++++++------ 10 files changed, 17 insertions(+), 18 deletions(-) rename Hledger/{ => Cli}/Tests.hs (99%) rename Hledger/{ => Cli}/Utils.hs (99%) rename Hledger/{ => Cli}/Version.hs (99%) diff --git a/Hledger/Cli/Commands/Add.hs b/Hledger/Cli/Commands/Add.hs index 69ed8704b..f1699ca47 100644 --- a/Hledger/Cli/Commands/Add.hs +++ b/Hledger/Cli/Commands/Add.hs @@ -19,7 +19,7 @@ import System.IO ( stderr, hFlush, hPutStrLn, hPutStr ) #endif import System.IO.Error import Text.ParserCombinators.Parsec -import Hledger.Utils (ledgerFromStringWithOpts) +import Hledger.Cli.Utils (ledgerFromStringWithOpts) import qualified Data.Foldable as Foldable (find) -- | Read ledger transactions from the terminal, prompting for each field, diff --git a/Hledger/Cli/Commands/Convert.hs b/Hledger/Cli/Commands/Convert.hs index aeb37222e..2a8ab57fe 100644 --- a/Hledger/Cli/Commands/Convert.hs +++ b/Hledger/Cli/Commands/Convert.hs @@ -5,7 +5,7 @@ format, and print it on stdout. See the manual for more details. module Hledger.Cli.Commands.Convert where import Hledger.Cli.Options (Opt(Debug)) -import Hledger.Version (versionstr) +import Hledger.Cli.Version (versionstr) import Hledger.Data.Types (Ledger,AccountName,Transaction(..),Posting(..),PostingType(..)) import Hledger.Data.Utils (strip, spacenonewline, restofline, parseWithCtx, assertParse, assertParseEqual) import Hledger.Data.Parse (someamount, emptyCtx, ledgeraccountname) diff --git a/Hledger/Cli/Commands/Web.hs b/Hledger/Cli/Commands/Web.hs index c9cb60218..b8edd4d9e 100644 --- a/Hledger/Cli/Commands/Web.hs +++ b/Hledger/Cli/Commands/Web.hs @@ -50,7 +50,7 @@ import Paths_hledger_make (getDataFileName) #else import Paths_hledger (getDataFileName) #endif -import Hledger.Utils (openBrowserOn) +import Hledger.Cli.Utils (openBrowserOn) -- import Debug.Trace -- strace :: Show a => a -> a diff --git a/Hledger/Cli/Main.hs b/Hledger/Cli/Main.hs index 259398f17..6206dce2a 100644 --- a/Hledger/Cli/Main.hs +++ b/Hledger/Cli/Main.hs @@ -47,9 +47,9 @@ import System.IO.UTF8 import Hledger.Cli.Commands.All import Hledger.Data import Hledger.Cli.Options -import Hledger.Tests -import Hledger.Utils (withLedgerDo) -import Hledger.Version (versionmsg, binaryfilename) +import Hledger.Cli.Tests +import Hledger.Cli.Utils (withLedgerDo) +import Hledger.Cli.Version (versionmsg, binaryfilename) main :: IO () main = do diff --git a/Hledger/Cli/Options.hs b/Hledger/Cli/Options.hs index 31ffe0137..34927641b 100644 --- a/Hledger/Cli/Options.hs +++ b/Hledger/Cli/Options.hs @@ -7,7 +7,7 @@ module Hledger.Cli.Options where import System.Console.GetOpt import System.Environment -import Hledger.Version (timeprogname) +import Hledger.Cli.Version (timeprogname) import Hledger.Data.IO (myLedgerPath,myTimelogPath) import Hledger.Data.Utils import Hledger.Data.Types diff --git a/Hledger/Tests.hs b/Hledger/Cli/Tests.hs similarity index 99% rename from Hledger/Tests.hs rename to Hledger/Cli/Tests.hs index aeb0dfdb3..af7244ecd 100644 --- a/Hledger/Tests.hs +++ b/Hledger/Cli/Tests.hs @@ -26,7 +26,7 @@ $ hledger -f sample.ledger balance o -} -module Hledger.Tests +module Hledger.Cli.Tests where import qualified Data.Map as Map import Test.HUnit.Tools (runVerboseTests) @@ -36,7 +36,7 @@ import System.Time (ClockTime(TOD)) import Hledger.Cli.Commands.All import Hledger.Data -- including testing utils in Hledger.Data.Utils import Hledger.Cli.Options -import Hledger.Utils +import Hledger.Cli.Utils -- | Run unit tests. diff --git a/Hledger/Utils.hs b/Hledger/Cli/Utils.hs similarity index 99% rename from Hledger/Utils.hs rename to Hledger/Cli/Utils.hs index f47381449..b90d6ec22 100644 --- a/Hledger/Utils.hs +++ b/Hledger/Cli/Utils.hs @@ -6,7 +6,7 @@ Hledger.Data.Utils. -} -module Hledger.Utils +module Hledger.Cli.Utils where import Control.Monad.Error import Hledger.Data diff --git a/Hledger/Version.hs b/Hledger/Cli/Version.hs similarity index 99% rename from Hledger/Version.hs rename to Hledger/Cli/Version.hs index fa544a74a..55f3ee6a4 100644 --- a/Hledger/Version.hs +++ b/Hledger/Cli/Version.hs @@ -4,7 +4,7 @@ Version-related utilities. See the Makefile for details of our version numbering policy. -} -module Hledger.Version +module Hledger.Cli.Version where import System.Info (os, arch) import Hledger.Data.Utils diff --git a/Makefile b/Makefile index ac0dc01d9..0ac5407fd 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,6 @@ MAIN=hledger.hs SOURCEFILES:= \ $(MAIN) \ [A-Z]*hs \ - Hledger/*hs \ Hledger/Cli/*hs \ Hledger/Cli/Commands/*hs \ hledger-lib/*hs \ diff --git a/hledger.cabal b/hledger.cabal index c25d7395f..e6f53203f 100644 --- a/hledger.cabal +++ b/hledger.cabal @@ -51,11 +51,11 @@ executable hledger main-is: hledger.hs other-modules: Paths_hledger - Hledger.Tests - Hledger.Utils - Hledger.Version Hledger.Cli.Main Hledger.Cli.Options + Hledger.Cli.Tests + Hledger.Cli.Utils + Hledger.Cli.Version Hledger.Cli.Commands.Add Hledger.Cli.Commands.All Hledger.Cli.Commands.Balance @@ -116,11 +116,11 @@ executable hledger library exposed-modules: - Hledger.Tests - Hledger.Utils - Hledger.Version Hledger.Cli.Main Hledger.Cli.Options + Hledger.Cli.Tests + Hledger.Cli.Utils + Hledger.Cli.Version Hledger.Cli.Commands.Add Hledger.Cli.Commands.All Hledger.Cli.Commands.Balance