simplews 1.5.1 → 1.5.2

data/lib/simplews/jobs.rb

@@ -295,6 +295,10 @@ class SimpleWS::Jobs < SimpleWS
         save
       end
 
+      def result_filenames
+        @state[:results]
+      end
+
       def abort
         raise SimpleWS::Jobs::Aborted
         save

data/lib/simplews/rake.rb

@@ -5,19 +5,24 @@ require 'rake'
 
 class SimpleWS::Jobs::Scheduler::Job
 
-  def add_message(reg_exp, step, message)
-    @step_messages ||= {}
-    @step_messages[Regexp.new(reg_exp)] = "#{ step }: #{ message }"
+  # Add step information to rule tasks, as the 'desc' method cannot be used to
+  # describe them for the time being.
+  def add_description(reg_exp, step, message)
+    @step_descriptions ||= {}
+    @step_descriptions[Regexp.new(reg_exp)] = "#{ step }: #{ message }"
   end
 
+  # Instruct rake to load the rakefile, named Rakefile by default, and use it
+  # to produce the file specified first as product of the web service task. The
+  # 'execute' method of the Rake::Tasks class method execute is monkey-patched
+  # to log the steps. Since this is executed on a new process, there should be
+  # no side-effects from the patching.
   def rake(rakefile = "Rakefile")
-    $_current_job = self
-    $_step_messages = @step_messages || {}
     Rake::Task.class_eval <<-'EOC'
       alias_method :old_execute, :execute
       def execute(*args)
         action = name
-        message = $_step_messages.collect{|rexp, msg| 
+        message = $_step_desriptions.collect{|rexp, msg| 
           if name.match(rexp)
             msg
           else
@@ -39,8 +44,15 @@ class SimpleWS::Jobs::Scheduler::Job
       end
     EOC
 
+    $step_descriptions = {}
     load rakefile
-    files = SimpleWS::Jobs::Scheduler::Job.job_info(job_name)[:results]
+    $step_descriptions.each{|re, info|
+      add_description(re, info[:step], info[:message])
+    }
+    files = result_filenames
+
+    $_current_job = self
+    $_step_desriptions = @step_descriptions || {}
     Rake::Task[files.first].invoke
   end
 

metadata

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