Release 0.7.5

.gitignore

@@ -10,5 +10,3 @@ tags
 .stack-work/
 .cabal-sandbox/
 cabal.sandbox.config
-dist-newstyle/
-.ghc.environment.*

.travis.yml

@@ -7,18 +7,12 @@ dist: trusty
 
 matrix:
   include:
-    - env: CABALVER=1.18 GHCVER=7.6.3
-      addons: {apt: {packages: [cabal-install-1.18,ghc-7.6.3], sources: [hvr-ghc]}}
     - env: CABALVER=1.22 GHCVER=7.8.4
       addons: {apt: {packages: [cabal-install-1.22,ghc-7.8.4], sources: [hvr-ghc]}}
     - env: CABALVER=1.24 GHCVER=7.10.2
       addons: {apt: {packages: [cabal-install-1.24,ghc-7.10.2], sources: [hvr-ghc]}}
     - env: CABALVER=1.24 GHCVER=8.0.1
       addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1], sources: [hvr-ghc]}}
-    - env: CABALVER=2.0 GHCVER=8.2.2
-      addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2], sources: [hvr-ghc]}}
-    - env: CABALVER=2.2 GHCVER=8.4.1
-      addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.1], sources: [hvr-ghc]}}
     - env: CABALVER=head GHCVER=head
       addons: {apt: {packages: [cabal-install-head,ghc-head],  sources: [hvr-ghc]}}
 

CHANGELOG

@@ -1,20 +1,3 @@
-0.9.2
-	* fix build with ghc-7.6
-	* raise required bytestring version
-	* Tighten base bound to prevent building before GHC 7.6 (by George Wilson)
-0.9.1
-	* fix build with ghc-7.8 and 7.10
-0.9.0
-	* don't force "Path Abs" anymore in IO module, abstract more over Path types
-	* add 'toAbs'
-0.8.1
-	* add 'readFile', 'readFileEOF', 'writeFile' and 'appendFile'
-0.8.0
-	* 'copyDirRecursiveOverwrite', 'copyFileOverwrite', 'easyCopyOverwrite' and 'moveFileOverwrite' have been removed, instead use the versions without the *Overwrite suffix and pass in 'Strict' (for default behavior) or 'Overwrite' as the CopyMode argument
-	* introduced a new 'RecursiveErrorMode' type to allow controlling recursive behavior of 'copyDirRecursive' (use 'FailEarly' for default behavior)
-	* 'createRegularFile' and 'createDir' now take FileMode as a parameter (also see 'newFilePerms' and 'newDirPerms')
-	* various documentation fixes
-	* improved reliability of tests
 0.7.5:
 	* relicense to BSD3
 0.7.3:

README.md

@@ -1,6 +1,6 @@
 # HPath
 
-[![Gitter chat](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/hasufell/hpath?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Hackage version](https://img.shields.io/hackage/v/hpath.svg?label=Hackage)](https://hackage.haskell.org/package/hpath) [![Build Status](https://api.travis-ci.org/hasufell/hpath.png?branch=master)](http://travis-ci.org/hasufell/hpath) [![Hackage-Deps](https://img.shields.io/hackage-deps/v/hpath.svg)](http://packdeps.haskellers.com/feed?needle=hpath)
+[![Gitter chat](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/hasufell/hpath?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Hackage version](https://img.shields.io/hackage/v/hpath.svg?label=Hackage)](https://hackage.haskell.org/package/hpath) [![Build Status](https://api.travis-ci.org/hasufell/hpath.png?branch=master)](http://travis-ci.org/hasufell/hpath)
 
 Support for well-typed paths in Haskell. Also provides ByteString based filepath
 manipulation.

doctests-hpath.hs

@@ -8,7 +8,6 @@ main =
     doctest
       ["-isrc"
       , "-XOverloadedStrings"
-      , "-XScopedTypeVariables"
       , "src/HPath.hs"
       ]
 

hpath.cabal

@@ -1,5 +1,5 @@
 name:                hpath
-version:             0.9.2
+version:             0.7.5
 synopsis:            Support for well-typed paths
 description:         Support for well-typed paths, utilizing ByteString under the hood.
 license:             BSD3
@@ -9,7 +9,7 @@ maintainer:          Julian Ospald <hasufell@posteo.de>
 copyright:           Julian Ospald 2016
 category:            Filesystem
 build-type:          Simple
-cabal-version:       1.14
+cabal-version:       >=1.14
 extra-source-files:  README.md
                      CHANGELOG
                      cbits/dirutils.h
@@ -17,27 +17,21 @@ extra-source-files:  README.md
                      doctests-posix.hs
 
 library
-  if os(windows)
-    build-depends: unbuildable<0
-    buildable: False
   hs-source-dirs:    src/
   default-language:  Haskell2010
-  if impl(ghc >= 8.0)
-    ghc-options:       -Wall -Wno-redundant-constraints
-  else
-    ghc-options:       -Wall
+  ghc-options:       -Wall
   c-sources:         cbits/dirutils.c
   exposed-modules:   HPath,
                      HPath.IO,
                      HPath.IO.Errors,
+                     HPath.IO.Utils,
                      System.Posix.Directory.Foreign,
                      System.Posix.Directory.Traversals,
                      System.Posix.FD,
                      System.Posix.FilePath
   other-modules:     HPath.Internal
-  build-depends:     base >= 4.6 && <5
-                   , IfElse
-                   , bytestring >= 0.10.0.0
+  build-depends:     base >= 4.2 && <5
+                   , bytestring >= 0.9.2.0
                    , deepseq
                    , exceptions
                    , hspec
@@ -49,9 +43,6 @@ library
 
 
 test-suite doctests-hpath
-  if os(windows)
-    build-depends: unbuildable<0
-    buildable: False
   default-language:  Haskell2010
   type:              exitcode-stdio-1.0
   ghc-options:       -threaded
@@ -63,15 +54,12 @@ test-suite doctests-hpath
                    , hpath
 
 test-suite doctests-posix
-  if os(windows)
-    build-depends: unbuildable<0
-    buildable: False
   default-language:  Haskell2010
   type:              exitcode-stdio-1.0
   ghc-options:       -threaded
   main-is:           doctests-posix.hs
   build-depends:     base,
-                     bytestring >= 0.10.0.0,
+                     bytestring,
                      unix,
                      hpath,
                      doctest >= 0.8,
@@ -79,22 +67,16 @@ test-suite doctests-posix
                      QuickCheck
 
 test-suite spec
-  if os(windows)
-    build-depends: unbuildable<0
-    buildable: False
   Type:                 exitcode-stdio-1.0
   Default-Language:     Haskell2010
   Hs-Source-Dirs:       test
   Main-Is:              Main.hs
   other-modules:
-                        HPath.IO.AppendFileSpec
                         HPath.IO.CanonicalizePathSpec
-                        HPath.IO.CopyDirRecursiveCollectFailuresSpec
                         HPath.IO.CopyDirRecursiveOverwriteSpec
                         HPath.IO.CopyDirRecursiveSpec
                         HPath.IO.CopyFileOverwriteSpec
                         HPath.IO.CopyFileSpec
-                        HPath.IO.CreateDirRecursiveSpec
                         HPath.IO.CreateDirSpec
                         HPath.IO.CreateRegularFileSpec
                         HPath.IO.CreateSymlinkSpec
@@ -105,20 +87,14 @@ test-suite spec
                         HPath.IO.GetFileTypeSpec
                         HPath.IO.MoveFileOverwriteSpec
                         HPath.IO.MoveFileSpec
-                        HPath.IO.ReadFileEOFSpec
-                        HPath.IO.ReadFileSpec
-                        HPath.IO.RecreateSymlinkOverwriteSpec
                         HPath.IO.RecreateSymlinkSpec
                         HPath.IO.RenameFileSpec
-                        HPath.IO.ToAbsSpec
-                        HPath.IO.WriteFileSpec
                         Spec
                         Utils
   GHC-Options:          -Wall
   Build-Depends:        base
                       , HUnit
-                      , IfElse
-                      , bytestring >= 0.10.0.0
+                      , bytestring
                       , hpath
                       , hspec >= 1.3
                       , process

src/HPath.hs

@@ -10,14 +10,10 @@
 -- Support for well-typed paths.
 
 
-{-# LANGUAGE BangPatterns #-}
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE EmptyDataDecls #-}
-#if __GLASGOW_HASKELL__ >= 708
 {-# LANGUAGE PatternSynonyms #-}
-#endif
-{-# LANGUAGE ScopedTypeVariables #-}
 
 module HPath
   (
@@ -29,10 +25,8 @@ module HPath
   ,PathParseException
   ,PathException
   ,RelC
-#if __GLASGOW_HASKELL__ >= 708
   -- * PatternSynonyms/ViewPatterns
   ,pattern Path
-#endif
    -- * Path Parsing
   ,parseAbs
   ,parseFn
@@ -41,8 +35,6 @@ module HPath
   ,fromAbs
   ,fromRel
   ,toFilePath
-  ,unsafeToString
-  ,unsafeToString'
   -- * Path Operations
   ,(</>)
   ,basename
@@ -57,10 +49,8 @@ module HPath
   )
   where
 
-import           Control.Exception (IOException, Exception, catch)
-import           Control.Monad ((<$!>))
+import           Control.Exception (Exception)
 import           Control.Monad.Catch (MonadThrow(..))
-import           Data.ByteString.Unsafe(unsafeUseAsCStringLen)
 #if MIN_VERSION_bytestring(0,10,8)
 import           Data.ByteString(ByteString, stripPrefix)
 #else
@@ -71,17 +61,10 @@ import qualified Data.ByteString as BS
 import           Data.Data
 import           Data.Maybe
 import           Data.Word8
-import           GHC.Foreign(peekCStringLen)
-import           GHC.IO.Encoding(getLocaleEncoding, TextEncoding)
 import           HPath.Internal
-import           System.IO.Unsafe(unsafePerformIO)
 import           System.Posix.FilePath hiding ((</>))
 
 
--- $setup
--- >>> import GHC.IO.Encoding(utf8)
-
-
 --------------------------------------------------------------------------------
 -- Types
 
@@ -118,9 +101,7 @@ instance RelC Fn
 #if __GLASGOW_HASKELL__ >= 710
 pattern Path :: ByteString -> Path a
 #endif
-#if __GLASGOW_HASKELL__ >= 708
 pattern Path x <- (MkPath x)
-#endif
 
 --------------------------------------------------------------------------------
 -- Path Parsers
@@ -245,41 +226,6 @@ fromAbs = toFilePath
 fromRel :: RelC r => Path r -> ByteString
 fromRel = toFilePath
 
--- | This converts the underlying bytestring of the path to an unsafe
--- FilePath by assuming the encoding of the current locale setting. This
--- may be utterly wrong, but isn't particularly worse than what the
--- base library does. Blows up on decoding errors.
---
--- >>> unsafeToString (MkPath "/lal/lad")
--- "/lal/lad"
--- >>> unsafeToString (MkPath "/")
--- "/"
--- >>> unsafeToString (MkPath "lad")
--- "lad"
--- >>> catch (Just <$> unsafeToString (MkPath "<22>")) (\(_ :: IOException) -> pure Nothing)
--- Nothing
-unsafeToString :: Path b -> IO FilePath
-unsafeToString (MkPath p) = do
-  enc <- getLocaleEncoding
-  unsafeUseAsCStringLen p (peekCStringLen enc)
-
--- | Same as @unsafeToString@, except requires the encoding
--- to be passed explicitly. This uses 'unsafePerformIO' and
--- returns 'Nothing' on decoding errors.
---
--- >>> unsafeToString' (MkPath "/lal/lad") utf8
--- Just "/lal/lad"
--- >>> unsafeToString' (MkPath "/") utf8
--- Just "/"
--- >>> unsafeToString' (MkPath "lad") utf8
--- Just "lad"
--- >>> unsafeToString' (MkPath "<22>") utf8
--- Nothing
-unsafeToString' :: Path b -> TextEncoding -> Maybe FilePath
-unsafeToString' (MkPath !p) enc =
-  unsafePerformIO $!
-    catch (Just <$!> unsafeUseAsCStringLen p (peekCStringLen enc))
-          (\(_ :: IOException) -> pure Nothing)
 
 
 --------------------------------------------------------------------------------
@@ -368,6 +314,10 @@ getAllParents (MkPath p)
 
 -- | Extract the directory name of a path.
 --
+-- The following properties hold:
+--
+-- @dirname (p \<\/> a) == dirname p@
+--
 -- >>> dirname (MkPath "/abc/def/dod")
 -- "/abc/def"
 -- >>> dirname (MkPath "/")
@@ -386,8 +336,6 @@ dirname (MkPath fp) = MkPath (takeDirectory $ dropTrailingPathSeparator fp)
 --
 -- >>> basename (MkPath "/abc/def/dod") :: Maybe (Path Fn)
 -- Just "dod"
--- >>> basename (MkPath "/abc/def/dod/") :: Maybe (Path Fn)
--- Just "dod"
 -- >>> basename (MkPath "/")            :: Maybe (Path Fn)
 -- Nothing
 basename :: MonadThrow m => Path b -> m (Path Fn)

src/HPath/IO.hs-boot

@@ -3,6 +3,5 @@ module HPath.IO where
 
 import HPath
 
-canonicalizePath :: Path b -> IO (Path Abs)
+canonicalizePath :: Path Abs -> IO (Path Abs)
 
-toAbs :: Path b -> IO (Path Abs)

src/HPath/IO/Errors.hs

@@ -16,20 +16,23 @@ module HPath.IO.Errors
   (
   -- * Types
     HPathIOException(..)
-  , RecursiveFailureHint(..)
 
   -- * Exception identifiers
+  , isFileDoesNotExist
+  , isDirDoesNotExist
   , isSameFile
   , isDestinationInSource
-  , isRecursiveFailure
-  , isReadContentsFailed
-  , isCreateDirFailed
-  , isCopyFileFailed
-  , isRecreateSymlinkFailed
+  , isFileDoesExist
+  , isDirDoesExist
+  , isInvalidOperation
+  , isCan'tOpenDirectory
+  , isCopyFailed
 
   -- * Path based functions
   , throwFileDoesExist
   , throwDirDoesExist
+  , throwFileDoesNotExist
+  , throwDirDoesNotExist
   , throwSameFile
   , sameFile
   , throwDestinationInSource
@@ -37,6 +40,7 @@ module HPath.IO.Errors
   , doesDirectoryExist
   , isWritable
   , canOpenDirectory
+  , throwCantOpenDirectory
 
   -- * Error handling functions
   , catchErrno
@@ -58,10 +62,6 @@ import Control.Monad
     forM
   , when
   )
-import Control.Monad.IfElse
-  (
-    whenM
-  )
 import Data.ByteString
   (
     ByteString
@@ -70,10 +70,11 @@ import Data.ByteString.UTF8
   (
     toString
   )
-import Data.Typeable
+import Data.Data
   (
-    Typeable
+    Data(..)
   )
+import Data.Typeable
 import Foreign.C.Error
   (
     getErrno
@@ -84,21 +85,15 @@ import GHC.IO.Exception
     IOErrorType
   )
 import HPath
-import HPath.Internal
-  (
-    Path(..)
-  )
 import {-# SOURCE #-} HPath.IO
   (
     canonicalizePath
-  , toAbs
   )
+import HPath.IO.Utils
 import System.IO.Error
   (
-    alreadyExistsErrorType
-  , catchIOError
+    catchIOError
   , ioeGetErrorType
-  , mkIOError
   )
 
 import qualified System.Posix.Directory.ByteString as PFD
@@ -110,36 +105,40 @@ import System.Posix.Files.ByteString
 import qualified System.Posix.Files.ByteString as PF
 
 
--- |Additional generic IO exceptions that the posix functions
--- do not provide.
-data HPathIOException = SameFile ByteString ByteString
+data HPathIOException = FileDoesNotExist ByteString
+                      | DirDoesNotExist ByteString
+                      | SameFile ByteString ByteString
                       | DestinationInSource ByteString ByteString
-                      | RecursiveFailure [(RecursiveFailureHint, IOException)]
-  deriving (Eq, Show, Typeable)
+                      | FileDoesExist ByteString
+                      | DirDoesExist ByteString
+                      | InvalidOperation String
+                      | Can'tOpenDirectory ByteString
+                      | CopyFailed String
+  deriving (Typeable, Eq, Data)
 
 
--- |A type for giving failure hints on recursive failure, which allows
--- to programmatically make choices without examining
--- the weakly typed I/O error attributes (like `ioeGetFileName`).
---
--- The first argument to the data constructor is always the
--- source and the second the destination.
-data RecursiveFailureHint = ReadContentsFailed    ByteString ByteString
-                          | CreateDirFailed       ByteString ByteString
-                          | CopyFileFailed        ByteString ByteString
-                          | RecreateSymlinkFailed ByteString ByteString
-  deriving (Eq, Show)
+instance Show HPathIOException where
+  show (FileDoesNotExist fp) = "File does not exist:" ++ toString fp
+  show (DirDoesNotExist fp) = "Directory does not exist: "
+                              ++ toString fp
+  show (SameFile fp1 fp2) = toString fp1
+                            ++ " and " ++ toString fp2
+                            ++ " are the same file!"
+  show (DestinationInSource fp1 fp2) = toString fp1
+                                       ++ " is contained in "
+                                       ++ toString fp2
+  show (FileDoesExist fp) = "File does exist: " ++ toString fp
+  show (DirDoesExist fp) = "Directory does exist: " ++ toString fp
+  show (InvalidOperation str) = "Invalid operation: " ++ str
+  show (Can'tOpenDirectory fp) = "Can't open directory: "
+                                 ++ toString fp
+  show (CopyFailed str) = "Copying failed: " ++ str
+
 
 
 instance Exception HPathIOException
 
 
-toConstr :: HPathIOException -> String
-toConstr SameFile {}            = "SameFile"
-toConstr DestinationInSource {} = "DestinationInSource"
-toConstr RecursiveFailure {}    = "RecursiveFailure"
-
-
 
 
 
@@ -147,23 +146,16 @@ toConstr RecursiveFailure {}    = "RecursiveFailure"
     --[ Exception identifiers ]--
     -----------------------------
 
-
-isSameFile, isDestinationInSource, isRecursiveFailure :: HPathIOException -> Bool
+isFileDoesNotExist, isDirDoesNotExist, isSameFile, isDestinationInSource, isFileDoesExist, isDirDoesExist, isInvalidOperation, isCan'tOpenDirectory, isCopyFailed :: HPathIOException -> Bool
+isFileDoesNotExist ex = toConstr (ex :: HPathIOException) == toConstr FileDoesNotExist{}
+isDirDoesNotExist ex = toConstr (ex :: HPathIOException) == toConstr DirDoesNotExist{}
 isSameFile ex = toConstr (ex :: HPathIOException) == toConstr SameFile{}
 isDestinationInSource ex = toConstr (ex :: HPathIOException) == toConstr DestinationInSource{}
-isRecursiveFailure ex = toConstr (ex :: HPathIOException) == toConstr RecursiveFailure{}
-
-
-isReadContentsFailed, isCreateDirFailed, isCopyFileFailed, isRecreateSymlinkFailed ::RecursiveFailureHint -> Bool
-isReadContentsFailed ReadContentsFailed{} = True
-isReadContentsFailed _ = False
-isCreateDirFailed CreateDirFailed{} = True
-isCreateDirFailed _ = False
-isCopyFileFailed CopyFileFailed{} = True
-isCopyFileFailed _ = False
-isRecreateSymlinkFailed RecreateSymlinkFailed{} = True
-isRecreateSymlinkFailed _ = False
-
+isFileDoesExist ex = toConstr (ex :: HPathIOException) == toConstr FileDoesExist{}
+isDirDoesExist ex = toConstr (ex :: HPathIOException) == toConstr DirDoesExist{}
+isInvalidOperation ex = toConstr (ex :: HPathIOException) == toConstr InvalidOperation{}
+isCan'tOpenDirectory ex = toConstr (ex :: HPathIOException) == toConstr Can'tOpenDirectory{}
+isCopyFailed ex = toConstr (ex :: HPathIOException) == toConstr CopyFailed{}
 
 
 
@@ -173,51 +165,52 @@ isRecreateSymlinkFailed _ = False
     ----------------------------
 
 
--- |Throws `AlreadyExists` `IOError` if file exists.
-throwFileDoesExist :: Path b -> IO ()
-throwFileDoesExist fp@(MkPath bs) =
-  whenM (doesFileExist fp)
-        (ioError . mkIOError
-                     alreadyExistsErrorType
-                     "File already exists"
-                     Nothing
-                   $ (Just (toString $ bs))
-        )
+throwFileDoesExist :: Path Abs -> IO ()
+throwFileDoesExist fp =
+  whenM (doesFileExist fp) (throwIO . FileDoesExist
+                                    . fromAbs $ fp)
 
 
--- |Throws `AlreadyExists` `IOError` if directory exists.
-throwDirDoesExist :: Path b -> IO ()
-throwDirDoesExist fp@(MkPath bs) =
-  whenM (doesDirectoryExist fp)
-        (ioError . mkIOError
-                     alreadyExistsErrorType
-                     "Directory already exists"
-                     Nothing
-                   $ (Just (toString $ bs))
-        )
+throwDirDoesExist :: Path Abs -> IO ()
+throwDirDoesExist fp =
+  whenM (doesDirectoryExist fp) (throwIO . DirDoesExist
+                                         . fromAbs $ fp)
+
+
+throwFileDoesNotExist :: Path Abs -> IO ()
+throwFileDoesNotExist fp =
+  unlessM (doesFileExist fp) (throwIO . FileDoesNotExist
+                                      . fromAbs $ fp)
+
+
+throwDirDoesNotExist :: Path Abs -> IO ()
+throwDirDoesNotExist fp =
+  unlessM (doesDirectoryExist fp) (throwIO . DirDoesNotExist
+                                           . fromAbs $ fp)
 
 
 -- |Uses `isSameFile` and throws `SameFile` if it returns True.
-throwSameFile :: Path b1
-              -> Path b2
+throwSameFile :: Path Abs
+              -> Path Abs
               -> IO ()
-throwSameFile fp1@(MkPath bs1) fp2@(MkPath bs2) =
+throwSameFile fp1 fp2 =
   whenM (sameFile fp1 fp2)
-        (throwIO $ SameFile bs1 bs2)
+        (throwIO $ SameFile (fromAbs fp1) (fromAbs fp2))
 
 
 -- |Check if the files are the same by examining device and file id.
 -- This follows symbolic links.
-sameFile :: Path b1 -> Path b2 -> IO Bool
-sameFile (MkPath fp1) (MkPath fp2) =
-  handleIOError (\_ -> return False) $ do
-    fs1 <- getFileStatus fp1
-    fs2 <- getFileStatus fp2
+sameFile :: Path Abs -> Path Abs -> IO Bool
+sameFile fp1 fp2 =
+  withAbsPath fp1 $ \fp1' -> withAbsPath fp2 $ \fp2' ->
+    handleIOError (\_ -> return False) $ do
+      fs1 <- getFileStatus fp1'
+      fs2 <- getFileStatus fp2'
 
-    if ((PF.deviceID fs1, PF.fileID fs1) ==
-        (PF.deviceID fs2, PF.fileID fs2))
-      then return True
-      else return False
+      if ((PF.deviceID fs1, PF.fileID fs1) ==
+          (PF.deviceID fs2, PF.fileID fs2))
+        then return True
+        else return False
 
 
 -- TODO: make this more robust when destination does not exist
@@ -225,59 +218,66 @@ sameFile (MkPath fp1) (MkPath fp2) =
 -- within the source directory by comparing the device+file ID of the
 -- source directory with all device+file IDs of the parent directories
 -- of the destination.
-throwDestinationInSource :: Path b1 -- ^ source dir
-                         -> Path b2 -- ^ full destination, @dirname dest@
-                                    --   must exist
+throwDestinationInSource :: Path Abs -- ^ source dir
+                         -> Path Abs -- ^ full destination, @dirname dest@
+                                     --   must exist
                          -> IO ()
-throwDestinationInSource (MkPath sbs) dest@(MkPath dbs) = do
-  destAbs <- toAbs dest
+throwDestinationInSource source dest = do
   dest'   <- (\x -> maybe x (\y -> x </> y) $ basename dest)
-             <$> (canonicalizePath $ dirname destAbs)
+             <$> (canonicalizePath $ dirname dest)
   dids <- forM (getAllParents dest') $ \p -> do
           fs <- PF.getSymbolicLinkStatus (fromAbs p)
           return (PF.deviceID fs, PF.fileID fs)
   sid <- fmap (\x -> (PF.deviceID x, PF.fileID x))
-              $ PF.getFileStatus sbs
+              $ PF.getFileStatus (fromAbs source)
   when (elem sid dids)
-       (throwIO $ DestinationInSource dbs sbs)
+       (throwIO $ DestinationInSource (fromAbs dest)
+                                      (fromAbs source))
 
 
 -- |Checks if the given file exists and is not a directory.
 -- Does not follow symlinks.
-doesFileExist :: Path b -> IO Bool
-doesFileExist (MkPath bs) =
+doesFileExist :: Path Abs -> IO Bool
+doesFileExist fp =
   handleIOError (\_ -> return False) $ do
-    fs  <- PF.getSymbolicLinkStatus bs
+    fs  <- PF.getSymbolicLinkStatus (fromAbs fp)
     return $ not . PF.isDirectory $ fs
 
 
 -- |Checks if the given file exists and is a directory.
 -- Does not follow symlinks.
-doesDirectoryExist :: Path b -> IO Bool
-doesDirectoryExist (MkPath bs) =
+doesDirectoryExist :: Path Abs -> IO Bool
+doesDirectoryExist fp =
   handleIOError (\_ -> return False) $ do
-    fs  <- PF.getSymbolicLinkStatus bs
+    fs  <- PF.getSymbolicLinkStatus (fromAbs fp)
     return $ PF.isDirectory fs
 
 
 -- |Checks whether a file or folder is writable.
-isWritable :: Path b -> IO Bool
-isWritable (MkPath bs) =
+isWritable :: Path Abs -> IO Bool
+isWritable fp =
   handleIOError (\_ -> return False) $
-    fileAccess bs False True False
+    fileAccess (fromAbs fp) False True False
 
 
 -- |Checks whether the directory at the given path exists and can be
 -- opened. This invokes `openDirStream` which follows symlinks.
-canOpenDirectory :: Path b -> IO Bool
-canOpenDirectory (MkPath bs) =
+canOpenDirectory :: Path Abs -> IO Bool
+canOpenDirectory fp =
   handleIOError (\_ -> return False) $ do
-    bracket (PFD.openDirStream bs)
+    bracket (PFD.openDirStream . fromAbs $ fp)
             PFD.closeDirStream
             (\_ -> return ())
     return True
 
 
+-- |Throws a `Can'tOpenDirectory` HPathIOException if the directory at the given
+-- path cannot be opened.
+throwCantOpenDirectory :: Path Abs -> IO ()
+throwCantOpenDirectory fp =
+  unlessM (canOpenDirectory fp)
+          (throwIO . Can'tOpenDirectory . fromAbs $ fp)
+
 
 
     --------------------------------
@@ -357,4 +357,3 @@ reactOnError a ios fmios =
                                 else y)
                (throwIO ex)
                fmios
-

src/HPath/IO/Utils.hs

@@ -0,0 +1,32 @@
+-- |
+-- Module      :  HPath.IO.Utils
+-- Copyright   :  © 2016 Julian Ospald
+-- License     :  BSD3
+--
+-- Maintainer  :  Julian Ospald <hasufell@posteo.de>
+-- Stability   :  experimental
+-- Portability :  portable
+--
+-- Random and general IO/monad utilities.
+
+
+module HPath.IO.Utils where
+
+
+import Control.Monad
+  (
+    when
+  , unless
+  )
+
+
+-- |If the value of the first argument is True, then execute the action
+-- provided in the second argument, otherwise do nothing.
+whenM :: Monad m => m Bool -> m () -> m ()
+whenM mb a = mb >>= (`when` a)
+
+
+-- |If the value of the first argument is False, then execute the action
+-- provided in the second argument, otherwise do nothing.
+unlessM :: Monad m => m Bool -> m () -> m ()
+unlessM mb a = mb >>= (`unless` a)

src/System/Posix/Directory/Traversals.hs

@@ -10,7 +10,6 @@
 -- Traversal and read operations on directories.
 
 
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE ForeignFunctionInterface #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE PackageImports #-}
@@ -38,10 +37,7 @@ module System.Posix.Directory.Traversals (
 , realpath
 ) where
 
-
-#if __GLASGOW_HASKELL__ < 710
-import Control.Applicative ((<$>))
-#endif
+import Control.Applicative
 import Control.Monad
 import System.Posix.FilePath ((</>))
 import System.Posix.Directory.Foreign

stack.yaml

@@ -1,7 +0,0 @@
-resolver: lts-12.1
-
-packages:
-    - '.'
-
-extra-deps:
-    - IfElse-0.85

test/HPath/IO/AppendFileSpec.hs

@@ -1,108 +0,0 @@
-{-# LANGUAGE OverloadedStrings #-}
-
-
-module HPath.IO.AppendFileSpec where
-
-
-import Test.Hspec
-import System.IO.Error
-  (
-    ioeGetErrorType
-  )
-import GHC.IO.Exception
-  (
-    IOErrorType(..)
-  )
-import Utils
-
-
-
-upTmpDir :: IO ()
-upTmpDir = do
-  setTmpDir "AppendFileSpec"
-  createTmpDir
-
-setupFiles :: IO ()
-setupFiles = do
-  createRegularFile' "fileWithContent"
-  createRegularFile' "fileWithoutContent"
-  createSymlink' "inputFileSymL" "fileWithContent"
-  createDir' "alreadyExistsD"
-  createRegularFile' "noPerms"
-  noPerms "noPerms"
-  createDir' "noPermsD"
-  createRegularFile' "noPermsD/inputFile"
-  noPerms "noPermsD"
-  writeFile' "fileWithContent" "BLKASL"
-
-
-cleanupFiles :: IO ()
-cleanupFiles = do
-  deleteFile' "fileWithContent"
-  deleteFile' "fileWithoutContent"
-  deleteFile' "inputFileSymL"
-  deleteDir' "alreadyExistsD"
-  normalFilePerms "noPerms"
-  deleteFile' "noPerms"
-  normalDirPerms "noPermsD"
-  deleteFile' "noPermsD/inputFile"
-  deleteDir' "noPermsD"
-
-
-spec :: Spec
-spec = beforeAll_ (upTmpDir >> setupFiles) $ afterAll_ cleanupFiles $
-  describe "HPath.IO.appendFile" $ do
-
-    -- successes --
-    it "appendFile file with content, everything clear" $ do
-      appendFile' "fileWithContent" "blahfaselllll"
-      out <- readFile' "fileWithContent"
-      out `shouldBe` "BLKASLblahfaselllll"
-
-    it "appendFile file with content, everything clear" $ do
-      appendFile' "fileWithContent" "gagagaga"
-      out <- readFile' "fileWithContent"
-      out `shouldBe` "BLKASLblahfaselllllgagagaga"
-
-    it "appendFile file with content, everything clear" $ do
-      appendFile' "fileWithContent" ""
-      out <- readFile' "fileWithContent"
-      out `shouldBe` "BLKASLblahfaselllllgagagaga"
-
-    it "appendFile file without content, everything clear" $ do
-      appendFile' "fileWithoutContent" "blahfaselllll"
-      out <- readFile' "fileWithoutContent"
-      out `shouldBe` "blahfaselllll"
-
-    it "appendFile, everything clear" $ do
-      appendFile' "fileWithoutContent" "gagagaga"
-      out <- readFile' "fileWithoutContent"
-      out `shouldBe` "blahfaselllllgagagaga"
-
-    it "appendFile symlink, everything clear" $ do
-      appendFile' "inputFileSymL" "blahfaselllll"
-      out <- readFile' "inputFileSymL"
-      out `shouldBe` "BLKASLblahfaselllllgagagagablahfaselllll"
-
-    it "appendFile symlink, everything clear" $ do
-      appendFile' "inputFileSymL" "gagagaga"
-      out <- readFile' "inputFileSymL"
-      out `shouldBe` "BLKASLblahfaselllllgagagagablahfaselllllgagagaga"
-
-
-    -- posix failures --
-    it "appendFile to dir, inappropriate type" $ do
-      appendFile' "alreadyExistsD" ""
-        `shouldThrow` (\e -> ioeGetErrorType e == InappropriateType)
-
-    it "appendFile, no permissions to file" $ do
-      appendFile' "noPerms" ""
-        `shouldThrow` (\e -> ioeGetErrorType e == PermissionDenied)
-
-    it "appendFile, no permissions to file" $ do
-      appendFile' "noPermsD/inputFile" ""
-        `shouldThrow` (\e -> ioeGetErrorType e == PermissionDenied)
-
-    it "appendFile, file does not exist" $ do
-      appendFile' "gaga" ""
-        `shouldThrow` (\e -> ioeGetErrorType e == NoSuchThing)

test/HPath/IO/CanonicalizePathSpec.hs

@@ -13,15 +13,12 @@ import GHC.IO.Exception
     IOErrorType(..)
   )
 import Utils
+import qualified Data.ByteString as BS
+import           Data.ByteString.UTF8 (toString)
 
 
 
 
-upTmpDir :: IO ()
-upTmpDir = do
-  setTmpDir "CanonicalizePathSpec"
-  createTmpDir
-
 setupFiles :: IO ()
 setupFiles = do
   createRegularFile' "file"
@@ -40,7 +37,7 @@ cleanupFiles = do
 
 
 spec :: Spec
-spec = beforeAll_ (upTmpDir >> setupFiles) $ afterAll_ cleanupFiles $
+spec = before_ setupFiles $ after_ cleanupFiles $
   describe "HPath.IO.canonicalizePath" $ do
 
     -- successes --

test/HPath/IO/CopyDirRecursiveCollectFailuresSpec.hs

@@ -1,247 +0,0 @@
-{-# LANGUAGE OverloadedStrings #-}
-
-
-module HPath.IO.CopyDirRecursiveCollectFailuresSpec where
-
-
-import Test.Hspec
-import Data.List (sort)
-import HPath.IO
-import HPath.IO.Errors
-import System.IO.Error
-  (
-    ioeGetErrorType
-  )
-import GHC.IO.Exception
-  (
-    IOErrorType(..)
-  )
-import System.Exit
-import System.Process
-import Utils
-import qualified Data.ByteString as BS
-import Data.ByteString.UTF8 (toString)
-
-
-
-upTmpDir :: IO ()
-upTmpDir = do
-  setTmpDir "CopyDirRecursiveCollectFailuresSpec"
-  createTmpDir
-
-setupFiles :: IO ()
-setupFiles = do
-  createRegularFile' "alreadyExists"
-  createRegularFile' "wrongInput"
-  createSymlink' "wrongInputSymL" "inputDir/"
-  createDir' "alreadyExistsD"
-  createDir' "noPerms"
-  createDir' "noWritePerm"
-
-  createDir' "inputDir"
-  createDir' "inputDir/bar"
-  createDir' "inputDir/foo"
-  createRegularFile' "inputDir/foo/inputFile1"
-  createRegularFile' "inputDir/inputFile2"
-  createRegularFile' "inputDir/bar/inputFile3"
-  writeFile' "inputDir/foo/inputFile1" "SDAADSdsada"
-  writeFile' "inputDir/inputFile2" "Blahfaselgagaga"
-  writeFile' "inputDir/bar/inputFile3"
-    "fdfdssdffsd3223sasdasdasdadasasddasdasdasasd4"
-
-  createDir' "inputDir1"
-  createDir' "inputDir1/foo2"
-  createDir' "inputDir1/foo2/foo3"
-  createDir' "inputDir1/foo2/foo4"
-  createRegularFile' "inputDir1/foo2/inputFile1"
-  createRegularFile' "inputDir1/foo2/inputFile2"
-  createRegularFile' "inputDir1/foo2/inputFile3"
-  createRegularFile' "inputDir1/foo2/foo4/inputFile4"
-  createRegularFile' "inputDir1/foo2/foo4/inputFile6"
-  createRegularFile' "inputDir1/foo2/foo3/inputFile5"
-  noPerms "inputDir1/foo2/foo3"
-
-  createDir' "outputDir1"
-  createDir' "outputDir1/foo2"
-  createDir' "outputDir1/foo2/foo4"
-  createDir' "outputDir1/foo2/foo4/inputFile4"
-  createRegularFile' "outputDir1/foo2/foo4/inputFile6"
-  noPerms "outputDir1/foo2/foo4/inputFile4"
-  noPerms "outputDir1/foo2/foo4"
-
-  noPerms "noPerms"
-  noWritableDirPerms "noWritePerm"
-
-
-cleanupFiles :: IO ()
-cleanupFiles = do
-  normalDirPerms "noPerms"
-  normalDirPerms "noWritePerm"
-
-  normalDirPerms "inputDir1/foo2/foo3"
-  deleteFile' "inputDir1/foo2/foo4/inputFile4"
-  deleteFile' "inputDir1/foo2/foo4/inputFile6"
-  deleteFile' "inputDir1/foo2/inputFile1"
-  deleteFile' "inputDir1/foo2/inputFile2"
-  deleteFile' "inputDir1/foo2/inputFile3"
-  deleteFile' "inputDir1/foo2/foo3/inputFile5"
-  deleteDir' "inputDir1/foo2/foo3"
-  deleteDir' "inputDir1/foo2/foo4"
-  deleteDir' "inputDir1/foo2"
-  deleteDir' "inputDir1"
-
-  normalDirPerms "outputDir1/foo2/foo4"
-  normalDirPerms "outputDir1/foo2/foo4/inputFile4"
-  deleteFile' "outputDir1/foo2/foo4/inputFile6"
-  deleteDir' "outputDir1/foo2/foo4/inputFile4"
-  deleteDir' "outputDir1/foo2/foo4"
-  deleteDir' "outputDir1/foo2"
-  deleteDir' "outputDir1"
-
-  deleteFile' "alreadyExists"
-  deleteFile' "wrongInput"
-  deleteFile' "wrongInputSymL"
-  deleteDir' "alreadyExistsD"
-  deleteDir' "noPerms"
-  deleteDir' "noWritePerm"
-  deleteFile' "inputDir/foo/inputFile1"
-  deleteFile' "inputDir/inputFile2"
-  deleteFile' "inputDir/bar/inputFile3"
-  deleteDir' "inputDir/foo"
-  deleteDir' "inputDir/bar"
-  deleteDir' "inputDir"
-
-
-
-
-spec :: Spec
-spec = beforeAll_ (upTmpDir >> setupFiles) $ afterAll_ cleanupFiles $
-  describe "HPath.IO.copyDirRecursive" $ do
-
-    -- successes --
-    it "copyDirRecursive (Strict, CollectFailures), all fine and compare" $ do
-      tmpDir' <- getRawTmpDir
-      copyDirRecursive' "inputDir"
-                        "outputDir"
-                        Strict
-                        CollectFailures
-      (system $ "diff -r --no-dereference "
-                          ++ toString tmpDir' ++ "inputDir" ++ " "
-                          ++ toString tmpDir' ++ "outputDir")
-        `shouldReturn` ExitSuccess
-      removeDirIfExists "outputDir"
-
-    -- posix failures --
-    it "copyDirRecursive (Strict, CollectFailures), source directory does not exist" $
-      copyDirRecursive' "doesNotExist"
-                        "outputDir"
-                        Strict
-                        CollectFailures
-        `shouldThrow`
-        (\e -> ioeGetErrorType e == NoSuchThing)
-
-    it "copyDirRecursive (Strict, CollectFailures), cannot open source dir" $
-      copyDirRecursive' "noPerms/inputDir"
-                        "foo"
-                        Strict
-                        CollectFailures
-        `shouldThrow`
-        (\e -> ioeGetErrorType e == PermissionDenied)
-
-
-    -- custom failures
-    it "copyDirRecursive (Overwrite, CollectFailures), various failures" $ do
-      copyDirRecursive' "inputDir1/foo2"
-                        "outputDir1/foo2"
-                        Overwrite
-                        CollectFailures
-        `shouldThrow`
-        (\(RecursiveFailure ex@[_, _]) ->
-          any (\(h, e) -> ioeGetErrorType e == InappropriateType
-                          && isCopyFileFailed h) ex &&
-          any (\(h, e) -> ioeGetErrorType e == PermissionDenied
-                          && isReadContentsFailed h) ex)
-      normalDirPerms "outputDir1/foo2/foo4"
-      normalDirPerms "outputDir1/foo2/foo4/inputFile4"
-      c <- allDirectoryContents' "outputDir1"
-      tmpDir' <- getRawTmpDir
-      let shouldC = (fmap (\x -> tmpDir' `BS.append` x)
-                          ["outputDir1"
-                          ,"outputDir1/foo2"
-                          ,"outputDir1/foo2/inputFile1"
-                          ,"outputDir1/foo2/inputFile2"
-                          ,"outputDir1/foo2/inputFile3"
-                          ,"outputDir1/foo2/foo4"
-                          ,"outputDir1/foo2/foo4/inputFile6"
-                          ,"outputDir1/foo2/foo4/inputFile4"])
-      deleteFile' "outputDir1/foo2/inputFile1"
-      deleteFile' "outputDir1/foo2/inputFile2"
-      deleteFile' "outputDir1/foo2/inputFile3"
-      sort c `shouldBe` sort shouldC
-
-
-    it "copyDirRecursive (Strict, CollectFailures), no write permission on output dir" $
-      copyDirRecursive' "inputDir"
-                        "noWritePerm/foo"
-                        Strict
-                        CollectFailures
-        `shouldThrow`
-        (\(RecursiveFailure [(CreateDirFailed{}, e)]) -> ioeGetErrorType e == PermissionDenied)
-
-    it "copyDirRecursive (Strict, CollectFailures), cannot open output dir" $
-      copyDirRecursive' "inputDir"
-                        "noPerms/foo"
-                        Strict
-                        CollectFailures
-        `shouldThrow`
-        isRecursiveFailure
-
-    it "copyDirRecursive (Strict, CollectFailures), destination dir already exists" $
-      copyDirRecursive' "inputDir"
-                        "alreadyExistsD"
-                        Strict
-                        CollectFailures
-        `shouldThrow`
-        (\(RecursiveFailure [(CreateDirFailed{}, e)]) -> ioeGetErrorType e == AlreadyExists)
-
-    it "copyDirRecursive (Strict, CollectFailures), destination already exists and is a file" $
-      copyDirRecursive' "inputDir"
-                        "alreadyExists"
-                        Strict
-                        CollectFailures
-        `shouldThrow`
-        isRecursiveFailure
-
-    it "copyDirRecursive (Strict, CollectFailures), wrong input (regular file)" $
-      copyDirRecursive' "wrongInput"
-                        "outputDir"
-                        Strict
-                        CollectFailures
-        `shouldThrow`
-        (\(RecursiveFailure [(ReadContentsFailed{}, e)]) -> ioeGetErrorType e == InappropriateType)
-
-    it "copyDirRecursive (Strict, CollectFailures), wrong input (symlink to directory)" $
-      copyDirRecursive' "wrongInputSymL"
-                        "outputDir"
-                        Strict
-                        CollectFailures
-        `shouldThrow`
-        (\(RecursiveFailure [(ReadContentsFailed{}, e)]) -> ioeGetErrorType e == InvalidArgument)
-
-    it "copyDirRecursive (Strict, CollectFailures), destination in source" $
-      copyDirRecursive' "inputDir"
-                        "inputDir/foo"
-                        Strict
-                        CollectFailures
-        `shouldThrow`
-        isDestinationInSource
-
-    it "copyDirRecursive (Strict, CollectFailures), destination and source same directory" $
-      copyDirRecursive' "inputDir"
-                        "inputDir"
-                        Strict
-                        CollectFailures
-        `shouldThrow`
-        isSameFile
-
-

test/HPath/IO/CopyDirRecursiveOverwriteSpec.hs

@@ -5,7 +5,6 @@ module HPath.IO.CopyDirRecursiveOverwriteSpec where
 
 
 import Test.Hspec
-import HPath.IO
 import HPath.IO.Errors
 import System.IO.Error
   (
@@ -18,16 +17,11 @@ import GHC.IO.Exception
 import System.Exit
 import System.Process
 import Utils
-import Data.ByteString.UTF8 (toString)
+import qualified Data.ByteString as BS
+import           Data.ByteString.UTF8 (toString)
 
 
 
-upTmpDir :: IO ()
-upTmpDir = do
-  setTmpDir "CopyDirRecursiveOverwriteSpec"
-  createTmpDir
-
-
 setupFiles :: IO ()
 setupFiles = do
   createRegularFile' "alreadyExists"
@@ -87,116 +81,89 @@ cleanupFiles = do
 
 
 spec :: Spec
-spec = beforeAll_ (upTmpDir >> setupFiles) $ afterAll_ cleanupFiles $
-  describe "HPath.IO.copyDirRecursive" $ do
+spec = before_ setupFiles $ after_ cleanupFiles $
+  describe "HPath.IO.copyDirRecursiveOverwrite" $ do
 
     -- successes --
-    it "copyDirRecursive (Overwrite, FailEarly), all fine" $ do
-      copyDirRecursive' "inputDir"
-                        "outputDir"
-                        Overwrite
-                        FailEarly
+    it "copyDirRecursiveOverwrite, all fine" $ do
+      copyDirRecursiveOverwrite' "inputDir"
+                                 "outputDir"
       removeDirIfExists "outputDir"
 
-    it "copyDirRecursive (Overwrite, FailEarly), all fine and compare" $ do
-      tmpDir' <- getRawTmpDir
-      copyDirRecursive' "inputDir"
-                        "outputDir"
-                        Overwrite
-                        FailEarly
+    it "copyDirRecursiveOverwrite, all fine and compare" $ do
+      copyDirRecursiveOverwrite' "inputDir"
+                                 "outputDir"
       (system $ "diff -r --no-dereference "
-                          ++ toString tmpDir' ++ "inputDir" ++ " "
-                          ++ toString tmpDir' ++ "outputDir")
+                          ++ toString tmpDir ++ "inputDir" ++ " "
+                          ++ toString tmpDir ++ "outputDir")
         `shouldReturn` ExitSuccess
       removeDirIfExists "outputDir"
 
-    it "copyDirRecursive (Overwrite, FailEarly), destination dir already exists" $ do
-      tmpDir' <- getRawTmpDir
+    it "copyDirRecursiveOverwrite, destination dir already exists" $ do
       (system $ "diff -r --no-dereference "
-                          ++ toString tmpDir' ++ "inputDir" ++ " "
-                          ++ toString tmpDir' ++ "alreadyExistsD")
+                          ++ toString tmpDir ++ "inputDir" ++ " "
+                          ++ toString tmpDir ++ "alreadyExistsD")
         `shouldReturn` (ExitFailure 1)
-      copyDirRecursive' "inputDir"
-                        "alreadyExistsD"
-                        Overwrite
-                        FailEarly
+      copyDirRecursiveOverwrite' "inputDir"
+                                 "alreadyExistsD"
       (system $ "diff -r --no-dereference "
-                          ++ toString tmpDir' ++ "inputDir" ++ " "
-                          ++ toString tmpDir' ++ "alreadyExistsD")
+                          ++ toString tmpDir ++ "inputDir" ++ " "
+                          ++ toString tmpDir ++ "alreadyExistsD")
         `shouldReturn` ExitSuccess
       removeDirIfExists "outputDir"
 
-
     -- posix failures --
-    it "copyDirRecursive, source directory does not exist" $
-      copyDirRecursive' "doesNotExist"
-                        "outputDir"
-                        Overwrite
-                        FailEarly
+    it "copyDirRecursiveOverwrite, source directory does not exist" $
+      copyDirRecursiveOverwrite' "doesNotExist"
+                                 "outputDir"
         `shouldThrow`
         (\e -> ioeGetErrorType e == NoSuchThing)
 
-    it "copyDirRecursive, no write permission on output dir" $
-      copyDirRecursive' "inputDir"
-                        "noWritePerm/foo"
-                        Overwrite
-                        FailEarly
+    it "copyDirRecursiveOverwrite, no write permission on output dir" $
+      copyDirRecursiveOverwrite' "inputDir"
+                                 "noWritePerm/foo"
         `shouldThrow`
         (\e -> ioeGetErrorType e == PermissionDenied)
 
-    it "copyDirRecursive, cannot open output dir" $
-      copyDirRecursive' "inputDir"
-                        "noPerms/foo"
-                        Overwrite
-                        FailEarly
+    it "copyDirRecursiveOverwrite, cannot open output dir" $
+      copyDirRecursiveOverwrite' "inputDir"
+                                 "noPerms/foo"
         `shouldThrow`
         (\e -> ioeGetErrorType e == PermissionDenied)
 
-    it "copyDirRecursive, cannot open source dir" $
-      copyDirRecursive' "noPerms/inputDir"
-                        "foo"
-                        Overwrite
-                        FailEarly
+    it "copyDirRecursiveOverwrite, cannot open source dir" $
+      copyDirRecursiveOverwrite' "noPerms/inputDir"
+                                 "foo"
         `shouldThrow`
         (\e -> ioeGetErrorType e == PermissionDenied)
 
-    it "copyDirRecursive, destination already exists and is a file" $
-      copyDirRecursive' "inputDir"
-                        "alreadyExists"
-                        Overwrite
-                        FailEarly
+    it "copyDirRecursiveOverwrite, destination already exists and is a file" $
+      copyDirRecursiveOverwrite' "inputDir"
+                                 "alreadyExists"
         `shouldThrow`
         (\e -> ioeGetErrorType e == InappropriateType)
 
-    it "copyDirRecursive, wrong input (regular file)" $
-      copyDirRecursive' "wrongInput"
-                        "outputDir"
-                        Overwrite
-                        FailEarly
+    it "copyDirRecursiveOverwrite, wrong input (regular file)" $
+      copyDirRecursiveOverwrite' "wrongInput"
+                                 "outputDir"
         `shouldThrow`
         (\e -> ioeGetErrorType e == InappropriateType)
 
-    it "copyDirRecursive, wrong input (symlink to directory)" $
-      copyDirRecursive' "wrongInputSymL"
-                        "outputDir"
-                        Overwrite
-                        FailEarly
+    it "copyDirRecursiveOverwrite, wrong input (symlink to directory)" $
+      copyDirRecursiveOverwrite' "wrongInputSymL"
+                                 "outputDir"
         `shouldThrow`
         (\e -> ioeGetErrorType e == InvalidArgument)
 
     -- custom failures
-    it "copyDirRecursive (Overwrite, FailEarly), destination in source" $
-      copyDirRecursive' "inputDir"
-                        "inputDir/foo"
-                        Overwrite
-                        FailEarly
+    it "copyDirRecursiveOverwrite, destination in source" $
+      copyDirRecursiveOverwrite' "inputDir"
+                                 "inputDir/foo"
         `shouldThrow`
         isDestinationInSource
 
-    it "copyDirRecursive (Overwrite, FailEarly), destination and source same directory" $
-      copyDirRecursive' "inputDir"
-                        "inputDir"
-                        Overwrite
-                        FailEarly
+    it "copyDirRecursiveOverwrite, destination and source same directory" $
+      copyDirRecursiveOverwrite' "inputDir"
+                                 "inputDir"
         `shouldThrow`
         isSameFile

test/HPath/IO/CopyDirRecursiveSpec.hs

@@ -5,7 +5,6 @@ module HPath.IO.CopyDirRecursiveSpec where
 
 
 import Test.Hspec
-import HPath.IO
 import HPath.IO.Errors
 import System.IO.Error
   (
@@ -18,14 +17,12 @@ import GHC.IO.Exception
 import System.Exit
 import System.Process
 import Utils
-import Data.ByteString.UTF8 (toString)
+import qualified Data.ByteString as BS
+import           Data.ByteString.UTF8 (toString)
+
 
 
 
-upTmpDir :: IO ()
-upTmpDir = do
-  setTmpDir "CopyDirRecursiveSpec"
-  createTmpDir
 
 setupFiles :: IO ()
 setupFiles = do
@@ -72,109 +69,82 @@ cleanupFiles = do
 
 
 spec :: Spec
-spec = beforeAll_ (upTmpDir >> setupFiles) $ afterAll_ cleanupFiles $
+spec = before_ setupFiles $ after_ cleanupFiles $
   describe "HPath.IO.copyDirRecursive" $ do
 
     -- successes --
-    it "copyDirRecursive (Strict, FailEarly), all fine" $ do
+    it "copyDirRecursive, all fine" $ do
       copyDirRecursive' "inputDir"
                         "outputDir"
-                        Strict
-                        FailEarly
       removeDirIfExists "outputDir"
 
-    it "copyDirRecursive (Strict, FailEarly), all fine and compare" $ do
-      tmpDir' <- getRawTmpDir
+    it "copyDirRecursive, all fine and compare" $ do
       copyDirRecursive' "inputDir"
                         "outputDir"
-                        Strict
-                        FailEarly
       (system $ "diff -r --no-dereference "
-                          ++ toString tmpDir' ++ "inputDir" ++ " "
-                          ++ toString tmpDir' ++ "outputDir")
+                          ++ toString tmpDir ++ "inputDir" ++ " "
+                          ++ toString tmpDir ++ "outputDir")
         `shouldReturn` ExitSuccess
       removeDirIfExists "outputDir"
 
     -- posix failures --
-    it "copyDirRecursive (Strict, FailEarly), source directory does not exist" $
+    it "copyDirRecursive, source directory does not exist" $
       copyDirRecursive' "doesNotExist"
                         "outputDir"
-                        Strict
-                        FailEarly
         `shouldThrow`
         (\e -> ioeGetErrorType e == NoSuchThing)
 
-    it "copyDirRecursive (Strict, FailEarly), no write permission on output dir" $
+    it "copyDirRecursive, no write permission on output dir" $
       copyDirRecursive' "inputDir"
                         "noWritePerm/foo"
-                        Strict
-                        FailEarly
         `shouldThrow`
         (\e -> ioeGetErrorType e == PermissionDenied)
 
-    it "copyDirRecursive (Strict, FailEarly), cannot open output dir" $
+    it "copyDirRecursive, cannot open output dir" $
       copyDirRecursive' "inputDir"
                         "noPerms/foo"
-                        Strict
-                        FailEarly
         `shouldThrow`
         (\e -> ioeGetErrorType e == PermissionDenied)
 
-    it "copyDirRecursive (Strict, FailEarly), cannot open source dir" $
+    it "copyDirRecursive, cannot open source dir" $
       copyDirRecursive' "noPerms/inputDir"
                         "foo"
-                        Strict
-                        FailEarly
         `shouldThrow`
         (\e -> ioeGetErrorType e == PermissionDenied)
 
-    it "copyDirRecursive (Strict, FailEarly), destination dir already exists" $
+    it "copyDirRecursive, destination dir already exists" $
       copyDirRecursive' "inputDir"
                         "alreadyExistsD"
-                        Strict
-                        FailEarly
         `shouldThrow`
         (\e -> ioeGetErrorType e == AlreadyExists)
 
-    it "copyDirRecursive (Strict, FailEarly), destination already exists and is a file" $
+    it "copyDirRecursive, destination already exists and is a file" $
       copyDirRecursive' "inputDir"
                         "alreadyExists"
-                        Strict
-                        FailEarly
         `shouldThrow`
         (\e -> ioeGetErrorType e == AlreadyExists)
 
-    it "copyDirRecursive (Strict, FailEarly), wrong input (regular file)" $
+    it "copyDirRecursive, wrong input (regular file)" $
       copyDirRecursive' "wrongInput"
                         "outputDir"
-                        Strict
-                        FailEarly
         `shouldThrow`
         (\e -> ioeGetErrorType e == InappropriateType)
 
-    it "copyDirRecursive (Strict, FailEarly), wrong input (symlink to directory)" $
+    it "copyDirRecursive, wrong input (symlink to directory)" $
       copyDirRecursive' "wrongInputSymL"
                         "outputDir"
-                        Strict
-                        FailEarly
         `shouldThrow`
         (\e -> ioeGetErrorType e == InvalidArgument)
 
     -- custom failures
-    it "copyDirRecursive (Strict, FailEarly), destination in source" $
+    it "copyDirRecursive, destination in source" $
       copyDirRecursive' "inputDir"
                         "inputDir/foo"
-                        Strict
-                        FailEarly
         `shouldThrow`
         isDestinationInSource
 
-    it "copyDirRecursive (Strict, FailEarly), destination and source same directory" $
+    it "copyDirRecursive, destination and source same directory" $
       copyDirRecursive' "inputDir"
                         "inputDir"
-                        Strict
-                        FailEarly
         `shouldThrow`
         isSameFile
-
-

test/HPath/IO/CopyFileOverwriteSpec.hs

@@ -4,7 +4,6 @@ module HPath.IO.CopyFileOverwriteSpec where
 
 
 import Test.Hspec
-import HPath.IO
 import HPath.IO.Errors
 import System.IO.Error
   (
@@ -17,14 +16,8 @@ import GHC.IO.Exception
 import System.Exit
 import System.Process
 import Utils
-import Data.ByteString.UTF8 (toString)
-
-
-
-upTmpDir :: IO ()
-upTmpDir = do
-  setTmpDir "CopyFileOverwriteSpec"
-  createTmpDir
+import qualified Data.ByteString as BS
+import           Data.ByteString.UTF8 (toString)
 
 
 setupFiles :: IO ()
@@ -58,91 +51,79 @@ cleanupFiles = do
 
 
 spec :: Spec
-spec = beforeAll_ (upTmpDir >> setupFiles) $ afterAll_ cleanupFiles $
-  describe "HPath.IO.copyFile" $ do
+spec = before_ setupFiles $ after_ cleanupFiles $
+  describe "HPath.IO.copyFileOverwrite" $ do
 
     -- successes --
-    it "copyFile (Overwrite), everything clear" $ do
-      copyFile' "inputFile"
+    it "copyFileOverwrite, everything clear" $ do
+      copyFileOverwrite' "inputFile"
                 "outputFile"
-                Overwrite
       removeFileIfExists "outputFile"
 
-    it "copyFile (Overwrite), output file already exists, all clear" $ do
-      tmpDir' <- getRawTmpDir
-      copyFile' "alreadyExists" "alreadyExists.bak" Strict
-      copyFile' "inputFile" "alreadyExists" Overwrite
-      (system $ "cmp -s " ++ toString tmpDir' ++ "inputFile" ++ " "
-                          ++ toString tmpDir' ++ "alreadyExists")
+    it "copyFileOverwrite, output file already exists, all clear" $ do
+      copyFile' "alreadyExists" "alreadyExists.bak"
+      copyFileOverwrite' "inputFile"
+                         "alreadyExists"
+      (system $ "cmp -s " ++ toString tmpDir ++ "inputFile" ++ " "
+                          ++ toString tmpDir ++ "alreadyExists")
         `shouldReturn` ExitSuccess
       removeFileIfExists "alreadyExists"
-      copyFile' "alreadyExists.bak" "alreadyExists" Strict
+      copyFile' "alreadyExists.bak" "alreadyExists"
       removeFileIfExists "alreadyExists.bak"
 
-    it "copyFile (Overwrite), and compare" $ do
-      tmpDir' <- getRawTmpDir
-      copyFile' "inputFile"
+    it "copyFileOverwrite, and compare" $ do
+      copyFileOverwrite' "inputFile"
                 "outputFile"
-                Overwrite
-      (system $ "cmp -s " ++ toString tmpDir' ++ "inputFile" ++ " "
-                          ++ toString tmpDir' ++ "outputFile")
+      (system $ "cmp -s " ++ toString tmpDir ++ "inputFile" ++ " "
+                          ++ toString tmpDir ++ "outputFile")
         `shouldReturn` ExitSuccess
       removeFileIfExists "outputFile"
 
-
     -- posix failures --
-    it "copyFile (Overwrite), input file does not exist" $
-      copyFile' "noSuchFile"
+    it "copyFileOverwrite, input file does not exist" $
+      copyFileOverwrite' "noSuchFile"
                 "outputFile"
-                Overwrite
         `shouldThrow`
         (\e -> ioeGetErrorType e == NoSuchThing)
 
-    it "copyFile (Overwrite), no permission to write to output directory" $
-      copyFile' "inputFile"
+    it "copyFileOverwrite, no permission to write to output directory" $
+      copyFileOverwrite' "inputFile"
                 "outputDirNoWrite/outputFile"
-                Overwrite
         `shouldThrow`
         (\e -> ioeGetErrorType e == PermissionDenied)
 
-    it "copyFile (Overwrite), cannot open output directory" $
-      copyFile' "inputFile"
+    it "copyFileOverwrite, cannot open output directory" $
+      copyFileOverwrite' "inputFile"
                 "noPerms/outputFile"
-                Overwrite
         `shouldThrow`
         (\e -> ioeGetErrorType e == PermissionDenied)
 
-    it "copyFile (Overwrite), cannot open source directory" $
-      copyFile' "noPerms/inputFile"
+    it "copyFileOverwrite, cannot open source directory" $
+      copyFileOverwrite' "noPerms/inputFile"
                 "outputFile"
-                Overwrite
         `shouldThrow`
         (\e -> ioeGetErrorType e == PermissionDenied)
 
-    it "copyFile (Overwrite), wrong input type (symlink)" $
-      copyFile' "inputFileSymL"
+    it "copyFileOverwrite, wrong input type (symlink)" $
+      copyFileOverwrite' "inputFileSymL"
                 "outputFile"
-                Overwrite
         `shouldThrow`
         (\e -> ioeGetErrorType e == InvalidArgument)
 
-    it "copyFile (Overwrite), wrong input type (directory)" $
-      copyFile' "wrongInput"
+    it "copyFileOverwrite, wrong input type (directory)" $
+      copyFileOverwrite' "wrongInput"
                 "outputFile"
-                Overwrite
         `shouldThrow`
         (\e -> ioeGetErrorType e == InappropriateType)
 
-    it "copyFile (Overwrite), output file already exists and is a dir" $
-      copyFile' "inputFile"
+    it "copyFileOverwrite, output file already exists and is a dir" $
+      copyFileOverwrite' "inputFile"
                 "alreadyExistsD"
-                Overwrite
         `shouldThrow`
         (\e -> ioeGetErrorType e == InappropriateType)
 
     -- custom failures --
-    it "copyFile (Overwrite), output and input are same file" $
-      copyFile' "inputFile"
+    it "copyFileOverwrite, output and input are same file" $
+      copyFileOverwrite' "inputFile"
                 "inputFile"
-                Overwrite
         `shouldThrow` isSameFile

test/HPath/IO/CopyFileSpec.hs

@@ -5,7 +5,6 @@ module HPath.IO.CopyFileSpec where
 
 
 import Test.Hspec
-import HPath.IO
 import HPath.IO.Errors
 import System.IO.Error
   (
@@ -18,15 +17,10 @@ import GHC.IO.Exception
 import System.Exit
 import System.Process
 import Utils
-import Data.ByteString.UTF8 (toString)
+import qualified Data.ByteString as BS
+import           Data.ByteString.UTF8 (toString)
 
 
-
-upTmpDir :: IO ()
-upTmpDir = do
-  setTmpDir "CopyFileSpec"
-  createTmpDir
-
 setupFiles :: IO ()
 setupFiles = do
   createRegularFile' "inputFile"
@@ -57,87 +51,75 @@ cleanupFiles = do
 
 
 spec :: Spec
-spec = beforeAll_ (upTmpDir >> setupFiles) $ afterAll_ cleanupFiles $
+spec = before_ setupFiles $ after_ cleanupFiles $
   describe "HPath.IO.copyFile" $ do
 
     -- successes --
-    it "copyFile (Strict), everything clear" $ do
+    it "copyFile, everything clear" $ do
       copyFile' "inputFile"
                 "outputFile"
-                Strict
       removeFileIfExists "outputFile"
 
-    it "copyFile (Strict), and compare" $ do
-      tmpDir' <- getRawTmpDir
+    it "copyFile, and compare" $ do
       copyFile' "inputFile"
                 "outputFile"
-                Strict
-      (system $ "cmp -s " ++ toString tmpDir' ++ "inputFile" ++ " "
-                          ++ toString tmpDir' ++ "outputFile")
+      (system $ "cmp -s " ++ toString tmpDir ++ "inputFile" ++ " "
+                          ++ toString tmpDir ++ "outputFile")
         `shouldReturn` ExitSuccess
       removeFileIfExists "outputFile"
 
     -- posix failures --
-    it "copyFile (Strict), input file does not exist" $
+    it "copyFile, input file does not exist" $
       copyFile' "noSuchFile"
                 "outputFile"
-                Strict
         `shouldThrow`
         (\e -> ioeGetErrorType e == NoSuchThing)
 
-    it "copyFile (Strict), no permission to write to output directory" $
+    it "copyFile, no permission to write to output directory" $
       copyFile' "inputFile"
                 "outputDirNoWrite/outputFile"
-                Strict
         `shouldThrow`
         (\e -> ioeGetErrorType e == PermissionDenied)
 
-    it "copyFile (Strict), cannot open output directory" $
+    it "copyFile, cannot open output directory" $
       copyFile' "inputFile"
                 "noPerms/outputFile"
-                Strict
         `shouldThrow`
         (\e -> ioeGetErrorType e == PermissionDenied)
 
-    it "copyFile (Strict), cannot open source directory" $
+    it "copyFile, cannot open source directory" $
       copyFile' "noPerms/inputFile"
                 "outputFile"
-                Strict
         `shouldThrow`
         (\e -> ioeGetErrorType e == PermissionDenied)
 
-    it "copyFile (Strict), wrong input type (symlink)" $
+    it "copyFile, wrong input type (symlink)" $
       copyFile' "inputFileSymL"
                 "outputFile"
-                Strict
         `shouldThrow`
         (\e -> ioeGetErrorType e == InvalidArgument)
 
-    it "copyFile (Strict), wrong input type (directory)" $
+    it "copyFile, wrong input type (directory)" $
       copyFile' "wrongInput"
                 "outputFile"
-                Strict
         `shouldThrow`
         (\e -> ioeGetErrorType e == InappropriateType)
 
-    it "copyFile (Strict), output file already exists" $
+    it "copyFile, output file already exists" $
       copyFile' "inputFile"
                 "alreadyExists"
-                Strict
         `shouldThrow`
         (\e -> ioeGetErrorType e == AlreadyExists)
 
-    it "copyFile (Strict), output file already exists and is a dir" $
+    it "copyFile, output file already exists and is a dir" $
       copyFile' "inputFile"
                 "alreadyExistsD"
-                Strict
         `shouldThrow`
         (\e -> ioeGetErrorType e == AlreadyExists)
 
     -- custom failures --
-    it "copyFile (Strict), output and input are same file" $
+    it "copyFile, output and input are same file" $
       copyFile' "inputFile"
                 "inputFile"
-                Strict
         `shouldThrow`
         isSameFile

test/HPath/IO/CreateDirRecursiveSpec.hs

@@ -1,78 +0,0 @@
-{-# LANGUAGE OverloadedStrings #-}
-
-module HPath.IO.CreateDirRecursiveSpec where
-
-
-import Test.Hspec
-import System.IO.Error
-  (
-    ioeGetErrorType
-  )
-import GHC.IO.Exception
-  (
-    IOErrorType(..)
-  )
-import Utils
-
-
-
-upTmpDir :: IO ()
-upTmpDir = do
-  setTmpDir "CreateDirRecursiveSpec"
-  createTmpDir
-
-setupFiles :: IO ()
-setupFiles = do
-  createDir' "alreadyExists"
-  createRegularFile' "alreadyExistsF"
-  createDir' "noPerms"
-  createDir' "noWritePerms"
-  noPerms "noPerms"
-  noWritableDirPerms "noWritePerms"
-
-cleanupFiles :: IO ()
-cleanupFiles = do
-  normalDirPerms "noPerms"
-  normalDirPerms "noWritePerms"
-  deleteDir' "alreadyExists"
-  deleteDir' "noPerms"
-  deleteDir' "noWritePerms"
-  deleteFile' "alreadyExistsF"
-
-
-spec :: Spec
-spec = beforeAll_ (upTmpDir >> setupFiles) $ afterAll_ cleanupFiles $
-  describe "HPath.IO.createDirRecursive" $ do
-
-    -- successes --
-    it "createDirRecursive, all fine" $ do
-      createDirRecursive' "newDir"
-      deleteDir' "newDir"
-
-    it "createDirRecursive, parent directories do not exist" $ do
-      createDirRecursive' "some/thing/dada"
-      deleteDir' "some/thing/dada"
-      deleteDir' "some/thing"
-      deleteDir' "some"
-
-    it "createDirRecursive, destination directory already exists" $
-      createDirRecursive' "alreadyExists"
-
-    -- posix failures --
-    it "createDirRecursive, destination already exists and is a file" $
-      createDirRecursive' "alreadyExistsF"
-        `shouldThrow`
-        (\e -> ioeGetErrorType e == AlreadyExists)
-
-    it "createDirRecursive, can't write to output directory" $
-      createDirRecursive' "noWritePerms/newDir"
-        `shouldThrow`
-        (\e -> ioeGetErrorType e == PermissionDenied)
-
-    it "createDirRecursive, can't open output directory" $
-      createDirRecursive' "noPerms/newDir"
-        `shouldThrow`
-        (\e -> ioeGetErrorType e == PermissionDenied)
-
-
-

test/HPath/IO/CreateDirSpec.hs

@@ -13,14 +13,10 @@ import GHC.IO.Exception
     IOErrorType(..)
   )
 import Utils
+import qualified Data.ByteString as BS
+import           Data.ByteString.UTF8 (toString)
 
 
-
-upTmpDir :: IO ()
-upTmpDir = do
-  setTmpDir "CreateDirSpec"
-  createTmpDir
-
 setupFiles :: IO ()
 setupFiles = do
   createDir' "alreadyExists"
@@ -41,7 +37,7 @@ cleanupFiles = do
 
 
 spec :: Spec
-spec = beforeAll_ (upTmpDir >> setupFiles) $ afterAll_ cleanupFiles $
+spec = before_ setupFiles $ after_ cleanupFiles $
   describe "HPath.IO.createDir" $ do
 
     -- successes --
@@ -50,11 +46,6 @@ spec = beforeAll_ (upTmpDir >> setupFiles) $ afterAll_ cleanupFiles $
       removeDirIfExists "newDir"
 
     -- posix failures --
-    it "createDir, parent directories do not exist" $
-      createDir' "some/thing/dada"
-        `shouldThrow`
-        (\e -> ioeGetErrorType e == NoSuchThing)
-
     it "createDir, can't write to output directory" $
       createDir' "noWritePerms/newDir"
         `shouldThrow`

test/HPath/IO/CreateRegularFileSpec.hs

@@ -13,14 +13,10 @@ import GHC.IO.Exception
     IOErrorType(..)
   )
 import Utils
+import qualified Data.ByteString as BS
+import           Data.ByteString.UTF8 (toString)
 
 
-
-upTmpDir :: IO ()
-upTmpDir = do
-  setTmpDir "CreateRegularFileSpec"
-  createTmpDir
-
 setupFiles :: IO ()
 setupFiles = do
   createRegularFile' "alreadyExists"
@@ -29,6 +25,8 @@ setupFiles = do
   noPerms "noPerms"
   noWritableDirPerms "noWritePerms"
 
+
+
 cleanupFiles :: IO ()
 cleanupFiles = do
   normalDirPerms "noPerms"
@@ -39,7 +37,7 @@ cleanupFiles = do
 
 
 spec :: Spec
-spec = beforeAll_ (upTmpDir >> setupFiles) $ afterAll_ cleanupFiles $
+spec = before_ setupFiles $ after_ cleanupFiles $
   describe "HPath.IO.createRegularFile" $ do
 
     -- successes --
@@ -48,11 +46,6 @@ spec = beforeAll_ (upTmpDir >> setupFiles) $ afterAll_ cleanupFiles $
       removeFileIfExists "newDir"
 
     -- posix failures --
-    it "createRegularFile, parent directories do not exist" $
-      createRegularFile' "some/thing/dada"
-        `shouldThrow`
-        (\e -> ioeGetErrorType e == NoSuchThing)
-
     it "createRegularFile, can't write to destination directory" $
       createRegularFile' "noWritePerms/newDir"
         `shouldThrow`

test/HPath/IO/CreateSymlinkSpec.hs

@@ -4,6 +4,7 @@ module HPath.IO.CreateSymlinkSpec where
 
 
 import Test.Hspec
+import HPath.IO.Errors
 import System.IO.Error
   (
     ioeGetErrorType
@@ -13,12 +14,8 @@ import GHC.IO.Exception
     IOErrorType(..)
   )
 import Utils
-
-
-upTmpDir :: IO ()
-upTmpDir = do
-  setTmpDir "CreateSymlinkSpec"
-  createTmpDir
+import qualified Data.ByteString as BS
+import           Data.ByteString.UTF8 (toString)
 
 
 setupFiles :: IO ()
@@ -40,7 +37,7 @@ cleanupFiles = do
 
 
 spec :: Spec
-spec = beforeAll_ (upTmpDir >> setupFiles) $ afterAll_ cleanupFiles $
+spec = before_ setupFiles $ after_ cleanupFiles $
   describe "HPath.IO.createSymlink" $ do
 
     -- successes --
@@ -49,11 +46,6 @@ spec = beforeAll_ (upTmpDir >> setupFiles) $ afterAll_ cleanupFiles $
       removeFileIfExists "newSymL"
 
     -- posix failures --
-    it "createSymlink, parent directories do not exist" $
-      createSymlink' "some/thing/dada" "lala"
-        `shouldThrow`
-        (\e -> ioeGetErrorType e == NoSuchThing)
-
     it "createSymlink, can't write to destination directory" $
       createSymlink' "noWritePerms/newDir" "lala"
         `shouldThrow`

test/HPath/IO/DeleteDirRecursiveSpec.hs

@@ -17,13 +17,8 @@ import GHC.IO.Exception
     IOErrorType(..)
   )
 import Utils
-
-
-
-upTmpDir :: IO ()
-upTmpDir = do
-  setTmpDir "DeleteDirRecursiveSpec"
-  createTmpDir
+import qualified Data.ByteString as BS
+import           Data.ByteString.UTF8 (toString)
 
 
 setupFiles :: IO ()
@@ -51,7 +46,7 @@ cleanupFiles = do
 
 
 spec :: Spec
-spec = beforeAll_ (upTmpDir >> setupFiles) $ afterAll_ cleanupFiles $
+spec = before_ setupFiles $ after_ cleanupFiles $
   describe "HPath.IO.deleteDirRecursive" $ do
 
     -- successes --

test/HPath/IO/DeleteDirSpec.hs

@@ -17,14 +17,8 @@ import GHC.IO.Exception
     IOErrorType(..)
   )
 import Utils
-
-
-
-
-upTmpDir :: IO ()
-upTmpDir = do
-  setTmpDir "DeleteDirSpec"
-  createTmpDir
+import qualified Data.ByteString as BS
+import           Data.ByteString.UTF8 (toString)
 
 
 setupFiles :: IO ()
@@ -52,7 +46,7 @@ cleanupFiles = do
 
 
 spec :: Spec
-spec = beforeAll_ (upTmpDir >> setupFiles) $ afterAll_ cleanupFiles $
+spec = before_ setupFiles $ after_ cleanupFiles $
   describe "HPath.IO.deleteDir" $ do
 
     -- successes --

test/HPath/IO/DeleteFileSpec.hs

@@ -4,7 +4,6 @@ module HPath.IO.DeleteFileSpec where
 
 
 import Test.Hspec
-import HPath.IO
 import System.IO.Error
   (
     ioeGetErrorType
@@ -18,12 +17,8 @@ import GHC.IO.Exception
     IOErrorType(..)
   )
 import Utils
-
-
-upTmpDir :: IO ()
-upTmpDir = do
-  setTmpDir "DeleteFileSpec"
-  createTmpDir
+import qualified Data.ByteString as BS
+import           Data.ByteString.UTF8 (toString)
 
 
 setupFiles :: IO ()
@@ -46,7 +41,7 @@ cleanupFiles = do
 
 
 spec :: Spec
-spec = beforeAll_ (upTmpDir >> setupFiles) $ afterAll_ cleanupFiles $
+spec = before_ setupFiles $ after_ cleanupFiles $
   describe "HPath.IO.deleteFile" $ do
 
     -- successes --
@@ -60,7 +55,6 @@ spec = beforeAll_ (upTmpDir >> setupFiles) $ afterAll_ cleanupFiles $
     it "deleteFile, symlink, all fine" $ do
       recreateSymlink' "syml"
                        "testFile"
-                       Strict
       deleteFile' "testFile"
       getSymbolicLinkStatus "testFile"
         `shouldThrow`

test/HPath/IO/GetDirsFilesSpec.hs

@@ -3,10 +3,18 @@
 module HPath.IO.GetDirsFilesSpec where
 
 
+import Control.Applicative
+  (
+    (<$>)
+  )
 import Data.List
   (
     sort
   )
+import Data.Maybe
+  (
+    fromJust
+  )
 import qualified HPath as P
 import HPath.IO
 import Test.Hspec
@@ -14,17 +22,17 @@ import System.IO.Error
   (
     ioeGetErrorType
   )
+import System.Posix.Env.ByteString
+  (
+    getEnv
+  )
 import GHC.IO.Exception
   (
     IOErrorType(..)
   )
 import Utils
-
-
-upTmpDir :: IO ()
-upTmpDir = do
-  setTmpDir "GetDirsFilesSpec"
-  createTmpDir
+import qualified Data.ByteString as BS
+import           Data.ByteString.UTF8 (toString)
 
 
 setupFiles :: IO ()
@@ -53,7 +61,7 @@ cleanupFiles = do
 
 
 spec :: Spec
-spec = beforeAll_ (upTmpDir >> setupFiles) $ afterAll_ cleanupFiles $
+spec = before_ setupFiles $ after_ cleanupFiles $
   describe "HPath.IO.getDirsFiles" $ do
 
     -- successes --

test/HPath/IO/GetFileTypeSpec.hs

@@ -14,13 +14,8 @@ import GHC.IO.Exception
     IOErrorType(..)
   )
 import Utils
-
-
-
-upTmpDir :: IO ()
-upTmpDir = do
-  setTmpDir "GetFileTypeSpec"
-  createTmpDir
+import qualified Data.ByteString as BS
+import           Data.ByteString.UTF8 (toString)
 
 
 setupFiles :: IO ()
@@ -47,7 +42,7 @@ cleanupFiles = do
 
 
 spec :: Spec
-spec = beforeAll_ (upTmpDir >> setupFiles) $ afterAll_ cleanupFiles $
+spec = before_ setupFiles $ after_ cleanupFiles $
   describe "HPath.IO.getFileType" $ do
 
     -- successes --

test/HPath/IO/MoveFileOverwriteSpec.hs

@@ -4,7 +4,6 @@ module HPath.IO.MoveFileOverwriteSpec where
 
 
 import Test.Hspec
-import HPath.IO
 import HPath.IO.Errors
 import System.IO.Error
   (
@@ -15,13 +14,8 @@ import GHC.IO.Exception
     IOErrorType(..)
   )
 import Utils
-
-
-
-upTmpDir :: IO ()
-upTmpDir = do
-  setTmpDir "MoveFileOverwriteSpec"
-  createTmpDir
+import qualified Data.ByteString as BS
+import           Data.ByteString.UTF8 (toString)
 
 
 setupFiles :: IO ()
@@ -51,76 +45,65 @@ cleanupFiles = do
 
 
 spec :: Spec
-spec = beforeAll_ (upTmpDir >> setupFiles) $ afterAll_ cleanupFiles $
-  describe "HPath.IO.moveFile" $ do
+spec = before_ setupFiles $ after_ cleanupFiles $
+  describe "HPath.IO.moveFileOverwrite" $ do
 
     -- successes --
-    it "moveFile (Overwrite), all fine" $
-      moveFile' "myFile"
-                "movedFile"
-                Overwrite
+    it "moveFileOverwrite, all fine" $
+      moveFileOverwrite' "myFile"
+                         "movedFile"
 
-    it "moveFile (Overwrite), all fine" $
-      moveFile' "myFile"
-                "dir/movedFile"
-                Overwrite
+    it "moveFileOverwrite, all fine" $
+      moveFileOverwrite' "myFile"
+                         "dir/movedFile"
 
-    it "moveFile (Overwrite), all fine on symlink" $
-      moveFile' "myFileL"
-                "movedFile"
-                Overwrite
+    it "moveFileOverwrite, all fine on symlink" $
+      moveFileOverwrite' "myFileL"
+                         "movedFile"
 
-    it "moveFile (Overwrite), all fine on directory" $
-      moveFile' "dir"
-                "movedFile"
-                Overwrite
+    it "moveFileOverwrite, all fine on directory" $
+      moveFileOverwrite' "dir"
+                         "movedFile"
 
-    it "moveFile (Overwrite), destination file already exists" $
-      moveFile' "myFile"
-                "alreadyExists"
-                Overwrite
+    it "moveFileOverwrite, destination file already exists" $
+      moveFileOverwrite' "myFile"
+                         "alreadyExists"
 
     -- posix failures --
-    it "moveFile (Overwrite), source file does not exist" $
-      moveFile' "fileDoesNotExist"
-                "movedFile"
-                Overwrite
+    it "moveFileOverwrite, source file does not exist" $
+      moveFileOverwrite' "fileDoesNotExist"
+                         "movedFile"
         `shouldThrow`
         (\e -> ioeGetErrorType e == NoSuchThing)
 
-    it "moveFile (Overwrite), can't write to destination directory" $
-      moveFile' "myFile"
-                "noWritePerm/movedFile"
-                Overwrite
+    it "moveFileOverwrite, can't write to destination directory" $
+      moveFileOverwrite' "myFile"
+                         "noWritePerm/movedFile"
         `shouldThrow`
         (\e -> ioeGetErrorType e == PermissionDenied)
 
-    it "moveFile (Overwrite), can't open destination directory" $
-      moveFile' "myFile"
-                "noPerms/movedFile"
-                Overwrite
+    it "moveFileOverwrite, can't open destination directory" $
+      moveFileOverwrite' "myFile"
+                         "noPerms/movedFile"
         `shouldThrow`
         (\e -> ioeGetErrorType e == PermissionDenied)
 
-    it "moveFile (Overwrite), can't open source directory" $
-      moveFile' "noPerms/myFile"
-                "movedFile"
-                Overwrite
+    it "moveFileOverwrite, can't open source directory" $
+      moveFileOverwrite' "noPerms/myFile"
+                         "movedFile"
         `shouldThrow`
         (\e -> ioeGetErrorType e == PermissionDenied)
 
     -- custom failures --
-
-    it "moveFile (Overwrite), move from file to dir" $
-      moveFile' "myFile"
-                "alreadyExistsD"
-                Overwrite
+    it "moveFileOverwrite, move from file to dir" $
+      moveFileOverwrite' "myFile"
+                         "alreadyExistsD"
         `shouldThrow`
-        (\e -> ioeGetErrorType e == AlreadyExists)
+        isDirDoesExist
 
-    it "moveFile (Overwrite), source and dest are same file" $
-      moveFile' "myFile"
-                "myFile"
-                Overwrite
+    it "moveFileOverwrite, source and dest are same file" $
+      moveFileOverwrite' "myFile"
+                         "myFile"
         `shouldThrow`
         isSameFile
+

test/HPath/IO/MoveFileSpec.hs

@@ -4,7 +4,6 @@ module HPath.IO.MoveFileSpec where
 
 
 import Test.Hspec
-import HPath.IO
 import HPath.IO.Errors
 import System.IO.Error
   (
@@ -15,13 +14,8 @@ import GHC.IO.Exception
     IOErrorType(..)
   )
 import Utils
-
-
-
-upTmpDir :: IO ()
-upTmpDir = do
-  setTmpDir "MoveFileSpec"
-  createTmpDir
+import qualified Data.ByteString as BS
+import           Data.ByteString.UTF8 (toString)
 
 
 setupFiles :: IO ()
@@ -53,77 +47,67 @@ cleanupFiles = do
 
 
 spec :: Spec
-spec = beforeAll_ (upTmpDir >> setupFiles) $ afterAll_ cleanupFiles $
+spec = before_ setupFiles $ after_ cleanupFiles $
   describe "HPath.IO.moveFile" $ do
 
     -- successes --
-    it "moveFile (Strict), all fine" $
+    it "moveFile, all fine" $
       moveFile' "myFile"
                 "movedFile"
-                Strict
 
-    it "moveFile (Strict), all fine" $
+    it "moveFile, all fine" $
       moveFile' "myFile"
                 "dir/movedFile"
-                Strict
 
-    it "moveFile (Strict), all fine on symlink" $
+    it "moveFile, all fine on symlink" $
       moveFile' "myFileL"
                 "movedFile"
-                Strict
 
-    it "moveFile (Strict), all fine on directory" $
+    it "moveFile, all fine on directory" $
       moveFile' "dir"
                 "movedFile"
-                Strict
 
     -- posix failures --
-    it "moveFile (Strict), source file does not exist" $
+    it "moveFile, source file does not exist" $
       moveFile' "fileDoesNotExist"
                 "movedFile"
-                Strict
         `shouldThrow`
         (\e -> ioeGetErrorType e == NoSuchThing)
 
-    it "moveFile (Strict), can't write to destination directory" $
+    it "moveFile, can't write to destination directory" $
       moveFile' "myFile"
                 "noWritePerm/movedFile"
-                Strict
         `shouldThrow`
         (\e -> ioeGetErrorType e == PermissionDenied)
 
-    it "moveFile (Strict), can't open destination directory" $
+    it "moveFile, can't open destination directory" $
       moveFile' "myFile"
                 "noPerms/movedFile"
-                Strict
         `shouldThrow`
         (\e -> ioeGetErrorType e == PermissionDenied)
 
-    it "moveFile (Strict), can't open source directory" $
+    it "moveFile, can't open source directory" $
       moveFile' "noPerms/myFile"
                 "movedFile"
-                Strict
         `shouldThrow`
         (\e -> ioeGetErrorType e == PermissionDenied)
 
     -- custom failures --
-    it "moveFile (Strict), destination file already exists" $
+    it "moveFile, destination file already exists" $
       moveFile' "myFile"
                 "alreadyExists"
-                Strict
         `shouldThrow`
-        (\e -> ioeGetErrorType e == AlreadyExists)
+        isFileDoesExist
 
-    it "moveFile (Strict), move from file to dir" $
+    it "moveFile, move from file to dir" $
       moveFile' "myFile"
                 "alreadyExistsD"
-                Strict
         `shouldThrow`
-        (\e -> ioeGetErrorType e == AlreadyExists)
+        isDirDoesExist
 
-    it "moveFile (Strict), source and dest are same file" $
+    it "moveFile, source and dest are same file" $
       moveFile' "myFile"
                 "myFile"
-                Strict
         `shouldThrow`
         isSameFile
+

test/HPath/IO/ReadFileEOFSpec.hs

@@ -1,85 +0,0 @@
-{-# LANGUAGE OverloadedStrings #-}
-
-
-module HPath.IO.ReadFileEOFSpec where
-
-
-import Test.Hspec
-import System.IO.Error
-  (
-    ioeGetErrorType
-  )
-import GHC.IO.Exception
-  (
-    IOErrorType(..)
-  )
-import Utils
-
-
-
-upTmpDir :: IO ()
-upTmpDir = do
-  setTmpDir "ReadFileEOFSpec"
-  createTmpDir
-
-setupFiles :: IO ()
-setupFiles = do
-  createRegularFile' "fileWithContent"
-  createRegularFile' "fileWithoutContent"
-  createSymlink' "inputFileSymL" "fileWithContent"
-  createDir' "alreadyExistsD"
-  createRegularFile' "noPerms"
-  noPerms "noPerms"
-  createDir' "noPermsD"
-  createRegularFile' "noPermsD/inputFile"
-  noPerms "noPermsD"
-  writeFile' "fileWithContent" "Blahfaselgagaga"
-
-
-cleanupFiles :: IO ()
-cleanupFiles = do
-  deleteFile' "fileWithContent"
-  deleteFile' "fileWithoutContent"
-  deleteFile' "inputFileSymL"
-  deleteDir' "alreadyExistsD"
-  normalFilePerms "noPerms"
-  deleteFile' "noPerms"
-  normalDirPerms "noPermsD"
-  deleteFile' "noPermsD/inputFile"
-  deleteDir' "noPermsD"
-
-
-spec :: Spec
-spec = beforeAll_ (upTmpDir >> setupFiles) $ afterAll_ cleanupFiles $
-  describe "HPath.IO.readFileEOF" $ do
-
-    -- successes --
-    it "readFileEOF (Strict) file with content, everything clear" $ do
-      out <- readFileEOF' "fileWithContent"
-      out `shouldBe` "Blahfaselgagaga"
-
-    it "readFileEOF (Strict) symlink, everything clear" $ do
-      out <- readFileEOF' "inputFileSymL"
-      out `shouldBe` "Blahfaselgagaga"
-
-    it "readFileEOF (Strict) empty file, everything clear" $ do
-      out <- readFileEOF' "fileWithoutContent"
-      out `shouldBe` ""
-
-
-    -- posix failures --
-    it "readFileEOF (Strict) directory, wrong file type" $ do
-      readFileEOF' "alreadyExistsD"
-        `shouldThrow` (\e -> ioeGetErrorType e == InappropriateType)
-
-    it "readFileEOF (Strict) file, no permissions" $ do
-      readFileEOF' "noPerms"
-        `shouldThrow` (\e -> ioeGetErrorType e == PermissionDenied)
-
-    it "readFileEOF (Strict) file, no permissions on dir" $ do
-      readFileEOF' "noPermsD/inputFile"
-        `shouldThrow` (\e -> ioeGetErrorType e == PermissionDenied)
-
-    it "readFileEOF (Strict) file, no such file" $ do
-      readFileEOF' "lalala"
-        `shouldThrow` (\e -> ioeGetErrorType e == NoSuchThing)

test/HPath/IO/ReadFileSpec.hs

@@ -1,85 +0,0 @@
-{-# LANGUAGE OverloadedStrings #-}
-
-
-module HPath.IO.ReadFileSpec where
-
-
-import Test.Hspec
-import System.IO.Error
-  (
-    ioeGetErrorType
-  )
-import GHC.IO.Exception
-  (
-    IOErrorType(..)
-  )
-import Utils
-
-
-
-upTmpDir :: IO ()
-upTmpDir = do
-  setTmpDir "ReadFileSpec"
-  createTmpDir
-
-setupFiles :: IO ()
-setupFiles = do
-  createRegularFile' "fileWithContent"
-  createRegularFile' "fileWithoutContent"
-  createSymlink' "inputFileSymL" "fileWithContent"
-  createDir' "alreadyExistsD"
-  createRegularFile' "noPerms"
-  noPerms "noPerms"
-  createDir' "noPermsD"
-  createRegularFile' "noPermsD/inputFile"
-  noPerms "noPermsD"
-  writeFile' "fileWithContent" "Blahfaselgagaga"
-
-
-cleanupFiles :: IO ()
-cleanupFiles = do
-  deleteFile' "fileWithContent"
-  deleteFile' "fileWithoutContent"
-  deleteFile' "inputFileSymL"
-  deleteDir' "alreadyExistsD"
-  normalFilePerms "noPerms"
-  deleteFile' "noPerms"
-  normalDirPerms "noPermsD"
-  deleteFile' "noPermsD/inputFile"
-  deleteDir' "noPermsD"
-
-
-spec :: Spec
-spec = beforeAll_ (upTmpDir >> setupFiles) $ afterAll_ cleanupFiles $
-  describe "HPath.IO.readFile" $ do
-
-    -- successes --
-    it "readFile (Strict) file with content, everything clear" $ do
-      out <- readFile' "fileWithContent"
-      out `shouldBe` "Blahfaselgagaga"
-
-    it "readFile (Strict) symlink, everything clear" $ do
-      out <- readFile' "inputFileSymL"
-      out `shouldBe` "Blahfaselgagaga"
-
-    it "readFile (Strict) empty file, everything clear" $ do
-      out <- readFile' "fileWithoutContent"
-      out `shouldBe` ""
-
-
-    -- posix failures --
-    it "readFile (Strict) directory, wrong file type" $ do
-      readFile' "alreadyExistsD"
-        `shouldThrow` (\e -> ioeGetErrorType e == InappropriateType)
-
-    it "readFile (Strict) file, no permissions" $ do
-      readFile' "noPerms"
-        `shouldThrow` (\e -> ioeGetErrorType e == PermissionDenied)
-
-    it "readFile (Strict) file, no permissions on dir" $ do
-      readFile' "noPermsD/inputFile"
-        `shouldThrow` (\e -> ioeGetErrorType e == PermissionDenied)
-
-    it "readFile (Strict) file, no such file" $ do
-      readFile' "lalala"
-        `shouldThrow` (\e -> ioeGetErrorType e == NoSuchThing)

test/HPath/IO/RecreateSymlinkOverwriteSpec.hs

@@ -1,139 +0,0 @@
-{-# LANGUAGE OverloadedStrings #-}
-
-module HPath.IO.RecreateSymlinkOverwriteSpec where
-
-
--- TODO: exception if destination exists but is not a file + `OverWrite` CopyMode
-
-
-import Test.Hspec
-import HPath.IO
-import HPath.IO.Errors
-import System.IO.Error
-  (
-    ioeGetErrorType
-  )
-import GHC.IO.Exception
-  (
-    IOErrorType(..)
-  )
-import Utils
-
-
-upTmpDir :: IO ()
-upTmpDir = do
-  setTmpDir "RecreateSymlinkOverwriteSpec"
-  createTmpDir
-
-
-setupFiles :: IO ()
-setupFiles = do
-  createRegularFile' "myFile"
-  createSymlink' "myFileL" "myFile"
-  createRegularFile' "alreadyExists"
-  createDir' "alreadyExistsD"
-  createDir' "dir"
-  createDir' "noPerms"
-  createDir' "noWritePerm"
-  createDir' "alreadyExistsD2"
-  createRegularFile' "alreadyExistsD2/lala"
-  noPerms "noPerms"
-  noWritableDirPerms "noWritePerm"
-  writeFile' "myFile" "Blahfaselgagaga"
-
-
-cleanupFiles :: IO ()
-cleanupFiles = do
-  normalDirPerms "noPerms"
-  normalDirPerms "noWritePerm"
-  deleteFile' "myFile"
-  deleteFile' "myFileL"
-  deleteFile' "alreadyExists"
-  deleteFile' "alreadyExistsD2/lala"
-  deleteDir' "alreadyExistsD"
-  deleteDir' "alreadyExistsD2"
-  deleteDir' "dir"
-  deleteDir' "noPerms"
-  deleteDir' "noWritePerm"
-
-
-spec :: Spec
-spec = beforeAll_ (upTmpDir >> setupFiles) $ afterAll_ cleanupFiles $
-  describe "HPath.IO.recreateSymlink" $ do
-
-    -- successes --
-    it "recreateSymLink (Overwrite), all fine" $ do
-      recreateSymlink' "myFileL"
-                       "movedFile"
-                       Overwrite
-      removeFileIfExists "movedFile"
-
-    it "recreateSymLink (Overwrite), all fine" $ do
-      recreateSymlink' "myFileL"
-                       "dir/movedFile"
-                       Overwrite
-      removeFileIfExists "dir/movedFile"
-
-    it "recreateSymLink (Overwrite), destination file already exists" $
-      recreateSymlink' "myFileL"
-                       "alreadyExists"
-                       Overwrite
-
-    it "recreateSymLink (Overwrite), destination already exists and is an empty dir" $ do
-      recreateSymlink' "myFileL"
-                       "alreadyExistsD"
-                       Overwrite
-      deleteFile' "alreadyExistsD"
-      createDir' "alreadyExistsD"
-
-    -- posix failures --
-    it "recreateSymLink (Overwrite), destination already exists and is a non-empty dir" $
-      recreateSymlink' "myFileL"
-                       "alreadyExistsD2"
-                       Overwrite
-        `shouldThrow`
-        (\e -> ioeGetErrorType e == UnsatisfiedConstraints)
-
-    it "recreateSymLink (Overwrite), wrong input type (file)" $
-      recreateSymlink' "myFile"
-                       "movedFile"
-                       Overwrite
-        `shouldThrow`
-        (\e -> ioeGetErrorType e == InvalidArgument)
-
-    it "recreateSymLink (Overwrite), wrong input type (directory)" $
-      recreateSymlink' "dir"
-                       "movedFile"
-                       Overwrite
-        `shouldThrow`
-        (\e -> ioeGetErrorType e == InvalidArgument)
-
-    it "recreateSymLink (Overwrite), can't write to destination directory" $
-      recreateSymlink' "myFileL"
-                       "noWritePerm/movedFile"
-                       Overwrite
-        `shouldThrow`
-        (\e -> ioeGetErrorType e == PermissionDenied)
-
-    it "recreateSymLink (Overwrite), can't open destination directory" $
-      recreateSymlink' "myFileL"
-                       "noPerms/movedFile"
-                       Overwrite
-        `shouldThrow`
-        (\e -> ioeGetErrorType e == PermissionDenied)
-
-    it "recreateSymLink (Overwrite), can't open source directory" $
-      recreateSymlink' "noPerms/myFileL"
-                       "movedFile"
-                       Overwrite
-        `shouldThrow`
-        (\e -> ioeGetErrorType e == PermissionDenied)
-
-    -- custom failures --
-    it "recreateSymLink (Overwrite), source and destination are the same file" $
-      recreateSymlink' "myFileL"
-                       "myFileL"
-                       Overwrite
-        `shouldThrow`
-        isSameFile
-

test/HPath/IO/RecreateSymlinkSpec.hs

@@ -3,10 +3,7 @@
 module HPath.IO.RecreateSymlinkSpec where
 
 
-
-
 import Test.Hspec
-import HPath.IO
 import HPath.IO.Errors
 import System.IO.Error
   (
@@ -17,13 +14,8 @@ import GHC.IO.Exception
     IOErrorType(..)
   )
 import Utils
-
-
-
-upTmpDir :: IO ()
-upTmpDir = do
-  setTmpDir "RecreateSymlinkSpec"
-  createTmpDir
+import qualified Data.ByteString as BS
+import           Data.ByteString.UTF8 (toString)
 
 
 setupFiles :: IO ()
@@ -54,77 +46,67 @@ cleanupFiles = do
 
 
 spec :: Spec
-spec = beforeAll_ (upTmpDir >> setupFiles) $ afterAll_ cleanupFiles $
+spec = before_ setupFiles $ after_ cleanupFiles $
   describe "HPath.IO.recreateSymlink" $ do
 
     -- successes --
-    it "recreateSymLink (Strict), all fine" $ do
+    it "recreateSymLink, all fine" $ do
       recreateSymlink' "myFileL"
                        "movedFile"
-                       Strict
       removeFileIfExists "movedFile"
 
-    it "recreateSymLink (Strict), all fine" $ do
+    it "recreateSymLink, all fine" $ do
       recreateSymlink' "myFileL"
                        "dir/movedFile"
-                       Strict
       removeFileIfExists "dir/movedFile"
 
     -- posix failures --
-    it "recreateSymLink (Strict), wrong input type (file)" $
+    it "recreateSymLink, wrong input type (file)" $
       recreateSymlink' "myFile"
                        "movedFile"
-                       Strict
         `shouldThrow`
         (\e -> ioeGetErrorType e == InvalidArgument)
 
-    it "recreateSymLink (Strict), wrong input type (directory)" $
+    it "recreateSymLink, wrong input type (directory)" $
       recreateSymlink' "dir"
                        "movedFile"
-                       Strict
         `shouldThrow`
         (\e -> ioeGetErrorType e == InvalidArgument)
 
-    it "recreateSymLink (Strict), can't write to destination directory" $
+    it "recreateSymLink, can't write to destination directory" $
       recreateSymlink' "myFileL"
                        "noWritePerm/movedFile"
-                       Strict
         `shouldThrow`
         (\e -> ioeGetErrorType e == PermissionDenied)
 
-    it "recreateSymLink (Strict), can't open destination directory" $
+    it "recreateSymLink, can't open destination directory" $
       recreateSymlink' "myFileL"
                        "noPerms/movedFile"
-                       Strict
         `shouldThrow`
         (\e -> ioeGetErrorType e == PermissionDenied)
 
-    it "recreateSymLink (Strict), can't open source directory" $
+    it "recreateSymLink, can't open source directory" $
       recreateSymlink' "noPerms/myFileL"
                        "movedFile"
-                       Strict
         `shouldThrow`
         (\e -> ioeGetErrorType e == PermissionDenied)
 
-    it "recreateSymLink (Strict), destination file already exists" $
+    it "recreateSymLink, destination file already exists" $
       recreateSymlink' "myFileL"
                        "alreadyExists"
-                       Strict
         `shouldThrow`
         (\e -> ioeGetErrorType e == AlreadyExists)
 
-    it "recreateSymLink (Strict), destination already exists and is a dir" $
+    it "recreateSymLink, destination already exists and is a dir" $
       recreateSymlink' "myFileL"
                        "alreadyExistsD"
-                       Strict
         `shouldThrow`
         (\e -> ioeGetErrorType e == AlreadyExists)
 
     -- custom failures --
-    it "recreateSymLink (Strict), source and destination are the same file" $
+    it "recreateSymLink, source and destination are the same file" $
       recreateSymlink' "myFileL"
                        "myFileL"
-                       Strict
         `shouldThrow`
         isSameFile
 

test/HPath/IO/RenameFileSpec.hs

@@ -14,13 +14,8 @@ import GHC.IO.Exception
     IOErrorType(..)
   )
 import Utils
-
-
-
-upTmpDir :: IO ()
-upTmpDir = do
-  setTmpDir "RenameFileSpec"
-  createTmpDir
+import qualified Data.ByteString as BS
+import           Data.ByteString.UTF8 (toString)
 
 
 setupFiles :: IO ()
@@ -51,7 +46,7 @@ cleanupFiles = do
 
 
 spec :: Spec
-spec = beforeAll_ (upTmpDir >> setupFiles) $ afterAll_ cleanupFiles $
+spec = before_ setupFiles $ after_ cleanupFiles $
   describe "HPath.IO.renameFile" $ do
 
     -- successes --
@@ -101,13 +96,13 @@ spec = beforeAll_ (upTmpDir >> setupFiles) $ afterAll_ cleanupFiles $
       renameFile' "myFile"
                   "alreadyExists"
         `shouldThrow`
-        (\e -> ioeGetErrorType e == AlreadyExists)
+        isFileDoesExist
 
     it "renameFile, move from file to dir" $
       renameFile' "myFile"
                   "alreadyExistsD"
         `shouldThrow`
-        (\e -> ioeGetErrorType e == AlreadyExists)
+        isDirDoesExist
 
     it "renameFile, source and dest are same file" $
       renameFile' "myFile"

test/HPath/IO/ToAbsSpec.hs

@@ -1,27 +0,0 @@
-{-# LANGUAGE OverloadedStrings #-}
-
-
-module HPath.IO.ToAbsSpec where
-
-
-import Test.Hspec
-import HPath
-import HPath.IO
-
-
-
-spec :: Spec
-spec = describe "HPath.IO.toAbs" $ do
-
-    -- successes --
-    it "toAbs returns absolute paths unchanged" $ do
-      p1 <- parseAbs "/a/b/c/d"
-      to <- toAbs p1
-      p1 `shouldBe` to
-
-    it "toAbs returns even existing absolute paths unchanged" $ do
-      p1 <- parseAbs "/home"
-      to <- toAbs p1
-      p1 `shouldBe` to
-
-

test/HPath/IO/WriteFileSpec.hs

@@ -1,108 +0,0 @@
-{-# LANGUAGE OverloadedStrings #-}
-
-
-module HPath.IO.WriteFileSpec where
-
-
-import Test.Hspec
-import System.IO.Error
-  (
-    ioeGetErrorType
-  )
-import GHC.IO.Exception
-  (
-    IOErrorType(..)
-  )
-import Utils
-
-
-
-upTmpDir :: IO ()
-upTmpDir = do
-  setTmpDir "WriteFileSpec"
-  createTmpDir
-
-setupFiles :: IO ()
-setupFiles = do
-  createRegularFile' "fileWithContent"
-  createRegularFile' "fileWithoutContent"
-  createSymlink' "inputFileSymL" "fileWithContent"
-  createDir' "alreadyExistsD"
-  createRegularFile' "noPerms"
-  noPerms "noPerms"
-  createDir' "noPermsD"
-  createRegularFile' "noPermsD/inputFile"
-  noPerms "noPermsD"
-  writeFile' "fileWithContent" "BLKASL"
-
-
-cleanupFiles :: IO ()
-cleanupFiles = do
-  deleteFile' "fileWithContent"
-  deleteFile' "fileWithoutContent"
-  deleteFile' "inputFileSymL"
-  deleteDir' "alreadyExistsD"
-  normalFilePerms "noPerms"
-  deleteFile' "noPerms"
-  normalDirPerms "noPermsD"
-  deleteFile' "noPermsD/inputFile"
-  deleteDir' "noPermsD"
-
-
-spec :: Spec
-spec = beforeAll_ (upTmpDir >> setupFiles) $ afterAll_ cleanupFiles $
-  describe "HPath.IO.writeFile" $ do
-
-    -- successes --
-    it "writeFile file with content, everything clear" $ do
-      writeFile' "fileWithContent" "blahfaselllll"
-      out <- readFile' "fileWithContent"
-      out `shouldBe` "blahfaselllll"
-
-    it "writeFile file with content, everything clear" $ do
-      writeFile' "fileWithContent" "gagagaga"
-      out <- readFile' "fileWithContent"
-      out `shouldBe` "gagagaga"
-
-    it "writeFile file with content, everything clear" $ do
-      writeFile' "fileWithContent" ""
-      out <- readFile' "fileWithContent"
-      out `shouldBe` ""
-
-    it "writeFile file without content, everything clear" $ do
-      writeFile' "fileWithoutContent" "blahfaselllll"
-      out <- readFile' "fileWithoutContent"
-      out `shouldBe` "blahfaselllll"
-
-    it "writeFile, everything clear" $ do
-      writeFile' "fileWithoutContent" "gagagaga"
-      out <- readFile' "fileWithoutContent"
-      out `shouldBe` "gagagaga"
-
-    it "writeFile symlink, everything clear" $ do
-      writeFile' "inputFileSymL" "blahfaselllll"
-      out <- readFile' "inputFileSymL"
-      out `shouldBe` "blahfaselllll"
-
-    it "writeFile symlink, everything clear" $ do
-      writeFile' "inputFileSymL" "gagagaga"
-      out <- readFile' "inputFileSymL"
-      out `shouldBe` "gagagaga"
-
-
-    -- posix failures --
-    it "writeFile to dir, inappropriate type" $ do
-      writeFile' "alreadyExistsD" ""
-        `shouldThrow` (\e -> ioeGetErrorType e == InappropriateType)
-
-    it "writeFile, no permissions to file" $ do
-      writeFile' "noPerms" ""
-        `shouldThrow` (\e -> ioeGetErrorType e == PermissionDenied)
-
-    it "writeFile, no permissions to file" $ do
-      writeFile' "noPermsD/inputFile" ""
-        `shouldThrow` (\e -> ioeGetErrorType e == PermissionDenied)
-
-    it "writeFile, file does not exist" $ do
-      writeFile' "gaga" ""
-        `shouldThrow` (\e -> ioeGetErrorType e == NoSuchThing)

test/Main.hs

@@ -14,6 +14,10 @@ main :: IO ()
 main =
   hspecWith
     defaultConfig { configFormatter = Just progress }
-    $ beforeAll_ createBaseTmpDir
-    $ afterAll_ deleteBaseTmpDir
+    $ before_ up
+    $ after_ down
     $ Spec.spec
+  where
+    up = createTmpDir
+    down = deleteTmpDir
+

test/Utils.hs

@@ -11,34 +11,16 @@ import Control.Applicative
   )
 import Control.Monad
   (
-    forM_
-  , void
-  )
-import Control.Monad.IfElse
-  (
-    whenM
-  )
-import qualified Data.ByteString as BS
-import Data.IORef
-  (
-    newIORef
-  , readIORef
-  , writeIORef
-  , IORef
+    void
   )
 import HPath.IO
 import HPath.IO.Errors
-import Prelude hiding (appendFile, readFile, writeFile)
+import HPath.IO.Utils
 import Data.Maybe
   (
     fromJust
   )
 import qualified HPath as P
-import System.IO.Unsafe
-  (
-    unsafePerformIO
-  )
-import qualified System.Posix.Directory.Traversals as DT
 import System.Posix.Env.ByteString
   (
     getEnv
@@ -47,7 +29,6 @@ import Data.ByteString
   (
     ByteString
   )
-import qualified Data.ByteString.Lazy as L
 import System.Posix.Files.ByteString
   (
     groupExecuteMode
@@ -61,15 +42,13 @@ import System.Posix.Files.ByteString
   , unionFileModes
   )
 
+import qualified "unix" System.Posix.IO.ByteString as SPI
+import qualified "unix-bytestring" System.Posix.IO.ByteString as SPB
 
 
-baseTmpDir :: ByteString
-baseTmpDir = "test/HPath/IO/tmp/"
 
-
-tmpDir :: IORef ByteString
-{-# NOINLINE tmpDir #-}
-tmpDir = unsafePerformIO (newIORef baseTmpDir)
+tmpDir :: ByteString
+tmpDir = "test/HPath/IO/tmp/"
 
 
 
@@ -78,63 +57,31 @@ tmpDir = unsafePerformIO (newIORef baseTmpDir)
     -----------------
 
 
-setTmpDir :: ByteString -> IO ()
-{-# NOINLINE setTmpDir #-}
-setTmpDir bs = writeIORef tmpDir (baseTmpDir `BS.append` bs)
-
-
 createTmpDir :: IO ()
-{-# NOINLINE createTmpDir #-}
 createTmpDir = do
   pwd <- fromJust <$> getEnv "PWD" >>= P.parseAbs
-  tmp <- P.parseRel =<< readIORef tmpDir
-  void $ createDir newDirPerms (pwd P.</> tmp)
+  tmp <- P.parseRel tmpDir
+  void $ createDir (pwd P.</> tmp)
 
 
 deleteTmpDir :: IO ()
-{-# NOINLINE deleteTmpDir #-}
 deleteTmpDir = do
   pwd <- fromJust <$> getEnv "PWD" >>= P.parseAbs
-  tmp <- P.parseRel  =<< readIORef tmpDir
-  void $ deleteDir (pwd P.</> tmp)
-
-
-createBaseTmpDir :: IO ()
-{-# NOINLINE createBaseTmpDir #-}
-createBaseTmpDir = do
-  pwd <- fromJust <$> getEnv "PWD" >>= P.parseAbs
-  tmp <- P.parseRel baseTmpDir
-  void $ createDir newDirPerms (pwd P.</> tmp)
-
-
-deleteBaseTmpDir :: IO ()
-{-# NOINLINE deleteBaseTmpDir #-}
-deleteBaseTmpDir = do
-  pwd <- fromJust <$> getEnv "PWD" >>= P.parseAbs
-  tmp <- P.parseRel baseTmpDir
-  contents <- getDirsFiles (pwd P.</> tmp)
-  forM_ contents deleteDir
+  tmp <- P.parseRel tmpDir
   void $ deleteDir (pwd P.</> tmp)
 
 
 withRawTmpDir :: (P.Path P.Abs -> IO a) -> IO a
-{-# NOINLINE withRawTmpDir #-}
 withRawTmpDir f = do
   pwd <- fromJust <$> getEnv "PWD" >>= P.parseAbs
-  tmp <- P.parseRel =<< readIORef tmpDir
+  tmp <- P.parseRel tmpDir
   f (pwd P.</> tmp)
 
 
-getRawTmpDir :: IO ByteString
-{-# NOINLINE getRawTmpDir #-}
-getRawTmpDir = withRawTmpDir (return . flip BS.append "/" . P.fromAbs)
-
-
 withTmpDir :: ByteString -> (P.Path P.Abs -> IO a) -> IO a
-{-# NOINLINE withTmpDir #-}
 withTmpDir ip f = do
   pwd <- fromJust <$> getEnv "PWD" >>= P.parseAbs
-  tmp <- P.parseRel =<< readIORef tmpDir
+  tmp <- P.parseRel tmpDir
   p <- (pwd P.</> tmp P.</>) <$> P.parseRel ip
   f p
 
@@ -143,83 +90,84 @@ withTmpDir' :: ByteString
             -> ByteString
             -> (P.Path P.Abs -> P.Path P.Abs -> IO a)
             -> IO a
-{-# NOINLINE withTmpDir' #-}
 withTmpDir' ip1 ip2 f = do
   pwd <- fromJust <$> getEnv "PWD" >>= P.parseAbs
-  tmp <- P.parseRel =<< readIORef tmpDir
+  tmp <- P.parseRel tmpDir
   p1 <- (pwd P.</> tmp P.</>) <$> P.parseRel ip1
   p2 <- (pwd P.</> tmp P.</>) <$> P.parseRel ip2
   f p1 p2
 
 
 removeFileIfExists :: ByteString -> IO ()
-{-# NOINLINE removeFileIfExists #-}
 removeFileIfExists bs =
   withTmpDir bs $ \p -> whenM (doesFileExist p) (deleteFile p)
 
 
 removeDirIfExists :: ByteString -> IO ()
-{-# NOINLINE removeDirIfExists #-}
 removeDirIfExists bs =
   withTmpDir bs $ \p -> whenM (doesDirectoryExist p) (deleteDirRecursive p)
 
 
-copyFile' :: ByteString -> ByteString -> CopyMode -> IO ()
-{-# NOINLINE copyFile' #-}
-copyFile' inputFileP outputFileP cm =
-  withTmpDir' inputFileP outputFileP (\p1 p2 -> copyFile p1 p2 cm)
+copyFile' :: ByteString -> ByteString -> IO ()
+copyFile' inputFileP outputFileP =
+  withTmpDir' inputFileP outputFileP copyFile
 
 
-copyDirRecursive' :: ByteString -> ByteString
-                  -> CopyMode -> RecursiveErrorMode -> IO ()
-{-# NOINLINE copyDirRecursive' #-}
-copyDirRecursive' inputDirP outputDirP cm rm =
-  withTmpDir' inputDirP outputDirP (\p1 p2 -> copyDirRecursive p1 p2 cm rm)
+copyFileOverwrite' :: ByteString -> ByteString -> IO ()
+copyFileOverwrite' inputFileP outputFileP =
+  withTmpDir' inputFileP outputFileP copyFileOverwrite
+
+
+copyDirRecursive' :: ByteString -> ByteString -> IO ()
+copyDirRecursive' inputDirP outputDirP =
+  withTmpDir' inputDirP outputDirP copyDirRecursive
+
+
+copyDirRecursiveOverwrite' :: ByteString -> ByteString -> IO ()
+copyDirRecursiveOverwrite' inputDirP outputDirP =
+  withTmpDir' inputDirP outputDirP copyDirRecursiveOverwrite
 
 
 createDir' :: ByteString -> IO ()
-{-# NOINLINE createDir' #-}
-createDir' dest = withTmpDir dest (createDir newDirPerms)
+createDir' dest = withTmpDir dest createDir
 
-createDirRecursive' :: ByteString -> IO ()
-{-# NOINLINE createDirRecursive' #-}
-createDirRecursive' dest = withTmpDir dest (createDirRecursive newDirPerms)
 
 createRegularFile' :: ByteString -> IO ()
-{-# NOINLINE createRegularFile' #-}
-createRegularFile' dest = withTmpDir dest (createRegularFile newFilePerms)
+createRegularFile' dest = withTmpDir dest createRegularFile
 
 
 createSymlink' :: ByteString -> ByteString -> IO ()
-{-# NOINLINE createSymlink' #-}
 createSymlink' dest sympoint = withTmpDir dest
   (\x -> createSymlink x sympoint)
 
 
 renameFile' :: ByteString -> ByteString -> IO ()
-{-# NOINLINE renameFile' #-}
 renameFile' inputFileP outputFileP =
   withTmpDir' inputFileP outputFileP $ \i o -> do
     renameFile i o
     renameFile o i
 
 
-moveFile' :: ByteString -> ByteString -> CopyMode -> IO ()
-{-# NOINLINE moveFile' #-}
-moveFile' inputFileP outputFileP cm =
+moveFile' :: ByteString -> ByteString -> IO ()
+moveFile' inputFileP outputFileP =
   withTmpDir' inputFileP outputFileP $ \i o -> do
-    moveFile i o cm
-    moveFile o i Strict
+    moveFile i o
+    moveFile o i
 
 
-recreateSymlink' :: ByteString -> ByteString -> CopyMode -> IO ()
-{-# NOINLINE recreateSymlink' #-}
-recreateSymlink' inputFileP outputFileP cm =
-  withTmpDir' inputFileP outputFileP (\p1 p2 -> recreateSymlink p1 p2 cm)
+moveFileOverwrite' :: ByteString -> ByteString -> IO ()
+moveFileOverwrite' inputFileP outputFileP =
+  withTmpDir' inputFileP outputFileP $ \i o -> do
+    moveFileOverwrite i o
+    moveFile o i
+
+
+recreateSymlink' :: ByteString -> ByteString -> IO ()
+recreateSymlink' inputFileP outputFileP =
+  withTmpDir' inputFileP outputFileP recreateSymlink
 
 
 noWritableDirPerms :: ByteString -> IO ()
-{-# NOINLINE noWritableDirPerms #-}
 noWritableDirPerms path = withTmpDir path $ \p ->
   setFileMode (P.fromAbs p) perms
   where
@@ -232,76 +180,42 @@ noWritableDirPerms path = withTmpDir path $ \p ->
 
 
 noPerms :: ByteString -> IO ()
-{-# NOINLINE noPerms #-}
 noPerms path = withTmpDir path $ \p -> setFileMode (P.fromAbs p) nullFileMode
 
 
 normalDirPerms :: ByteString -> IO ()
-{-# NOINLINE normalDirPerms #-}
 normalDirPerms path =
   withTmpDir path $ \p -> setFileMode (P.fromAbs p) newDirPerms
 
 
-normalFilePerms :: ByteString -> IO ()
-{-# NOINLINE normalFilePerms #-}
-normalFilePerms path =
-  withTmpDir path $ \p -> setFileMode (P.fromAbs p) newFilePerms
-
-
 getFileType' :: ByteString -> IO FileType
-{-# NOINLINE getFileType' #-}
 getFileType' path = withTmpDir path getFileType
 
 
 getDirsFiles' :: ByteString -> IO [P.Path P.Abs]
-{-# NOINLINE getDirsFiles' #-}
 getDirsFiles' path = withTmpDir path getDirsFiles
 
 
 deleteFile' :: ByteString -> IO ()
-{-# NOINLINE deleteFile' #-}
 deleteFile' p = withTmpDir p deleteFile
 
 
 deleteDir' :: ByteString -> IO ()
-{-# NOINLINE deleteDir' #-}
 deleteDir' p = withTmpDir p deleteDir
 
 
 deleteDirRecursive' :: ByteString -> IO ()
-{-# NOINLINE deleteDirRecursive' #-}
 deleteDirRecursive' p = withTmpDir p deleteDirRecursive
 
 
 canonicalizePath' :: ByteString -> IO (P.Path P.Abs)
-{-# NOINLINE canonicalizePath' #-}
 canonicalizePath' p = withTmpDir p canonicalizePath
 
 
 writeFile' :: ByteString -> ByteString -> IO ()
-{-# NOINLINE writeFile' #-}
 writeFile' ip bs = 
-  withTmpDir ip $ \p -> writeFile p bs
-
-
-appendFile' :: ByteString -> ByteString -> IO ()
-{-# NOINLINE appendFile' #-}
-appendFile' ip bs =
-  withTmpDir ip $ \p -> appendFile p bs
-
-
-allDirectoryContents' :: ByteString -> IO [ByteString]
-{-# NOINLINE allDirectoryContents' #-}
-allDirectoryContents' ip =
-  withTmpDir ip $ \p -> DT.allDirectoryContents' (P.fromAbs p)
-
-
-readFile' :: ByteString -> IO ByteString
-{-# NOINLINE readFile' #-}
-readFile' p = withTmpDir p readFile
-
-
-readFileEOF' :: ByteString -> IO L.ByteString
-{-# NOINLINE readFileEOF' #-}
-readFileEOF' p = withTmpDir p readFileEOF
-
+  withTmpDir ip $ \p -> do
+    fd <- SPI.openFd (P.fromAbs p) SPI.WriteOnly Nothing
+                                   SPI.defaultFileFlags
+    SPB.fdWrite fd bs
+    SPI.closeFd fd