From 700212006876a16b4b18dc448ff729afc7007955 Mon Sep 17 00:00:00 2001 From: Fabrizio Ferrai Date: Wed, 10 Jul 2019 12:45:41 +0300 Subject: [PATCH] Print project sources too in 'spago sources' --- src/Spago/Packages.hs | 2 +- test/SpagoSpec.hs | 9 +++++++++ test/fixtures/sources-output.txt | 6 ++++++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 test/fixtures/sources-output.txt diff --git a/src/Spago/Packages.hs b/src/Spago/Packages.hs index 6d5cdb0be..87f67ba5c 100644 --- a/src/Spago/Packages.hs +++ b/src/Spago/Packages.hs @@ -260,7 +260,7 @@ sources = do echoDebug "Running `spago sources`" config <- Config.ensureConfig deps <- getProjectDeps config - _ <- traverse echo $ fmap Purs.unSourcePath $ getGlobs deps + _ <- traverse echo $ fmap Purs.unSourcePath (getGlobs deps <> Config.configSourcePaths config) pure () diff --git a/test/SpagoSpec.hs b/test/SpagoSpec.hs index 463c38815..854e48ab8 100644 --- a/test/SpagoSpec.hs +++ b/test/SpagoSpec.hs @@ -119,6 +119,15 @@ spec = around_ setup $ do writeTextFile "packages.dhall" "let pkgs = ./packagesBase.dhall in pkgs // { spago = { dependencies = [\"prelude\"], repo = \"https://github.com/spacchetti/spago.git\", version = \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\" }}" spago ["install", "spago"] >>= shouldBeFailure + + describe "spago sources" $ do + + it "Spago should print both dependencies and project sources" $ do + + spago ["init"] >>= shouldBeSuccess + spago ["sources"] >>= shouldBeSuccessOutput "sources-output.txt" + + describe "spago build" $ do it "Spago should build successfully" $ do diff --git a/test/fixtures/sources-output.txt b/test/fixtures/sources-output.txt new file mode 100644 index 000000000..594ff377f --- /dev/null +++ b/test/fixtures/sources-output.txt @@ -0,0 +1,6 @@ +.spago/console/v4.2.0/src/**/*.purs +.spago/effect/v2.0.1/src/**/*.purs +.spago/prelude/v4.1.1/src/**/*.purs +.spago/psci-support/v4.0.0/src/**/*.purs +src/**/*.purs +test/**/*.purs