isomorfeus-puppetmaster 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 422c2bb4f0581a37a50491b60bfb2b0a44b96acd903c8aaf5460d233d70eb8bf
-  data.tar.gz: cc52402be32baecea8e5d70071cdc9d94684ab682eec4e36f124b9185130869b
+  metadata.gz: 7123d1c27ed7357e7ac6fff577bb2dcd025bd7d622c2ba849d1232ab9d3086d2
+  data.tar.gz: 4020f116455824c9ff42c4dca646ef69fb252ee7113986cb3926109cb874d381
 SHA512:
-  metadata.gz: 89f9b3910c274388f23623aded55d5ac5e94d620ff77586bd6f597b6cb723540b9c91d586a4f7e95e869b801832a2dee13f9db88706a32578a2e7ce3e5b52bb1
-  data.tar.gz: 0e79a45d2fd530702f95180cb5710b9e304244b76bfe8fe0f59ca2e62c71a349d4c8fb0704e9fc3a93f59df5731187f1086660077c7e385ff5986b2796f3d58a
+  metadata.gz: c30ba060532b000fe950b6bbbd0dcde8a22f0957771368b0b4f8862839f4690102ea71b7ce8e74e1f6d1c5aaded08331cb4a387f14adde8dd3b0cd902b3484e7
+  data.tar.gz: 9418b91dd65c552b9f26fa1c92fe2eeb2e75eb5f807125a6413e1812fd58545d3c6c554474f565b43700acb54f6478add020444b9ee202978758e782ce24ab74

data/lib/isomorfeus/puppetmaster/document.rb

@@ -80,7 +80,13 @@ module Isomorfeus
         evaluate_script <<~JAVASCRIPT
           (function(){
             Opal.gvars.promise_resolved = false;
-            return #{compiled_ruby}
+            Opal.await_ruby_exception = null;
+            try {
+              return #{compiled_ruby}
+            } catch (e) {
+              Opal.await_ruby_exception = e;
+              Opal.gvars.promise_resolved = true;
+            }
           })()
         JAVASCRIPT
         have_result = false
@@ -90,14 +96,26 @@ module Isomorfeus
           have_result = evaluate_script 'Opal.gvars.promise_resolved'
           sleep 0.1 unless have_result
         end
-        execute_script <<~JAVASCRIPT
+        result, exception = execute_script <<~JAVASCRIPT
           var result;
-          if (typeof Opal.gvars.promise_result.$to_n === 'function') { result = Opal.gvars.promise_result.$to_n(); }
+          var exception = false;
+          if (Opal.await_ruby_exception) {
+            var e = Opal.await_ruby_exception;
+            exception = { message: e.message, name: e.name, stack: e.stack }
+          } else if (typeof Opal.gvars.promise_result.$to_n === 'function') { 
+            result = Opal.gvars.promise_result.$to_n(); 
+          }
           else { result = Opal.gvars.promise_result };
           delete Opal.gvars.promise_result;
           delete Opal.gvars.promise_resolved;
-          return result;
+          return [result, exception];
         JAVASCRIPT
+        if exception
+          e = Isomorfeus::Puppetmaster::Error.new("#{exception['name']}: #{exception['message']}")
+          e.set_backtrace(exception['stack'])
+          raise e
+        end
+        result
       end
 
       def evaluate_ruby(ruby_source = '', &block)
@@ -238,4 +256,4 @@ module Isomorfeus
       end
     end
   end
-end
+end

data/lib/isomorfeus/puppetmaster/dsl.rb

@@ -20,7 +20,7 @@ module Isomorfeus
       end
 
       def open_new_document(uri = nil)
-        puppetmaster_session.document_open_new_document(uri)
+        puppetmaster_session.document_open_new_document(nil, uri)
       end
 
       def reset_session!
@@ -41,4 +41,4 @@ module Isomorfeus
 
     end
   end
-end
+end

data/lib/isomorfeus/puppetmaster/version.rb

@@ -1,3 +1,3 @@
 module Isomorfeus
-  PUPPETMASTER_VERSION = '0.3.0'
+  PUPPETMASTER_VERSION = '0.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-puppetmaster
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-06 00:00:00.000000000 Z
+date: 2020-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -359,7 +359,8 @@ files:
 homepage: http://isomorfeus.com
 licenses:
 - MIT
-metadata: {}
+metadata:
+  github_repo: ssh://github.com/isomorfeus/gems
 post_install_message: 
 rdoc_options: []
 require_paths: