summaryrefslogtreecommitdiff
path: root/src/Propellor/Message.hs
diff options
context:
space:
mode:
authorJoey Hess2014-05-31 18:52:42 -0400
committerJoey Hess2014-05-31 18:52:42 -0400
commit4c96b0681c554965bc2aff15a04eb7a48268b3f6 (patch)
treea5cfccb8f871ac8e542378c33996f37f4bdcf8c8 /src/Propellor/Message.hs
parent84eb0500850138ad0145e453e2ce4204f2fc7afd (diff)
propellor spin
Diffstat (limited to 'src/Propellor/Message.hs')
-rw-r--r--src/Propellor/Message.hs19
1 files changed, 17 insertions, 2 deletions
diff --git a/src/Propellor/Message.hs b/src/Propellor/Message.hs
index 780471c3..afbed1ca 100644
--- a/src/Propellor/Message.hs
+++ b/src/Propellor/Message.hs
@@ -12,7 +12,15 @@ import Propellor.Types
-- | Shows a message while performing an action, with a colored status
-- display.
actionMessage :: (MonadIO m, ActionResult r) => Desc -> m r -> m r
-actionMessage desc a = do
+actionMessage = actionMessage' Nothing
+
+-- | Shows a message while performing an action on a specified host,
+-- with a colored status display.
+actionMessageOn :: (MonadIO m, ActionResult r) => HostName -> Desc -> m r -> m r
+actionMessageOn = actionMessage' . Just
+
+actionMessage' :: (MonadIO m, ActionResult r) => Maybe HostName -> Desc -> m r -> m r
+actionMessage' mhn desc a = do
liftIO $ do
setTitle $ "propellor: " ++ desc
hFlush stdout
@@ -21,12 +29,19 @@ actionMessage desc a = do
liftIO $ do
setTitle "propellor: running"
- let (msg, intensity, color) = getActionResult r
+ showhn mhn
putStr $ desc ++ " ... "
+ let (msg, intensity, color) = getActionResult r
colorLine intensity color msg
hFlush stdout
return r
+ where
+ showhn Nothing = return ()
+ showhn (Just hn) = do
+ setSGR [SetColor Foreground Dull Cyan]
+ putStr (hn ++ " ")
+ setSGR []
warningMessage :: MonadIO m => String -> m ()
warningMessage s = liftIO $ colorLine Vivid Magenta $ "** warning: " ++ s