mumuki-java-runner 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3e49fce3563aa66a7604c91f88cdd8f1d8410c0531c7c03973cbdb9f86311e8
-  data.tar.gz: 970a07892790c2d723436f3a3cce059345ca8f82d9f3cfefef6b23b89c88843b
+  metadata.gz: ea14e747f1b581e7397d867462a61def7085269acefb29add2af30f895b78605
+  data.tar.gz: aa652048741ffd0958cd631f81ffb7faebfb50f25b73b70b39642bf321b84d67
 SHA512:
-  metadata.gz: 9f16499caf666e4d009b921f5be08407a5c7be624b1db52bfd4c6d7b2d46ca04f14fb8771f63086988485dd5aadb11e2e4accfbbf9a6a066d174c03ca89186d1
-  data.tar.gz: ab72b1133f8c40c567ed87d08a957615cce92e36b2eff9991460b1899fe5a762a1c836bedcee173474514a63f26f553da48a1215ba14bcbfaffb2fae81f6087c
+  metadata.gz: 1b27e08aee218d3bc4cf31569d5c8ecc95d0b144a6333c29f09752b684ef18e96e0d62effb32f0a917940c66d15915743462bfa0a29feefe96361cfe77d2b625
+  data.tar.gz: '004778f490a77cd4dfb7e70656277b22ca7cdf7c47a2fbbf9c87b35be90d5d4185ee2c86c38fac308fed4c3608ee3bf4d3a37552ef0ec2d3c1b22a54a736e237'

data/lib/expectations_hook.rb

@@ -5,6 +5,12 @@ class JavaExpectationsHook < Mumukit::Templates::MulangExpectationsHook
     'Java'
   end
 
+  def compile_content(content)
+    return content unless content.is_a?(Hash)
+
+    content.values.join("\n").gsub(/import .+/, '')
+  end
+
   def default_smell_exceptions
     LOGIC_SMELLS + FUNCTIONAL_SMELLS
   end

data/lib/java_runner.rb

@@ -4,8 +4,9 @@ I18n.load_translations_path File.join(__dir__, 'locales', '*.yml')
 
 Mumukit.runner_name = 'java'
 Mumukit.configure do |config|
-  config.docker_image = 'mumuki/mumuki-junit-worker:2.0'
+  config.docker_image = 'mumuki/mumuki-junit-worker:2.1'
   config.content_type = 'markdown'
+  config.multifile = true
 end
 
 require_relative './version'

data/lib/test_hook.rb

@@ -1,4 +1,4 @@
-class JavaTestHook < Mumukit::Templates::FileHook
+class JavaTestHook < Mumukit::Templates::MultiFileHook
   COMPILATION_ERROR_FLAG = '!!TEST FINISHED WITH COMPILATION ERROR!!'
   isolated true
   structured true, separator: '!!!JAVA-MUMUKI-OUTPUT!!!'
@@ -7,12 +7,13 @@ class JavaTestHook < Mumukit::Templates::FileHook
     '.java'
   end
 
-  def command_line(filename)
-    "runjunit #{filename}"
+  def command_line(*filenames)
+    "runjunit #{filenames.join(' ')}"
   end
 
   def to_structured_result(result)
-    transform(JSON.parse(result))
+    clean_json = result.strip.gsub("\n", '\n')
+    transform(JSON.parse(clean_json))
   end
 
   def transform(examples)
@@ -32,7 +33,7 @@ class JavaTestHook < Mumukit::Templates::FileHook
   end
 
   def compile_file_content(request)
-    <<EOF
+    test = <<EOF
 import java.util.*;
 import java.util.function.*;
 import java.util.stream.*;
@@ -45,7 +46,7 @@ import org.junit.runner.notification.*;
 import org.junit.runners.*;
 import org.junit.runners.model.InitializationError;
 import org.apache.commons.text.StringEscapeUtils;
-#{request.content}
+#{has_files?(request) ? '' : request.content}
 #{request.extra}
 
 public class SubmissionTest {
@@ -92,6 +93,9 @@ class MuListener extends RunListener {
   }
 }
 EOF
-  end
 
+    has_files?(request) ?
+        files_of(request).merge('SubmissionTest.java' => test) :
+        test
+  end
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module JavaVersionHook
-  VERSION = '1.6.0'
+  VERSION = '1.7.0'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-java-runner
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-17 00:00:00.000000000 Z
+date: 2019-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.17'
+        version: '2.29'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.17'
+        version: '2.29'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement