Update travis with osc build

2020-04-14 00:00:42 +02:00
19 changed files with 42 additions and 101 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,8 +32,8 @@ matrix:
      before_install:
       - sudo apt-get install -y hscolour
       - export PATH=~/.cabal/bin:/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
-    - env: CABALVER=3.0 GHCVER=8.8.3
-      addons: {apt: {packages: [cabal-install-3.0,ghc-8.8.3], sources: [hvr-ghc]}}
+    - env: CABALVER=3.0 GHCVER=8.8.1
+      addons: {apt: {packages: [cabal-install-3.0,ghc-8.8.1], sources: [hvr-ghc]}}
      before_install:
       - sudo apt-get install -y hscolour
       - export PATH=~/.cabal/bin:/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
@@ -52,7 +52,7 @@ matrix:
       - export PATH=~/.cabal/bin:~/.ghcup/bin:$PATH
       - ghcup install 8.6.5
       - ghcup set 8.6.5
-       - ghcup install-cabal 3.2.0.0
+       - ghcup install-cabal

  allow_failures:
    - env: CABALVER=head GHCVER=head
--- a/hpath-directory/CHANGELOG.md
+++ b/hpath-directory/CHANGELOG.md
@@ -1,17 +1,5 @@
 # Revision history for hpath-directory

