rundeck-ruby-client 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52206825af75c0e173b4a4c728547910e43cbff3
-  data.tar.gz: 538fbdf0c5874662c2728f2d74cd7423d5b0874f
+  metadata.gz: 9fc318f02f505fd0b7274b5e1e5b33e5a9d26390
+  data.tar.gz: fd12d89dd888462463537ed41b8b8747bc25a27d
 SHA512:
-  metadata.gz: a02b3685ae270491c8785795d7e56acbe35b675ec8c116d0283f9db4a35b79826d0ad8df9df31c37741690fe3a360a88cabb9c22ae113c02477ca78f5f889102
-  data.tar.gz: bcd2949483d65d8b74085ea2b47467a038a51f11dcd1f2fbb558113707531cdebf1b0605f8fe0793b4090d4a6507bb1c1d13d76abeb13145a254cf8fe06f30d6
+  metadata.gz: 246ff2c0aa1f650011271dcaaf292ae387d77f18f8d2bae7efd7c6e806310383b3bb1a37c52c1d00d1f91d7044bbe68479eb5bb724fbd7dd426aca7f730050c0
+  data.tar.gz: e2aa7bfdd46f8da936594247f5d8750eb1e0504fe0baf4fc02453a3ce7acfba23e3f41dbcbb108f9682cba89312a22fbdc5ec2859b6f38ddbfc2fc15cb218eba

data/lib/rundeck-ruby-client/execution.rb

@@ -1,4 +1,5 @@
 require 'timeout'
+require 'pp'
 
 module Rundeck
   class Execution
@@ -46,17 +47,24 @@ module Rundeck
       ret = session.get("api/9/execution/#{id}/output")
       result = ret['result']
       raise "API call not successful" unless result && result['success']=='true'
-
-      #sort the output by node
       ret = result['output'].slice(*%w(id completed hasFailedNodes))
-      ret['log'] = result['output']['entries']['entry'].group_by{|e| e['node']}
+      logs = result['output']['entries']['entry']
+      if logs.class == Array
+        logs = logs.group_by{|e| e['node']}
+      else
+        logs = {"localhost" => [logs]}
+      end
+      ret['log'] = logs
+      ret = [ret] if ret.class != Array
       ret
     end
 
     # http request are done at each loop so, be nice with interval :)
     def wait_end interval, timeout
       Timeout.timeout(timeout) do
-        until Execution::find(@session, @id).status != :running do
+          exec = Execution::find(@session, @id)
+        until exec.status != :running do
+          exec = Execution::find(@session, @id)
           sleep interval
         end
       end

data/lib/rundeck-ruby-client/job.rb

@@ -35,7 +35,7 @@ module Rundeck
 
     def execute!(args_hash)
       argstr=""
-      args_hash.map {|param, value| argstr += "-#{param} #{value} "}
+      args_hash.map {|param, value| argstr += "-#{param} \"#{value}\" "}
       encoded_args = URI::encode(argstr)
       query = "api/1/job/#{id}/run?argString=#{encoded_args}"
       hash = session.get(query, 'result', 'executions', 'execution') || {}

data/lib/rundeck-ruby-client/version.rb

@@ -1,3 +1,3 @@
 module Rundeck
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rundeck-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jon Phillips
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2014-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client