marty 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74092a6c860ba6143a686a653e304abd173f7b1e
-  data.tar.gz: 7e18178b04dacec033571c2566c653043d27116a
+  metadata.gz: cb347975c0c4442e6466f8cbcbd72d431c85f45f
+  data.tar.gz: 4c7de97777049441bbf43ea5d324ed1a4c858315
 SHA512:
-  metadata.gz: c9666aa7555d70c078cb27745206af4ae51dfa6728d21f0cb637d1736cb106b19228c6056c51d16a3a923f1630ee732a93768ca252d7fde6ecc7229a1f091586
-  data.tar.gz: 675388c07330499a07f89705c7887eadaf0da17cef12c65c0ae914ca55d3c59062e08676c6af36aff1b6891827b94348849ccb3770fe6cbc66577b70c5775bc9
+  metadata.gz: dc0b688584580e74b519a04559d0c3dd6bcbc0d3fc2e00949403a32c54ef25f78380573238f8d80d048ce434d3c936a6c455db94c1a2945065ea4c39525b277d
+  data.tar.gz: 7318c212db79212f25ad3fcfc3f27d28e666f1948d333b93f7ab5d5689e5eb4f16f54873a02d016eff9678bd607a7edce244d3234b94e2229c05b7313149197b

data/lib/marty/rpc_call.rb

@@ -1,24 +1,40 @@
 class Marty::RpcCall
-  def self.marty_post(host, port, path, script, node, attrs, params)
+  # POST to a remote marty
+  def self.marty_post(host, port, path, script, node, attrs, params, options={})
     http = Net::HTTP.new(host, port)
     request = Net::HTTP::Post.new(path)
     request.add_field('Content-Type', 'application/json')
-    request.body = {
-      "script" => script,
-      "node"   => node,
-      "attrs"  => attrs.to_json,
-      "params" => params.to_json,
-    }.to_json
+    request.body = (options + {
+                      "script" => script,
+                      "node"   => node,
+                      "attrs"  => attrs.to_json,
+                      "params" => params.to_json,
+                    }).to_json
     begin
-      resraw = http.request(request)
+      response = http.request(request)
     rescue => e
       raise "#{e.message} during RPC call to #{host}:#{port}"
     end
-    res = JSON.parse(resraw.body)
+
+    res = JSON.parse(response.body)
     raise res["error"] if res.is_a?(Hash) && !res["error"].blank?
     res
   end
 
+  def self.marty_download(host, port, path, job_id)
+    params = {job_id: job_id}
+    url = path + '?' + URI.encode(URI.encode_www_form(params))
+
+    http = Net::HTTP.new(host, port)
+    request = Net::HTTP::Get.new(url)
+
+    begin
+      http.request(request)
+    rescue => e
+      raise "#{e.message} during download call to #{host}:#{port}"
+    end
+  end
+
   def self.xml_call(host, port, path, body, use_ssl)
     http = Net::HTTP.new(host, port)
     request = Net::HTTP::Post.new(path)
@@ -26,14 +42,14 @@ class Marty::RpcCall
     request.add_field('Content-Type', 'xml')
     request.add_field('Accept', 'xml')
     request.body = body
+
     begin
-      resraw = http.request(request)
-      if resraw.class != Net::HTTPOK
-        raise "got #{resraw} during XML call"
-      end
+      response = http.request(request)
+      raise "got #{response} during XML call" if response.class != Net::HTTPOK
     rescue => e
       raise "#{e.message} during RPC call to #{host}:#{port}#{path}"
     end
-    resraw.body
+
+    response.body
   end
 end

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "1.0.11"
+  VERSION = "1.0.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - Arman Bostani