mumukit-assistant 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a60cd7990b918459cf5ca6d880988803b2ae05fcaf134027962288da648dcc88
-  data.tar.gz: 0282f96960a30e776ec04472024f35f4f6e1423a18143bc80bdf7240560b63fe
+  metadata.gz: 61831f6e3b8b9148533c7750c6cd1fe00da152b7b65f1b17c8e03a2230702299
+  data.tar.gz: a50ed94ad78bbf063979f101a0598f6ef868e1b62d852f1dd5102bfed8cef6b2
 SHA512:
-  metadata.gz: 50954bef56f3b6a7490aa883523f483648787a6ee0e54ed7d719c4f282c172839892f0d09738e2288d81fc2a5bc34d695b6c523d09cf1a89442dcd0cf3bbcf83
-  data.tar.gz: b2744d1e36db6e2f91d201c7c449a60f925932f81a1e1c9f40ae882ea26c89c95b06869cebf85e7ef0ebfa8f7cae73b9e64eae5610266f412d6cf51ea5eec596
+  metadata.gz: 9ae461914bc5d0af93cdb177ddbd7c29bda4757f8505ccf15a8c6033659e0ff0ff693600350861c32ca3621a3ff863dbec569c8b6ea35d3a44e1bf0f99a9c083
+  data.tar.gz: 71477eb4923bba10efdb08fb9763c5e76c26f05a62069bb4a34921a6ecfed66d9365a7d57b374dace95f18028e0f4442a7b34b7cd5afe8d3aa0759d1e67548a7

data/lib/mumukit/assistant/rule.rb

@@ -22,10 +22,13 @@ module Mumukit::Assistant::Rule
   def self.parse_complex_when(w, message)
     condition, value = *w
     case condition.to_sym
-      when :error_contains            then Mumukit::Assistant::Rule::ErrorContains.new(message, value)
-      when :these_tests_failed        then Mumukit::Assistant::Rule::TheseTestsFailed.new(message, value)
-      when :only_these_tests_failed   then Mumukit::Assistant::Rule::OnlyTheseTestsFailed.new(message, value)
-      when :these_expectations_failed then Mumukit::Assistant::Rule::TheseExpectationsFailed.new(message, value)
+      when :error_contains                             then Mumukit::Assistant::Rule::ErrorContains.new(message, value)
+      when :these_tests_failed                         then Mumukit::Assistant::Rule::TheseTestsFailed.new(message, value)
+      when :only_these_tests_failed                    then Mumukit::Assistant::Rule::OnlyTheseTestsFailed.new(message, value)
+      when :these_expectations_failed                  then Mumukit::Assistant::Rule::TheseExpectationsFailed.new(message, value)
+      when :only_these_expectations_failed             then Mumukit::Assistant::Rule::OnlyTheseExpectationsFailed.new(message, value)
+      when :submission_passed_with_these_warnings      then Mumukit::Assistant::Rule::TheseExpectationsFailed.new(message, value, strict: true)
+      when :submission_passed_with_only_these_warnings then Mumukit::Assistant::Rule::OnlyTheseExpectationsFailed.new(message, value, strict: true)
       else raise "Unsupported rule #{condition}"
     end
   end
@@ -38,5 +41,6 @@ require_relative 'rule/these_tests_failed.rb'
 require_relative 'rule/only_these_tests_failed.rb'
 require_relative 'rule/submission_passed_with_warnings.rb'
 require_relative 'rule/these_expectations_failed.rb'
+require_relative 'rule/only_these_expectations_failed.rb'
 require_relative 'rule/submission_errored.rb'
 require_relative 'rule/error_contains.rb'

data/lib/mumukit/assistant/rule/only_these_expectations_failed.rb

@@ -0,0 +1,5 @@
+class Mumukit::Assistant::Rule::OnlyTheseExpectationsFailed < Mumukit::Assistant::Rule::TheseExpectationsFailed
+  def matches_failing_expectations?(submission)
+    super && failed_expectations(submission).count == @expectations.count
+  end
+end

data/lib/mumukit/assistant/rule/these_expectations_failed.rb

@@ -1,22 +1,27 @@
 class Mumukit::Assistant::Rule::TheseExpectationsFailed < Mumukit::Assistant::Rule::SubmissionPassedWithWarnings
-  def initialize(message, expectations)
+  def initialize(message, expectations, strict: false)
     raise 'missing expectations' if expectations.blank?
     super(message)
     @expectations = expectations
+    @strict = strict
   end
 
   def matches?(submission)
-    super && matches_failing_expectations?(submission)
+    (!@strict || super) && matches_failing_expectations?(submission)
   end
 
   def matches_failing_expectations?(submission)
     @expectations.all? do |it|
-      includes_failing_expectation? it, submission.expectation_results
+      includes_failing_expectation? it, submission
     end
   end
 
-  def includes_failing_expectation?(humanized_expectation, expectation_results)
+  def failed_expectations(submission)
+    @failed_expectations ||= submission.expectation_results.select { |it| it[:result].failed? }
+  end
+
+  def includes_failing_expectation?(humanized_expectation, submission)
     binding, inspection = humanized_expectation.split(' ')
-    expectation_results.include? binding: binding, inspection: inspection, result: :failed
+    failed_expectations(submission).any? { |it| it[:binding] == binding && it[:inspection] == inspection }
   end
 end

data/lib/mumukit/assistant/rule/these_tests_failed.rb

@@ -20,6 +20,6 @@ class Mumukit::Assistant::Rule::TheseTestsFailed < Mumukit::Assistant::Rule::Sub
   end
 
   def failed_tests(submission)
-    submission.test_results.select { |it| it[:status].failed? }
+    @failed_tests ||= submission.test_results.select { |it| it[:status].failed? }
   end
 end

data/lib/mumukit/assistant/version.rb

@@ -1,5 +1,5 @@
 module Mumukit
   class Assistant
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mumukit-assistant
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Julián Berbel Alt
@@ -9,22 +9,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-08 00:00:00.000000000 Z
+date: 2019-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -85,6 +91,7 @@ files:
 - lib/mumukit/assistant/rule/base.rb
 - lib/mumukit/assistant/rule/content_empty.rb
 - lib/mumukit/assistant/rule/error_contains.rb
+- lib/mumukit/assistant/rule/only_these_expectations_failed.rb
 - lib/mumukit/assistant/rule/only_these_tests_failed.rb
 - lib/mumukit/assistant/rule/submission_errored.rb
 - lib/mumukit/assistant/rule/submission_failed.rb