mumuki-haskell-runner 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a50767a14e1032fc83d6b6a224e81ab3ef6fca7d27a3569cd2cf9519fc5d2543
-  data.tar.gz: 98f6efc72583d13f723f5e3edf10ff3de226a1a39f4872b2c44e6b99e120cd5b
+  metadata.gz: 7298c93467bcf1eefb0ae42a2df30276da87aef1ad5cdad377d1029f63a2e118
+  data.tar.gz: da7960b7ed9f7f9de9960050c7dc6cc69f87b30b138587e8b31c4e7d2425a220
 SHA512:
-  metadata.gz: 39c1ab8b24c5c6582029c4f53b6667443183ea86e2d03dc9543dd76fdec37452bd40870c36fa1f9c4a96e1298316484dab15a66dbe605b0d46d6147c130bbd4f
-  data.tar.gz: b6d41b31b6b085db546515daa9f6aa842b8c3e58a0d79695f180e712e2dbdcf9b21fc47eb610011c164dd58ff466d3993d984acdf84382aede00e9b8ede06c4d
+  metadata.gz: 87d08ef31288041ce18aa7cf427a5c176d4aa8cf6cceb29e0041505de40353389dfd02244cda60d778efc51f2ea07aedfe24c24e797cb05a005ce7528ba73ad9
+  data.tar.gz: fbc1194d768197e3c739986ff958b032c8e9bd88be0a31fe41a0ae1c72d8d77b243c51ca282a9482ee9a936bea0a8ef3469cef8cb51c464b4a5ce73fcd4f0797

data/lib/haskell_file_hook.rb

@@ -1,4 +1,4 @@
-class HaskellFileHook < Mumukit::Templates::FileHook
+class HaskellFileHook < Mumukit::Templates::MultiFileHook
   isolated true
 
   def cleanup_raw_result(result)

data/lib/test_hook.rb

@@ -6,40 +6,66 @@ class HaskellTestHook < HaskellFileHook
     super(result).compact
   end
 
+  def has_files?(_req)
+    true
+  end
+
   def compile_file_content(req)
-    <<-EOF
-{-# OPTIONS_GHC -fdefer-type-errors #-}
-import Test.Hspec
-import Test.Hspec.Runner (hspecWith, defaultConfig, Config (configFormatter))
-import Test.QuickCheck
-import Test.Hspec.Formatters
-
-import qualified Control.Exception as Exception
-
-import Data.List
-
-structured :: Formatter
-structured = silent {
-  exampleSucceeded = \\p ->
-    writeTerm [formatPath p, "passed", ""],
-  exampleFailed    = \\p result -> case result of
-      (Right e) -> writeTerm [formatPath p, "failed", e]
-      (Left e)  -> writeTerm [formatPath p, "failed", show e],
-  headerFormatter  = write $ "@@@RESULTS-START@@@[",
-  footerFormatter  = write $ "null]"
-}
-  where formatPath (ps, p) = intercalate " " $ (ps ++ [p])
-        writeTerm = write.(++",").show
-
-#{req.content}
-#{req.extra}
-main :: IO ()
-main = hspecWith defaultConfig {configFormatter = Just structured} $ do
-#{req.test.lines.map {|it| '    ' + it}.join}
-EOF
+    {
+      'Test.hs' => compile_test_file(req),
+      'Code.hs' => compile_code_file(req)
+    }
   end
 
-  def command_line(filename)
-    "runhaskell #{filename}"
+  def compile_test_file(req)
+    <<~HASKELL
+      {-# OPTIONS_GHC -fdefer-type-errors #-}
+      import Test.Hspec
+      import Test.Hspec.Runner (hspecWith, defaultConfig, Config (configFormatter))
+      import Test.QuickCheck
+      import Test.Hspec.Formatters
+      import Code
+      
+      import qualified Control.Exception as Exception
+      
+      import Data.List
+      
+      structured :: Formatter
+      structured = silent {
+        exampleSucceeded = \\p ->
+          writeTerm [formatPath p, "passed", ""],
+        exampleFailed    = \\p result -> case result of
+            (Right e) -> writeTerm [formatPath p, "failed", e]
+            (Left e)  -> writeTerm [formatPath p, "failed", show e],
+        headerFormatter  = write $ "@@@RESULTS-START@@@[",
+        footerFormatter  = write $ "null]"
+      }
+        where formatPath (ps, p) = intercalate " " $ (ps ++ [p])
+              writeTerm = write.(++",").show
+      
+      main :: IO ()
+      main = hspecWith defaultConfig {configFormatter = Just structured} $ do
+      #{req.test.lines.map {|it| '    ' + it}.join}
+    HASKELL
+  end
+
+  def compile_code_file(req)
+    <<~HASKELL
+      {-# OPTIONS_GHC -fdefer-type-errors #-}
+      module Code where
+      
+      #{req.content}
+      #{req.extra}
+    HASKELL
+  end
+
+  def command_line(test_file, _code_file)
+    ['bash', '-c', "cd #{dir_from_file_path test_file} && runhaskell #{test_file}"]
+  end
+
+  private
+
+  def dir_from_file_path(file_path)
+    file_path[/.*\//]
   end
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module HaskellVersionHook
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-haskell-runner
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-12 00:00:00.000000000 Z
+date: 2020-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit
@@ -129,7 +129,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Haskell Runner for Mumuki