mumukit 2.7.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92b6f5f0aef129cae95f9c8cbdf2af0acf1e245f
-  data.tar.gz: 3b9d1b1b3a787c38416ca9296d88a6ce01f6a061
+  metadata.gz: b1423fda205b081b91b0561d56e411b8939a3725
+  data.tar.gz: c86cfd9ad3ba565a0edb82f69aaaa54c65bf70bd
 SHA512:
-  metadata.gz: 107002a3a1f6f82125d0dc2f15beb17c68f4e2d5ed8057a74158722dbceef7472c6cf19625d0193053614a4ed78aac24f0694f605b6b558134fdfc888c28bddf
-  data.tar.gz: af81b4c924434799d566c27b6c0bf42ee757158501bbf6cc2c45a9b429a3d65ac708676650d95d40eba00c3478bba1fab0662665fccde85ba98939b9fb4df4ae
+  metadata.gz: 957d17aa5282ab203ee13d5a988ba736db8f9cda15592fc4f3be26fde2ed69fd2584040fc0e2ce3786ff2476ffe6feb226bb5a0624be379c2c25eed7aa276799
+  data.tar.gz: 1fd89515534bd0e4fd1a06204c03ffe8249f4816b5b779129ac8c253324e27def6a6b994bace145baf02aa20b69102c4fe28ff299f79b18dd61e040b8b9e3243

data/lib/mumukit/runner.rb

@@ -1,3 +1,4 @@
+
 class Mumukit::Runner
   attr_reader :name, :runtime
 
@@ -22,6 +23,23 @@ class Mumukit::Runner
     name.camelize
   end
 
+  def directives_pipeline
+    @pipeline ||= new_directives_pipeline
+  end
+
+  def new_directives_pipeline
+    if config.preprocessor_enabled
+      Mumukit::Directives::Pipeline.new(
+          [Mumukit::Directives::Sections.new,
+           Mumukit::Directives::Interpolations.new('test'),
+           Mumukit::Directives::Interpolations.new('extra'),
+           Mumukit::Directives::Flags.new],
+          config.comment_type)
+    else
+      Mumukit::Directives::NullPipeline
+    end
+  end
+
   def self.default_config
     @default_config
   end

data/lib/mumukit/server/test_server.rb

@@ -87,20 +87,7 @@ class Mumukit::Server::TestServer
   end
 
   def preprocess(request)
-    if Mumukit.config.preprocessor_enabled
-      directives_pipeline.transform(request)
-    else
-      request
-    end
-  end
-
-  def directives_pipeline
-    @pipeline ||= Mumukit::Directives::Pipeline.new(
-        [Mumukit::Directives::Sections.new,
-         Mumukit::Directives::Interpolations.new('test'),
-         Mumukit::Directives::Interpolations.new('extra'),
-         Mumukit::Directives::Flags.new],
-        Mumukit.config.comment_type)
+    Mumukit.directives_pipeline.transform(request)
   end
 
   def validate_request!(request)

data/lib/mumukit/templates/file_hook.rb

@@ -22,6 +22,13 @@ module Mumukit
 
     required :run_file!, 'Wrong configuration. You must include an environment mixin'
 
+    def self.metatested(value=true)
+      if value
+        include Mumukit::Templates::WithMetatest
+        include Mumukit::Templates::WithMetatestResults
+      end
+    end
+
     def self.structured(value=true)
       if value
         include Mumukit::Templates::WithStructuredResults

data/lib/mumukit/templates/with_metatest.rb

@@ -0,0 +1,14 @@
+module Mumukit::Templates::WithMetatest
+  def metatest
+    Mumukit::Metatest::Framework.new checker: metatest_checker,
+                                     runner: metatest_runner
+  end
+
+  def metatest_runner
+    Mumukit::Metatest::IdentityRunner.new
+  end
+
+  def run_metatest!(target, examples)
+    metatest.test target, examples
+  end
+end

data/lib/mumukit/templates/with_metatest_results.rb

@@ -0,0 +1,31 @@
+module Mumukit::Templates::WithMetatestResults
+  def compile_file_content(request)
+    @examples = compile_metatest_examples(request)
+    compile_metatest_file_content(request)
+  end
+
+  def compile_metatest_examples(request)
+    YAML.load(request.test).deep_symbolize_keys[:examples]
+  end
+
+  def post_process_file(file, result, status)
+    if status == :passed
+      run_metatest! to_metatest_compilation(result), @examples
+    else
+      post_process_unsuccessful_result(file, result, status)
+    end
+  rescue JSON::ParserError
+    [result, :errored]
+  end
+
+  def post_process_unsuccessful_result(_file, result, status)
+    [result, status]
+  end
+
+  def to_metatest_compilation(result)
+    JSON.pretty_parse(result).deep_symbolize_keys
+  end
+end
+
+
+

data/lib/mumukit/templates/with_structured_results.rb

@@ -3,13 +3,17 @@ module Mumukit::Templates::WithStructuredResults
     if [:passed, :failed].include? status
       [to_structured_result(result)]
     else
-      [result, status]
+      post_process_unstructured_result(file, result, status)
     end
   rescue JSON::ParserError
     [result, :errored]
   end
 
+  def post_process_unstructured_result(_file, result, status)
+    [result, status]
+  end
+
   def to_structured_result(result)
     JSON.pretty_parse(result)
   end
-end
+end

data/lib/mumukit/templates.rb

@@ -5,6 +5,8 @@ end
 
 require_relative './templates/file_hook'
 require_relative './templates/with_structured_results'
+require_relative './templates/with_metatest'
+require_relative './templates/with_metatest_results'
 require_relative './templates/with_mashup_file_content'
 require_relative './templates/with_embedded_environment'
 require_relative './templates/with_isolated_environment'

data/lib/mumukit/version.rb

@@ -1,3 +1,3 @@
 module Mumukit
-  VERSION = '2.7.0'
+  VERSION = '2.8.0'
 end

data/lib/mumukit.rb

@@ -27,7 +27,7 @@ module Mumukit
   end
 
   class << self
-    delegate :prefix, :config, :configure, :runtime, :configure_runtime, to: :current_runner
+    delegate :prefix, :config, :configure, :runtime, :configure_runtime, :directives_pipeline, to: :current_runner
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-05 00:00:00.000000000 Z
+date: 2017-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: mumukit-content-type
   requirement: !ruby/object:Gem::Requirement
@@ -254,6 +254,8 @@ files:
 - lib/mumukit/templates/with_embedded_environment.rb
 - lib/mumukit/templates/with_isolated_environment.rb
 - lib/mumukit/templates/with_mashup_file_content.rb
+- lib/mumukit/templates/with_metatest.rb
+- lib/mumukit/templates/with_metatest_results.rb
 - lib/mumukit/templates/with_structured_results.rb
 - lib/mumukit/version.rb
 - lib/mumukit/with_command_line.rb