rutema 1.0.9 → 1.1.0

data/History.txt

@@ -1,3 +1,9 @@
+== 1.1.0 /2010-12
+* Added Rutema::RakeTask class to allow integration of the test runner with rake
+* Email reporting now suppresses _setup and _teardown entries unless it's configured as verbose. To do this add a :verbose=>true entry in the reporter configuration
+* Fixed a bug, where on a setup spec failure the state of the actual spec was nil
+* added YAML dump reporter	
+* Fixed a bug in the initialization of StepRunner that prevented use of --step
 == 1.0.9 / 2010-03-22
 * Fixed (hopefully) a nagging bug in activerecord reporter where it would crash if a step had status nil.
 * Fixed the same behaviour in the text reporter

data/Manifest.txt

@@ -9,11 +9,14 @@ distro_test.sh
 lib/rutema/configuration.rb
 lib/rutema/gems.rb
 lib/rutema/model.rb
+lib/rutema/rake.rb
 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/reporters/yaml.rb
+lib/rutema/reporters/couchdb.rb
 lib/rutema/specification.rb
 lib/rutema/system.rb
 selftest.sh
@@ -38,4 +41,5 @@ test/test_model.rb
 test/test_reporter.rb
 test/test_specification.rb
 test/test_system.rb
+test/test_couchdb.rb
 

data/Rakefile

@@ -1,4 +1,4 @@
-#  Copyright (c) 2007 Vassilis Rizopoulos. All rights reserved.
+#  Copyright (c) 2007-2010 Vassilis Rizopoulos. All rights reserved.
 # -*- ruby -*-
 $:.unshift File.join(File.dirname(__FILE__),"lib")
 $:.unshift File.join(File.dirname(__FILE__),"ext")
@@ -17,11 +17,12 @@ Hoe.spec('rutema') do |p|
   p.url = p.paragraphs_of('README.txt', 0).first.split(/\n/)[1..-1]
   p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
   p.extra_deps<<['patir',">=0.6.4"]
-  p.extra_deps<<['highline']
-  p.extra_deps<<['mailfactory']
-  p.extra_deps<<['activerecord','2.3.4']
-  p.extra_deps<<['ruport','1.6.1']
+  p.extra_deps<<['highline','1.5.2']
+  p.extra_deps<<['mailfactory','1.4.0']
+  p.extra_deps<<['activerecord','2.3.8']
+  p.extra_deps<<['ruport','1.6.3']
   p.extra_deps<<['acts_as_reportable','1.1.1']
+  p.extra_deps<<['couchrest','=0.37']
   p.spec_extras={:executables=>["rutemax","rutema_upgrader"],
     :default_executable=>"rutemax"}
 end

data/bin/rutema_upgrader

@@ -1,4 +1,4 @@
-#  Copyright (c) 2008 Vassilis Rizopoulos. All rights reserved.
+#  Copyright (c) 2008-2010 Vassilis Rizopoulos. All rights reserved.
 require 'rutema/system'
 require 'patir/base'
 

data/bin/rutemax

@@ -1,4 +1,8 @@
-#  Copyright (c) 2007 Vassilis Rizopoulos. All rights reserved.
+#  Copyright (c) 2007-2010 Vassilis Rizopoulos. All rights reserved.
 require 'rutema/gems'
 require 'rutema/system'
-Rutema::RutemaX.new(ARGV)
+begin
+	Rutema::RutemaX.new(ARGV)
+rescue
+	exit 1
+end	

data/lib/rutema/configuration.rb

@@ -1,4 +1,4 @@
-#  Copyright (c) 2007 Vassilis Rizopoulos. All rights reserved.
+#  Copyright (c) 2007-2010 Vassilis Rizopoulos. All rights reserved.
 $:.unshift File.join(File.dirname(__FILE__),"..")
 
 module Rutema

data/lib/rutema/gems.rb

@@ -1,3 +1,4 @@
-gem 'activerecord','2.3.4'
+gem 'activerecord','2.3.8'
 gem 'patir',">=0.6.4"
 gem 'acts_as_reportable','=1.1.1'
+gem 'couchrest','=0.37'

data/lib/rutema/model.rb

@@ -1,7 +1,9 @@
-#  Copyright (c) 2007 Vassilis Rizopoulos. All rights reserved.
+#  Copyright (c) 2007-2010 Vassilis Rizopoulos. All rights reserved.
 $:.unshift File.join(File.dirname(__FILE__),"..")
 require 'active_record'
 require 'ruport/acts_as_reportable'
+require 'patir/base'
+require 'couchrest'
 #this fixes the AR Logger hack that annoys me sooooo much
 class Logger
   private
@@ -10,84 +12,218 @@ class Logger
   end
 end
 module Rutema 
-  #This is the ActiveRecord model for Rutema:
-  #
-  #A Run has n instances of executed scenarios - which in turn have n instances of executed steps - 
-  #and n instances of parse errors.
-  module Model
-    #This is the schema for the AR database used to store test results
+  module ActiveRecord
+    #Exception occuring when connecting to a database
+    class ConnectionError<RuntimeError
+    end
+    #This is the ActiveRecord model for Rutema:
     #
-    #We store the RutemaConfiguration#context for every run so that reports for past runs can be recreated without running the actual tests again.
-    class Schema<ActiveRecord::Migration
-      def self.up
-        create_table :runs do |t|
-          t.column :context, :string
-        end
+    #A Run has n instances of executed scenarios - which in turn have n instances of executed steps - 
+    #and n instances of parse errors.
+    module Model
+      #This is the schema for the AR database used to store test results
+      #
+      #We store the RutemaConfiguration#context for every run so that reports for past runs can be recreated without running the actual tests again.
+      class Schema< ::ActiveRecord::Migration
+        def self.up
+          create_table :runs do |t|
+            t.column :context, :string
+          end
 
-        create_table :scenarios do |t|
-          t.column :name, :string, :null=>false
-          t.column :run_id,:integer, :null=>false
-          t.column :attended,:bool, :null=>false
-          t.column :status, :string,:null=>false
-          t.column :number,:integer
-          t.column :start_time, :datetime,:null=>false
-          t.column :stop_time, :datetime
-          t.column :version, :string
-          t.column :title, :string
-          t.column :description, :string
-        end
+          create_table :scenarios do |t|
+            t.column :name, :string, :null=>false
+            t.column :run_id,:integer, :null=>false
+            t.column :attended,:bool, :null=>false
+            t.column :status, :string,:null=>false
+            t.column :number,:integer
+            t.column :start_time, :datetime,:null=>false
+            t.column :stop_time, :datetime
+            t.column :version, :string
+            t.column :title, :string
+            t.column :description, :string
+          end
+
+          create_table :steps do |t|
+            t.column :scenario_id,:integer, :null=>false
+            t.column :name, :string
+            t.column :number, :integer,:null=>false
+            t.column :status, :string,:null=>false
+            t.column :output, :text
+            t.column :error, :text
+            t.column :duration, :decimal
+          end
 
-        create_table :steps do |t|
-          t.column :scenario_id,:integer, :null=>false
-          t.column :name, :string
-          t.column :number, :integer,:null=>false
-          t.column :status, :string,:null=>false
-          t.column :output, :text
-          t.column :error, :text
-          t.column :duration, :decimal
+          create_table :parse_errors do |t|
+            t.column :filename, :string,:null=>false
+            t.column :error, :string
+            t.column :run_id,:integer, :null=>false
+          end
         end
+      end
+
+      class Run< ::ActiveRecord::Base
+        has_many :scenarios
+        has_many :parse_errors
+        serialize :context
+        acts_as_reportable      
+      end
 
-        create_table :parse_errors do |t|
-          t.column :filename, :string,:null=>false
-          t.column :error, :string
-          t.column :run_id,:integer, :null=>false
+      class Scenario< ::ActiveRecord::Base
+        belongs_to :run
+        has_many :steps
+        acts_as_reportable
+      end
+
+      class Step< ::ActiveRecord::Base
+        belongs_to :scenario
+        acts_as_reportable
+      end
+
+      class ParseError< ::ActiveRecord::Base
+        belongs_to :run
+        acts_as_reportable
+      end
+
+      class UpgradeV9toV10< ::ActiveRecord::Migration
+        def self.up
+          puts("Adding new columns")
+          add_column(:scenarios, :title, :string,{:default=>"title"})
+          add_column(:scenarios, :description, :string,{:default=>"description"})
+          puts("Updating existing scenario entries")
+          Rutema::Model::Scenario.find(:all).each do |sc|
+            puts "Updating scenario #{sc.id}"
+            sc.title="#{name}"
+            sc.description="#{name}"
+          end
         end
       end
     end
 
-    class Run<ActiveRecord::Base
-      has_many :scenarios
-      has_many :parse_errors
-      serialize :context
-      acts_as_reportable      
+    #Exports the contents of the database/model as a yaml dump
+    class Export
+      def initialize params
+        @logger = params[:logger]
+        @logger ||= Patir.setup_logger
+        @result_set_size = params[:result_set_size]
+        @result_set_size ||= 1000
+        @currently_on_no=0
+        database_configuration = params[:db]
+        raise "No database configuration defined, missing :db configuration key." unless database_configuration
+        ActiveRecord.connect(database_configuration,@logger)
+      end
+
+      def next
+        @logger.info("Found #{Model::Run.count} runs") if @currently_on_no==0
+        @logger.info("Exporting from #{@currently_on_no} to #{@currently_on_no+@result_set_size}")
+        export(@result_set_size)
+      end
+      
+      def all
+        @logger.info("Found #{Model::Run.count} runs")
+        export(nil)
+      end
+      private 
+      def export offset=nil
+        if offset
+          runs=Model::Run.find(:all,:order=>"id ASC",:limit=>@result_set_size,:offset=>@currently_on_no)
+          @currently_on_no+=offset
+        else
+          runs=Model::Run.find(:all)
+        end
+        return nil if runs.empty?
+        export=[]
+        runs.each do |run|
+          e={:parse_errors=>[],:scenarios=>[],:context=>run.context}
+          run.parse_errors.each { |pe| e[:parse_errors]<<{:filename=>pe.filename, :error=>pe.error} }
+          run.scenarios.each { |sc| e[:scenarios]<<export_scenario(sc)  }
+          export<<e
+          @logger.debug("Exported #{run.id}")
+        end
+        return export
+      end
+      
+      def export_scenario sc
+        scenario={:name=>sc[:name],
+          :attended=>sc[:attended],
+          :status=>sc[:status],
+          :number=>sc[:number],
+          :start_time=>sc[:start_time], 
+          :stop_time=>sc[:stop_time],
+          :version=>sc[:version],
+          :title=>sc[:title], 
+          :description=>sc[:description],
+          :steps=>[]
+        }
+        sc.steps.each do |step|
+          st={:name=>step[:name],
+            :number=>step[:number], 
+            :status=>step[:status], 
+            :output=>step[:output], 
+            :error=>step[:error],
+            :duration=>step[:duration]
+          }
+          scenario[:steps]<<st
+        end
+        return scenario
+      end
+    end
+  
+    #Establishes an ActiveRecord connection
+    def self.connect cfg,logger
+      conn=cnct(cfg,logger)
+      Model::Schema.migrate(:up) if perform_migration?(cfg)
     end
 
-    class Scenario<ActiveRecord::Base
-      belongs_to :run
-      has_many :steps
-      acts_as_reportable
+    private
+    #Establishes an active record connection using the cfg hash
+    #There is only a rudimentary check to ensure the integrity of cfg
+    def self.cnct cfg,logger
+      if cfg[:adapter] && cfg[:database]
+        logger.debug("Connecting to #{cfg[:database]}")
+        return ::ActiveRecord::Base.establish_connection(cfg)
+      else
+        raise ConnectionError,"Erroneous database configuration. Missing :adapter and/or :database"
+      end
     end
 
-    class Step<ActiveRecord::Base
-      belongs_to :scenario
-      acts_as_reportable
+    def self.perform_migration? cfg
+      return true if cfg[:migrate]
+      #special case for sqlite3
+      if cfg[:adapter]=="sqlite3" && !File.exists?(cfg[:database])
+        return true
+      end
+      return false
     end
 
-    class ParseError<ActiveRecord::Base
-      belongs_to :run
-      acts_as_reportable
+  end     
+
+  module CouchDB
+    def self.connect cfg,logger
+      if cfg[:url] && cfg[:database]
+        if cfg[:user] && cfg[:password]
+        end
+        return CouchRest.database!("#{cfg[:url]}/#{cfg[:database]}")
+        
+      else
+        raise ConnectionError,"Erroneous database configuration. Missing :url and/or :database"
+      end
     end
-  
-    class UpgradeV9toV10<ActiveRecord::Migration
-      def self.up
-        puts("Adding new columns")
-        add_column(:scenarios, :title, :string,{:default=>"title"})
-        add_column(:scenarios, :description, :string,{:default=>"description"})
-        puts("Updating existing scenario entries")
-        Rutema::Model::Scenario.find(:all).each do |sc|
-          puts "Updating scenario #{sc.id}"
-          sc.title="#{name}"
-          sc.description="#{name}"
+    module Model
+      class Run <CouchRest::ExtendedDocument
+        unique_id :slug
+        
+        timestamps!
+        
+        view_by :slug, :descending=>true
+        
+        property :slug, :read_only => true
+        property :context
+        property :scenarios
+        property :parse_errors
+        
+        set_callback :save, :before, :generate_slug_from_payload
+        def generate_slug_from_payload
+          self['slug']=Digest::SHA1.hexdigest("#{self['context']},#{self['scenarios']}")
         end
       end
     end

data/lib/rutema/rake.rb

@@ -0,0 +1,32 @@
+require 'rutema/system'
+require 'optparse'
+
+module Rutema
+  class RakeTask
+    attr_accessor :config_file, :log_file, :step, :name
+    def initialize params=nil
+      params||={}
+      @config_file=params[:config]
+      @log_file=params[:log]
+      @name=params[:name]
+      yield self if block_given?
+      
+      raise "No rutema configuration given" unless @config_file
+      args=['-c',@config_file]
+      args+=['-l',@log_file] if @log_file
+      args<<"all"
+      OptionParser::Arguable.extend_object(args)
+      if @name
+        desc "Executes the tests in #{File.basename(@config_file)}" 
+        task :"rutema:#{@name}" do
+          Rutema::RutemaX.new(args)
+        end
+      else
+        desc "Executes the tests in #{File.basename(@config_file)}" 
+        task :rutema do
+          Rutema::RutemaX.new(args)
+        end
+      end
+    end
+  end
+end

data/lib/rutema/reporter.rb

@@ -1,4 +1,4 @@
-#  Copyright (c) 2007 Vassilis Rizopoulos. All rights reserved.
+#  Copyright (c) 2007-2010 Vassilis Rizopoulos. All rights reserved.
 $:.unshift File.join(File.dirname(__FILE__),"..")
 require 'rutema/specification'
 

data/lib/rutema/reporters/activerecord.rb

@@ -1,47 +1,15 @@
-#  Copyright (c) 2007 Vassilis Rizopoulos. All rights reserved.
+#  Copyright (c) 2007-2010 Vassilis Rizopoulos. All rights reserved.
 $:.unshift File.join(File.dirname(__FILE__),"..","..")
 require 'yaml'
 require 'rutema/reporter'
 require 'rutema/model'
 
 module Rutema
-  #Exception occuring when connecting to a database
-  class ConnectionError<RuntimeError
-  end
-  
-  module ActiveRecordConnections
-     #Establishes an ActiveRecord connection
-     def connect_to_active_record cfg,logger
-       conn=connect(cfg,logger)
-       Rutema::Model::Schema.migrate(:up) if perform_migration?(cfg)
-     end
-     private
-     #Establishes an active record connection using the cfg hash
-     #There is only a rudimentary check to ensure the integrity of cfg
-     def connect cfg,logger
-       if cfg[:adapter] && cfg[:database]
-         logger.debug("Connecting to #{cfg[:database]}")
-         return ActiveRecord::Base.establish_connection(cfg)
-       else
-         raise ConnectionError,"Erroneous database configuration. Missing :adapter and/or :database"
-       end
-     end
-     
-     def perform_migration? cfg
-       return true if cfg[:migrate]
-       #special case for sqlite3
-       if cfg[:adapter]=="sqlite3" && !File.exists?(cfg[:database])
-         return true
-       end
-       return false
-     end
-  end
-
   #The ActiveRecordReporter will store the results of a test run in a database using ActiveRecord.
   #
   #The DBMSs supported are dependent on the platform: either SQLite3 (MRI) or h2 (jruby)
   class ActiveRecordReporter
-    include ActiveRecordConnections
+    include ActiveRecord
     #The required keys in this reporter's configuration are:
     # :db - the database configuration. A Hash with the DB adapter information
     #  :db=>{:database=>"sample.rb"}
@@ -50,27 +18,27 @@ module Rutema
       @logger||=Patir.setup_logger
       database_configuration = definition[:db]
       raise "No database configuration defined, missing :db configuration key." unless database_configuration
-      connect_to_active_record(database_configuration,@logger)
+      ActiveRecord.connect(database_configuration,@logger)
       @logger.info("Reporter #{self.to_s} registered")
     end
     
-    #We get all the data for a Rutema::Model::Run entry in here.
+    #We get all the data for a Rutema::ActiveRecord::Model::Run entry in here.
     #
-    #If the configuration is given and there is a context defined, this will be YAML-dumped into Rutema::Model::Run#context
+    #If the configuration is given and there is a context defined, this will be YAML-dumped into Rutema::ActiveRecord::Model::Run#context
     def report specifications,runner_states,parse_errors,configuration
-      run_entry=Model::Run.new
+      run_entry=ActiveRecord::Model::Run.new
       if configuration && configuration.context
         run_entry.context=configuration.context
       end
       parse_errors.each do |pe|
-        er=Model::ParseError.new()
+        er=ActiveRecord::Model::ParseError.new()
         er.filename=pe[:filename]
         er.error=pe[:error]
         run_entry.parse_errors<<er
       end
       runner_states.compact!
       runner_states.each do |scenario|
-        sc=Model::Scenario.new
+        sc=ActiveRecord::Model::Scenario.new
         sc.name=scenario.sequence_name
         sc.number=scenario.sequence_id
         sc.start_time=scenario.start_time
@@ -93,7 +61,7 @@ module Rutema
           sc.attended=false
         end
         scenario.step_states.each do |number,step|
-          st=Model::Step.new
+          st=ActiveRecord::Model::Step.new
           st.name=step[:name]
           st.number=number
           st.status="#{step[:status]}"
@@ -109,7 +77,7 @@ module Rutema
     end
     
     def to_s
-      "ActiveRecordReporter using '#{@dbfile}'"
+      "ActiveRecordReporter"
     end
     
     private

data/lib/rutema/reporters/couchdb.rb

