shelly 1.6.8.1 → 1.6.8.2

raw patch · 5 files changed

+15/−9 lines, 5 filesdep ~basedep ~directoryPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: base, directory

API changes (from Hackage documentation)

Files

• LICENSE +1/−1
• shelly.cabal +3/−3
• src/Shelly.hs +8/−2
• src/Shelly/Base.hs +3/−1
• src/Shelly/Pipe.hs +0/−2

@@ -1,4 +1,4 @@-Copyright (c) 2010, Petr Rockai <me@mornfall.net>+Copyright (c) 2017, Petr Rockai <me@mornfall.net>  All rights reserved. 

@@ -1,6 +1,6 @@ Name:       shelly -Version:     1.6.8.1+Version:     1.6.8.2 Synopsis:    shell-like (systems) programming in Haskell  Description: Shelly provides convenient systems programming in Haskell,@@ -49,7 +49,7 @@   Build-depends:     containers                >= 0.4.2.0,     time                      >= 1.3 && < 1.7,-    directory                 >= 1.1.0.0 && < 1.3.0.0,+    directory                 >= 1.1.0.0 && < 1.4.0.0,     mtl                       >= 2,     process                   >= 1.0,     unix-compat               < 0.5,@@ -123,7 +123,7 @@     async,     bytestring                >= 0.10,     containers                >= 0.5.0.0,-    directory                 >= 1.1.0.0 && < 1.3.0.0,+    directory                 >= 1.1.0.0 && < 1.4.0.0,     process                   >= 1.1.0,     unix-compat               < 0.5,     system-filepath           >= 0.4.7 && < 0.5,

@@ -828,12 +828,18 @@                                  , sPrintCommands = True                                  }) >> a --- | Create a sub-Sh in which stdout is sent to the user-defined logger+-- | Create a sub-Sh in which stdout is sent to the user-defined+-- logger.  When running with 'silently' the given log will not be+-- called for any output. Likewise the log will also not be called for+-- output from 'run_' and 'bash_' commands. log_stdout_with :: (Text -> IO ()) -> Sh a -> Sh a log_stdout_with logger a = sub $ modify (\s -> s { sPutStdout = logger })                                  >> a --- | Create a sub-Sh in which stderr is sent to the user-defined logger+-- | Create a sub-Sh in which stderr is sent to the user-defined+-- logger.  When running with 'silently' the given log will not be+-- called for any output. However, unlike 'log_stdout_with' the log+-- will be called for output from 'run_' and 'bash_' commands. log_stderr_with :: (Text -> IO ()) -> Sh a -> Sh a log_stderr_with logger a = sub $ modify (\s -> s { sPutStderr = logger })                                  >> a

@@ -39,7 +39,9 @@ import System.Process( ProcessHandle, StdStream(..) ) import System.IO ( Handle, hFlush, stderr, stdout ) -import Control.Monad (when, (>=>), liftM)+import Control.Monad (when, (>=>),+         liftM+       ) import Control.Monad.Base import Control.Monad.Trans.Control import Control.Applicative (Applicative, (<$>))

@@ -119,8 +119,6 @@  import Data.Text as T hiding (concat, all, find, cons) -default (T.Text)-  -- | This type is a simple wrapper for a type @Shelly.Sh@. -- 'Sh' contains a list of results.