rutema 0.9.1 → 0.9.2

data/History.txt

@@ -1,9 +1,14 @@
+== 0.9.2 / 2008-09-10
+* Fixed major blunder with test reporting
+* Added text reporter for consistent text summaries
+* More tests
+* Fixed check test behaviour (was not running even when specified in the configuration)
+* Fixed bungled emailing when using multiple addresses in the config
 == 0.9.1 / 2008-09-09
 * Modularisation of element parsing methods introduced. 
 * MinimalXMLParser refactored as example.
 * Extra element parser modules available in the rutema_elements gem
 * Cleaned up EmailReporter. Unit tests with Mocha, text report has a better layout
-
 == 0.9.0 / 2008-09-08
 * Ability to nest scenarios added to the base parser
 * Documentation at http://patir.rubyforge.org/rutema/tool_configuration.html

data/Manifest.txt

@@ -15,6 +15,7 @@ lib/rutema/reporter.rb
 lib/rutema/reporters/activerecord.rb
 lib/rutema/reporters/email.rb
 lib/rutema/reporters/standard_reporters.rb
+lib/rutema/reporters/text.rb
 lib/rutema/specification.rb
 lib/rutema/system.rb
 selftest.sh

data/distro_test.sh

@@ -2,4 +2,6 @@
 rutemax -c test/distro_test/config/minimal.rutema
 rutemax -c test/distro_test/config/database.rutema 
 rutemah -c test/distro_test/config/database.rutemah all
-rutemax -c test/distro_test/config/minimal.rutema --step
+rutemax -c test/distro_test/config/full.rutema --check
+rutemax -c test/distro_test/config/full.rutema 
+#rutemax -c test/distro_test/config/minimal.rutema --step

data/lib/rutema/reporters/activerecord.rb

@@ -53,7 +53,7 @@ module Rutema
         if spec
           sc.version=spec.version if spec.has_version?
         else
-          @logger.error("Could not find specification for #{scenario.sequence_name}")
+          @logger.debug("Could not find specification for #{scenario.sequence_name}")
         end
         if scenario.strategy==:attended
           sc.attended=true

data/lib/rutema/reporters/email.rb

@@ -1,7 +1,9 @@
 #  Copyright (c) 2007 Vassilis Rizopoulos. All rights reserved.
 $:.unshift File.join(File.dirname(__FILE__),"..","..")
+require 'net/smtp'
 require 'rutema/reporter'
 require 'rutema/specification'
+require 'rutema/reporters/text'
 require 'rutema/gems'
 
 module Rutema
@@ -38,7 +40,6 @@ module Rutema
       @mail.from = definition[:sender]
       @mail.from||="rutema@#{@domain}"
       @recipients=definition[:recipients]
-      @mail.to=@recipients
       #customize
       @subject=definition[:subject]
       @subject||=""
@@ -52,42 +53,25 @@ module Rutema
     
     def report specifications,runner_states,parse_errors,configuration
       @mail.subject = "#{@subject}"
-      @mail.text = text_report(runner_states,parse_errors)
+      @mail.text = TextReporter.new.report(specifications,runner_states,parse_errors,configuration)
       begin
-        if @mail.to.empty?
+        if @recipients.empty?
           @logger.error("No recipients for the report mail")
         else
           #
           #~ if @password
           #~ #if a password is defined, use cram_md5 authentication
           #~ else
-          Net::SMTP.start(@server, @port, @domain) {|smtp| smtp.sendmail(@mail.to_s(),@mail.from,@mail.to)}
+          @logger.info("Emailing through #{@server}:#{@port}(#{@domain})")
+          Net::SMTP.start(@server, @port, @domain) {|smtp| smtp.send_message(@mail.to_s(),@mail.from,@recipients)}
           #~ end
         end#recipients empty
       rescue
+        @logger.debug($!)
         @logger.error("Sending of email report failed: #{$!}")
+        @logger.debug("Tried to sent to #{@recipients}")
       end
       @mail.to_s
     end
-    private
-    def text_report runner_states,parse_errors
-      msg=""
-      #Report on parse errors
-      msg<<"No parse errors" if parse_errors.empty?
-      msg<<"One parse error:" if parse_errors.size==1
-      msg<<"#{parse_errors.size} parse errors:" if parse_errors.size>1
-      parse_errors.each do |er|
-        msg<<"\n\tin #{er[:filename]} : #{er[:error]}"
-      end
-      msg<<"\n---"
-      #Report on scenarios
-      msg<<"\nNo scenarios in this run" if runner_states.empty?
-      msg<<"\nOne scenario in the current run:" if runner_states.size==1
-      msg<<"\n#{runner_states.size} scenarios in the current run:" if runner_states.size>1
-      runner_states.each do |state|
-        msg<<"\n#{state.summary}\n---"
-      end
-      return msg
-    end
   end
 end

data/lib/rutema/reporters/standard_reporters.rb

@@ -1,5 +1,6 @@
 #  Copyright (c) 2007 Vassilis Rizopoulos. All rights reserved.
 $:.unshift File.join(File.dirname(__FILE__),"..","..")
 
+require 'rutema/reporters/text'
 require 'rutema/reporters/email'
 require 'rutema/reporters/activerecord'

data/lib/rutema/reporters/text.rb

