patir 0.5.7 → 0.5.8

data/History.txt

@@ -1,3 +1,5 @@
+== 0.5.8 /2008-09-18
+* CommandSequence status updates set the correct status
 == 0.5.7 / 2008-09-10
 * Sorted CommandSequenceStatus summaries
 == 0.5.6 / 2008-05-16

data/lib/patir/base.rb

@@ -6,7 +6,7 @@ module Patir
   module Version
     MAJOR=0
     MINOR=5
-    TINY=7
+    TINY=8
     STRING=[ MAJOR, MINOR, TINY ].join( "." )  	
   end
   #Error thrown usually in initialize methods when missing required parameters

data/lib/patir/command.rb

@@ -246,7 +246,7 @@ module Patir
             break 
           end
         end
-      end
+      end#each step
       #we finished
       @state.stop_time=Time.now
       @state.status=running_status
@@ -377,10 +377,12 @@ module Patir
         :output=>step.output,
         :duration=>step.exec_time,
         :error=>step.error,
-        :strategy=>step.strategy}
-        #this way we don't have to compare all the step states we always get the worst last stable state
-        #:not_executed<:success<:warning<:success
-        @previous_status=@status unless @status==:running
+        :strategy=>step.strategy
+      }
+      #this way we don't have to compare all the step states we always get the worst last stable state
+      #:not_executed<:success<:warning<:success
+      unless @status==:running
+        @previous_status=@status 
         case step.status
         when :running
           @status=:running
@@ -396,97 +398,98 @@ module Patir
         when :not_executed
           @status=@previous_status
         end
-      end
-      #produces a brief text summary for this status
-      def summary
-        sum=""
-        sum<<"#{@sequence_id}:" if @sequence_id
-        sum<<"#{@sequence_name}. " unless @sequence_name.empty?
-        sum<<"Status - #{@status}" 
-        if !@step_states.empty? && @status!=:not_executed
-          sum<<". States #{@step_states.size}\nStep status summary:"
-          sorter=Hash.new
-          @step_states.each do |number,state|
-            #sort them by number
-            sorter[number]="\n\t#{number}:'#{state[:name]}' - #{state[:status]}"
-          end
-          1.upto(sorter.size) {|i| sum<<sorter[i] if sorter[i]}
-        end 
-        return sum
-      end
-      def to_s
-        "'#{sequence_id}':'#{@sequence_name}' on '#{@sequence_runner}' started at #{@start_time}.#{@step_states.size} steps"
-      end
-      def exec_time
-        return @stop_time-@start_time if @stop_time
-        return 0
-      end
-      def name
-        return @sequence_name
-      end  
-      def number
-        return @sequence_id
-      end
-      def output
-        return self.summary
-      end
-      def error
-        return ""
-      end
-      def executed?
-        return true unless @status==:not_executed
-        return false
-      end
+      end#unless running
     end
-
-    #This class allows you to wrap Ruby blocks and handle them like Command
-    #
-    #Provide a block to RubyCommand#new and you can execute the block using
-    #RubyCommand#run
-    #
-    #The block receives the instance of RubyCommand so you can set the output and error output.
-    #
-    #The return value of the block is assigned as the command status.
-    #
-    #== Examples
-    #An example (using the excellent HighLine lib) of a CLI prompt as a RubyCommand
-    # RubyCommand.new("prompt") do |cmd|  
-    #     cmd.output=""
-    #     cmd.error=""
-    #     if HighLine.agree("#{step.text}?")
-    #       :success
-    #     else
-    #       :error
-    #     end
-    #   end
-    class RubyCommand
-      include Patir::Command
-      attr_reader :cmd,:working_directory
-      def initialize name,working_directory=nil,&block
-        @name=name
-        @working_directory=working_directory||"."
-        if block_given?
-          @cmd=block 
-        else
-          raise "You need to provide a block"
+    #produces a brief text summary for this status
+    def summary
+      sum=""
+      sum<<"#{@sequence_id}:" if @sequence_id
+      sum<<"#{@sequence_name}. " unless @sequence_name.empty?
+      sum<<"Status - #{@status}" 
+      if !@step_states.empty? && @status!=:not_executed
+        sum<<". States #{@step_states.size}\nStep status summary:"
+        sorter=Hash.new
+        @step_states.each do |number,state|
+          #sort them by number
+          sorter[number]="\n\t#{number}:'#{state[:name]}' - #{state[:status]}"
         end
+        1.upto(sorter.size) {|i| sum<<sorter[i] if sorter[i]}
+      end 
+      return sum
+    end
+    def to_s
+      "'#{sequence_id}':'#{@sequence_name}' on '#{@sequence_runner}' started at #{@start_time}.#{@step_states.size} steps"
+    end
+    def exec_time
+      return @stop_time-@start_time if @stop_time
+      return 0
+    end
+    def name
+      return @sequence_name
+    end  
+    def number
+      return @sequence_id
+    end
+    def output
+      return self.summary
+    end
+    def error
+      return ""
+    end
+    def executed?
+      return true unless @status==:not_executed
+      return false
+    end
+  end
+
+  #This class allows you to wrap Ruby blocks and handle them like Command
+  #
+  #Provide a block to RubyCommand#new and you can execute the block using
+  #RubyCommand#run
+  #
+  #The block receives the instance of RubyCommand so you can set the output and error output.
+  #
+  #The return value of the block is assigned as the command status.
+  #
+  #== Examples
+  #An example (using the excellent HighLine lib) of a CLI prompt as a RubyCommand
+  # RubyCommand.new("prompt") do |cmd|  
+  #     cmd.output=""
+  #     cmd.error=""
+  #     if HighLine.agree("#{step.text}?")
+  #       :success
+  #     else
+  #       :error
+  #     end
+  #   end
+  class RubyCommand
+    include Patir::Command
+    attr_reader :cmd,:working_directory
+    def initialize name,working_directory=nil,&block
+      @name=name
+      @working_directory=working_directory||"."
+      if block_given?
+        @cmd=block 
+      else
+        raise "You need to provide a block"
       end
-      #Runs the associated block
-      def run
-        @run=true
-        begin
-          t1=Time.now
-          Dir.chdir(@working_directory) do
-            @status=@cmd.call(self)
-          end
-        rescue
-          error<<"RubyCommand failed:"
-          error<<"#{$!}"
-          @status=:error
-        ensure
-          @exec_time=Time.now-t1
+    end
+    #Runs the associated block
+    def run
+      @run=true
+      begin
+        t1=Time.now
+        Dir.chdir(@working_directory) do
+          @status=@cmd.call(self)
         end
-        return @status
+      rescue
+        error<<"RubyCommand failed:"
+        error<<"#{$!}"
+        @status=:error
+      ensure
+        @exec_time=Time.now-t1
       end
+      return @status
     end
-  end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: patir
 version: !ruby/object:Gem::Version 
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors: 
 - Vassilis Rizopoulos
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-10 00:00:00 +02:00
+date: 2008-09-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency