shelly 1.6.3.4 → 1.6.4

raw patch · 3 files changed

+34/−11 lines, 3 filesPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

API changes (from Hackage documentation)

Files

• shelly.cabal +20/−1
• src/Shelly.hs +10/−9
• test/src/RunSpec.hs +4/−1

@@ -1,6 +1,6 @@ Name:       shelly -Version:     1.6.3.4+Version:     1.6.4 Synopsis:    shell-like (systems) programming in Haskell  Description: Shelly provides convenient systems programming in Haskell,@@ -88,6 +88,25 @@   type: exitcode-stdio-1.0   hs-source-dirs: src test/src   main-is: TestMain.hs+  other-modules:+    CopySpec+    EnvSpec+    FailureSpec+    FindSpec+    Help+    LiftedSpec+    MoveSpec+    ReadFileSpec+    RmSpec+    RunSpec+    Shelly+    Shelly.Base+    Shelly.Find+    Shelly.Lifted+    TestInit+    WhichSpec+    WriteSpec+   ghc-options: -O2 -Wall -fwarn-tabs -funbox-strict-fields -threaded                -fno-warn-unused-do-bind -fno-warn-type-defaults 

@@ -30,7 +30,8 @@          , log_stdout_with, log_stderr_with           -- * Running external commands.-         , run, run_, bash, bash_, runFoldLines, cmd, FoldCallback+         , run, run_, runFoldLines, cmd, FoldCallback+         , bash, bash_, bashPipeFail          , (-|-), lastStderr, setStdin, lastExitCode          , command, command_, command1, command1_          , sshPairs, sshPairs_@@ -1067,8 +1068,7 @@ run :: FilePath -> [Text] -> Sh Text run fp args = return . lineSeqToText =<< runFoldLines mempty (|>) fp args --- | Like `run`, but it invokes the user-requested program with _bash_,--- setting _pipefail_ appropriately.+-- | Like `run`, but it invokes the user-requested program with _bash_. bash :: FilePath -> [Text] -> Sh Text bash fp args = escaping False $ run "bash" $ bashArgs fp args @@ -1076,14 +1076,15 @@ bash_ fp args = escaping False $ run_ "bash" $ bashArgs fp args  bashArgs :: FilePath -> [Text] -> [Text]-bashArgs fp args =-  -- trapping PIPE is needed to avoid random failures from setting pipefail-  ---  -- https://github.com/yesodweb/Shelly.hs/issues/106-  -- http://stackoverflow.com/questions/22464786/ignoring-bash-pipefail-for-error-code-141-  ["-c", "'set -o pipefail; trap '' PIPE; " <> sanitise (toTextIgnore fp : args) <> "'"]+bashArgs fp args = ["-c", "'" <> sanitise (toTextIgnore fp : args) <> "'"]   where     sanitise = T.replace "'" "\'" . T.intercalate " "++-- | Use this with `bash` to set _pipefail_+--+-- > bashPipeFail $ bash "echo foo | echo"+bashPipeFail :: (FilePath -> [Text] -> Sh a) -> FilePath -> [Text] -> Sh a+bashPipeFail runner fp args = runner "set -o pipefail;" (toTextIgnore fp : args)  -- | bind some arguments to run for re-use. Example: --

@@ -40,11 +40,14 @@                     $ bash "cat" [ "test/data/nonascii.txt" ]       res @?= "Selbstverst\228ndlich \252berraschend\n" +    {- This throws spurious errors on some systems     it "can detect failing commands in pipes" $ do       eCode <- shelly $ escaping False $ errExit False $ do-        bash_ "echo" [ "'foo'", "|", "ls", "\"eoueouoe\"", "2>/dev/null", "|", "echo", "'bar'" ]+        bashPipeFail+          bash_ "echo" ["'foo'", "|", "ls", "\"eoueouoe\"", "2>/dev/null", "|", "echo", "'bar'" ]         lastExitCode       eCode `shouldSatisfy` (/= 0)+      -}      it "preserve pipe behaviour" $ do       (eCode, res) <- shelly $ escaping False $ errExit False $ do