mumuki-wollok-runner 1.0.1 → 1.0.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjU1MjZiMWU4Y2Q1MjliYjJlOTZlY2NlNzRhOTI1M2MwZWZhZmQzYw==
-  data.tar.gz: !binary |-
-    MDVhNTA3ZGU3NDExN2M5Y2FiOTI2NTU3M2E2OWM1ZTc0NzA5Yzc0ZQ==
+SHA1:
+  metadata.gz: 5a6733a861de3e4199272d1a810e672ced8c108c
+  data.tar.gz: d429672cba3031121de0b701014061f14c2763cd
 SHA512:
-  metadata.gz: !binary |-
-    Y2E4ZTQ4MGU5OGMzMjM0YWI3ODNhYWUyNjEyOWYwYTk4MzZjM2JiOTNkZjdi
-    NzgyNTE2YzlhNWZkNTcyNjJkOTE2YzFhYTYyMGIyMzYwZTJjZTg2OWJmM2Nl
-    NWQ5NTYxNzc5Y2U4YzRlNGU3MWU3Yzc0ZDVlNjNhNTdhMTVkMzA=
-  data.tar.gz: !binary |-
-    NmUzMWJlZTBlMTBmNTliZDVkMDg0NDU2MTU3NTQ0Y2YxYjk0Y2M2NTM4OGUw
-    ZGI4ODY2MTc1YWQ3MDdiNzUwMTI4NmNlNjMyM2YxNTVhMDg4YTFjOTk0YzE3
-    NzE3Zjk1MDkyMTMzYWU0NGZkOGIxM2VlZWRlYWI3NTE5MDE5YzM=
+  metadata.gz: 8ef79d3770440429fea57064f8a97b4ff5896f8802442d86a45ac64a17a067ede11d345e8eaa658b2ba2dd96aa2bb0a41b89d828eb2cd0785620e89ef7eb9f72
+  data.tar.gz: dd1e4ecad360961ed212d578d5544ab08af17f672e1b260da6d2583765449ffcdd7f3c685579f0b6b5551443db542b8414b8d0493a1f72f210669692736fe101

data/lib/metadata_hook.rb

@@ -2,7 +2,7 @@ class WollokMetadataHook < Mumukit::Hook
   def metadata
     {language: {
         name: 'wollok',
-        icon: {type: 'devicon', name: 'code'},
+        icon: {type: 'devicon', name: 'wollok'},
         version: '1.5',
         extension: 'wlk',
         ace_mode: 'wollok'

data/lib/query_hook.rb

@@ -1,11 +1,25 @@
 require 'rest-client'
 
+class WollokCookie < Mumukit::Cookie
+  private
+
+  def statements_code
+    statements.map { |statement| "try { #{statement} } catch e : Exception {  }" }.join("\n")
+  end
+
+  def stdout_separator_code
+    "console.println(\"#{stdout_separator}\")"
+  end
+end
+
 class WollokQueryHook < WollokHook
+  stateful_through WollokCookie
+
   def transform_response(response)
     if errored? response
       [extract_compilation_errors(response), :errored]
     elsif response['consoleOutput'].present?
-      [response['consoleOutput'], :passed]
+      [trim_cookie_output(response['consoleOutput']), :passed]
     elsif response['runtimeError'].present?
       [response['runtimeError']['message'], :failed]
     else
@@ -31,23 +45,13 @@ object mumukiPrettyPrinter {
 }
 
 object mumukiConsole {
-  var inCookie = false
-
-  method enterCookie() { inCookie = true }
-  method exitCookie() { inCookie = false }
-
   method println(anObject) {
-    if (!inCookie) {
-       console.println(anObject)
-    }
+     console.println(anObject)
   }
 }
 
 program mumuki {
-  mumukiConsole.enterCookie()
-  #{build_state(r.cookie)}
-  mumukiConsole.exitCookie()
-
+  #{build_cookie_code(r)}
   #{
     if %w(var const).any? { |it| r.query.strip.start_with? it }
       "#{r.query}\nmumukiPrettyPrinter.prettyPrint(void)"
@@ -59,7 +63,4 @@ program mumuki {
 WLK
   end
 
-  def build_state(cookie)
-    (cookie||[]).map { |statement| "try { #{statement} } catch e : Exception {  }" }.join("\n")
-  end
-end
+end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-wollok-runner
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-13 00:00:00.000000000 Z
+date: 2017-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mumukit-bridge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 description: 
@@ -130,12 +130,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []