mumukit 2.24.0 → 2.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5447e85500689af2b4e3111efa2a49ab2b2d21216d7d19a9b17ecdd1485fe99
-  data.tar.gz: 81740fbcd74028fae923d4c9a9971205c18e4b76b9fe789e2e2180634fc2b9de
+  metadata.gz: 7b81867a9a5abeffe235e31ab9112621032cd9aabe70331164cd04ef9fa9690d
+  data.tar.gz: 8a2a5ee8b78adccd927ae4cf6eeb2485500aa97b5a29289a77ae6ff067c767c4
 SHA512:
-  metadata.gz: 3c8f894e8dea3708db381805451919696e39438ed1fc016af2bfe3db5e7ffeb6d74be18c5896d842c7567329adc203b206940c29127fdea58de43322d56a65a7
-  data.tar.gz: 6fd82030a8554bc823b3923f9a40cb8d24b99cacbb459dc1eaa7998284cedbc828bf5b3508d828d4215761d22bb2231e9b2b88c7b68fe9793097167a5c81b4c7
+  metadata.gz: 259531cd39aabca42051d6e5e43f2e1a20034aaffb66275073b2554a7f9cb4644bbf9df865b29ef9e1523a566995e85ed3452401e1d7dc0c202682a4a3f4c296
+  data.tar.gz: 3fa8093b04df63cbf313d7204fb710a7a566d2ac7a369750d359294c7ef93c1b6c87e4ada07da72adffd88bd0b9f07b10f2d0d431212d00453b208174a954c85

data/lib/mumukit.rb

@@ -31,7 +31,7 @@ module Mumukit
   end
 
   class << self
-    delegate :prefix, :config, :configure, :runtime, :configure_runtime, :directives_pipeline, to: :current_runner
+    delegate :prefix, :config, :configure, :reconfigure, :runtime, :configure_runtime, :directives_pipeline, to: :current_runner
   end
 end
 
@@ -48,6 +48,7 @@ Mumukit.configure_defaults do |config|
   config.command_size_limit = 1024
   config.process_expectations_on_empty_content = false
   config.run_test_hook_on_empty_test = false
+  config.multifile = false
 end
 
 require 'mumukit/content_type'

data/lib/mumukit/runner.rb

@@ -11,6 +11,12 @@ class Mumukit::Runner
     yield @config
   end
 
+  def reconfigure(&block)
+    @config = nil
+    @pipeline = nil
+    configure &block
+  end
+
   def configure_runtime(config)
     @runtime = Mumukit::Runtime.new(config)
   end
@@ -30,17 +36,29 @@ class Mumukit::Runner
   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::Interpolations.new('content'),
-           Mumukit::Directives::Flags.new],
+          [new_sections_directive,
+           new_interpolations_directive('test'),
+           new_interpolations_directive('extra'),
+           new_interpolations_directive('content'),
+           new_flags_directive],
           config.comment_type)
     else
       Mumukit::Directives::NullPipeline
     end
   end
 
+  def new_interpolations_directive(key)
+    Mumukit::Directives::Interpolations.new(key)
+  end
+
+  def new_sections_directive
+    Mumukit::Directives::Sections.new nest_sections: Mumukit.config.multifile
+  end
+
+  def new_flags_directive
+    Mumukit::Directives::Flags.new
+  end
+
   def self.default_config
     @default_config
   end
@@ -49,4 +67,4 @@ class Mumukit::Runner
     @default_config ||= OpenStruct.new
     yield @default_config
   end
-end
+end

data/lib/mumukit/runtime/info.rb

@@ -10,17 +10,18 @@ module Mumukit::RuntimeInfo
         output_content_type: Mumukit.config.content_type,
         comment_type: Mumukit.config.comment_type,
         features: {
-            precompile: precompile_hook?,
-            query: query_hook?,
-            try: try_hook?,
-            expectations: expectations_hook?,
-            feedback: feedback_hook?,
-            secure: validation_hook?,
-            stateful: Mumukit.config.stateful,
-            preprocessor: Mumukit.config.preprocessor_enabled,
+          precompile: precompile_hook?,
+          query: query_hook?,
+          try: try_hook?,
+          expectations: expectations_hook?,
+          feedback: feedback_hook?,
+          secure: validation_hook?,
+          stateful: Mumukit.config.stateful,
+          multifile: Mumukit.config.multifile,
+          preprocessor: Mumukit.config.preprocessor_enabled,
 
-            sandboxed: any_hook_include?([:test, :query], Mumukit::Templates::WithIsolatedEnvironment),
-            structured: any_hook_include?([:test], Mumukit::Templates::WithStructuredResults) || Mumukit.config.structured
+          sandboxed: any_hook_include?([:test, :query], Mumukit::Templates::WithIsolatedEnvironment),
+          structured: any_hook_include?([:test], Mumukit::Templates::WithStructuredResults) || Mumukit.config.structured
         }
     }
   end

data/lib/mumukit/server/test_server.rb

@@ -10,7 +10,10 @@ class Mumukit::Server::TestServer
   end
 
   def info(url)
-    runtime.info.merge(runtime.metadata_hook.metadata).merge(url: url)
+    runtime.info
+        .merge(repo_url: default_repo_url)
+        .merge(runtime.metadata_hook.metadata)
+        .merge(url: url)
   end
 
   def start_request!(_request)
@@ -114,4 +117,7 @@ class Mumukit::Server::TestServer
     {exit: :errored, out: content_type.format_exception(e)}
   end
 
+  def default_repo_url
+    "https://github.com/mumuki/mumuki-#{Mumukit.runner_name}-runner"
+  end
 end

data/lib/mumukit/templates.rb

@@ -3,8 +3,6 @@ module Mumukit
   end
 end
 
-require_relative './templates/file_hook'
-require_relative './templates/try_hook'
 require_relative './templates/with_structured_results'
 require_relative './templates/with_metatest'
 require_relative './templates/with_metatest_results'
@@ -12,6 +10,11 @@ require_relative './templates/with_mashup_file_content'
 require_relative './templates/with_embedded_environment'
 require_relative './templates/with_isolated_environment'
 require_relative './templates/with_line_number_offset'
-require_relative './templates/mulang_expectations_hook'
+require_relative './templates/with_multiple_files'
 require_relative './templates/with_code_smells'
 require_relative './templates/with_cookie'
+
+require_relative './templates/file_hook'
+require_relative './templates/try_hook'
+require_relative './templates/mulang_expectations_hook'
+require_relative './templates/multi_file_precompile_hook'

data/lib/mumukit/templates/file_hook.rb

@@ -4,7 +4,6 @@ module Mumukit
 
     attr_accessor :request
 
-
     def compile(request)
       self.request = request
       write_tempfile! compile_file_content(request)

data/lib/mumukit/templates/multi_file_precompile_hook.rb

@@ -0,0 +1,49 @@
+module Mumukit
+  class Templates::MultiFilePrecompileHook < Mumukit::Hook
+    include Mumukit::Templates::WithMultipleFiles
+
+    def compile(request)
+      request
+        .to_h
+        .merge(content: files_content(request))
+        .to_struct
+    end
+
+    def main_file
+      raise NotImplementedError
+    end
+
+    def consolidate(main_content, files)
+      raise NotImplementedError
+    end
+
+    private
+
+    def files_content(request)
+      files = files_of request
+      if files.empty?
+        no_files_content request
+      elsif files.count == 1
+        single_file_content files
+      else
+        multi_file_content files
+      end
+    end
+
+    def no_files_content(request)
+      request.content
+    end
+
+    def single_file_content(files)
+      files.values.first
+    end
+
+    def multi_file_content(files)
+      consolidate main_file_content(files), files
+    end
+
+    def main_file_content(files)
+      files[main_file] || ''
+    end
+  end
+end

data/lib/mumukit/templates/with_multiple_files.rb

@@ -0,0 +1,6 @@
+module Mumukit::Templates::WithMultipleFiles
+  def files_of(request)
+    raise 'You need to enable Mumukit.config.multifile first!' unless Mumukit.config.multifile
+    request.content.is_a?(Hash) ? request.content : {}
+  end
+end

data/lib/mumukit/version.rb

@@ -1,3 +1,3 @@
 module Mumukit
-  VERSION = '2.24.0'
+  VERSION = '2.25.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit
 version: !ruby/object:Gem::Version
-  version: 2.24.0
+  version: 2.25.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-22 00:00:00.000000000 Z
+date: 2018-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: mumukit-content-type
   requirement: !ruby/object:Gem::Requirement
@@ -303,6 +303,7 @@ files:
 - lib/mumukit/templates.rb
 - lib/mumukit/templates/file_hook.rb
 - lib/mumukit/templates/mulang_expectations_hook.rb
+- lib/mumukit/templates/multi_file_precompile_hook.rb
 - lib/mumukit/templates/try_hook.rb
 - lib/mumukit/templates/with_code_smells.rb
 - lib/mumukit/templates/with_cookie.rb
@@ -312,6 +313,7 @@ files:
 - 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_multiple_files.rb
 - lib/mumukit/templates/with_structured_results.rb
 - lib/mumukit/version.rb
 - lib/mumukit/with_command_line.rb