@@ -0,0 +1,62 @@
+require 'rutema/model'
+
+module Rutema
+  class CouchDBReporter
+    def initialize definition
+      @logger=definition[:logger]
+      @logger||=Patir.setup_logger
+      database_configuration = definition[:db]
+      raise "No database configuration defined, missing :db configuration key." unless database_configuration
+      @database=Rutema::CouchDB.connect(database_configuration,@logger)
+      @logger.info("Reporter #{self.to_s} registered")
+    end
+    
+    #We get all the data for a Rutema::CouchDB::Model::Run entry in here.
+    def report specifications,runner_states,parse_errors,configuration
+      run_entry=Rutema::CouchDB::Model::Run.new
+      run_entry.database=@database
+      if configuration && configuration.context
+        run_entry.context=configuration.context
+      end
+      run_entry.parse_errors=parse_errors
+      scenarios=[]
+      runner_states.compact!
+      runner_states.each { |scenario| scenarios<<format_scenario(scenario,specifications)}
+      run_entry.scenarios=scenarios
+      run_entry.save
+      "couchdb reporter done"
+    end
+    
+    def to_s
+      "CouchDBReporter"
+    end
+    private 
+    def format_scenario scenario,specifications
+      sc={}
+      sc[:name]=scenario.sequence_name
+      sc[:number]=scenario.sequence_id
+      sc[:start_time]=scenario.start_time
+      sc[:stop_time]=scenario.stop_time
+      sc[:status]=scenario.status.to_s
+      #get the specification for this scenario
+      spec=specifications[sc[:name]]
+      if spec
+        sc[:version]=spec.version if spec.has_version?
+        sc[:title]=spec.title
+        sc[:description]=spec.description
+      else
+        @logger.debug("Could not find specification for #{sc[:name]}")
+        
+        sc[:title]=sc[:name]
+        sc[:description]=""
+      end
+      if scenario.strategy==:attended
+        sc[:attended]=true
+      else
+        sc[:attended]=false
+      end
+      sc[:steps]=scenario.step_states
+      return sc
+    end
+  end
+end

data/lib/rutema/reporters/email.rb

@@ -1,4 +1,4 @@
-#  Copyright (c) 2007 Vassilis Rizopoulos. All rights reserved.
+#  Copyright (c) 2007-2010 Vassilis Rizopoulos. All rights reserved.
 $:.unshift File.join(File.dirname(__FILE__),"..","..")
 require 'net/smtp'
 require 'rutema/reporter'
@@ -24,6 +24,8 @@ module Rutema
   #Customization keys:
   #
   #:subject - the string of this key will be prefixed as a subject for the email
+  #
+  #:verbose - when true, the report contains info on setup and teardown specs. Optional. Default is false
   class EmailReporter
     attr_reader :last_message
     def initialize definition
@@ -47,6 +49,8 @@ module Rutema
       @subject||=""
       @footer=definition[:footer]
       @footer||=""
+      @verbose=definition[:verbose]
+      @verbose||=false
       @logger.info("Reporter '#{self.to_s}' registered")
     end
 
@@ -57,7 +61,7 @@ module Rutema
     
     def report specifications,runner_states,parse_errors,configuration
       @mail.subject = "#{@subject}"
-      txt=TextReporter.new.report(specifications,runner_states,parse_errors,configuration)
+      txt=TextReporter.new(:verbose=>@verbose).report(specifications,runner_states,parse_errors,configuration)
       txt<<"\n\n#{@footer}"
       @mail.text = txt 
       begin

data/lib/rutema/reporters/standard_reporters.rb

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

data/lib/rutema/reporters/text.rb

@@ -1,7 +1,13 @@
 module Rutema
-  #This reporter cerates a simple text summary of a test run
+  #This reporter creates a simple text summary of a test run
+  #
+  #The following configuration keys are used by TextReporter:
+  #
+  #:verbose - when true, the report contains info on setup and teardown specs. Optional. Default is false
   class TextReporter
-    def initialize params=nil 
+    def initialize params=nil
+      @verbose=params[:verbose] if params
+      @verbose||=false 
     end
     
     #Returns the text summary
@@ -26,20 +32,30 @@ module Rutema
       #Report on scenarios
       runner_states.compact!#make sure no nil elements make it through
       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
-      not_run = runner_states.select{|state| state.status == :not_executed }.sort_by {|state| state.sequence_id.to_i}
-      errors = runner_states.select{|state| state.status == :error }.sort_by {|state| state.sequence_id.to_i}
-      warnings = runner_states.select{|state| state.status == :warning }.sort_by {|state| state.sequence_id.to_i}
-      successes = runner_states.select{|state| state.status == :success }.sort_by {|state| state.sequence_id.to_i}
-      msg<<"\n#{errors.size} errors, #{warnings.size} warnings, #{successes.size} successes"
+      if @verbose
+        states=runner_states
+      else
+        states=runner_states.select{|state| state.sequence_name !~ /[_setup|_teardown]$/}
+      end
+      msg<<"\nOne scenario in the current run" if states.size==1
+      msg<<"\n#{states.size} scenarios in the current run" if states.size>1
+      
+      not_run = states.select{|state| state.status == :not_executed }.sort_by {|state| state.sequence_id.to_i}
+      errors = states.select{|state| state.status == :error }.sort_by {|state| state.sequence_id.to_i}
+      warnings = states.select{|state| state.status == :warning }.sort_by {|state| state.sequence_id.to_i}
+      successes = states.select{|state| state.status == :success }.sort_by {|state| state.sequence_id.to_i}
+      msg<<"\n#{errors.size} errors, #{warnings.size} warnings, #{successes.size} successes, #{not_run.size} not executed (setup failure)"
       msg<<"\nErrors:" unless errors.empty?
       msg<<scenario_summaries(errors,specifications)
       msg<<"\nWarnings:" unless warnings.empty?
       msg<<scenario_summaries(warnings,specifications)
       msg<<"\nNot executed:" unless not_run.empty?
       not_run.each do |state|
-        msg<<"\n#{specifications[state.sequence_name].title}" if specifications[state.sequence_name]
+        if specifications[state.sequence_name]
+          msg<<"\n#{specifications[state.sequence_name].title}"
+        else
+           msg<<"\n#{state.sequence_name}"
+        end
       end
       msg<<"\nSuccesses:" unless successes.empty?
       msg<<scenario_summaries(successes,specifications)

data/lib/rutema/reporters/yaml.rb

@@ -0,0 +1,35 @@
+require 'yaml'
+
+module Rutema
+  
+  module YAML
+    #Experimental reporter used to dump the data of a run on disk
+    #
+    #The following configuration keys are used by YAML::Reporter:
+    #
+    #:filename - the filename to use to save the YAML dump. Default is 'rutema.yaml'
+    class Reporter
+      DEFAULT_FILENAME="rutema.yaml"
+    
+      def initialize definition
+        @logger=definition[:logger]
+        @logger||=Patir.setup_logger
+        @filename=definition[:filename]
+        @filename||="rutema.yaml"
+        @logger.info("Reporter #{self.to_s} registered")
+      end
+      
+      #We get all the data from a test run in here.
+      def report specifications,runner_states,parse_errors,configuration
+        run_entry={}
+        if configuration && configuration.context
+          run_entry[:context]=configuration.context
+        end
+        run_entry[:parse_errors]=parse_errors
+        runner_states.compact!
+        run_entry[:runner_states]=runner_states
+        File.open(@filename,"wb") {|f| f.write( ::YAML.dump(run_entry))}
+      end
+    end
+  end
+end

data/lib/rutema/specification.rb

@@ -1,4 +1,4 @@
-#  Copyright (c) 2007 Vassilis Rizopoulos. All rights reserved.
+#  Copyright (c) 2007-2010 Vassilis Rizopoulos. All rights reserved.
 $:.unshift File.join(File.dirname(__FILE__),"..")
 require 'rutema/reporters/standard_reporters'
 require 'patir/command'

data/lib/rutema/system.rb

@@ -1,4 +1,4 @@
-#  Copyright (c) 2007 Vassilis Rizopoulos. All rights reserved.
+#  Copyright (c) 2007-2010 Vassilis Rizopoulos. All rights reserved.
 $:.unshift File.join(File.dirname(__FILE__),"..")
 require 'rexml/document'
 require 'patir/configuration'
@@ -12,8 +12,8 @@ module Rutema
   #This module defines the version numbers for the library
   module Version
     MAJOR=1
-    MINOR=0
-    TINY=9
+    MINOR=1
+    TINY=0
     STRING=[ MAJOR, MINOR, TINY ].join( "." )
   end
   #The Elements module provides the namespace for the various modules adding parser functionality
@@ -304,12 +304,12 @@ module Rutema
           run_test(spec) if spec
         else
           @logger.fatal("Don't know how to run '#{mode}'")
-          exit 1
+          raise "Don't know how to run '#{mode}'"
         end
       rescue
         @logger.debug($!)
         @logger.fatal("Runner error: #{$!.message}")
-        exit 1
+        raise 
       end
       @configuration.context[:end_time]=Time.now
       @logger.info("Run completed in #{@configuration.context[:end_time]-@configuration.context[:start_time]}s")
@@ -500,6 +500,9 @@ module Rutema
             @logger.info("Scenario for #{name}")
             @states[name]=run_scenario(name,scenario)
             @states[name].sequence_id="#{@number_of_runs}"
+          else
+            @states[name]=initialize_state(name,scenario)
+            @states[name].sequence_id="#{@number_of_runs}"
           end
         end
       else
@@ -542,18 +545,9 @@ module Rutema
     end
     private
     def run_scenario name,scenario
-      state=Patir::CommandSequenceStatus.new(name,scenario.steps)
-      begin
-        attention_needed=scenario.attended?
-        if attention_needed && !self.attended?
-          @logger.warn("Attended scenario cannot be run in unattended mode")
-          state.status=:warning
-        else
-          if attention_needed
-            state.strategy=:attended
-          else
-            state.strategy=:unattended
-          end
+      state=initialize_state(name,scenario)
+      begin 
+        if evaluate_attention(scenario,state)
           stps=scenario.steps
           if stps.empty?
             @logger.warn("Scenario #{name} contains no steps")
@@ -574,6 +568,22 @@ module Rutema
       state.sequence_id=@number_of_runs
       return state
     end
+    def initialize_state name,scenario
+      state=Patir::CommandSequenceStatus.new(name,scenario.steps)
+    end
+    def evaluate_attention scenario,state
+      if scenario.attended?
+        if !self.attended?
+          @logger.warn("Attended scenario cannot be run in unattended mode")
+          state.status=:warning
+          return false
+        end
+        state.strategy=:attended
+      else
+        state.strategy=:unattended
+      end
+      return true
+    end
     def run_step step
       @logger.info("Running step #{step.number} - #{step.name}")
       if step.has_cmd? && step.cmd.respond_to?(:run)
