From 9d348647d9d1b47d0119b3988e0ece9aa383d166 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 31 Mar 2014 01:06:44 -0400
Subject: propellor spin

---
 Propellor/Property.hs | 44 +-------------------------------------------
 1 file changed, 1 insertion(+), 43 deletions(-)

(limited to 'Propellor/Property.hs')

diff --git a/Propellor/Property.hs b/Propellor/Property.hs
index 727fe25e..c2e2cbab 100644
--- a/Propellor/Property.hs
+++ b/Propellor/Property.hs
@@ -2,13 +2,10 @@ module Propellor.Property where
 
 import System.Directory
 import Control.Monad
-import System.Console.ANSI
-import System.Exit
-import System.IO
 
 import Propellor.Types
+import Propellor.Engine
 import Utility.Monad
-import Utility.Exception
 
 makeChange :: IO () -> IO Result
 makeChange a = a >> return MadeChange
@@ -82,42 +79,3 @@ check c property = Property (propertyDesc property) $ ifM c
 	( ensureProperty property
 	, return NoChange
 	)
-
-ensureProperty :: Property -> IO Result
-ensureProperty = catchDefaultIO FailedChange . propertySatisfy
-
-ensureProperties :: [Property] -> IO ()
-ensureProperties ps = do
-	r <- ensureProperties' [propertyList "overall" ps]
-	case r of
-		FailedChange -> exitWith (ExitFailure 1)
-		_ -> exitWith ExitSuccess
-
-ensureProperties' :: [Property] -> IO Result
-ensureProperties' ps = ensure ps NoChange
-  where
-	ensure [] rs = return rs
-	ensure (l:ls) rs = do
-		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 []
-		ensure ls (combineResult r rs)
-
-warningMessage :: String -> IO ()
-warningMessage s = do
-	setSGR [SetColor Foreground Vivid Red]
-	putStrLn $ "** warning: " ++ s
-	setSGR []
-	hFlush stdout
-- 
cgit v1.3-2-g0d8e