simplews 1.5.2 → 1.5.3

data/lib/simplews/jobs.rb

@@ -265,9 +265,9 @@ class SimpleWS::Jobs < SimpleWS
 
       def write(file, contents)
         path = Job.path(file, @name)
-        fout = File.open(path,'w')
-        fout.write contents
-        fout.close
+        File.open(path,'w') do |fout|
+          fout.write contents
+        end
       end
 
       def message(message)

data/lib/simplews/rake.rb

@@ -22,7 +22,7 @@ class SimpleWS::Jobs::Scheduler::Job
       alias_method :old_execute, :execute
       def execute(*args)
         action = name
-        message = $_step_desriptions.collect{|rexp, msg| 
+        message = $_step_descriptions.collect{|rexp, msg| 
           if name.match(rexp)
             msg
           else
@@ -37,22 +37,26 @@ class SimpleWS::Jobs::Scheduler::Job
         if message.match(/^(\w+): (.*)/)
           $_current_job.step($1, $2)
         else
-          $_current_job.step(name, message)
+          $_current_job.step(action, message)
         end
 
         old_execute(*args)
       end
     EOC
 
-    $step_descriptions = {}
     load rakefile
-    $step_descriptions.each{|re, info|
-      add_description(re, info[:step], info[:message])
-    }
+    if defined? Rake::Pipeline
+      Rake::Pipeline::step_descriptions.each{|re, description|
+        if description.match(/(.*): (.*)/)
+          add_description(re, $1, $2)
+        end
+      }
+    end
+
     files = result_filenames
 
     $_current_job = self
-    $_step_desriptions = @step_descriptions || {}
+    $_step_descriptions = @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.2
+  version: 1.5.3
 platform: ruby
 authors: 
 - Miguel Vazquez
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-08 00:00:00 +01:00
+date: 2009-12-16 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency