mumuki-php-runner 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b383b3471219b3c06826e6a31af6aa386e20d06c1d38d56253625e37364061d
-  data.tar.gz: 2fa8f7a9a039a90146feed91e892a15f79e383466cef7eb7dbcb20e25cfa60d9
+  metadata.gz: a78a74ba91adeccae7b3eca4d2ebf43b323cf49efe3ba15d32f30551de2c516d
+  data.tar.gz: 66998fcda2ee10ab6e8d5e9502bcb270eb64cf4146af611239e375d26121ff44
 SHA512:
-  metadata.gz: 7ec5d63b677a0105ee352ac1ec66f76b9f3e15faeab6e3e9270efd9dc1d33716047eeb878f7917846bcf6d185dff411b297e96d64406c4022d4fdb4e867f3def
-  data.tar.gz: 66faf08083495bcbe027178a59146468835644128b99304d73ae98aee274277024960e2c2601985a2a0a07458bc9df9b5a1cf40d16f2d26290808cfb6eec8e84
+  metadata.gz: a996da9058eda150e0a8899d91b4dfabd712dca644d3551957c1ed0ace13a21d55fc6536b976a144f68da39db3fb12da4beffe3a9267cf61893b38a3dd15e69a
+  data.tar.gz: 61e9aa9289e29dca15d370afd8c96bc3b1c019a9f111d0157e1d6557b1c8b79bbb09ead4dbaecb041b218913968637411b04839185e1a8388909b291e9d34654

data/lib/php_file_hook.rb

@@ -1,4 +1,4 @@
-class PhpFileHook < Mumukit::Templates::FileHook
+class PhpFileHook < Mumukit::Templates::MultiFileHook
   isolated true
 
   def tempfile_extension

data/lib/php_runner.rb

@@ -2,7 +2,8 @@ require 'mumukit'
 
 Mumukit.runner_name = 'php'
 Mumukit.configure do |config|
-  config.docker_image = 'mumuki/mumuki-php-worker:1.4'
+  config.docker_image = 'mumuki/mumuki-php-worker:1.5'
+  config.multifile = true
 end
 
 require_relative './version'

data/lib/precompile_hook.rb

@@ -2,19 +2,26 @@ class PhpPrecompileHook < PhpFileHook
   BATCH_SEPARATOR = "\n/* ---Mumuki-Batch-Separator--- */\n"
   RESULTS_SEPARATOR = "\n/* ---Mumuki-Results-Separator--- */\n"
 
-  def command_line(filename)
-    "run-tests-and-get-ast #{filename}"
+  def command_line(*filenames)
+    "run-tests-and-get-ast #{filenames.join(' ')}"
   end
 
   def compile(request)
     return request unless request[:query].nil?
 
-    file = super request
-    struct request.to_h.merge result: run!(file)
+    files = super request
+    struct request.to_h.merge result: run!(files)
   end
 
   def compile_file_content(request)
-    compile_test_content(request) + BATCH_SEPARATOR + compile_ast_content(request)
+    test_content = compile_test_content request
+
+    if has_files?(request)
+      ast_content = request.content.values.join("\n")
+      add_php_tags(test_content).merge('submission_ast.json' => add_php_tag(ast_content))
+    else
+      add_php_tag(test_content) + BATCH_SEPARATOR + add_php_tag(request.content)
+    end
   end
 
   def post_process_file(_file, result, status)
@@ -24,12 +31,11 @@ class PhpPrecompileHook < PhpFileHook
   end
 
   def compile_test_content(request)
-    <<-EOF
-<?php
+    test = <<-EOF
 declare(strict_types=1);
 
 #{request.extra}
-#{request.content}
+#{has_files?(request) ? '' : request.content}
 
 use PHPUnit\\Framework\\TestCase;
 
@@ -37,9 +43,17 @@ final class #{PhpTestHook::TEST_NAME}Test extends TestCase {
 #{request.test.lines.map {|it| '  ' + it}.join}
 }
     EOF
+
+    has_files?(request) ?
+      files_of(request).merge("#{PhpTestHook::TEST_NAME.downcase}.php" => test) :
+      test
+  end
+
+  def add_php_tags(files)
+    Hash[files.map{|name, content| [name, add_php_tag(content)] } ]
   end
 
-  def compile_ast_content(request)
-    "<?php\n#{request[:content]}"
+  def add_php_tag(content)
+    "<?php\n#{content}"
   end
 end

data/lib/test_hook.rb

@@ -1,5 +1,5 @@
 class PhpTestHook < Mumukit::Defaults::TestHook
-  TEST_NAME = 'AAAMumukiTestCaseAAA'
+  TEST_NAME = 'MumukiSubmissionTest'
   PASSED_REGEXP = /[✔☢] ([^\n]+)/
   FAILED_REGEXP = /✘ ([^\n]+)\n *\│\n *│ ([^イ]+│ \n   )/
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module PhpVersionHook
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-php-runner
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Rodrigo Alfonso
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.21'
+        version: '2.29'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.21'
+        version: '2.29'
 - !ruby/object:Gem::Dependency
   name: mulang-php
   requirement: !ruby/object:Gem::Requirement