mumukit 2.33.1 → 2.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53a67386034be2d2272eccfeba15c16323223348686831489ad775124cf93fa9
-  data.tar.gz: fb936ba6ed321fe213ef4eb34a305599de3abd5b30c3f1f9b8ff86d32fe5641f
+  metadata.gz: dfa3c63e600cb5848a01f68ac274471b174e2812faf5895d99d0764b874a5d4b
+  data.tar.gz: c1c0d95c19b7b986759fb4c490a4ac1a88c5503e7fd99b3ad8a88f6370644555
 SHA512:
-  metadata.gz: fdd096000a133d6584906ec744524dcdeadaa61df3213648c7d5a2de9a51c51532ba31b70af4e6641e68b5bf7b32be590ca231e09a5b163b695e8df554a4e9fd
-  data.tar.gz: 2125b8bfb4a64163b3158521db6f79f1b5c94b734dfe9128cfebe90052fd6a8edc55bd90edc4aed6092b69228d913a9328b18c4c4515c70d1d9625de090d2379
+  metadata.gz: e86876cf4f194d7c1bf299d533001b57973a24e0c50ac46a4d054e948a959391a9f70482cecab30f97506bae3d2108040418e6187bdf59f6b45c0681566953ee
+  data.tar.gz: 2782593fbba56c18d46be88f69e8688b51056f9693d626662f442ff6c4afecbf9c367c77bd38a493e37c032e380990eb34b4c2083901acbb63df81cd6ddf20de

data/lib/locales/es-CL.yml

@@ -0,0 +1,17 @@
+es-CL:
+  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
+    interactive:
+      check_last_query_equals: "La consulta debería ser '%{expected}' pero fue '%{actual}'"
+      check_last_query_fails: "La consulta debería fallar pero pasó"
+      check_last_query_matches: "La consulta no cumple con la expresión regular %{regex}"
+      check_last_query_outputs: "La consulta debería devolver '%{expected}' pero devolvió '%{actual}'"
+      check_last_query_includes: "La consulta debería incluir '%{expected}' pero devolvió '%{actual}'"
+      check_last_query_like: "La consulta debería ser como '%{expected}' pero devolvió '%{actual}'"
+      check_last_query_passes: "La consulta debería pasar pero falló"
+      check_query_fails: "La consulta '%{query}' debería fallar pero pasó"
+      check_query_outputs: "La consulta '%{query}' debería devolver '%{expected}' pero devolvió '%{actual}'"
+      check_query_passes: "La consulta '%{query}' debería pasar pero falló"
+      goal_passed: "El objetivo se cumplió exitosamente"

data/lib/locales/es.yml

@@ -1,7 +1,7 @@
 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?
+    time_exceeded: Limite de tiempo de ejecución de %{limit}s excedido. ¿Tu programa tiene recursión o bucle infinito?
     masked_tempfile_basename: solucion
     interactive:
       check_last_query_equals: "La consulta debería ser '%{expected}' pero fue '%{actual}'"
@@ -14,4 +14,4 @@ es:
       check_query_fails: "La consulta '%{query}' debería fallar pero pasó"
       check_query_outputs: "La consulta '%{query}' debería devolver '%{expected}' pero devolvió '%{actual}'"
       check_query_passes: "La consulta '%{query}' debería pasar pero falló"
-      goal_passed: "El objetivo se cumplió exitosamente"
+      goal_passed: "El objetivo se cumplió exitosamente"

data/lib/mumukit.rb

@@ -1,9 +1,13 @@
 require 'mumukit/core'
 require 'mumukit/directives'
+require 'mumukit/inspection'
 require 'ostruct'
+require 'mulang'
 
 I18n.load_translations_path File.join(__dir__, 'locales', '*.yml')
 
+Mulang::Inspection.register_extension! Mumukit::Inspection::Source
+
 module Mumukit
   def self.current_runner=(runner)
     @current_runner = runner
@@ -49,6 +53,7 @@ Mumukit.configure_defaults do |config|
   config.process_expectations_on_empty_content = false
   config.run_test_hook_on_empty_test = false
   config.multifile = false
+  config.settings = false
 end
 
 require 'mumukit/content_type'

data/lib/mumukit/explainer.rb

@@ -1,11 +1,17 @@
 class Mumukit::Explainer
+  include Mumukit::WithContentType
+
   def explain(content, test_results)
+    content_type.enumerate(explanations(content, test_results))
+  end
+
+  private
+
+  def explanations(content, test_results)
     explain_methods
         .map { |selector, key| eval_explain(selector, key, content, test_results) }
         .compact
         .map { |explain| I18n.t(explain[:key], explain[:binding]) }
