mumukit-bridge 3.7.0 → 3.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b92856b6d6f1a7760ca0b0b748e94f0db57e3bba72389b61769121644fd60def
-  data.tar.gz: 12492314955a16949836cd8615697e2cf3e39b9cd65b3616026f2c7e58d40b1a
+  metadata.gz: 6889a403cce8b6e167861d4b0ae9c6c085ef55e1ce55116b6e8a02c931255b39
+  data.tar.gz: 85f171d7e075aba74feecba7d61ba0a8a5d56a6de6c25c69982e3f58eda0c706
 SHA512:
-  metadata.gz: 21f954a58e350c5cedc6d34b519688eb65d727608bfe61dcc53ed23aca5eba1e1c5ed804aea27961ad5c3955ef5912e2fdb7bcc242ebe680e438d6615408a8f9
-  data.tar.gz: 2cee461421396708169b55c9faeabfd0d31d56faec3786e3a8d9739705daf4fd5fcc6f11220606dd48b0bb37b7b5c536f8c98a9367618670b24be973a874aa33
+  metadata.gz: a4a56d718075d48a04349b3ea5dec213b6b9bdecb277aeeebfbbd431b9b31cf82057113f16b71f9f1493fb954f515b7f1cfd8a38680f1817da746567e2dd2563
+  data.tar.gz: be9b34edf084d0a056d961930437f79792d332e00110b32ddabc380f0d5e7a87d5bd7340508f582a947f3666fcd05334f244e53d1498bbaae8a9d23938e7f52b

data/lib/mumukit/bridge.rb

@@ -1,6 +1,6 @@
 require 'rest_client'
 
-require 'active_support/all'
+require 'mumukit/core'
 
 require_relative './bridge/version'
 require_relative './bridge/runner'
@@ -11,4 +11,4 @@ require_relative './bridge/thesaurus'
 module Mumukit
   module Bridge
   end
-end
+end

data/lib/mumukit/bridge/runner/array.rb

@@ -1,5 +1,5 @@
 class Array
   def fetch_mumuki_status(key)
-    all? { |it| it[key] == :passed }.to_mumuki_status
+    all? { |it| it[key].passed? }.to_mumuki_status
   end
 end

data/lib/mumukit/bridge/runner/response_type.rb

@@ -12,7 +12,7 @@ module Mumukit::Bridge
       end
 
       def global_status(test_status, expectation_status, request)
-        if test_status == :passed && expectation_status == :failed
+        if test_status.passed? && expectation_status.failed?
           request[:test].blank? ? :failed : :passed_with_warnings
         else
           test_status
@@ -39,10 +39,10 @@ module Mumukit::Bridge
       private
 
       def parse_test_results(results)
-         results.map { |it| {
-             title: it['title'],
-             status: it['status'].to_sym,
-             result: it['result']} }
+        results.map { |it| {
+            title: it['title'],
+            status: it['status'].to_sym,
+            result: it['result']} }
       end
     end
 
@@ -54,12 +54,36 @@ module Mumukit::Bridge
       end
     end
 
+    class Mixed < Structured
+      def build_hash(response)
+        structured_results = super(response)
+        structured_results.merge response_type: :mixed,
+                                 status: status(structured_results[:status], response['exit'].to_sym)
+      end
+
+      private
+
+      def status(tests_status, output_status)
+        tests_status.passed? && output_status.passed? ? :passed : :failed
+      end
+    end
+
     def self.structured_test_results?(response)
       response['testResults'].present?
     end
 
+    def self.mixed_test_results?(response)
+      structured_test_results?(response) && response['out'].present?
+    end
+
     def self.for_response(response)
-      structured_test_results?(response) ? Structured.new : Unstructured.new
+      if mixed_test_results?(response)
+        Mixed.new
+      elsif structured_test_results?(response)
+        Structured.new
+      else
+        Unstructured.new
+      end
     end
   end
 end

data/lib/mumukit/bridge/version.rb

@@ -1,5 +1,5 @@
 module Mumukit
   module Bridge
-    VERSION = '3.7.0'
+    VERSION = '3.8.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit-bridge
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.8.1
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-14 00:00:00.000000000 Z
+date: 2018-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
 description: 
 email:
 - flbulgarelli@yahoo.com.ar
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Library for connecting to a Mumuki test runner