mumukit 2.9.0 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21c46d72fc20503bd751e4ef3b798b006d6d2857
-  data.tar.gz: 7ea814106ca4d802e729eb2a0131c11051be45b9
+  metadata.gz: 35638ca8f8f4793021d2e0cf43b60e62d8cbc5b7
+  data.tar.gz: 6fea9eb121d02c2db837ef23efae0649fc9e204a
 SHA512:
-  metadata.gz: cb397d1d351c9958717d5e604a1a9cf5099ad40ca55ce574cb668fde10ba4b788639a35648bbeb7a5a66ebfc39b6a7b511113780d8fc0982d5a66a31fb72a165
-  data.tar.gz: 86d56d7eb5d463deae54fe44268856dd149fc86437fd7464a6e79e14862beddc56309c55e3ef2dc3dca30102fc9b73da2a3696083da925a01b47a58402d70397
+  metadata.gz: 03b79127fdc4df1954b04cd83bbf559934662e85d6b8d36687c053606af96b3a1d35dbd1c6a4046fbfb0fb100533e2602bd703aeaf2f2ac8ca7379a92b9d752a
+  data.tar.gz: 9f0f259eba97f1efc7e8339774cbbeff9889c279ed26b37733dbd940980c070f0b8fd5909814f62849d472cf71d6ba3807800ba2a97ed97e790534bb1d608b70

data/lib/mumukit/server/test_server.rb

@@ -69,7 +69,7 @@ class Mumukit::Server::TestServer
 
   def run_expectations!(request)
     if request.expectations
-      compile_and_run runtime.expectations_hook, request
+      compile_and_run(runtime.expectations_hook, request) { [] }
     else
       []
     end
@@ -85,7 +85,7 @@ class Mumukit::Server::TestServer
     compilation = hook.compile(preprocess request)
     hook.run!(compilation)
   rescue Mumukit::CompilationError => e
-    [e.message, :errored]
+    block_given? ? yield(e) : [e.message, :errored]
   end
 
   def preprocess(request)

data/lib/mumukit/templates/mulang_expectations_hook.rb

@@ -1,7 +1,15 @@
+require 'mumukit/inspection'
+
 module Mumukit
   class Templates::MulangExpectationsHook < Mumukit::Templates::FileHook
-    isolated false
+    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(HasTooShortBindings HasWrongCaseBindings HasMisspelledBindings)
+    GENERIC_SMELLS = %w(IsLongCode HasCodeDuplication HasRedundantLambda HasRedundantIf DoesTypeTest HasRedundantBooleanComparison)
 
+    isolated false
     required :language, 'You have to provide a Mulang-compatible language in order to use this hook'
 
     def tempfile_extension
@@ -9,11 +17,14 @@ module Mumukit
     end
 
     def command_line(filename)
-      "cat #{filename} | #{mulang_path} -s"
+      # TODO avoid file generation
+      "cat #{filename} | #{mulang_path} -s 2>&1"
     end
 
     def post_process_file(file, result, status)
       parse_response JSON.pretty_parse(result)
+    rescue JSON::ParserError
+      raise Mumukit::CompilationError, "Can not handle mulang results #{result}"
     end
 
     def compile_file_content(request)
@@ -21,24 +32,70 @@ module Mumukit
     end
 
     def compile_json_file_content(request)
+      expectations, exceptions = compile_expectations_and_exceptions request
       {
-          expectations: request[:expectations].map { |it| compile_expectation(it.deep_symbolize_keys) },
-          code: {
-              content: compile_content(request[:content]),
-              language: language}
+          sample: compile_sample(request),
+          spec: {
+            expectations: expectations,
+            smellsSet: {
+              tag: 'AllSmells',
+              exclude: (exceptions + default_smell_exceptions)
+            }
+          }
       }
     end
 
+    def default_smell_exceptions
+      []
+    end
+
+    def compile_sample(request)
+      compiled_content = compile_content(request[:content])
+      if language == 'Mulang'
+        {
+          tag: 'MulangSample',
+          ast: compiled_content
+        }
+      else
+        {
+          tag: 'CodeSample',
+          language: language,
+          content: compiled_content
+        }
+      end
+    end
+
+    def compile_expectations_and_exceptions(request)
+      expectations = []
+      exceptions = []
+      request[:expectations].each do |it|
+        fill_expectations_and_excetions it.deep_symbolize_keys, expectations, exceptions
+      end
+      [expectations, exceptions]
+    end
+
+    def fill_expectations_and_excetions(expectation, expectations, exceptions)
+      inspection = expectation[:inspection]
+      if inspection&.start_with? 'Except:'
+        exceptions << inspection[7..-1]
+      else
+        expectations << compile_expectation(expectation)
+      end
+    end
+
     def compile_content(content)
       content
     end
 
     def compile_expectation(expectation)
-      (expectation[:verb].present? ? {tag: :Advanced} : {tag: :Basic}).merge(expectation)
+      Mumukit::Inspection::Expectation.parse(expectation).as_v2.to_h
     end
 
     def parse_response(response)
-      response['results'].map do |it|
+      if response['tag'] == 'AnalysisFailed'
+        raise Mumukit::CompilationError, response['reason']
+      end
+      response['expectationResults'].map do |it|
         {result: it['result'],
          expectation: parse_expectation(it['expectation'])}
       end
@@ -54,4 +111,4 @@ module Mumukit
       end
     end
   end
-end
+end

data/lib/mumukit/version.rb

@@ -1,3 +1,3 @@
 module Mumukit
-  VERSION = '2.9.0'
+  VERSION = '2.10.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.10.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-06 00:00:00.000000000 Z
+date: 2017-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.46'
+- !ruby/object:Gem::Dependency
+  name: mumukit-inspection
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: mumukit-core
   requirement: !ruby/object:Gem::Requirement
@@ -284,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Mumuki Test Server Development Kit