mumuki-haskell-runner 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7298c93467bcf1eefb0ae42a2df30276da87aef1ad5cdad377d1029f63a2e118
-  data.tar.gz: da7960b7ed9f7f9de9960050c7dc6cc69f87b30b138587e8b31c4e7d2425a220
+  metadata.gz: 4577dbd2f321c149250272c274e26961e32b7fd2e2b6d607aaec5ccbd4ad9a96
+  data.tar.gz: 773c258bb07174ee2ceac32843a1ca63db4c9c857b9386851893bb493513f030
 SHA512:
-  metadata.gz: 87d08ef31288041ce18aa7cf427a5c176d4aa8cf6cceb29e0041505de40353389dfd02244cda60d778efc51f2ea07aedfe24c24e797cb05a005ce7528ba73ad9
-  data.tar.gz: fbc1194d768197e3c739986ff958b032c8e9bd88be0a31fe41a0ae1c72d8d77b243c51ca282a9482ee9a936bea0a8ef3469cef8cb51c464b4a5ce73fcd4f0797
+  metadata.gz: 920044ab330aedde0e1082e540fa33dc5e03cff3c758be74dd2f76d7e88e13c1dfc42d75dbf3162016f112b8a8d42521e8acc228568605fc4edc3e682fbc8f86
+  data.tar.gz: 0b379d9d11821bd76e8b6ebfc7c93f58c00d08b5ca128fbd71c362a5fb752de1e2ae25aa64fda0a9526a03af161c55ea5d851850a5863bfd42264913ca6358b9

data/lib/haskell_file_hook.rb

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

data/lib/test_hook.rb

@@ -6,66 +6,40 @@ class HaskellTestHook < HaskellFileHook
     super(result).compact
   end
 
-  def has_files?(_req)
-    true
-  end
-
   def compile_file_content(req)
-    {
-      'Test.hs' => compile_test_file(req),
-      'Code.hs' => compile_code_file(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
   end
 
-  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[/.*\//]
+  def command_line(filename)
+    "runhaskell #{filename}"
   end
 end

data/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-haskell-runner
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-27 00:00:00.000000000 Z
+date: 2020-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit