mumukit 2.37.1 → 2.42.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc343e3684b7298db67776bc5173eca318387a04b1fc24f127c0e2fe33a00a37
-  data.tar.gz: cda123be4cfaf6f0fe6f83c33f6f397a6d02e78b3af32d73143b576884d4b498
+  metadata.gz: 13101751c0e9c513185940d8bc107133d1615fbb308b134c1d355673f99ad2a1
+  data.tar.gz: ba07a835f81ec89e070c0fefe7b9907bc7ecb5a100ff6d9b5c05577ecabda72b
 SHA512:
-  metadata.gz: c58571a713afbcf18b29ca925697db526232d7d7ccd7b7a885e242929e89aef24387ae94e0cafd7962d2d8ef335c1f646105e9fb0b9b9d00b955fc7924e069df
-  data.tar.gz: 1650c1dab328188894024f2a36d1c96f4ed922bd31a89a5419190956f44814eecba35387361da9525890f5991ca00acbe0d7cd5e04a4fe1aa8db9c10df254300
+  metadata.gz: c2842baf00a47c75db0161f2a5bccbf293740c46310a845b219d983d081c314743573091550074b9c9ea174a894c273cd018b19dfeaf893e00b75c4019684482
+  data.tar.gz: 51618512772abaa8542ae5f58ea6a01b13f724fda80256baad645d1390cf99c647023d933a51823c27412d5de92e4eb925a9b2f198c2ea789fdeef6ea057aa9f

data/lib/locales/en.yml

@@ -6,7 +6,7 @@ en:
     interactive:
       check_last_query_equals: "query should be '%{expected}' but was '%{actual}'"
       check_last_query_fails: "query should fail but it passed"
-      check_last_query_matches: "query does not match regex %{regex}"
+      check_last_query_matches: "query does not match regexp %{regexp}"
       check_last_query_outputs: "query output should be '%{expected}' but was '%{actual}'"
       check_last_query_includes: "query output should include '%{expected}' but was '%{actual}'"
       check_last_query_like: "query output should be like '%{expected}' but was '%{actual}'"
@@ -15,3 +15,4 @@ en:
       check_query_outputs: "query '%{query}' output should be '%{expected}' but was '%{actual}'"
       check_query_passes: "query '%{query}' should pass but it failed"
       goal_passed: "goal was met successfully"
+      check_queries_match: "All the required queries must be executed"

data/lib/locales/es-CL.yml

@@ -6,7 +6,7 @@ es-CL:
     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_matches: "La consulta no cumple con la expresión regular %{regexp}"
       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}'"
@@ -15,3 +15,4 @@ es-CL:
       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"
+      check_queries_match: "Se deben realizar todas las consultas solicitadas"

data/lib/locales/es.yml

@@ -6,7 +6,7 @@ es:
     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_matches: "La consulta no cumple con la expresión regular %{regexp}"
       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}'"
@@ -14,4 +14,5 @@ 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ó"
+      check_queries_match: "Se deben realizar todas las consultas solicitadas"
       goal_passed: "El objetivo se cumplió exitosamente"

data/lib/locales/pt.yml

@@ -6,7 +6,7 @@ pt:
     interactive:
       check_last_query_equals: "a consulta deve ser '%{expected}' mas foi '%{actual}'"
       check_last_query_fails: "a consulta deve falhar, mas passou"
-      check_last_query_matches: "A consulta não corresponde a regex %{regex}"
+      check_last_query_matches: "A consulta não corresponde a regex %{regexp}"
       check_last_query_outputs: "O resultado da consulta deve ser '%{expected}', mas foi '%{actual}'"
       check_last_query_includes: "O resultado da consulta deve incluir '%{expected}', mas foi '%{actual}'"
       check_last_query_like: "O resultado da consulta deve ser como '%{expected}', mas foi '%{actual}'"
@@ -14,4 +14,5 @@ pt:
       check_query_fails: "a consulta '%{query}' deve falhar, mas passou"
       check_query_outputs: "a consulta '%{query}' deve ser '%{expected}', mas foi '%{actual}'"
       check_query_passes: "a consulta '%{query}' deve passar, mas falhou"
+      check_queries_match: "Todas as consultas solicitadas devem ser feitas"
       goal_passed: "O objetivo foi alcançado com sucesso"

data/lib/mumukit/error_pattern.rb

@@ -1,15 +1,17 @@
 module Mumukit
   class ErrorPattern