-## 0.13.4 -- 2020-05-08
-
-* Add getDirsFilesStream and use streamly-posix for dircontents (#34)
-
-## 0.13.3 -- 2020-04-14
-
-* Fix tests on mac
-
-## 0.13.2 -- 2020-02-17
-
-* Fix bug in `createDirRecursive` with trailing path separators
-
 ## 0.13.1 -- 2020-01-29

 * Split some functionality out into 'hpath-posix'
--- a/hpath-directory/hpath-directory.cabal
+++ b/hpath-directory/hpath-directory.cabal
@@ -1,7 +1,7 @@
 cabal-version:       >=1.10

 name:                hpath-directory
-version:             0.13.4
+version:             0.13.1
 synopsis:            Alternative to 'directory' package with ByteString based filepaths
 description:         This provides a safer alternative to the 'directory'
                     package. FilePaths are ByteString based, so this
@@ -43,10 +43,8 @@ library
                       , hpath-posix         >= 0.13
                       , safe-exceptions     >= 0.1
                       , streamly            >= 0.7
-                       , streamly-bytestring >= 0.1.2
-                       , streamly-posix      >= 0.1.0.1
+                       , streamly-bytestring >= 0.1.0.1
                       , time                >= 1.8
-                       , transformers
                       , unix                >= 2.5
                       , unix-bytestring     >= 0.3
                       , utf8-string
--- a/hpath-directory/src/System/Posix/RawFilePath/Directory.hs
+++ b/hpath-directory/src/System/Posix/RawFilePath/Directory.hs
@@ -27,8 +27,7 @@
 -- Import as:
 -- > import System.Posix.RawFilePath.Directory

-{-# LANGUAGE CPP              #-}
-{-# LANGUAGE FlexibleContexts #-} -- streamly
+{-# LANGUAGE CPP #-}

 module System.Posix.RawFilePath.Directory
  (
@@ -83,7 +82,6 @@ module System.Posix.RawFilePath.Directory
  -- * Directory reading
  , getDirsFiles
  , getDirsFiles'
-  , getDirsFilesStream
  -- * Filetype operations
  , getFileType
  -- * Others
@@ -95,11 +93,8 @@ where

 import           Control.Applicative            ( (<$>) )
 import           Control.Exception.Safe         ( IOException
-                                                , MonadCatch
-                                                , MonadMask
                                                , bracket
                                                , bracketOnError
-                                                , onException
                                                , throwIO
                                                , finally
                                                )
@@ -110,7 +105,6 @@ import           Control.Monad                  ( unless
 import           Control.Monad.Catch            ( MonadThrow(..) )
 import           Control.Monad.Fail             ( MonadFail )
 import           Control.Monad.IfElse           ( unlessM )
-import           Control.Monad.IO.Class         ( liftIO )
 import qualified Data.ByteString               as BS
 import           Data.ByteString                ( ByteString )
 import           Data.Traversable               ( for )
@@ -161,8 +155,6 @@ import           Streamly
 import           Streamly.External.ByteString
 import qualified Streamly.External.ByteString.Lazy
                                               as SL
-import qualified Streamly.External.Posix.DirStream
-                                               as SD
 import qualified Streamly.Data.Fold            as FL
 import           Streamly.Memory.Array
 import qualified Streamly.FileSystem.Handle    as FH
@@ -572,7 +564,7 @@ easyCopy from to cm rm = do
 --
 -- Throws:
 --
--    - `InappropriateType` or `PermissionDenied` for wrong file type (directory)
+--    - `InappropriateType` for wrong file type (directory)
 --    - `NoSuchThing` if the file does not exist
 --    - `PermissionDenied` if the directory cannot be read
 --
@@ -750,8 +742,8 @@ createDirRecursive fm p = go p
          | en == eEXIST
          -> unlessM (doesDirectoryExist dest) (ioError e)
          | en == eNOENT
-          -> go (takeDirectory $ dropTrailingPathSeparator dest)
-            >> createDir fm dest
+          -> createDirRecursive fm (takeDirectory dest)
+            >> createDirectory dest fm
          | otherwise
          -> ioError e

@@ -1155,17 +1147,11 @@ getDirsFiles p = do
 -- of prepending the base path.
 getDirsFiles' :: RawFilePath        -- ^ dir to read
              -> IO [RawFilePath]
-getDirsFiles' fp = getDirsFilesStream fp >>= S.toList
-
-
-- | Like 'getDirsFiles'', except returning a Stream.
-getDirsFilesStream :: (MonadCatch m, MonadAsync m, MonadMask m)
-                   => RawFilePath
-                   -> IO (SerialT m RawFilePath)
-getDirsFilesStream fp = do
-  fd <- openFd fp SPI.ReadOnly [SPDF.oNofollow] Nothing
-  ds <- SPDT.fdOpendir fd `onException` SPI.closeFd fd
-  pure $ fmap snd $ SD.dirContentsStream ds
+getDirsFiles' fp = do
+  fd          <- openFd fp SPI.ReadOnly [SPDF.oNofollow] Nothing
+  rawContents <- getDirectoryContents' fd
+  fmap catMaybes $ for rawContents $ \(_, f) ->
+    if FP.isSpecialDirectoryEntry f then pure Nothing else pure $ Just f



--- a/hpath-directory/test/Main.hs
+++ b/hpath-directory/test/Main.hs
@@ -8,9 +8,6 @@ import Test.Hspec.Formatters
 import qualified Spec
 import Utils
 import System.Posix.Temp.ByteString (mkdtemp)
-import System.Posix.Env.ByteString (getEnvDefault)
-import System.Posix.FilePath ((</>))
-import "hpath-directory" System.Posix.RawFilePath.Directory


 -- TODO: chardev, blockdev, namedpipe, socket
@@ -18,8 +15,7 @@ import "hpath-directory" System.Posix.RawFilePath.Directory

 main :: IO ()
 main = do
-  tmpdir <- getEnvDefault "TMPDIR" "/tmp" >>= canonicalizePath
-  tmpBase <- mkdtemp (tmpdir </> "hpath-directory")
+  tmpBase <- mkdtemp "/tmp/"
  writeIORef baseTmpDir (Just (tmpBase `BS.append` "/"))
  putStrLn $ ("Temporary test directory at: " ++ show tmpBase)
  hspecWith
--- a/hpath-directory/test/System/Posix/RawFilePath/Directory/CopyDirRecursiveCollectFailuresSpec.hs
+++ b/hpath-directory/test/System/Posix/RawFilePath/Directory/CopyDirRecursiveCollectFailuresSpec.hs
@@ -125,7 +125,7 @@ spec = beforeAll_ (upTmpDir >> setupFiles) $ afterAll_ cleanupFiles $
                        "outputDir"
                        Strict
                        CollectFailures
-      (system $ "diff -r "
+      (system $ "diff -r --no-dereference "
                          ++ toString tmpDir' ++ "inputDir" ++ " "
                          ++ toString tmpDir' ++ "outputDir"
                          ++ " >/dev/null")
--- a/hpath-directory/test/System/Posix/RawFilePath/Directory/CopyDirRecursiveOverwriteSpec.hs
+++ b/hpath-directory/test/System/Posix/RawFilePath/Directory/CopyDirRecursiveOverwriteSpec.hs
@@ -104,7 +104,7 @@ spec = beforeAll_ (upTmpDir >> setupFiles) $ afterAll_ cleanupFiles $
                        "outputDir"
                        Overwrite
                        FailEarly
-      (system $ "diff -r "
+      (system $ "diff -r --no-dereference "
                          ++ toString tmpDir' ++ "inputDir" ++ " "
                          ++ toString tmpDir' ++ "outputDir"
                          ++ " >/dev/null")
@@ -113,7 +113,7 @@ spec = beforeAll_ (upTmpDir >> setupFiles) $ afterAll_ cleanupFiles $

    it "copyDirRecursive (Overwrite, FailEarly), destination dir already exists" $ do
      tmpDir' <- getRawTmpDir
-      (system $ "diff -r "
+      (system $ "diff -r --no-dereference "
                          ++ toString tmpDir' ++ "inputDir" ++ " "
                          ++ toString tmpDir' ++ "alreadyExistsD"
                          ++ " >/dev/null")
@@ -122,7 +122,7 @@ spec = beforeAll_ (upTmpDir >> setupFiles) $ afterAll_ cleanupFiles $
                        "alreadyExistsD"
                        Overwrite
                        FailEarly
-      (system $ "diff -r "
+      (system $ "diff -r --no-dereference "
                          ++ toString tmpDir' ++ "inputDir" ++ " "
                          ++ toString tmpDir' ++ "alreadyExistsD"
                          ++ " >/dev/null")
--- a/hpath-directory/test/System/Posix/RawFilePath/Directory/CopyDirRecursiveSpec.hs
+++ b/hpath-directory/test/System/Posix/RawFilePath/Directory/CopyDirRecursiveSpec.hs
@@ -89,7 +89,7 @@ spec = beforeAll_ (upTmpDir >> setupFiles) $ afterAll_ cleanupFiles $
                        "outputDir"
                        Strict
                        FailEarly
-      (system $ "diff -r "
+      (system $ "diff -r --no-dereference "
                          ++ toString tmpDir' ++ "inputDir" ++ " "
                          ++ toString tmpDir' ++ "outputDir"
                          ++ " >/dev/null")
--- a/hpath-directory/test/System/Posix/RawFilePath/Directory/CreateDirRecursiveSpec.hs
+++ b/hpath-directory/test/System/Posix/RawFilePath/Directory/CreateDirRecursiveSpec.hs
@@ -49,11 +49,6 @@ spec = beforeAll_ (upTmpDir >> setupFiles) $ afterAll_ cleanupFiles $
      createDirRecursive' "newDir"
      deleteDir' "newDir"

-    it "createDirRecursive with trailing path separator, all fine" $ do
-      createDirRecursive' "newDir/foo/"
-      deleteDir' "newDir/foo"
-      deleteDir' "newDir"
-
    it "createDirRecursive, parent directories do not exist" $ do
      createDirRecursive' "some/thing/dada"
      deleteDir' "some/thing/dada"
--- a/hpath-directory/test/System/Posix/RawFilePath/Directory/DeleteFileSpec.hs
+++ b/hpath-directory/test/System/Posix/RawFilePath/Directory/DeleteFileSpec.hs
@@ -70,7 +70,7 @@ spec = beforeAll_ (upTmpDir >> setupFiles) $ afterAll_ cleanupFiles $
    it "deleteFile, wrong file type (directory)" $
      deleteFile' "dir"
        `shouldThrow`
-        (\e -> ioeGetErrorType e == InappropriateType || ioeGetErrorType e == PermissionDenied)
+        (\e -> ioeGetErrorType e == InappropriateType)

    it "deleteFile, file does not exist" $
      deleteFile' "doesNotExist"
--- a/hpath-io/CHANGELOG.md
+++ b/hpath-io/CHANGELOG.md
@@ -1,9 +1,5 @@
 # Revision history for hpath-io

-## 0.13.2 -- 2020-05-08
-
-* Add getDirsFilesStream and use streamly-posix for dircontents (#34)
-
 ## 0.13.0 -- 2020-01-26

 * switch to using 'hpath-bytestring' for the implementation (this is now just a wrapper module, mostly)
--- a/hpath-io/hpath-io.cabal
+++ b/hpath-io/hpath-io.cabal
@@ -1,5 +1,5 @@
 name:                hpath-io
-version:             0.13.2
+version:             0.13.1
 synopsis:            High-level IO operations on files/directories
 description:         High-level IO operations on files/directories, utilizing type-safe Paths
 -- bug-reports:
--- a/hpath-io/src/HPath/IO.hs
+++ b/hpath-io/src/HPath/IO.hs
@@ -27,8 +27,7 @@
 -- For other functions (like `copyFile`), the behavior on these file types is
 -- unreliable/unsafe. Check the documentation of those functions for details.

-{-# LANGUAGE FlexibleContexts #-} -- streamly
-{-# LANGUAGE PackageImports   #-}
+{-# LANGUAGE PackageImports #-}

 module HPath.IO
  (
@@ -83,7 +82,6 @@ module HPath.IO
  -- * Directory reading
  , getDirsFiles
  , getDirsFiles'
-  , getDirsFilesStream
  -- * Filetype operations
  , getFileType
  -- * Others
@@ -96,9 +94,7 @@ module HPath.IO
 where


-import           Control.Exception.Safe         ( MonadMask
-                                                , MonadCatch
-                                                , bracketOnError
+import           Control.Exception.Safe         ( bracketOnError
                                                , finally
                                                )
 import           Control.Monad.Catch            ( MonadThrow(..) )
@@ -765,15 +761,6 @@ getDirsFiles' (Path fp) = do
  for rawContents $ \r -> parseRel r


-- | Like 'getDirsFiles'', except returning a Stream.
-getDirsFilesStream :: (MonadCatch m, MonadAsync m, MonadMask m)
-                   => Path b
-                   -> IO (SerialT m (Path Rel))
-getDirsFilesStream (Path fp) = do
-  s <- RD.getDirsFilesStream fp
-  pure (s >>= parseRel)
-
-


    ---------------------------
--- a/hpath-posix/CHANGELOG.md
+++ b/hpath-posix/CHANGELOG.md
@@ -1,14 +1,5 @@
 # Revision history for hpath-posix

-## 0.13.2 -- 2020-04-14
-
-* fix macOS compatibility, especially with memory bug in `fdopendir`
-
-## 0.13.1 -- 2020-02-08
-
-* Remove unnecessary dependencies
-
-
-## 0.13.0 -- 2020-01-29
+## 0.1.0.0 -- 2020-01-29

 * First version. Released on an unsuspecting world.
--- a/hpath-posix/cbits/dirutils.c
+++ b/hpath-posix/cbits/dirutils.c
@@ -1,7 +1,7 @@
 #include "dirutils.h"
-
 unsigned int
    __posixdir_d_type(struct dirent* d)
    {
      return(d -> d_type);
    }
+
--- a/hpath-posix/cbits/dirutils.h
+++ b/hpath-posix/cbits/dirutils.h
@@ -7,9 +7,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>

-
 extern unsigned int
    __posixdir_d_type(struct dirent* d)
    ;
-
 #endif
--- a/hpath-posix/hpath-posix.cabal
+++ b/hpath-posix/hpath-posix.cabal
@@ -1,7 +1,7 @@
 cabal-version:       >=1.10

 name:                hpath-posix
-version:             0.13.2
+version:             0.13.0
 synopsis:            Some low-level POSIX glue code, that is not in 'unix'
 homepage:            https://github.com/hasufell/hpath
 bug-reports:         https://github.com/hasufell/hpath/issues
@@ -32,9 +32,17 @@ library
  -- other-extensions:
  c-sources:           cbits/dirutils.c
  build-depends:         base                >= 4.8  && <5
+                       , IfElse
                       , bytestring          >= 0.10
+                       , exceptions          >= 0.10
                       , hpath-filepath      >= 0.10.3
+                       , safe-exceptions     >= 0.1
+                       , streamly            >= 0.7
+                       , streamly-bytestring >= 0.1.0.1
+                       , time                >= 1.8
                       , unix                >= 2.5
+                       , unix-bytestring     >= 0.3
+                       , utf8-string
  if impl(ghc < 8.0)
    build-depends:
        fail >= 4.9
--- a/hpath-posix/src/System/Posix/RawFilePath/Directory/Traversals.hs
+++ b/hpath-posix/src/System/Posix/RawFilePath/Directory/Traversals.hs
@@ -10,7 +10,6 @@
 -- Traversal and read operations on directories.


-{-# LANGUAGE CApiFFI #-}
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE ForeignFunctionInterface #-}
 {-# LANGUAGE OverloadedStrings #-}
@@ -174,15 +173,11 @@ foreign import ccall unsafe "__hscore_d_name"
 foreign import ccall unsafe "__posixdir_d_type"
  c_type :: Ptr CDirent -> IO DirType

-foreign import capi "stdlib.h realpath"
+foreign import ccall "realpath"
  c_realpath :: CString -> CString -> IO CString

-- Using normal 'ccall' here lead to memory bugs, crashes
-- and corrupted d_name entries. It appears there are two fdopendirs:
--   https://opensource.apple.com/source/Libc/Libc-1244.1.7/include/dirent.h.auto.html
-- The capi call picks the correct one.
-foreign import capi unsafe "dirent.h fdopendir"
-  c_fdopendir :: Posix.Fd -> IO (Ptr CDir)
+foreign import ccall unsafe "fdopendir"
+  c_fdopendir :: Posix.Fd -> IO (Ptr ())

 ----------------------------------------------------------
 -- less dodgy but still lower-level
--- a/hpath/src/HPath.hs
+++ b/hpath/src/HPath.hs
@@ -186,8 +186,11 @@ parseRel filepath =



-- | Parses a path, whether it's relative or absolute.
+-- | Parses a path, whether it's relative or absolute. Will lose
+-- information on whether it's relative or absolute. If you need to know,
+-- reparse it.
 --
+-- Filenames must not contain slashes.
 -- Excludes '.' and '..'.
 --
 -- Throws: 'PathParseException'