@@ -0,0 +1,33 @@
+module Rutema
+  #This reporter cerates a simple text summary of a test run
+  class TextReporter
+    def initialize params=nil 
+    end
+    
+    #Returns the text summary
+    def report specifications,runner_states,parse_errors,configuration
+      return text_report(specifications,runner_states,parse_errors)
+    end
+    private
+    def text_report specifications,runner_states,parse_errors
+      msg=""
+      #Report on parse errors
+      msg<<"No parse errors" if parse_errors.empty?
+      msg<<"One parse error:" if parse_errors.size==1
+      msg<<"#{parse_errors.size} parse errors:" if parse_errors.size>1
+      parse_errors.each do |er|
+        msg<<"\n\tin #{er[:filename]} : #{er[:error]}"
+      end
+      msg<<"\n---"
+      #Report on scenarios
+      msg<<"\nNo scenarios in this run" if runner_states.empty?
+      msg<<"\nOne scenario in the current run:" if runner_states.size==1
+      msg<<"\n#{runner_states.size} scenarios in the current run:" if runner_states.size>1
+      runner_states.each do |state|
+        msg<<"\n#{state.summary}\n---"
+      end
+      return msg
+    end
+  end
+  
+end

data/lib/rutema/system.rb

@@ -11,7 +11,7 @@ module Rutema
   module Version
     MAJOR=0
     MINOR=9
-    TINY=1
+    TINY=2
     STRING=[ MAJOR, MINOR, TINY ].join( "." )
   end
   #The Elements module provides the namespace for the various modules adding parser functionality
@@ -269,15 +269,15 @@ module Rutema
       @reporters=@configuration.reporters.collect{ |reporter| instantiate_class(reporter) }
       @reporters.compact!
       @configuration.tests.collect!{|t| File.expand_path(t)}
-      @runner=create_runner
-      @parsed_files=Array.new
       #this will hold any specifications that are succesfully parsed.
       @specifications=Hash.new
+      @parsed_files=Array.new
     end
     #Runs a set of tests
     #
     #mode can be :all, :attended, :unattended or a test filename
     def run mode
+      @runner||=create_runner
       @configuration.context.start_time=Time.now
       @logger.info("Run started in mode '#{mode}'")
       begin
@@ -336,7 +336,7 @@ module Rutema
       return @runner.success?
     end
     def to_s
-      "Parsed #{@parsed_files.size} files\n#{Rutema.text_report(@runner.states.values,@parse_errors)}"
+      "Parsed #{@parsed_files.size} files\n#{TextReporter.new.report(@specifications,@runner.states.values,@parse_errors,@configuration)}"
     end
     private
     def instantiate_class definition
@@ -405,9 +405,25 @@ module Rutema
       if specs.empty?
         @logger.error("No tests to run")
       else
-        specs.each{|s| run_test(s)}
+        if @configuration.check
+          @logger.info("Parsing check test '#{@configuration.check}'")
+          spec=parse_specification(@configuration.check)
+          if spec
+            @logger.info("Running check test '#{spec}'")
+            if run_test(spec).success?
+              specs.each{|s| run_test(s)}
+            else
+              @logger.error("Check test failed")
+            end
+          else
+            @logger.error("Error parsing check test")
+          end
+        else
+          specs.each{|s| run_test(s)}
+        end
       end
     end
+    
     def run_test specification
       @logger.info("Running #{specification.name} -  #{specification.title}")
       if specification.scenario

data/test/distro_test/config/full.rutema

@@ -10,6 +10,6 @@ configuration.tests=[
 configuration.tool={:name=>"test",:path=>".",:configuration=>{:key=>"value"}}
 configuration.path={:name=>"test",:path=>"."}
 configuration.context={:key=>"value"}
-configuration.check="."
-configuration.teardown="."
-configuration.setup="."
+configuration.check="../specs/check.spec"
+configuration.teardown="../specs/teardown.spec"
+configuration.setup="../specs/setup.spec"

data/test/distro_test/config/minimal.rutema

@@ -5,4 +5,4 @@ configuration.tests=[
 "../specs/T003.spec",
 "../specs/T004.spec",
 "../specs/T005.spec"
-]
+]

data/test/distro_test/specs/T005.spec

@@ -5,6 +5,6 @@
 <scenario>
 	<echo>We can now include scenarios in standalone files</echo>
 	<include_scenario file="include.scenario"/>
-	<echo>This is the 5th step</echo>
+	<echo>This is the 4th step</echo>
 </scenario>
 </specification>

data/test/rutema.spec

@@ -5,6 +5,7 @@
 	<command cmd="rutemax -c distro_test/config/minimal.rutema"/>
 	<command cmd="rutemax -c distro_test/config/database.rutema"/>
 	<command cmd="rutemax -c distro_test/config/database.rutema distro_test/specs/T001.spec"/>
+	<command cmd="rutemax -c distro_test/config/full.rutema"/>
 	<command cmd="rutemah -c distro_test/config/database.rutemah all"/>
 </scenario>
 </specification>

data/test/test_reporter.rb

@@ -5,7 +5,6 @@ require 'fileutils'
 require 'rutema/reporters/standard_reporters'
 require 'rubygems'
 require 'mocha'
-require 'net/smtp'
 #$DEBUG=true
 module TestRutema
   class MockCommand

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rutema
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - Vassilis Rizopoulos
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-09 00:00:00 +02:00
+date: 2008-09-10 00:00:00 +02:00
 default_executable: rutemax
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,6 +112,7 @@ files:
 - lib/rutema/reporters/activerecord.rb
 - lib/rutema/reporters/email.rb
 - lib/rutema/reporters/standard_reporters.rb
+- lib/rutema/reporters/text.rb
 - lib/rutema/specification.rb
 - lib/rutema/system.rb
 - selftest.sh