-    def initialize(regexp)
+    def initialize(regexp, status: :failed, replace: '')
       @regexp = regexp
+      @status = status
+      @replacement = replace
     end
 
-    def matches?(result)
-      @regexp.matches? result
+    def matches?(result, status)
+      @status.like?(status) && @regexp.match?(result)
     end
 
     def sanitize(result)
-      result.gsub(@regexp, '').strip
+      result.gsub(@regexp, @replacement).strip
     end
 
     def transform(result, status)

data/lib/mumukit/isolated_environment.rb

@@ -11,22 +11,21 @@ module Mumukit
       dirnames = filenames.map { |it| Pathname.new(it).dirname }.uniq
 
       binds = dirnames.map { |it| "#{it}:#{it}" }
-      volumes = Hash[dirnames.map { |it| [[it, {}]] }]
 
       command = yield(*filenames)
       command = command.split if command.is_a? String
 
-      configure_container! command, binds, volumes
+      configure_container! command, binds
     end
 
-    def configure_container!(command, binds, volumes)
+    def configure_container!(command, binds)
       self.container = Docker::Container.create(
-        'Image' => Mumukit.config.docker_image,
-        'Cmd' => command,
-        'NetworkDisabled' => true,
-        'HostConfig' => {
-            'Binds' => binds},
-        'Volumes' => volumes)
+        image: Mumukit.config.docker_image,
+        cmd: command,
+        hostConfig: {
+          binds: binds
+        },
+        networkDisabled: true)
     end
 
     def run!

data/lib/mumukit/metatest/interactive_checker.rb

@@ -1,25 +1,33 @@
 module Mumukit::Metatest
   class InteractiveChecker < Checker
 
-    def initialize(request)
+    def initialize(request, strip_mode: :left_and_right)
       @request = request
+      @strip_mode = strip_mode
     end
 
     def check_last_query_equals(_result, goal)
       expected = goal[:value]
-      actual = @request.query.strip
+      actual = query
       fail_t :check_last_query_equals, expected: expected, actual: actual unless expected == actual
     end
 
     def check_last_query_matches(_result, goal)
-      regex = goal[:regexp]
-      fail_t :check_last_query_matches, regex: regex.inspect unless regex.matches? @request.query
+      regexp = goal[:regexp]
+      fail_t :check_last_query_matches, regexp: regexp.inspect unless query.match?(regexp)
     end
 
     def check_last_query_fails(result, _goal)
       fail_t :check_last_query_fails unless result[:query][:status].failed?
     end
 
+    def check_queries_match(result, goal)
+      queries = [query] + @request.cookie.to_a
+      fail_t :check_queries_match unless goal[:regexps].all? do |regexp|
+        queries.any? { |query| query.match? regexp }
+      end
+    end
+
     def check_last_query_outputs(result, goal)
       compare_last_query_by(:check_last_query_outputs, result, goal) { |expected, actual| expected == actual }
     end
@@ -72,5 +80,11 @@ module Mumukit::Metatest
       a_string.delete(" \t\r\n").downcase
     end
 
+    private
+
+    def query
+      query_s = @request.query.to_s
+      @strip_mode == :right_only ? query_s.rstrip : query_s.strip
+    end
   end
 end

data/lib/mumukit/templates/mulang_expectations_hook.rb

@@ -2,12 +2,12 @@ require 'mulang'
 
 module Mumukit
   class Templates::MulangExpectationsHook < Mumukit::Templates::ExpectationsHook
-    LOGIC_SMELLS = %w(UsesCut UsesFail UsesUnificationOperator HasRedundantReduction)
-    FUNCTIONAL_SMELLS = %w(HasRedundantParameter HasRedundantGuards)
-    OBJECT_ORIENTED_SMELLS = %w(DoesNullTest ReturnsNull)
-    IMPERATIVE_SMELLS = %w(HasRedundantLocalVariableReturn HasAssignmentReturn)
-    EXPRESSIVENESS_SMELLS = %w(HasTooShortIdentifiers HasWrongCaseIdentifiers HasMisspelledIdentifiers)
-    GENERIC_SMELLS = %w(IsLongCode HasCodeDuplication HasRedundantLambda HasRedundantIf DoesTypeTest HasRedundantBooleanComparison HasEmptyIfBranches)
+    LOGIC_SMELLS = Mulang::Expectation::LOGIC_SMELLS
+    FUNCTIONAL_SMELLS = Mulang::Expectation::FUNCTIONAL_SMELLS
+    OBJECT_ORIENTED_SMELLS = Mulang::Expectation::OBJECT_ORIENTED_SMELLS
+    IMPERATIVE_SMELLS = Mulang::Expectation::IMPERATIVE_SMELLS
+    EXPRESSIVENESS_SMELLS = Mulang::Expectation::EXPRESSIVENESS_SMELLS
+    GENERIC_SMELLS = Mulang::Expectation::GENERIC_SMELLS
 
     required :language, 'You have to provide a Mulang-compatible language in order to use this hook'
 
