mumukit 2.33.1 → 2.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53a67386034be2d2272eccfeba15c16323223348686831489ad775124cf93fa9
-  data.tar.gz: fb936ba6ed321fe213ef4eb34a305599de3abd5b30c3f1f9b8ff86d32fe5641f
+  metadata.gz: 9beefd9e88deef1875e5ba15e634b0064ad895f0e5d198466c60b6e4f583a343
+  data.tar.gz: 92dd2f7e10a670859430c4a68f6a4e6fb1b6878f8c37dd55ecb5db809361740a
 SHA512:
-  metadata.gz: fdd096000a133d6584906ec744524dcdeadaa61df3213648c7d5a2de9a51c51532ba31b70af4e6641e68b5bf7b32be590ca231e09a5b163b695e8df554a4e9fd
-  data.tar.gz: 2125b8bfb4a64163b3158521db6f79f1b5c94b734dfe9128cfebe90052fd6a8edc55bd90edc4aed6092b69228d913a9328b18c4c4515c70d1d9625de090d2379
+  metadata.gz: d1005af685f7b05bd81b3ff292aee75a816eb366f419cbb56dd572af877dac6f92477764ba2ab29cf8cc1f40d7e2d20f00a33651409c4798664114a10b29352e
+  data.tar.gz: aad024612d60dd94e3bdb2497b48579fd1641c0dea1364f256fa4c00d9ccf060dd6cf37db9c224d60265cc17f2dc9b9f70e90477dfb118fda2e73a8ae5bb7c67

data/lib/mumukit.rb

@@ -49,6 +49,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/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/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.34.0'
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: mumukit
 version: !ruby/object:Gem::Version
-  version: 2.33.1
+  version: 2.34.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-24 00:00:00.000000000 Z
+date: 2019-09-23 00:00:00.000000000 Z
 dependencies:
 - !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
@@ -212,28 +218,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !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
@@ -373,7 +365,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Mumuki Test Server Development Kit