mumuki-php-runner 1.0.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8a44729b686db8ec1bee4e049aa6ed466e80a764c2d199c3cdc37c4c6c49fe0
-  data.tar.gz: 8ebe718ca780b84b09eccc38b5aba09ec751ac3462452c08a36b72e6309545c1
+  metadata.gz: 9c61f8cf6afdbca262d6e5b7277a5c743713e8562fa5a26402f6a0953427f68c
+  data.tar.gz: c373a4a25da4eea55906629a23232dcad8bfcccc1592e2eeeb422c607b4b370b
 SHA512:
-  metadata.gz: b7cba2ac3824aacfd7bd82c346377f174ba6f77fab1415d05713ce3aaf9806d80d3696b39ab80b9b1f787d46613a750778f42ba614d075ff466d9bd871918a71
-  data.tar.gz: 0772718ef25c9fb8c98f2798127b6f2fe240083f71d7ca2c39e167d32cc7e5ca5e51730c7440dce303c51d24da64382db6bb643c3bd50479828ce4e5b4a25891
+  metadata.gz: 70c714e696ee6072975ac4d256190d381d07695ad062f3dd107f74fa3ad0fd30d59ea97141fae6d1e5f0b5e6102a7ec24a91e94f7730b02b7f8efea1503a11b7
+  data.tar.gz: cc73db8cf9fc469964f6d01adf85ac6ef9704b40999827124ca81cfca7c8ca69b6524a0e02cfbdfc3b03cee73c87d88804d7564e9b1199a20bd29f6babe5bacb

data/lib/expectations_hook.rb

@@ -0,0 +1,41 @@
+require 'mulang/php'
+
+class PhpExpectationsHook < Mumukit::Templates::MulangExpectationsHook
+  SEPARATOR = '==> JSON dump:'
+
+  include_smells true
+
+  def language
+    'Mulang'
+  end
+
+  def mulang_code(request)
+    result = request.result[:ast]
+
+    Mulang::Code.new(mulang_language, to_mulang_ast(result))
+  end
+
+  def to_mulang_ast(output)
+    unless output.include? SEPARATOR
+      return ['Unable to get Mulang AST - Command failed!', :errored]
+    end
+
+    json = output.split(SEPARATOR).last
+    ast = JSON.parse json, symbolize_names: true
+
+    Mulang::PHP.parse(ast)
+  rescue => e
+    raise Mumukit::CompilationError, e
+  end
+
+  def default_smell_exceptions
+    LOGIC_SMELLS + FUNCTIONAL_SMELLS + OBJECT_ORIENTED_SMELLS
+  end
+
+  def domain_language
+    {
+      minimumIdentifierSize: 3,
+      jargon: []
+    }
+  end
+end

data/lib/metadata_hook.rb

@@ -4,7 +4,7 @@ class PhpMetadataHook < Mumukit::Hook
       language: {
         name: 'php',
         icon: {type: 'devicon', name: 'php'},
-        version: 'v1.0.0',
+        version: 'v1.1.0',
         extension: 'php',
         ace_mode: 'php'
       },

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,11 +2,14 @@ require 'mumukit'
 
 Mumukit.runner_name = 'php'
 Mumukit.configure do |config|
-  config.docker_image = 'mumuki/mumuki-php-worker:1.1'
+  config.docker_image = 'mumuki/mumuki-php-worker:1.5'
+  config.multifile = true
 end
 
 require_relative './version'
 require_relative './metadata_hook'
 require_relative './php_file_hook'
+require_relative './precompile_hook'
 require_relative './test_hook'
+require_relative './expectations_hook'
 require_relative './query_hook'

data/lib/precompile_hook.rb

@@ -0,0 +1,59 @@
+class PhpPrecompileHook < PhpFileHook
+  BATCH_SEPARATOR = "\n/* ---Mumuki-Batch-Separator--- */\n"
+  RESULTS_SEPARATOR = "\n/* ---Mumuki-Results-Separator--- */\n"
+
+  def command_line(*filenames)
+    "run-tests-and-get-ast #{filenames.join(' ')}"
+  end
+
+  def compile(request)
+    return request unless request[:query].nil?
+
+    files = super request
+    struct request.to_h.merge result: run!(files)
+  end
+
+  def compile_file_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)
+    parts = result.split RESULTS_SEPARATOR
+
+    { test: parts.first, ast: parts.last }
+  end
+
+  def compile_test_content(request)
+    test = <<-EOF
+declare(strict_types=1);
+
+#{request.extra}
+#{has_files?(request) ? '' : request.content}
+
+use PHPUnit\\Framework\\TestCase;
+
+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 add_php_tag(content)
+    "<?php\n#{content}"
+  end
+end

data/lib/test_hook.rb

@@ -1,18 +1,16 @@
-class PhpTestHook < PhpFileHook
-  structured true
-
-  TEST_NAME = 'AAAMumukiTestCaseAAA'
+class PhpTestHook < Mumukit::Defaults::TestHook
+  TEST_NAME = 'MumukiSubmissionTest'
   PASSED_REGEXP = /[✔☢] ([^\n]+)/
   FAILED_REGEXP = /✘ ([^\n]+)\n *\│\n *│ ([^イ]+│ \n   )/
 
-  def command_line(filename)
-    "phpunit --testdox #{filename}"
-  end
+  def run!(request)
+    result = request.result[:test]
 
-  def post_process_file(file, result, status)
-    return [result.strip, :errored] unless result.include? TEST_NAME
+    unless result.include? TEST_NAME
+      return [mask_tempfile_references(result.strip), :errored]
+    end
 
-    super file, result, status
+    [to_structured_result(result)]
   end
 
   def to_structured_result(result)
@@ -22,22 +20,6 @@ class PhpTestHook < PhpFileHook
     passed_tests.concat(failed_tests)
   end
 
-  def compile_file_content(req)
-    <<-EOF
-<?php
-declare(strict_types=1);
-
-#{req.extra}
-#{req.content}
-
-use PHPUnit\\Framework\\TestCase;
-
-final class #{TEST_NAME}Test extends TestCase {
-#{req.test.lines.map {|it| '  ' + it}.join}
-}
-EOF
-  end
-
   private
 
   def to_passed_result(regexp_groups)
@@ -50,4 +32,8 @@ EOF
 
     [regexp_groups.first, 'failed', reason]
   end
+
+  def mask_tempfile_references(string)
+    string.gsub /\/tmp\/tmp\.\w+/, 'solution.php'
+  end
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module PhpVersionHook
-  VERSION = '1.0.0'
+  VERSION = '1.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-php-runner
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Rodrigo Alfonso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-27 00:00:00.000000000 Z
+date: 2021-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit
@@ -16,28 +16,48 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.21'
+        version: '2.38'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.21'
+        version: '2.38'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: mulang-php
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -101,9 +121,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/expectations_hook.rb
 - lib/metadata_hook.rb
 - lib/php_file_hook.rb
 - lib/php_runner.rb
+- lib/precompile_hook.rb
 - lib/query_hook.rb
 - lib/test_hook.rb
 - lib/version.rb
@@ -126,8 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: PHP Runner for Mumuki