@@ -16,14 +16,19 @@ module Mumukit
     end
 
     def compile_mulang_analysis(request, expectations)
-      mulang_code(request).analysis(
+      mulang_code(request).analysis({
         expectations: expectations[:ast],
         customExpectations: expectations[:custom],
         smellsSet: {
           tag: 'AllSmells',
           exclude: (expectations[:exceptions] + default_smell_exceptions)
         },
-        domainLanguage: domain_language)
+        domainLanguage: domain_language
+      }.merge({
+        originalLanguage: original_language,
+        autocorrectionRules: autocorrection_rules.try { |it| positive_and_negative it }.presence,
+        normalizationOptions: normalization_options(request).presence
+      }.compact))
     end
 
     def run_mulang_analysis(analysis)
@@ -32,7 +37,6 @@ module Mumukit
       raise Mumukit::CompilationError, "Can not handle mulang results for analysis #{analysis}"
     end
 
-
     def domain_language
       {
         caseStyle: "CamelCase",
@@ -41,6 +45,17 @@ module Mumukit
       }
     end
 
+    def normalization_options(request)
+      request.dig(:settings, :normalization_options) || {}
+    end
+
+    def autocorrection_rules
+      {}
+    end
+
+    def original_language
+    end
+
     def default_smell_exceptions
       []
     end
@@ -76,5 +91,11 @@ module Mumukit
         include Mumukit::Templates::WithCodeSmells
       end
     end
+
+    private
+
+    def positive_and_negative(rules)
+      rules.flat_map { |k, v| [[k, v], ["Not:#{k}", "Not:#{v}"]] }.to_h
+    end
   end
 end

data/lib/mumukit/templates/try_hook.rb

@@ -4,7 +4,7 @@ module Mumukit
       request_goal = request.goal.with_indifferent_access
 
       @goal = {postconditions: [[request_goal[:kind], request_goal]]}
-      @checker = Metatest::InteractiveChecker.new request
+      @checker = checker_for request
       super request
     end
 
@@ -14,6 +14,14 @@ module Mumukit
       [check_results[2], check_results[1], structured_results[:query]]
     end
 
+    def checker_for(request)
+      Metatest::InteractiveChecker.new request, **checker_options
+    end
+
+    def checker_options
+      {}
+    end
+
     required :to_structured_results
   end
 end

data/lib/mumukit/templates/with_error_patterns.rb

@@ -1,8 +1,8 @@
 module Mumukit::Templates
   module WithErrorPatterns
     def post_process_file(_file, result, status)
-      error_patterns.each { |it| return it.transform(result, status) if it.matches? result } if status.failed?
-      super
+      pattern = error_patterns.find { |it| it.matches? result, status }
+      pattern ? pattern.transform(result, status) : super
     end
 
     def error_patterns

data/lib/mumukit/templates/with_structured_results.rb

@@ -7,7 +7,7 @@ module Mumukit::Templates::WithStructuredResults
       post_process_unstructured_result(file, result, status)
     end
   rescue JSON::ParserError
-    [result, :errored]
+    post_process_unstructured_result(file, result, :errored)
   end
 
   def post_process_unstructured_result(_file, result, status)

data/lib/mumukit/version.rb

@@ -1,3 +1,3 @@
 module Mumukit
-  VERSION = '2.37.1'
+  VERSION = '2.42.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit
 version: !ruby/object:Gem::Version
-  version: 2.37.1
+  version: 2.42.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-14 00:00:00.000000000 Z
+date: 2021-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.22.2
+        version: '1.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.22.2
+        version: '1.25'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
@@ -212,28 +212,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.4
 - !ruby/object:Gem::Dependency
   name: mumukit-inspection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: mumukit-core
   requirement: !ruby/object:Gem::Requirement