@@ -601,13 +611,14 @@ module Rutema
         @logger.info(msg) if msg && !msg.empty?
       end
     end
+
   end
 
   #StepRunner halts before every step and asks if it should be executed or not.
   class StepRunner<Runner
-    def initialize setup=nil, teardown=nil,logger=nil
+    def initialize context=nil,setup=nil, teardown=nil,logger=nil
       @questioner=HighLine.new
-      super(setup,teardown,logger)
+      super(context,setup,teardown,logger)
     end
     def run_step step
       if @questioner.agree("Execute #{step.to_s}?")
@@ -641,11 +652,11 @@ module Rutema
       rescue Patir::ConfigurationException
         @logger.debug($!)
         @logger.fatal("Configuration error '#{$!.message}'")
-        exit 1
+        raise "Configuration error '#{$!.message}'"
       rescue
         @logger.debug($!)
         @logger.fatal("#{$!.message}")
-        exit 1
+        raise
       end
     end
     private
@@ -682,7 +693,7 @@ module Rutema
               @mode=File.expand_path(command)
             else
               $stderr.puts "Can't find '#{command}' and it does not match any known commands. Don't know what to do with it."
-              exit 1
+              raise "Can't find '#{command}' and it does not match any known commands. Don't know what to do with it."
             end
           end
         end
@@ -696,7 +707,7 @@ module Rutema
           @coordinator.run(@configuration.check)
         else
           @logger.fatal("There is no check test defined in the configuration.")
-          exit 1
+          raise "There is no check test defined in the configuration."
         end
       else
         #run everything
@@ -706,10 +717,9 @@ module Rutema
       @coordinator.report
       if @coordinator.parse_errors.empty? && @coordinator.last_run_a_success?
         @logger.info("All tests successful")
-        exit 0
       else
         @logger.warn("Not all tests were successful")
-        exit 1
+        raise "Not all tests were successful"
       end
     end
   end

data/test/test_couchdb.rb

@@ -0,0 +1,60 @@
+$:.unshift File.join(File.dirname(__FILE__),"..","lib")
+require 'rubygems'
+require 'rutema/gems'
+require 'test/unit'
+require 'ostruct'
+require 'rutema/reporters/couchdb'
+require 'patir/command'
+require 'mocha'
+#$DEBUG=true
+module TestRutema
+  class MockCommand
+    include Patir::Command
+    def initialize number
+      @number=number
+    end
+  end
+
+  class TestCouchDBModel<Test::Unit::TestCase
+  end
+  
+  class TestCouchDBReporter<Test::Unit::TestCase
+    CFG={:db=>{:url=>"http://localhost:5984", :database=>"rutema_test_sandbox"}}
+      def setup
+        @parse_errors=[{:filename=>"f.spec",:error=>"error"}]
+        st=Patir::CommandSequenceStatus.new("test_seq")
+        st.step=MockCommand.new(1)
+        st.step=MockCommand.new(2)
+        st.step=MockCommand.new(3)
+        @status=[st]
+      end
+      
+      def test_no_errors
+        spec=mock
+        r=Rutema::CouchDBReporter.new(CFG)
+        assert_nothing_raised() { r.report({"test"=>spec},[runner_state_mock()],[],nil) }
+      end
+      
+      def test_a_bit_of_everything
+        spec=mock
+        spec.expects(:has_version?).returns(false)
+        spec.expects(:title).returns("T")
+        spec.expects(:description).returns("cool test")
+       
+        r=Rutema::CouchDBReporter.new(CFG)
+        assert_nothing_raised() {  r.report({"1"=>spec},[runner_state_mock,runner_state_mock(1,:error)],[],nil) }
+      end
+      
+      def runner_state_mock n=0,status=:success,step_states=[]
+        rs=mock()
+        rs.expects(:sequence_name).returns("#{n}")
+        rs.expects(:sequence_id).returns("seq_id#{n}")
+        rs.expects(:start_time).returns(Time.now-3600)
+        rs.expects(:stop_time).returns(Time.now)
+        rs.expects(:status).returns(status)
+        rs.expects(:strategy).returns(:attended)
+        rs.expects(:step_states).returns(step_states)
+        return rs
+      end
+  end
+end

data/test/test_model.rb

@@ -1,21 +1,16 @@
 $:.unshift File.join(File.dirname(__FILE__),"..","lib")
-
+require 'rubygems'
 require 'test/unit'
 require 'rutema/model'
 require 'fileutils'
 require 'rubygems'
 require 'rutema/gems'
-require 'active_record/fixtures'
 
 module TestRutema
-  class TestModel<Test::Unit::TestCase
+  class TestActiveRecordModel<Test::Unit::TestCase
     def setup
