babl 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6a7ba94522673fe7d587aa2b56da24a7acf3ad2
-  data.tar.gz: cc99b7dad80c9fdf741e80662c04375000c96b58
+  metadata.gz: bced3f7160dd07f83e46444d547bc08587f16a8f
+  data.tar.gz: 898d57f4ecdbbe67818fa1898e6895aa50b7362f
 SHA512:
-  metadata.gz: 633e807c570cbf94c4852854bd59e9643b95bac6961ae27a5ee7c328a3cbbaa124ae6c641399ee0c1bd0fdac798803e81d791c0adb71d84ec90f4c2781e808d9
-  data.tar.gz: f66e774431dc5b081d7523a20fb07e1522a58f160536452c0d05c441165baf34b1a1d597f6fdfbb92cf6708a8e32adde27e1a8e7ded4c5d2c9afb399244b8fee
+  metadata.gz: 5a5768024b9ee6f8038c2ae27fbe587567d11db7039348e32523a698ce3fb7fac56b3324856b6d091e7c5eac15810ccae8ce4da49c9e3f4aa3c571d71ba475ba
+  data.tar.gz: 5f776042d848defe5068465cc17b1c66c404f3dae33ae13111a407169b44c19aa8ccf8fd68209a703d63343d54067d54618e316bcb8c3b9f41d92c86b4dc6c2f

data/babl.gemspec

@@ -5,7 +5,7 @@ require 'babl'
 
 Gem::Specification.new do |spec|
   spec.name          = "babl"
-  spec.version       = "0.4.5"
+  spec.version       = "0.4.6"
   spec.authors       = ["Lars Kluge"]
   spec.email         = ["l@larskluge.com"]
 

data/lib/babl.rb

@@ -10,16 +10,17 @@ module Babl
   class ModuleNameFormatIncorrectError < StandardError; end
 
   class ModuleError < StandardError
-    attr_reader :stdout, :stderr, :exitcode
+    attr_reader :stdout, :stderr, :exitcode, :payload_url
 
     def initialize opts = {}
       @stdout = opts[:stdout]
       @stderr = opts[:stderr]
       @exitcode = opts[:exitcode]
+      @payload_url = opts[:payload_url]
     end
 
     def to_s
-      "Module execution failed with exitcode #{exitcode}. Stderr:\n#{stderr}"
+      "Module execution failed with exitcode #{exitcode}. Payload url: #{payload_url}. Stderr:\n#{stderr}"
     end
   end
 
@@ -46,9 +47,7 @@ module Babl
 
   def self.module! name, opts = {}
     res = call! name, opts
-    if res.exitcode != 0
-      raise ModuleError.new(stdout: res.stdout, stderr: res.stderr, exitcode: res.exitcode)
-    end
+    res.raise_exception_when_unsuccessful!
     res.stdout
   end
 
@@ -68,7 +67,7 @@ module Babl
     params = {'Name' => name}
     if input = opts[:in]
       if input.is_a?(ModuleResponse)
-        if input.payload_url.to_s != ""
+        if input.payload_url
           params['PayloadUrl'] = input.payload_url
         else
           params['Stdin'] = Base64.encode64(input.stdout)

data/lib/babl/module_response.rb

@@ -5,14 +5,16 @@ module Babl
     def initialize response
       @stdout_raw = response["Stdout"]
       @stderr_raw = response["Stderr"]
-      @exitcode = response["Exitcode"]
+      @exitcode = response["Exitcode"].to_i
 
-      @payload_url = response["PayloadUrl"]
+      if !response["PayloadUrl"].nil? and response["PayloadUrl"] != ""
+        @payload_url = response["PayloadUrl"]
+      end
     end
 
     def stdout allow_fetch = true
       @stdout ||= begin
-        if payload_url.to_s != ""
+        if payload_url
           fetch_payload if allow_fetch
         else
           o = Base64.decode64(@stdout_raw)
@@ -31,9 +33,15 @@ module Babl
     end
 
     def fetch_payload
-      if payload_url.to_s != ""
+      if payload_url
         Net::HTTP.get URI(payload_url)
       end
     end
+
+    def raise_exception_when_unsuccessful!
+      if exitcode != 0
+        raise ModuleError.new(stdout: stdout(false), stderr: stderr, exitcode: exitcode, payload_url: payload_url)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: babl
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Lars Kluge
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-14 00:00:00.000000000 Z
+date: 2016-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: quartz