Sandwich new Monad layer GmOutT into transformer stack

This way we can have access to some options pre Cradle setup which
should fix the output interleaving problems I was observing.

test/BrowseSpec.hs

@@ -17,12 +17,12 @@ spec = do
 
     describe "browse -d Data.Either" $ do
         it "contains functions (e.g. `either') including their type signature" $ do
-            syms <- run defaultOptions { detailed = True }
+            syms <- run defaultOptions { optDetailed = True }
                     $ lines <$> browse "Data.Either"
             syms `shouldContain` ["either :: (a -> c) -> (b -> c) -> Either a b -> c"]
 
         it "contains type constructors (e.g. `Left') including their type signature" $ do
-            syms <- run defaultOptions { detailed = True}
+            syms <- run defaultOptions { optDetailed = True}
                     $ lines <$> browse "Data.Either"
             syms `shouldContain` ["Left :: a -> Either a b"]
 

test/CabalHelperSpec.hs

@@ -61,7 +61,7 @@ spec = do
             let tdir = "test/data/stack-project"
             [ghcOpts] <- map gmcGhcOpts . filter ((==ChExeName "new-template-exe") . gmcName) <$> runD' tdir getComponents
             let pkgs = pkgOptions ghcOpts
-            pkgs `shouldBe` ["base", "bytestring"]
+            sort pkgs `shouldBe` ["base", "bytestring"]
 
         it "extracts build dependencies" $ do
             let tdir = "test/data/cabal-project"

test/CradleSpec.hs

@@ -7,6 +7,7 @@ import Language.Haskell.GhcMod.Types
 import System.Directory (canonicalizePath)
 import System.FilePath (pathSeparator)
 import Test.Hspec
+import TestUtils
 import Prelude
 
 import Dir
@@ -36,14 +37,14 @@ spec = do
         it "returns the current directory" $ do
             withDirectory_ "/" $ do
                 curDir <- stripLastDot <$> canonicalizePath "/"
-                res <- clean_ $ findCradle (outputOpts defaultOptions)
+                res <- clean_ $ runGmOutDef findCradle
                 cradleCurrentDir res `shouldBe` curDir
                 cradleRootDir    res `shouldBe` curDir
                 cradleCabalFile  res `shouldBe` Nothing
 
         it "finds a cabal file and a sandbox" $ do
             withDirectory "test/data/cabal-project/subdir1/subdir2" $ \dir -> do
-                res <- relativeCradle dir <$> clean_ (findCradle (outputOpts defaultOptions))
+                res <- relativeCradle dir <$> clean_ (runGmOutDef findCradle)
 
                 cradleCurrentDir res `shouldBe`
                     "test/data/cabal-project/subdir1/subdir2"
@@ -55,7 +56,7 @@ spec = do
 
         it "works even if a sandbox config file is broken" $ do
             withDirectory "test/data/broken-sandbox" $ \dir -> do
-                res <- relativeCradle dir <$> clean_ (findCradle (outputOpts defaultOptions))
+                res <- relativeCradle dir <$> clean_ (runGmOutDef findCradle)
                 cradleCurrentDir res `shouldBe`
                     "test" </> "data" </> "broken-sandbox"
 

test/InfoSpec.hs

@@ -1,7 +1,7 @@
 {-# LANGUAGE CPP #-}
 module InfoSpec where
 
-import Control.Applicative ((<$>))
+import Control.Applicative
 import Data.List (isPrefixOf)
 import Language.Haskell.GhcMod
 #if __GLASGOW_HASKELL__ < 706

test/TestUtils.hs

@@ -5,6 +5,7 @@ module TestUtils (
   , runD'
   , runE
   , runNullLog
+  , runGmOutDef
   , shouldReturnError
   , isPkgDbAt
   , isPkgConfDAt
@@ -19,6 +20,7 @@ import Language.Haskell.GhcMod.Types
 
 import Control.Arrow
 import Control.Category
+import Control.Concurrent
 import Control.Applicative
 import Control.Monad.Error (ErrorT, runErrorT)
 import Control.Monad.Trans.Journal
@@ -46,7 +48,7 @@ withSpecCradle :: IOish m => FilePath -> (Cradle -> m a) -> m a
 withSpecCradle cradledir f =
     gbracket (liftIO $ findSpecCradle cradledir) (liftIO . cleanupCradle) f
 
-withGhcModEnvSpec :: IOish m => FilePath -> Options -> (GhcModEnv -> m a) -> m a
+withGhcModEnvSpec :: (IOish m, GmOut m) => FilePath -> Options -> (GhcModEnv -> m a) -> m a
 withGhcModEnvSpec dir opt f = withSpecCradle dir $ withGhcModEnv' opt f
 
 runGhcModTSpec :: Options -> GhcModT IO a -> IO (Either GhcModError a, GhcModLog)
@@ -56,10 +58,12 @@ runGhcModTSpec opt action = do
 
 runGhcModTSpec' :: IOish m
     => FilePath -> Options -> GhcModT m b -> m (Either GhcModError b, GhcModLog)
-runGhcModTSpec' dir opt action = liftIO (canonicalizePath dir) >>= \dir' ->
+runGhcModTSpec' dir opt action = liftIO (canonicalizePath dir) >>= \dir' -> do
+  gmo <- GhcModOut (optOutput opt) <$> liftIO newChan
+  runGmOutT gmo $
     withGhcModEnvSpec dir' opt $ \env -> do
       first (fst <$>) <$> runGhcModT'' env defaultGhcModState
-        (gmSetLogLevel (logLevel $ outputOpts opt) >> action)
+        (gmSetLogLevel (ooptLogLevel $ optOutput opt) >> action)
 
 -- | Run GhcMod
 run :: Options -> GhcModT IO a -> IO a
@@ -75,7 +79,7 @@ runD' dir =
     extract . runGhcModTSpec' dir (setLogLevel testLogLevel defaultOptions)
 
 setLogLevel :: GmLogLevel -> Options -> Options
-setLogLevel = set (lLogLevel . lOutputOpts)
+setLogLevel = set (lOoptLogLevel . lOptOutput)
 
 runE :: ErrorT e IO a -> IO (Either e a)
 runE = runErrorT
@@ -86,6 +90,10 @@ runNullLog action = do
   liftIO $ print w
   return a
 
+runGmOutDef :: IOish m => GmOutT m a -> m a
+runGmOutDef =
+    runGmOutT (GhcModOut (optOutput defaultOptions) (error "no chan"))
+
 shouldReturnError :: Show a
                   => IO (Either GhcModError a, GhcModLog)
                   -> Expectation