process-conduit 0.5.0.5 → 1.0.0.0

raw patch · 2 files changed

+8/−7 lines, 2 filesdep ~conduitPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: conduit

API changes (from Hackage documentation)

Files

• Data/Conduit/Process.hs +6/−5
• process-conduit.cabal +2/−2

@@ -36,7 +36,7 @@ conduitProcess
   :: MonadResource m
      => CreateProcess
-     -> GConduit S.ByteString m S.ByteString
+     -> Conduit S.ByteString m S.ByteString
 conduitProcess cp = bracketP createp closep $ \(Just cin, Just cout, _, ph) -> do
   end <- repeatLoopT $ do
     -- if process's outputs are available, then yields them.
@@ -80,6 +80,7 @@       hClose cout
       _ <- waitForProcess' ph
       return ()
+    closep _ = error "Data.Conduit.Process.closep: Unhandled case"
 
     hReady' h =
       hReady h `E.catch` \(E.SomeException _) -> return False
@@ -87,13 +88,13 @@       waitForProcess ph `E.catch` \(E.SomeException _) -> return ExitSuccess
 
 -- | Source of process
-sourceProcess :: MonadResource m => CreateProcess -> GSource m S.ByteString
-sourceProcess cp = CL.sourceNull >+> conduitProcess cp
+sourceProcess :: MonadResource m => CreateProcess -> Producer m S.ByteString
+sourceProcess cp = toProducer $ CL.sourceNull $= conduitProcess cp
 
 -- | Conduit of shell command
-conduitCmd :: MonadResource m => String -> GConduit S.ByteString m S.ByteString
+conduitCmd :: MonadResource m => String -> Conduit S.ByteString m S.ByteString
 conduitCmd = conduitProcess . shell
 
 -- | Source of shell command
-sourceCmd :: MonadResource m => String -> GSource m S.ByteString
+sourceCmd :: MonadResource m => String -> Producer m S.ByteString
 sourceCmd = sourceProcess . shell

@@ -1,5 +1,5 @@ name:                process-conduit-version:             0.5.0.5+version:             1.0.0.0 synopsis:            Conduits for processes  description:@@ -33,7 +33,7 @@                      , bytestring       >= 0.9                      , text             >= 0.11                      , process          >= 1.0-                     , conduit          == 0.5.*+                     , conduit          == 1.0.*                      , shakespeare-text >= 1.0    ghc-options:         -Wall