From c246a8ee745723140150c8b8d35b7a7121c90c11 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 31 Mar 2014 18:31:08 -0400 Subject: propellor spin --- Propellor/Engine.hs | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) (limited to 'Propellor/Engine.hs') diff --git a/Propellor/Engine.hs b/Propellor/Engine.hs index a220ec77..e35e4c84 100644 --- a/Propellor/Engine.hs +++ b/Propellor/Engine.hs @@ -1,11 +1,12 @@ module Propellor.Engine where -import System.Console.ANSI import System.Exit import System.IO import Data.Monoid +import System.Console.ANSI import Propellor.Types +import Propellor.Message import Utility.Exception ensureProperty :: Property -> IO Result @@ -25,29 +26,5 @@ ensureProperties' ps = ensure ps NoChange where ensure [] rs = return rs ensure (l:ls) rs = do - setTitle $ propertyDesc l - hFlush stdout - r <- ensureProperty l - clearFromCursorToLineBeginning - setCursorColumn 0 - putStr $ propertyDesc l ++ "... " - case r of - FailedChange -> do - setSGR [SetColor Foreground Vivid Red] - putStrLn "failed" - NoChange -> do - setSGR [SetColor Foreground Dull Green] - putStrLn "unchanged" - MadeChange -> do - setSGR [SetColor Foreground Vivid Green] - putStrLn "done" - setSGR [] - hFlush stdout + r <- actionMessage (propertyDesc l) (ensureProperty l) ensure ls (r <> rs) - -warningMessage :: String -> IO () -warningMessage s = do - setSGR [SetColor Foreground Vivid Red] - putStrLn $ "** warning: " ++ s - setSGR [] - hFlush stdout -- cgit v1.2.3