mumukit 2.8.0 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1423fda205b081b91b0561d56e411b8939a3725
-  data.tar.gz: c86cfd9ad3ba565a0edb82f69aaaa54c65bf70bd
+  metadata.gz: 21c46d72fc20503bd751e4ef3b798b006d6d2857
+  data.tar.gz: 7ea814106ca4d802e729eb2a0131c11051be45b9
 SHA512:
-  metadata.gz: 957d17aa5282ab203ee13d5a988ba736db8f9cda15592fc4f3be26fde2ed69fd2584040fc0e2ce3786ff2476ffe6feb226bb5a0624be379c2c25eed7aa276799
-  data.tar.gz: 1fd89515534bd0e4fd1a06204c03ffe8249f4816b5b779129ac8c253324e27def6a6b994bace145baf02aa20b69102c4fe28ff299f79b18dd61e040b8b9e3243
+  metadata.gz: cb397d1d351c9958717d5e604a1a9cf5099ad40ca55ce574cb668fde10ba4b788639a35648bbeb7a5a66ebfc39b6a7b511113780d8fc0982d5a66a31fb72a165
+  data.tar.gz: 86d56d7eb5d463deae54fe44268856dd149fc86437fd7464a6e79e14862beddc56309c55e3ef2dc3dca30102fc9b73da2a3696083da925a01b47a58402d70397

data/lib/locales/en.yml

@@ -2,3 +2,4 @@ en:
   mumukit:
     memory_exceeded: Memory limit exceeded. Is your program trying to allocate to much memory?
     time_exceeded:  Execution time limit of %{limit}s exceeded. Is your program performing an infinite loop or recursion?
+    masked_tempfile_basename: solution

data/lib/locales/es.yml

@@ -2,3 +2,4 @@ es:
   mumukit:
     memory_exceeded: Limite de memoria excedido. ¿Tu programa está alocando demasiada memoria?
     time_exceeded:  Limite de tiempo de ejecución de %{limit}s excedido. ¿Tu programa tiene recursión o bucle infinito?
+    masked_tempfile_basename: solucion

data/lib/mumukit.rb

@@ -57,6 +57,7 @@ require_relative 'mumukit/runtime'
 require_relative 'mumukit/isolated_environment'
 require_relative 'mumukit/templates'
 require_relative 'mumukit/request_validation_error'
+require_relative 'mumukit/compilation_error'
 require_relative 'mumukit/defaults'
 require_relative 'mumukit/metatest'
 require_relative 'mumukit/explainer'

data/lib/mumukit/compilation_error.rb

@@ -0,0 +1,4 @@
+module Mumukit
+  class CompilationError < StandardError
+  end
+end

data/lib/mumukit/server/test_server.rb

@@ -84,6 +84,8 @@ class Mumukit::Server::TestServer
   def compile_and_run(hook, request)
     compilation = hook.compile(preprocess request)
     hook.run!(compilation)
+  rescue Mumukit::CompilationError => e
+    [e.message, :errored]
   end
 
   def preprocess(request)

data/lib/mumukit/templates.rb

@@ -10,6 +10,7 @@ require_relative './templates/with_metatest_results'
 require_relative './templates/with_mashup_file_content'
 require_relative './templates/with_embedded_environment'
 require_relative './templates/with_isolated_environment'
+require_relative './templates/with_line_number_offset'
 require_relative './templates/mulang_expectations_hook'
 require_relative './templates/with_code_smells'
 require_relative './templates/with_cookie'

data/lib/mumukit/templates/file_hook.rb

@@ -2,17 +2,24 @@ module Mumukit
   class Templates::FileHook < Mumukit::Hook
     include Mumukit::WithTempfile
 
+    attr_accessor :request
+
     def compile(request)
+      self.request = request
       write_tempfile! compile_file_content(request)
     end
 
     def run!(file)
       result, status = run_file!(file)
-      post_process_file(file, result.force_encoding('UTF-8'), status)
+      post_process_file(file, cleanup_raw_result(result), status)
     ensure
       file.unlink
     end
 
+    def cleanup_raw_result(result)
+      mask_tempfile_references(result.force_encoding('UTF-8'), masked_tempfile_path)
+    end
+
     def post_process_file(file, result, status)
       [result, status]
     end
@@ -22,6 +29,19 @@ module Mumukit
 
     required :run_file!, 'Wrong configuration. You must include an environment mixin'
 
+    def masked_tempfile_path
+      @masked_tempfile_path ||= "#{t 'mumukit.masked_tempfile_basename'}#{tempfile_extension}"
+    end
+
+    def self.line_number_offset(offset, options={})
+      include Mumukit::Templates::WithLineNumberOffset
+
+      define_method(:line_number_offset) do
+        extra_offset = options[:include_extra] && request.extra ? request.extra.lines.length : 0
+        offset + extra_offset
+      end
+    end
+
     def self.metatested(value=true)
       if value
         include Mumukit::Templates::WithMetatest

data/lib/mumukit/templates/with_line_number_offset.rb

@@ -0,0 +1,19 @@
+module Mumukit::Templates::WithLineNumberOffset
+  def cleanup_raw_result(result)
+    super(result).gsub(line_number_reference_regexp) do
+      rebuild_line_number_reference correct_line_number($1.to_i)
+    end
+  end
+
+  def line_number_reference_regexp
+    /#{masked_tempfile_path}\:(\d+)/m
+  end
+
+  def rebuild_line_number_reference(new_line_number)
+    "#{masked_tempfile_path}:#{new_line_number}"
+  end
+
+  def correct_line_number(number)
+    number - line_number_offset
+  end
+end

data/lib/mumukit/version.rb

@@ -1,3 +1,3 @@
 module Mumukit
-  VERSION = '2.8.0'
+  VERSION = '2.9.0'
 end

data/lib/mumukit/with_tempfile.rb

@@ -23,5 +23,8 @@ module Mumukit
       file
     end
 
+    def mask_tempfile_references(string, masked_tempfile_path)
+      string.gsub(/\/tmp\/mumuki\.compile(.+?)#{tempfile_extension}/, masked_tempfile_path)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.9.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2017-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -217,6 +217,7 @@ files:
 - lib/locales/en.yml
 - lib/locales/es.yml
 - lib/mumukit.rb
+- lib/mumukit/compilation_error.rb
 - lib/mumukit/cookie.rb
 - lib/mumukit/defaults.rb
 - lib/mumukit/defaults/default_expectations_hook.rb
@@ -253,6 +254,7 @@ files:
 - lib/mumukit/templates/with_cookie.rb
 - lib/mumukit/templates/with_embedded_environment.rb
 - lib/mumukit/templates/with_isolated_environment.rb
+- lib/mumukit/templates/with_line_number_offset.rb
 - lib/mumukit/templates/with_mashup_file_content.rb
 - lib/mumukit/templates/with_metatest.rb
 - lib/mumukit/templates/with_metatest_results.rb
@@ -282,7 +284,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Mumuki Test Server Development Kit