Browse Source

Rename Collage to Bricoleur

Getty Ritter 6 years ago
parent
commit
c2ce5adcf8

+ 11 - 11
collage.cabal

@@ -1,9 +1,9 @@
 cabal-version: 2.2
-name: collage
+name: bricoleur
 version: 0.1.0.0
 synopsis: A tool for assembling documents out of working, testable code
 description:
-  Collage is a tool for writing documents that include snippets of code
+  Bricoleur is a tool for writing documents that include snippets of code
   in such a way that the code can be build and examined independently
   of the source document.
 license: BSD-3-Clause
@@ -15,12 +15,12 @@ build-type: Simple
 
 
 library
-  exposed-modules: Collage
-                 , Collage.Config
-                 , Collage.Opts
-                 , Collage.Commands.Test
-                 , Collage.Commands.Splice
-                 , Collage.Utils
+  exposed-modules: Bricoleur
+                 , Bricoleur.Config
+                 , Bricoleur.Opts
+                 , Bricoleur.Commands.Test
+                 , Bricoleur.Commands.Splice
+                 , Bricoleur.Utils
   build-depends: base >=4.7 && <5
                , adnot
                , bytestring
@@ -37,10 +37,10 @@ library
   ghc-options: -Wall
   default-language: Haskell2010
 
-executable collage
-  hs-source-dirs: collage
+executable bricoleur
+  hs-source-dirs: bricoleur
   main-is: Main.hs
   default-language: Haskell2010
   ghc-options: -Wall
   build-depends: base >=4.7 && <5
-               , collage
+               , bricoleur

+ 6 - 0
bricoleur/Main.hs

@@ -0,0 +1,6 @@
+module Main where
+
+import qualified Bricoleur
+
+main :: IO ()
+main = Bricoleur.getOpts >>= Bricoleur.main

+ 0 - 6
collage/Main.hs

@@ -1,6 +0,0 @@
-module Main where
-
-import qualified Collage
-
-main :: IO ()
-main = Collage.getOpts >>= Collage.main

+ 5 - 5
src/Collage.hs

@@ -1,17 +1,17 @@
 {-# LANGUAGE OverloadedStrings #-}
 
-module Collage
+module Bricoleur
 ( main
 , Opt.getOpts
 ) where
 
 import qualified System.Exit as Sys
 
-import qualified Collage.Config as Conf
-import qualified Collage.Opts as Opt
+import qualified Bricoleur.Config as Conf
+import qualified Bricoleur.Opts as Opt
 
-import qualified Collage.Commands.Splice as Cmd
-import qualified Collage.Commands.Test as Cmd
+import qualified Bricoleur.Commands.Splice as Cmd
+import qualified Bricoleur.Commands.Test as Cmd
 
 -- | Run the main @collage@ function with the provided options.
 main :: Opt.Options -> IO ()

+ 4 - 4
src/Collage/Commands/Splice.hs

@@ -1,6 +1,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 
-module Collage.Commands.Splice(runSplice) where
+module Bricoleur.Commands.Splice(runSplice) where
 
 import           Control.Monad (foldM)
 import qualified Data.Map as M
@@ -10,9 +10,9 @@ import qualified Data.Text.Lazy.IO as TL
 import           System.FilePath ((</>))
 import qualified System.FilePath as Sys
 
-import Collage.Config
-import Collage.Opts
-import Collage.Utils
+import Bricoleur.Config
+import Bricoleur.Opts
+import Bricoleur.Utils
 
 findFragmentIdentifiers :: TL.Text -> [T.Text]
 findFragmentIdentifiers t

+ 4 - 4
src/Collage/Commands/Test.hs

@@ -1,15 +1,15 @@
 {-# LANGUAGE OverloadedStrings #-}
 
-module Collage.Commands.Test (runTest) where
+module Bricoleur.Commands.Test (runTest) where
 
 import           Control.Monad (forM_)
 import           System.FilePath ((</>))
 import qualified System.FilePath as Sys
 import qualified System.Process as Sys
 
-import Collage.Opts
-import Collage.Config
-import Collage.Utils
+import Bricoleur.Opts
+import Bricoleur.Config
+import Bricoleur.Utils
 
 runTest :: Config -> Options -> IO ()
 runTest conf opts = do

+ 1 - 1
src/Collage/Config.hs

@@ -1,6 +1,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 
-module Collage.Config
+module Bricoleur.Config
 ( Config(..)
 , Source(..)
 , Expose(..)

+ 1 - 1
src/Collage/Opts.hs

@@ -1,4 +1,4 @@
-module Collage.Opts
+module Bricoleur.Opts
 ( Command(..)
 , Options(..)
 , getOpts

+ 1 - 1
src/Collage/Utils.hs

@@ -1,6 +1,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 
-module Collage.Utils
+module Bricoleur.Utils
 ( cOutput
 , cDebug
 , cWarn