remove tshow

bobek.cabal

@@ -51,7 +51,6 @@ library
                    Bobek.OptParse
                    Bobek.Env
                    Bobek.Log
-  other-modules:   Bobek.Util
 
 test-suite test
   main-is:             Test.hs

lib/Bobek/FileEnv.hs

@@ -5,7 +5,6 @@ import Bobek.Env (SourceFunctions (..))
 import Bobek.Message
 import Bobek.ReceiveId
 import Bobek.Source
-import Bobek.Util (tshow)
 import Control.Arrow (left)
 import Control.Exception (IOException, try)
 import qualified Data.ByteString.Char8 as BSC (ByteString, append, cons, hGetLine, hPutStrLn, span)
@@ -39,7 +38,7 @@ createStdinSource = MkSourceFunctions (readFromFile stdin) (const $ return ())
 createFileSource :: FilePath -> IO (Either T.Text SourceFunctions)
 createFileSource filePath = do
   maybeHandle <- catchIO $ openFile filePath ReadMode
-  return $ bimap tshow (\handle -> MkSourceFunctions (readFromFile handle) (const $ return ())) maybeHandle
+  return $ bimap show (\handle -> MkSourceFunctions (readFromFile handle) (const $ return ())) maybeHandle
 
 serializeMessage :: Message -> BSC.ByteString
 serializeMessage (MkMessage _ routingK msg) = encodeUtf8 routingK `BSC.append` BSC.cons routingKeySeparator msg
@@ -59,7 +58,7 @@ writeToFile handle messages = do
 createFileDestination :: FilePath -> IO (Either T.Text ([Message] -> IO PublishResult))
 createFileDestination filePath = do
   maybeHandle <- catchIO $ openFile filePath AppendMode
-  return $ bimap tshow writeToFile maybeHandle
+  return $ bimap show writeToFile maybeHandle
 
 createStdoutDestination :: [Message] -> IO PublishResult
 createStdoutDestination = writeToFile stdout

lib/Bobek/RabbitMqEnv.hs

@@ -5,7 +5,6 @@ import Bobek.Env (SourceFunctions (..))
 import qualified Bobek.Message as M
 import Bobek.ReceiveId
 import Bobek.Source
-import Bobek.Util (tshow)
 import Control.Arrow (left)
 import Control.Exception (try)
 import Control.Monad.Trans.Except (except)
@@ -65,19 +64,19 @@ rabbitAcknowledge channel = traverse_ ackMessage
 createChannel :: AMQP.ConnectionOpts -> IO (Either T.Text AMQP.Channel)
 createChannel connOpts = runExceptT $ do
   maybeConn <- liftIO $ catchAmqp $ AMQP.openConnection'' connOpts
-  conn <- except $ left tshow maybeConn
+  conn <- except $ left show maybeConn
   maybeChan <- liftIO $ catchAmqp $ AMQP.openChannel conn
-  except $ left tshow maybeChan
+  except $ left show maybeChan
 
 createRabbitMqSource :: AMQP.ConnectionOpts -> T.Text -> IO (Either T.Text SourceFunctions)
 createRabbitMqSource connOpts queue = do
   maybeChan <- createChannel connOpts
-  return $ bimap tshow (\chan -> MkSourceFunctions (rabbitReceive chan queue) (rabbitAcknowledge chan)) maybeChan
+  return $ bimap show (\chan -> MkSourceFunctions (rabbitReceive chan queue) (rabbitAcknowledge chan)) maybeChan
 
 createRabbitMqDestination :: AMQP.ConnectionOpts -> T.Text -> Maybe T.Text -> IO (Either T.Text ([M.Message] -> IO PublishResult))
 createRabbitMqDestination connOpts exchange routingKey = runExceptT $ do
   maybeChan <- liftIO $ createChannel connOpts
-  channel <- except $ left tshow maybeChan
+  channel <- except $ left show maybeChan
   mightFail <- liftIO $ catchAmqp $ AMQP.confirmSelect channel False
-  except $ left tshow mightFail
+  except $ left show mightFail
   return $ rabbitPublish channel exchange routingKey

todo

@@ -1,3 +1,4 @@
+TODO unit tests for: Env.hs, FileEnv.hs, OptParse.hs, RabbitMqEnv.hs
 TODO fix script filter protocol (length of message in first line, json?, base64)
 TODO use phantom type parameter to track published state of messages
 TODO extract bulk size to config