hapistrano 0.4.1.3 → 0.4.1.4

raw patch · 5 files changed

+17/−14 lines, 5 filesdep ~pathPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: path

API changes (from Hackage documentation)

Files

• CHANGELOG.md +4/−0
• README.md +3/−3
• hapistrano.cabal +4/−4
• spec/System/HapistranoConfigSpec.hs +1/−1
• spec/System/HapistranoSpec.hs +5/−6

@@ -1,3 +1,7 @@+## 0.4.1.4+### Changed+* Bump path version upper constraint to 0.9+ ## 0.4.1.3 ### Changed * Allow formatting-7.0

@@ -1,4 +1,4 @@-[![Build Status](https://travis-ci.org/stackbuilders/hapistrano.svg?branch=master)](https://travis-ci.org/stackbuilders/hapistrano)+[![Build and Test](https://github.com/stackbuilders/hapistrano/actions/workflows/build-and-test.yml/badge.svg?branch=master)](https://github.com/stackbuilders/hapistrano/actions/workflows/build-and-test.yml) [![Hackage version](https://img.shields.io/hackage/v/hapistrano.svg)](http://hackage.haskell.org/package/hapistrano) [![Docker Hub](https://img.shields.io/docker/build/stackbuilders/hapistrano.svg?style=flat)](https://hub.docker.com/r/stackbuilders/hapistrano) @@ -15,8 +15,8 @@  * [Nix](#nix)  * [License](#license)  * [Contributing](#contributing)- - ++ # Hapistrano  Hapistrano is a deployment library for Haskell applications similar to

@@ -1,5 +1,5 @@ name:                hapistrano-version:             0.4.1.3+version:             0.4.1.4 synopsis:            A deployment library for Haskell applications description:   .@@ -60,7 +60,7 @@                      , gitrev             >= 1.2 && < 1.4                      , mtl                >= 2.0 && < 3.0                      , stm                >= 2.0 && < 2.6-                     , path               >= 0.5 && < 0.8+                     , path               >= 0.5 && < 0.9                      , process            >= 1.4 && < 1.7                      , typed-process      >= 0.2 && < 0.3                      , time               >= 1.5 && < 1.11@@ -83,7 +83,7 @@                      , gitrev             >= 1.2 && < 1.4                      , hapistrano                      , optparse-applicative >= 0.11 && < 0.17-                     , path               >= 0.5 && < 0.8+                     , path               >= 0.5 && < 0.9                      , path-io            >= 1.2 && < 1.7                      , stm                >= 2.4 && < 2.6                      , yaml               >= 0.8.16 && < 0.12@@ -109,7 +109,7 @@                      , hapistrano                      , hspec              >= 2.0 && < 3.0                      , mtl                >= 2.0 && < 3.0-                     , path               >= 0.5 && < 0.7.1+                     , path               >= 0.5 && < 0.9                      , path-io            >= 1.2 && < 1.7                      , process            >= 1.4 && < 1.7                      , QuickCheck         >= 2.5.1 && < 3.0

@@ -8,7 +8,7 @@                                            Source (..), TargetSystem (..))  import qualified Data.Yaml.Config         as Yaml-import           Path                     (mkAbsDir)+import           Path                     (mkAbsDir, Abs, Dir) import           Test.Hspec  

@@ -13,7 +13,7 @@ import Numeric.Natural import Path import Path.IO-import System.Directory (listDirectory)+import System.Directory (getCurrentDirectory, listDirectory) import qualified System.Hapistrano as Hap import qualified System.Hapistrano.Commands as Hap import qualified System.Hapistrano.Core as Hap@@ -43,11 +43,10 @@            expectedOutput `Hspec.shouldSatisfy` (`isPrefixOf` actualOutput)   describe "readScript" $     it "performs all the necessary normalizations correctly" $ do-#if MIN_VERSION_path_io(1,6,0)-      let spath = $(mkRelFile "script/clean-build.sh")-#else-      spath <- makeAbsolute $(mkRelFile "script/clean-build.sh")-#endif+      spath <- do+        currentDirectory <- getCurrentDirectory >>= parseAbsDir+        scriptFile <- parseRelFile "script/clean-build.sh"+        return (currentDirectory </> scriptFile)       (fmap Hap.unGenericCommand <$> Hap.readScript spath) `Hspec.shouldReturn`         [ "export PATH=~/.cabal/bin:/usr/local/bin:$PATH"         , "cabal sandbox delete"