Add Ghci options (#163)

* Add Ghci options * Add ghci options test * Remove Build for test
nmattia · Nov 20, 2019 · 069f7d0 · 069f7d0
1 parent 7e3b61e
commit 069f7d0
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 4 deletions.
diff --git a/bin/Snack.hs b/bin/Snack.hs
@@ -234,7 +234,7 @@ parseSnackConfig = SnackConfig <$> Opts.optional
 data Command
   = Build
   | Run [String] -- Run with extra args
-  | Ghci
+  | Ghci [String]
   | Test
   | Hoogle
 
@@ -245,7 +245,9 @@ parseCommand =
     <>  Opts.command "run" (Opts.info
         ( Run <$> Opts.many (Opts.argument Opts.str (Opts.metavar "ARG"))
         ) mempty)
-    <>  Opts.command "ghci" (Opts.info (pure Ghci) mempty)
+    <>  Opts.command "ghci" (Opts.info
+        ( Ghci <$> Opts.many (Opts.argument Opts.str (Opts.metavar "ARG"))
+        ) mempty)
     <>  Opts.command "hoogle" (Opts.info (pure Hoogle) mempty)
     )
   <|> Opts.hsubparser
@@ -460,7 +462,7 @@ runCommand :: SnackConfig -> PackageFile -> Command -> IO ()
 runCommand snackCfg packageFile = \case
   Build -> S.shelly $ void $ snackBuild snackCfg packageFile
   Run args -> quiet (snackBuild snackCfg packageFile) >>= runBuildResult args
-  Ghci -> flip runExe [] =<<
+  Ghci args -> flip runExe args =<<
     ghciExePath <$> (quiet (snackGhci snackCfg packageFile))
   Test -> noTest
   Hoogle -> flip runExe [ "server", "--local" ] =<<

diff --git a/snack-lib/ghci.nix b/snack-lib/ghci.nix
@@ -48,6 +48,6 @@ rec {
           done
           fi
         done
-        ${ghc}/bin/ghci ${lib.strings.escapeShellArgs ghciArgs}
+        ${ghc}/bin/ghci ${lib.strings.escapeShellArgs ghciArgs} $@
         '';
 }
diff --git a/tests/ghci-options/Main.hs b/tests/ghci-options/Main.hs
@@ -0,0 +1,5 @@
+module Main where
+
+import Data.Text
+
+main = putStrLn $ unpack "hello"
diff --git a/tests/ghci-options/golden b/tests/ghci-options/golden
@@ -0,0 +1 @@
+hello
diff --git a/tests/ghci-options/package.nix b/tests/ghci-options/package.nix
@@ -0,0 +1,4 @@
+{ main = "Main";
+  src = ./.;
+  dependencies = [ "text" ];
+}
diff --git a/tests/ghci-options/package.yaml b/tests/ghci-options/package.yaml
@@ -0,0 +1,6 @@
+name: snack-extensions-test
+dependencies:
+    - text
+executable:
+    main: Main.hs
+    source-dirs: .
diff --git a/tests/ghci-options/test b/tests/ghci-options/test
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+# vim: ft=sh sw=2 et
+
+set -euo pipefail
+
+test() {
+  TMP_FILE=$(mktemp)
+
+  capture_io "$TMP_FILE" main | $SNACK ghci -- -XOverloadedStrings
+
+  diff golden $TMP_FILE
+  rm $TMP_FILE
+}
+
+SNACK="snack --package-file ./package.nix" test
+SNACK="snack --package-file ./package.yaml" test
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,6 +48,6 @@ rec { @@
               done
               fi
             done
-            ${ghc}/bin/ghci ${lib.strings.escapeShellArgs ghciArgs}
+            ${ghc}/bin/ghci ${lib.strings.escapeShellArgs ghciArgs} $@
             '';
     }