-        .map { |it| "* #{it}" }
-        .join("\n")
   end
 
   def eval_explain(selector, key, content, test_results)

data/lib/mumukit/metatest.rb

@@ -3,6 +3,7 @@ end
 
 require_relative './metatest/errors'
 require_relative './metatest/checker'
+require_relative './metatest/test_result_builder'
 require_relative './metatest/interactive_checker'
 require_relative './metatest/framework'
-require_relative './metatest/identity_runner'
+require_relative './metatest/identity_runner'

data/lib/mumukit/metatest/checker.rb

@@ -24,10 +24,12 @@ module Mumukit::Metatest
     ## }
     ##
     def check(input, example)
+      builder = Mumukit::Metatest::TestResultBuilder.new
+
       check_assertions input, postconditions_for(example), example
-      [example[:name], :passed, render_success_output(input)]
+      build_passed_test_result builder, example, input
     rescue => e
-      [example[:name], :failed, render_error_output(input, e.message)]
+      build_failed_test_result builder, example, input, e
     end
 
     ## If no postconditions are included in the example,
@@ -36,12 +38,34 @@ module Mumukit::Metatest
       example[:postconditions] || example.except(:name)
     end
 
-    def render_success_output(value)
+    # Implementors may override this method instead of `build_success_output`
+    # if they don't want to handle error details.
+    #
+    # This method is only for backward compatibility. New code
+    # should use `build_success_output`.
+    def render_success_output(_input)
       nil
     end
 
-    def render_error_output(value, error)
-      error
+    # Implementors may override this method instead of `build_error_output`
+    # if they don't want to handle error details.
+    #
+    # This method is only for backward compatibility. New code
+    # should use `build_error_output`.
+    def render_error_output(_input, error_message)
+      error_message
+    end
+
+    # Implementors should override this method if they want access to
+    # the error details and produce more complex test results
+    def build_success_output(builder, _example, input)
+      builder.result = render_success_output input
+    end
+
+    # Implementors should override this method if they want access to
+    # the error details and produce more complex test results
+    def build_error_output(builder, input, _example, error)
+      builder.result = render_error_output input, error.message
     end
 
     def check_assertions(input, assertions_hash, example)
@@ -54,16 +78,30 @@ module Mumukit::Metatest
       send "check_#{assertion_name}", input, assertion_config
     end
 
-    def fail(message)
-      raise Mumukit::Metatest::Failed, message
+    def fail(message, details: nil)
+      raise Mumukit::Metatest::Failed.new(message, details)
+    end
+
+    def abort(message, details: nil)
+      raise Mumukit::Metatest::Aborted.new(message, details)
+    end
+
+    def error(message, details: nil)
+      raise Mumukit::Metatest::Errored.new(message, details)
     end
 
-    def abort(message)
-      raise Mumukit::Metatest::Aborted, message
+    def build_passed_test_result(builder, example, input)
+      builder.title = example[:name]
+      builder.status = :passed
+      build_success_output builder, example, input
+      builder.build
     end
 
-    def error(message)
-      raise Mumukit::Metatest::Errored, message
+    def build_failed_test_result(builder, example, input, e)
+      builder.title = example[:name]
+      builder.status = :failed
+      build_error_output builder, example, input, e
+      builder.build
     end
   end
 end

data/lib/mumukit/metatest/errors.rb

@@ -1,10 +1,17 @@
 module Mumukit::Metatest
-  class Aborted < StandardError
+  class BaseError < StandardError
+    attr_reader :details
+    def initialize(message = "", details = nil)
+      super(message)
+      @details = details
+    end
+  end
+  class Aborted < BaseError
   end
 
-  class Errored < StandardError
+  class Errored < BaseError
   end
 
-  class Failed < StandardError
+  class Failed < BaseError
   end
-end
+end

data/lib/mumukit/metatest/test_result_builder.rb

@@ -0,0 +1,20 @@
+module Mumukit::Metatest
+  class TestResultBuilder
+    attr_accessor :title, :status, :result, :summary_type, :summary_message
+
+    def summary
+      {type: summary_type.presence, message: summary_message.presence}.compact
+    end
+
+    def build
+      raise 'missing status' unless status
+      raise "invalid #{status}" unless status.passed? || status.failed?
+
+      if summary_message.present? || summary_type.present?
+        [title, status, result, summary]
+      else
+        [title, status, result]
+      end
+    end
+  end
+end

data/lib/mumukit/runtime/info.rb

@@ -19,6 +19,7 @@ module Mumukit::RuntimeInfo
           stateful: Mumukit.config.stateful,
           multifile: Mumukit.config.multifile,
           preprocessor: Mumukit.config.preprocessor_enabled,
+          settings: Mumukit.config.settings,
 
           sandboxed: any_hook_include?([:test, :query], Mumukit::Templates::WithIsolatedEnvironment),
           structured: any_hook_include?([:test], Mumukit::Templates::WithStructuredResults) || Mumukit.config.structured

data/lib/mumukit/server/response_builder.rb

@@ -58,10 +58,16 @@ class Mumukit::Server::ResponseBuilder
   end
 
   def structured_base_response(test_results)
-    {testResults: test_results[0].map { |title, status, result|
-      {title: title,
-       status: status,
-       result: result} }}
+    {
+      testResults: test_results[0].map do |title, status, result, summary|
+        { summary: summary&.compact.presence }
+          .compact
+          .merge(
+            title: title,
+            status: status,
+            result: result)
+      end
+    }
   end
 
   def unstructured_base_response(test_results)

data/lib/mumukit/templates/expectations_hook.rb

@@ -1,5 +1,3 @@
-require 'mumukit/inspection'
-
 module Mumukit
   class Templates::ExpectationsHook < Mumukit::Hook
     SOURCE_EXPECTATION_EVALUATORS = {
@@ -21,8 +19,8 @@ module Mumukit
     private
 
     def compile_expectations(request)
-      expectations = {ast: [], source: [], exceptions: []}
-      request[:expectations].each do |it|
+      expectations = {ast: [], source: [], exceptions: [], custom: request[:custom_expectations] }
+      request[:expectations].to_a.each do |it|
         fill_expectations it.deep_symbolize_keys, expectations
       end
       expectations
@@ -40,7 +38,7 @@ module Mumukit
     end
 
     def compile_expectation(expectation)
-      Mumukit::Inspection::Expectation.parse(expectation).as_v2.to_h
+      Mulang::Expectation.parse(expectation).as_v2.to_h
     end
 
     def compile_source_expectation(expectation)
@@ -62,7 +60,7 @@ module Mumukit
       end
 
       def self.parse(expectation)
-        parsed = Mumukit::Inspection::Expectation.parse(expectation)
+        parsed = Mulang::Expectation.parse(expectation)
         evaluator = parse_evaluator(parsed.inspection)
         new parsed, evaluator
       end

data/lib/mumukit/templates/mulang_expectations_hook.rb

@@ -18,6 +18,7 @@ module Mumukit
     def compile_mulang_analysis(request, expectations)
       mulang_code(request).analysis(
         expectations: expectations[:ast],
+        customExpectations: expectations[:custom],
         smellsSet: {
           tag: 'AllSmells',
           exclude: (expectations[:exceptions] + default_smell_exceptions)

data/lib/mumukit/version.rb

@@ -1,3 +1,3 @@
 module Mumukit
-  VERSION = '2.33.1'
+  VERSION = '2.37.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit
 version: !ruby/object:Gem::Version
-  version: 2.33.1
+  version: 2.37.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-24 00:00:00.000000000 Z
+date: 2020-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.46'
+        version: '0.71'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.46'
+        version: '0.71'
 - !ruby/object:Gem::Dependency
   name: sinatra-cross_origin
   requirement: !ruby/object:Gem::Requirement
@@ -212,28 +212,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: mumukit-inspection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: mumukit-core
   requirement: !ruby/object:Gem::Requirement
@@ -266,22 +266,16 @@ dependencies:
   name: mumukit-content-type
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.10'
 description: Helpers for building a Mumuki Test Server
 email:
 - flbulgarelli@yahoo.com.ar
@@ -291,6 +285,7 @@ extra_rdoc_files: []
 files:
 - bin/limit
 - lib/locales/en.yml
+- lib/locales/es-CL.yml
 - lib/locales/es.yml
 - lib/locales/pt.yml
 - lib/mumukit.rb
@@ -317,6 +312,7 @@ files:
 - lib/mumukit/metatest/framework.rb
 - lib/mumukit/metatest/identity_runner.rb
 - lib/mumukit/metatest/interactive_checker.rb
+- lib/mumukit/metatest/test_result_builder.rb
 - lib/mumukit/request_validation_error.rb
 - lib/mumukit/runner.rb
 - lib/mumukit/runtime.rb
@@ -373,7 +369,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Mumuki Test Server Development Kit