[#452] Use colourista-0.1.0.0 (#461)

* [#452] Use colourista-0.1.0.0 Resolves #452 * Fix CI
kowainik · May 21, 2020 · 73da3ae · 73da3ae
1 parent 122464b
commit 73da3ae
Show file tree

Hide file tree

Showing 13 changed files with 38 additions and 67 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,9 @@ The changelog is available [on GitHub][2].
   Bump up `tomland` version to `1.3.0.0`.
 * [#455](https://github.com/kowainik/summoner/issues/455):
   Allow `validation-selective` version `0.1.0.0`.
+* [#452](https://github.com/kowainik/summoner/issues/452):
+  Bump up `colourista` version to `0.1.0.0`. Remove the
+  `Summoner.Ansi` module.
 
 ## 2.0.0.0 – Mar 28, 2019
 

diff --git a/stack.yaml b/stack.yaml
@@ -5,6 +5,7 @@ packages:
   - summoner-tui/
 
 extra-deps:
+  - colourista-0.1.0.0
   - generic-data-0.8.0.0
   - hspec-hedgehog-0.0.1.1
   - tomland-1.3.0.0

diff --git a/summoner-cli/src/Summoner.hs b/summoner-cli/src/Summoner.hs
@@ -10,7 +10,6 @@ module Summoner
        ( module Summoner
        ) where
 
-import Summoner.Ansi as Summoner
 import Summoner.CLI as Summoner
 import Summoner.Config as Summoner
 import Summoner.CustomPrelude as Summoner

diff --git a/summoner-cli/src/Summoner/Ansi.hs b/summoner-cli/src/Summoner/Ansi.hs
diff --git a/summoner-cli/src/Summoner/CLI.hs b/summoner-cli/src/Summoner/CLI.hs
@@ -30,7 +30,8 @@ module Summoner.CLI
        , getCustomLicenseText
        ) where
 
-import Colourista (blue, bold, formatWith)
+import Colourista (blue, bold, errorMessage, formatWith, infoMessage, successMessage,
+                   warningMessage)
 import Data.Version (Version, showVersion)
 import Development.GitRev (gitCommitDate, gitHash)
 import NeatInterpolation (text)
@@ -45,7 +46,6 @@ import System.Directory (doesFileExist)
 import System.Info (os)
 import Validation (Validation (..))
 
-import Summoner.Ansi (errorMessage, infoMessage, successMessage, warningMessage)
 import Summoner.Config (Config, ConfigP (..), PartialConfig, defaultConfig, finalise,
                         guessConfigFromGit, loadFileConfig)
 import Summoner.CustomPrelude (CustomPrelude (..))

diff --git a/summoner-cli/src/Summoner/CustomPrelude.hs b/summoner-cli/src/Summoner/CustomPrelude.hs
@@ -11,7 +11,7 @@ module Summoner.CustomPrelude
        , customPreludeT
        ) where
 
-import Toml (Key, TomlCodec, (.=))
+import Toml (TomlCodec, (.=))
 
 import Summoner.Text (moduleNameValid, packageNameValid)
 

diff --git a/summoner-cli/src/Summoner/License.hs b/summoner-cli/src/Summoner/License.hs
@@ -19,12 +19,11 @@ module Summoner.License
        , showLicenseWithDesc
        ) where
 
+import Colourista (errorMessage)
 import Data.Aeson (FromJSON (..), decodeStrict, withObject, (.:))
 import Relude.Extra.Enum (inverseMap)
 import Shellmet (($|))
 
-import Summoner.Ansi (errorMessage)
-
 import qualified Data.Text as T
 import qualified Text.Show as TS
 

diff --git a/summoner-cli/src/Summoner/Project.hs b/summoner-cli/src/Summoner/Project.hs
@@ -17,13 +17,13 @@ module Summoner.Project
        , initializeProject
        ) where
 
-import Colourista (bold, formattedMessage, green)
+import Colourista (bold, errorMessage, formattedMessage, green, infoMessage, skipMessage,
+                   successMessage, warningMessage)
 import NeatInterpolation (text)
 import Relude.Extra.Enum (universe)
 import Shellmet (($?))
 import System.Directory (findExecutable, setCurrentDirectory)
 
-import Summoner.Ansi (errorMessage, infoMessage, skipMessage, successMessage, warningMessage)
 import Summoner.Config (Config, ConfigP (..))
 import Summoner.CustomPrelude (CustomPrelude (..))
 import Summoner.Decision (Decision (..), decisionToBool, decisionsToBools, promptDecisionToBool)
@@ -277,7 +277,7 @@ createProjectDirectory :: Settings -> IO ()
 createProjectDirectory settings@Settings{..} = do
     let tree = createProjectTemplate settings
     traverseTree tree
-    successMessage "\nThe project with the following structure has been created:"
+    successMessage "The project with the following structure has been created:"
     putTextLn $ showBoldTree tree
     setCurrentDirectory (toString settingsRepo)
 

diff --git a/summoner-cli/src/Summoner/Question.hs b/summoner-cli/src/Summoner/Question.hs
@@ -36,11 +36,12 @@ module Summoner.Question
        , falseMessage
        ) where
 
-import Colourista (bold, cyan, formatWith, formattedMessage, green, italic)
+import Colourista (blue, bold, cyan, errorMessage, formatWith, formattedMessage, green, italic,
+                   warningMessage)
 import System.Directory (doesPathExist, getCurrentDirectory)
 import System.FilePath ((</>))
+import System.IO (hFlush)
 
-import Summoner.Ansi (boldDefault, errorMessage, prompt, putStrFlush, warningMessage)
 import Summoner.Text (headToUpper, intercalateMap)
 
 import qualified Data.Text as T
@@ -274,3 +275,23 @@ doesExistProjectName :: Text -> IO Bool
 doesExistProjectName projectName = do
     curPath <- getCurrentDirectory
     doesPathExist $ curPath </> toString projectName
+
+----------------------------------------------------------------------------
+-- Internal implementation details
+----------------------------------------------------------------------------
+
+-- | Explicit flush ensures prompt messages are in the correct order on all systems.
+putStrFlush :: Text -> IO ()
+putStrFlush msg = do
+    putText msg
+    hFlush stdout
+
+{- | Read 'Text' from standard input after arrow prompt.
+-}
+prompt :: IO Text
+prompt = do
+    putStrFlush $ formatWith [blue] "  ->   "
+    T.strip <$> getLine
+
+boldDefault :: Text -> Text
+boldDefault message = formatWith [bold] $ " [" <> message <> "]"
diff --git a/summoner-cli/src/Summoner/Source.hs b/summoner-cli/src/Summoner/Source.hs
@@ -13,11 +13,11 @@ module Summoner.Source
        , fetchSource
        ) where
 
+import Colourista (errorMessage, infoMessage)
 import Control.Exception (catch)
 import System.Process (readProcess)
 import Toml (TomlBiMapError (..), TomlCodec)
 
-import Summoner.Ansi (errorMessage, infoMessage)
 import Summoner.Mode (ConnectMode (..), isOffline)
 import Summoner.Tree (TreeFs, pathToTree)
 

diff --git a/summoner-cli/summoner.cabal b/summoner-cli/summoner.cabal
@@ -112,7 +112,6 @@ library
   import:              common-options
   hs-source-dirs:      src
   exposed-modules:     Summoner
-                         Summoner.Ansi
                          Summoner.CLI
                          Summoner.Config
                          Summoner.CustomPrelude
@@ -141,7 +140,7 @@ library
 
   build-depends:       aeson >= 1.2.4.0 && < 1.5
                      , bytestring ^>= 0.10.8.2
-                     , colourista ^>= 0.0
+                     , colourista ^>= 0.1
                      , containers ^>= 0.6
                      , directory ^>= 1.3.0.2
                      , filepath ^>= 1.4.1.2

diff --git a/summoner-tui/src/Summoner/Tui.hs b/summoner-tui/src/Summoner/Tui.hs
@@ -27,11 +27,11 @@ import Brick.Widgets.Core (emptyWidget, fill, hLimit, hLimitPercent, padTopBotto
                            vLimit, viewport)
 import Brick.Widgets.Edit (editAttr, editFocusedAttr)
 import Brick.Widgets.List (listSelectedAttr, listSelectedFocusedAttr)
+import Colourista (errorMessage, infoMessage)
 import Lens.Micro ((.~), (^.))
 import Relude.Extra.Enum (universe)
 import System.Directory (doesDirectoryExist, doesFileExist, getCurrentDirectory, listDirectory)
 
-import Summoner.Ansi (errorMessage, infoMessage)
 import Summoner.CLI (Command (..), NewOpts (..), ShowOpts (..), getCustomLicenseText,
                      getFinalConfig, runConfig, runScript, summon)
 import Summoner.Config (ConfigP (cFiles))

diff --git a/summoner-tui/summoner-tui.cabal b/summoner-tui/summoner-tui.cabal
@@ -77,6 +77,7 @@ library
   other-modules:       Paths_summoner_tui
 
   build-depends:       brick >= 0.47 && < 0.53
+                     , colourista ^>= 0.1
                      , directory ^>= 1.3.0.2
                      , filepath ^>= 1.4.1.2
                      , microlens ^>= 0.4