simplews 1.7.1 → 1.7.2

data/lib/simplews/jobs.rb

@@ -4,6 +4,7 @@ require 'yaml'
 require 'singleton'
 require 'rand'
 require 'zlib'
+require 'base64'
 
 
 
@@ -414,55 +415,55 @@ class SimpleWS::Jobs < SimpleWS
     }
 
 
-    desc "Return the names of the jobs in the queue"
+    desc "Job management: Return the names of the jobs in the queue"
     param_desc :return => "Array of job names"
     serve :queue, [], :return => :array do 
       Scheduler.queue.collect{|info| info[:name]}
     end
 
-    desc "Check the status of a job"
+    desc "Job management: Check the status of a job"
     param_desc :job => "Job identifier", :return => "Status code. Special status codes are: 'queue', 'done', 'error', and 'aborted'"
     serve :status, ['job'], :job => :string, :return => :string do |job|
       Scheduler.job_info(job)[:status].to_s
     end
 
-    desc "Return an array with the messages issued by the job"
+    desc "Job management: Return an array with the messages issued by the job"
     param_desc :job => "Job identifier", :return => "Array with message strings"
     serve :messages, ['job'], :job => :string, :return => :array do |job|
       Scheduler.job_info(job)[:messages]
     end
 
-    desc "Return a YAML string containing arbitrary information set up by the job"
+    desc "Job management: Return a YAML string containing arbitrary information set up by the job"
     param_desc :job => "Job identifier", :return => "Hash with arbitrary values in YAML format"
     serve :info, ['job'], :job => :string, :return => :string do |job|
       Scheduler.job_info(job)[:info].to_yaml
     end
 
-    desc "Abort the job"
+    desc "Job management: Abort the job"
     param_desc :job => "Job identifier"
     serve :abort, %w(job), :job => :string, :return => false do |job|
       Scheduler.abort(job)
     end
 
-    desc "Check if the job is done. Could have finished successfully, with error, or have been aborted"
+    desc "Job management: Check if the job is done. Could have finished successfully, with error, or have been aborted"
     param_desc :job => "Job identifier", :return => "True if the job has status 'done', 'error' or 'aborted'"
     serve :done, %w(job), :job => :string, :return => :boolean do |job|
       [:done, :error, :aborted].include? Scheduler.job_info(job)[:status].to_sym
     end
 
-    desc "Check if the job has finished with error. The last message is the error message"
+    desc "Job management: Check if the job has finished with error. The last message is the error message"
     param_desc :job => "Job identifier", :return => "True if the job has status 'error'"
     serve :error, %w(job), :job => :string, :return => :boolean do |job|
       Scheduler.job_info(job)[:status] == :error
     end
 
-    desc "Check if the job has been aborted"
+    desc "Job management: Check if the job has been aborted"
     param_desc :job => "Job identifier", :return => "True if the job has status 'aborted'"
     serve :aborted, %w(job), :job => :string, :return => :boolean do |job|
       Scheduler.job_info(job)[:status] == :aborted
     end
 
-    desc "Return an array with result identifiers to be used with the 'result' operation. The content of the results depends
+    desc "Job management: Return an array with result identifiers to be used with the 'result' operation. The content of the results depends
     on the task"
     param_desc :job => "Job identifier", :return => "Array of result identifiers"
     serve :results, %w(job), :return => :array do |job|
@@ -471,12 +472,12 @@ class SimpleWS::Jobs < SimpleWS
       results.collect{|p| p[0]}
     end
 
-    desc "Return the content of the result specified by the result identifier. These identifiers are retrieve using the 'results' operation"
+    desc "Job management: Return the content of the result specified by the result identifier. These identifiers are retrieve using the 'results' operation"
     param_desc :result => "Result identifier", :return => "Content of the result file, in Base64 encoding for compatibility"
     serve :result, %w(result), :return => :binary do |result|
       path = @results[result]
       raise ResultNotFound unless File.exist? path
-      File.open(path).read
+      Base64.encode64 File.open(path).read
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simplews
 version: !ruby/object:Gem::Version 
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors: 
 - Miguel Vazquez
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-31 00:00:00 +01:00
+date: 2010-01-01 00:00:00 +01:00
 default_executable: start_ws
 dependencies: 
 - !ruby/object:Gem::Dependency