-      if RUBY_PLATFORM =~ /java/ 
-        ActiveRecord::Base.establish_connection(:adapter  => "jdbch2",:database =>"db/h2")
-      else
-        ActiveRecord::Base.establish_connection(:adapter  => "sqlite3",:database =>":memory:")
-      end
-      Rutema::Model::Schema.up
+      ActiveRecord::Base.establish_connection(:adapter  => "sqlite3",:database =>":memory:")
+      Rutema::ActiveRecord::Model::Schema.up
     end
     def teardown
       ActiveRecord::Base.remove_connection
@@ -24,15 +19,15 @@ module TestRutema
     #test the CRUD operations
     def test_create_read_update_delete
       #create
-      r=Rutema::Model::Run.new
+      r=Rutema::ActiveRecord::Model::Run.new
       context={:tester=>"automatopoulos",:version=>"latest"}
       r.context=context
-      sc=Rutema::Model::Scenario.new(:name=>"TC000",:attended=>false,:status=>"success",:start_time=>Time.now)
-      sc.steps<<Rutema::Model::Step.new(:name=>"echo",:number=>1,:status=>"success",:output=>"testing is nice",:error=>"",:duration=>1)
+      sc=Rutema::ActiveRecord::Model::Scenario.new(:name=>"TC000",:attended=>false,:status=>"success",:start_time=>Time.now)
+      sc.steps<<Rutema::ActiveRecord::Model::Step.new(:name=>"echo",:number=>1,:status=>"success",:output=>"testing is nice",:error=>"",:duration=>1)
       r.scenarios<<sc
       assert(r.save, "Failed to save.")
       #read
-      run=Rutema::Model::Run.find(r.id)
+      run=Rutema::ActiveRecord::Model::Run.find(r.id)
       assert_equal(context,run.context)
       assert_equal(sc.name, run.scenarios[0].name)
       #update
@@ -41,7 +36,27 @@ module TestRutema
       assert(run.save, "Failed to update.")
       #delete
       assert(run.destroy, "Failed to delete.")
-      assert_raise(ActiveRecord::RecordNotFound) {Rutema::Model::Run.find(r.id)}
+      assert_raise(ActiveRecord::RecordNotFound) {Rutema::ActiveRecord::Model::Run.find(r.id)}
+    end
+  end
+  
+  class TestCouchDBModel<Test::Unit::TestCase
+    def setup
+      @db=CouchRest.database!("http://localhost:5984/rutema_test")
+    end
+    
+    def test_couchdb_model
+      run=Rutema::CouchDB::Model::Run.new
+      run.database=@db
+      run.context="context"
+      run.scenarios=["1","2","#{self.object_id}"]
+      assert_nothing_raised() {  run.save }
+      
+      r=Rutema::CouchDB::Model::Run.get(run.slug)
+      assert_equal(run.slug, r.slug)
+      
     end
+    
+   
   end
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rutema
 version: !ruby/object:Gem::Version 
-  version: 1.0.9
+  hash: 19
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Vassilis Rizopoulos
@@ -9,99 +15,136 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-07 00:00:00 +03:00
+date: 2010-12-20 00:00:00 +02:00
 default_executable: rutemax
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: patir
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 6
+        - 4
         version: 0.6.4
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: highline
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+        hash: 7
+        segments: 
+        - 1
+        - 5
+        - 2
+        version: 1.5.2
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: mailfactory
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        - 0
+        version: 1.4.0
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.3.4
-    version: 
+        hash: 19
+        segments: 
+        - 2
+        - 3
+        - 8
+        version: 2.3.8
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: ruport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.6.1
-    version: 
+        hash: 9
+        segments: 
+        - 1
+        - 6
+        - 3
+        version: 1.6.3
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: acts_as_reportable
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 1
+        - 1
+        - 1
         version: 1.1.1
-    version: 
+  type: :runtime
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: couchrest
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.0.3
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: gemcutter
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 0.3.0
-    version: 
+        hash: 65
+        segments: 
+        - 0
+        - 37
+        version: "0.37"
+  type: :runtime
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.5.0
-    version: 
+        hash: 47
+        segments: 
+        - 2
+        - 8
+        - 0
+        version: 2.8.0
+  type: :development
+  version_requirements: *id008
 description: |-
   == DESCRIPTION:
   rutema is a test execution tool with a twist.
@@ -151,11 +194,14 @@ files:
 - lib/rutema/configuration.rb
 - lib/rutema/gems.rb
 - lib/rutema/model.rb
+- lib/rutema/rake.rb
 - 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/reporters/yaml.rb
+- lib/rutema/reporters/couchdb.rb
 - lib/rutema/specification.rb
 - lib/rutema/system.rb
 - selftest.sh
@@ -180,6 +226,7 @@ files:
 - test/test_reporter.rb
 - test/test_specification.rb
 - test/test_system.rb
+- test/test_couchdb.rb
 has_rdoc: true
 homepage: 
 licenses: []
@@ -191,26 +238,33 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: patir
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: rutema is a test execution and management framework for heterogeneous testing environments
 test_files: 
 - test/test_configuration.rb
+- test/test_couchdb.rb
 - test/test_model.rb
 - test/test_reporter.rb
 - test/test_specification.rb