babl 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d14c27ddc236458258e0d64b27c2f7980ebc3536
-  data.tar.gz: ee6d8b94246e42439abd7eaaea89305cab9408cc
+  metadata.gz: bfccf5f487a05b3c8c4aa22b1021204ef5c44c05
+  data.tar.gz: d23c51624462edaad77cc8ee55bbd2ec3ec2f586
 SHA512:
-  metadata.gz: a8f2bd5d3fa98994535fea376a0dfd67af41f247c17a0772461936dcdd129535dd88cf0a8c08867a3c4228da6973af07ef572e7cc11f341c91569fbee9837a24
-  data.tar.gz: a6df3de8427e7acecb27cb3bb10cc372c4b8db34f07d199bd16a32de2d6b7570befe836bcb338196d5b40465e757a8c4b61975a0efbc0778766e6bd2bb431e65
+  metadata.gz: bf1064a6549eec01f420aa7d7dc5d65c85d0012776a656fcd0880b9f2cebc15901c82ef655b5a5588b03415f0b6d397013495a2b9d320e28f9ef4374b18fc7da
+  data.tar.gz: 691580b6111bab10d54a07e4246bfdbc2238c152fd46c5e12b67fe42635191ab681361d4b2f9c46d475d8019493b5a3b63a3a6798ab1108347a38b6aedb56a80

data/babl.gemspec

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

data/lib/babl.rb

@@ -2,6 +2,8 @@ require 'quartz'
 require 'base64'
 require 'net/http'
 
+require_relative 'babl/module_response'
+
 
 module Babl
   class UnknownModuleError < StandardError; end
@@ -21,12 +23,6 @@ module Babl
     end
   end
 
-  def self.fetch_payload raw_response
-    url = raw_response['PayloadUrl']
-    raw_response['Stdout'] = Base64.strict_encode64(Net::HTTP.get URI(url)) if url != ''
-    raw_response
-  end
-
   def self.bin_path
     system = `which babl-rpc`.strip
     if system.empty?
@@ -49,29 +45,16 @@ module Babl
   end
 
   def self.module! name, opts = {}
-    res = fetch_payload(call! name, opts)
-    stdout = Base64.decode64(res["Stdout"])
-    exitcode = res['Exitcode']
-    if exitcode != 0
-      stderr = Base64.decode64(res["Stderr"])
-      raise ModuleError.new(stdout: stdout, stderr: stderr, exitcode: exitcode)
+    res = call! name, opts
+    if res.exitcode != 0
+      raise ModuleError.new(stdout: res.stdout, stderr: res.stderr, exitcode: res.exitcode)
     end
-    stdout
+    res.stdout
   end
 
   def self.call! name, opts = {}
-    params = {'Name' => name}
-    if opts[:in]
-      params['Stdin'] = Base64.encode64(opts[:in])
-    end
-    if opts[:env]
-      params['Env'] = opts[:env].inject({}) { |h, (k,v)| h[k.to_s] = v.to_s; h }
-    end
-    if opts[:endpoint]
-      params['BablEndpoint'] = opts[:endpoint]
-    end
     begin
-      res = client[:babl].call('Module', params)
+      ModuleResponse.new(client[:babl].call('Module', options_to_rpc_parameter(name, opts)))
     rescue Quartz::ResponseError => e
       if e.message == 'babl-rpc: module name format incorrect'
         raise ModuleNameFormatIncorrectError.new('Module Name Format Incorrect')
@@ -79,6 +62,30 @@ module Babl
         raise
       end
     end
-    res
+  end
+
+  def self.options_to_rpc_parameter name, opts
+    params = {'Name' => name}
+    if input = opts[:in]
+      if input.is_a?(ModuleResponse)
+        if input.payload_url
+          params['PayloadUrl'] = input.payload_url
+        else
+          params['Stdin'] = Base64.encode64(input.stdout)
+        end
+      else
+        params['Stdin'] = Base64.encode64(input)
+      end
+    end
+    if opts[:payload_url]
+      params['PayloadUrl'] = opts[:payload_url]
+    end
+    if opts[:env]
+      params['Env'] = opts[:env].inject({}) { |h, (k,v)| h[k.to_s] = v.to_s; h }
+    end
+    if opts[:endpoint]
+      params['BablEndpoint'] = opts[:endpoint]
+    end
+    params
   end
 end

data/lib/babl/module_response.rb

@@ -0,0 +1,39 @@
+module Babl
+  class ModuleResponse
+    attr_reader :exitcode, :payload_url
+
+    def initialize response
+      @stdout_raw = response["Stdout"]
+      @stderr_raw = response["Stderr"]
+      @exitcode = response["Exitcode"]
+
+      @payload_url = response["PayloadUrl"]
+    end
+
+    def stdout allow_fetch = true
+      @stdout ||= begin
+        if payload_url.to_s != ""
+          fetch_payload if allow_fetch
+        else
+          o = Base64.decode64(@stdout_raw)
+          @stdout_raw = nil
+          o
+        end
+      end
+    end
+
+    def stderr
+      @stderr ||= begin
+        o = Base64.decode64(@stderr_raw)
+        @stderr_raw = nil
+        o
+      end
+    end
+
+    def fetch_payload
+      if payload_url.to_s != ""
+        Net::HTTP.get URI(payload_url)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: babl
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Lars Kluge
@@ -101,6 +101,7 @@ files:
 - bin/console
 - bin/setup
 - lib/babl.rb
+- lib/babl/module_response.rb
 homepage: https://github.com/babl-sh/ruby-babl
 licenses:
 - MIT