rutema 0.3 → 0.4

data/History.txt

@@ -1,3 +1,15 @@
+== 0.4 / 2007-07-05
+* rutemaweb, a web interface for the db contents added
+	* uses WEBRick, Camping and Ruport
+	* offers views on all runs in the System, detailed scenario views and ccenario-over-time views
+* Runner now rescues all failures in scenarios
+* Bugfix in setting status of attended scenario in unattended mode
+* Better ruport usage in the historian
+* rutemah added to the gem and manifest
+* rutemax help message complete with commands
+* split the AR reporter and the model
+* expanded the unit tests
+
 == 0.3 / 2007-05-30
 * Reporter implementations moved to own file
 * Reporter interface changed (Runner stati now passed directly as a name indexed Hash, specifications passed as well)

data/Manifest.txt

@@ -5,12 +5,26 @@ COPYING.txt
 Rakefile
 bin/rutemax
 bin/rutemah
+bin/rutemaweb
 lib/rutema/configuration.rb
 lib/rutema/specification.rb
 lib/rutema/system.rb
 lib/rutema/reporter.rb
 lib/rutema/reporter_ar.rb
 lib/rutema/historian.rb
+lib/rutema/model.rb
+lib/rutemaweb/htdocs/bg_menu.gif
+lib/rutemaweb/htdocs/bg_submenu.gif
+lib/rutemaweb/htdocs/run_error.png
+lib/rutemaweb/htdocs/run_ok.png
+lib/rutemaweb/htdocs/run_warn.png
+lib/rutemaweb/htdocs/step_error.png
+lib/rutemaweb/htdocs/step_ok.png
+lib/rutemaweb/htdocs/step_warn.png
+lib/rutemaweb/htdocs/style.css
+lib/rutemaweb/htdocs/tie_logo.gif
+lib/rutemaweb/htdocs/index.html
+lib/rutemaweb/rutemaweb.rb
 test/test_configuration.rb
 test/test_specification.rb
 test/test_system.rb

data/README.txt

@@ -95,4 +95,9 @@ You can redistribute it and/or modify it under either the terms of the GPL
   6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
      IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
      WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     PURPOSE.
+     PURPOSE.
+
+== CREDITS
+	RutemaWeb uses icons from
+	Fast Icon (Dirceu Veiga)
+	Homepage:	http://www.fasticon.com

data/Rakefile

@@ -19,7 +19,8 @@ Hoe.new('rutema', "#{Rutema::VERSION_MAJOR}.#{Rutema::VERSION_MINOR}") do |p|
   p.extra_deps<<['mailfactory']
   p.extra_deps<<['activerecord']
   p.extra_deps<<['ruport']
-  p.spec_extras={:executables=>["rutemax","rutemah"],
+  p.extra_deps<<['camping']
+  p.spec_extras={:executables=>["rutemax","rutemah","rutemaweb"],
     :default_executable=>"rutemax"}
 end
 

data/bin/rutemaweb

@@ -0,0 +1,9 @@
+#  Copyright (c) 2007 Vassilis Rizopoulos. All rights reserved.
+begin
+  require 'rutemaweb/rutemaweb'
+rescue LoadError
+  require 'rubygems'
+  require 'rutemaweb/rutemaweb'
+end
+
+start_server

data/lib/rutema/historian.rb

@@ -31,12 +31,17 @@ module Rutema
     private
     def parse_command_line args
       args.options do |opt|
+        opt.on("Usage:")
+        opt.on("rutemah [options] -c CONFIG command")
         opt.on("Options:")
         opt.on("--debug", "-d","Turns on debug messages") { $DEBUG=true }
         opt.on("--config FILE", "-c FILE",String,"Loads the configuration from FILE") { |@config_file|}
         opt.on("--log FILE", "-l FILE",String,"Redirects the log output to FILE") { |@log_file|}
         opt.on("-V", "--version","Displays the version") { $stdout.puts("v#{VERSION_MAJOR}.#{VERSION_MINOR}");exit 0 }
         opt.on("--help", "-h", "-?", "This text") { $stdout.puts opt; exit 0 }
+        opt.on("Commands are:")
+        opt.on("all - lists all entries in the database")
+        opt.on("\"testname\" - lists all tests runs for the given test name")
         opt.parse!
         #and now the rest
         if args.empty?
@@ -47,6 +52,16 @@ module Rutema
         end
       end   
     end#parse_command_line
+    private
+    def application_flow
+      logger=Patir.setup_logger(@log_file)
+      if @config_file
+        cfg=RutemaHConfigurator.new(@config_file,logger).configuration()
+        puts Historian.new(cfg,logger).history(@command)
+      else
+        logger.error("No configuration file specified")
+      end
+    end
   end
   
   class Historian
@@ -60,35 +75,44 @@ module Rutema
     def history mode
       case mode
       when "all"
-        DB::Run.find(:all).each do |run|
-          puts "#{run.id}-----"
-          table=DB::Scenario.report_table(:all,:except=>["id","run_id","number"],:conditions => "run_id = '#{run.id}'")
-          puts beautify(table)
-        end
+          table=Model::Scenario.report_table(:all)
+          ret=Ruport::Data::Grouping(beautify(table),:by=>"run_id")
       when String
-        per_spec(mode)
+        ret=per_spec(mode)
       end
+      return ret
     end
     private
     def beautify table
-      table.reorder("name","status","attended","version","start_time","stop_time")
+      table.reorder("run_id","name","status","attended","version","start_time","stop_time")
       table.replace_column("version") {|r| r.version ? r.version : "N/A"}
       table.replace_column("attended") {|r| r.attended=="t" ? "yes" : "no"}
       table.replace_column("start_time") {|r| r.stop_time ? r.start_time : nil}
       return table
     end
     def per_spec spec_name
-      table=DB::Scenario.report_table(:all,:conditions=>"name = '#{spec_name}'",:except=>["id","run_id","number"])
-      if table.empty?
-        @logger.warn("No test run records found for #{spec_name}")
-      else
-        puts beautify(table)
+      begin
+        table=Model::Scenario.report_table(:all,:conditions=>"name = '#{spec_name}'",:except=>["id","number"])
+        if table.empty?
+          @logger.warn("No test run records found for #{spec_name}")
+          nil
+        else
+          beautify(table)
+        end
+      rescue
+        @logger.debug($!)
+        @logger.error("Could not retrieve scenario data from the database")
       end
     end
     def connect
       ActiveRecord::Base.logger = @logger
-      @logger.info("Connecting with database '#{@configuration.source}'")
-      ActiveRecord::Base.establish_connection(:adapter  => "sqlite3",:database => @configuration.source)
+      begin 
+        ActiveRecord::Base.connection
+        @logger.info("Database connection available: #{ActiveRecord::Base.connection.to_s}")
+      rescue
+        @logger.info("Connecting with database '#{@configuration.source}'")
+        ActiveRecord::Base.establish_connection(:adapter  => "sqlite3",:database => @configuration.source)
+      end
     end
   end
 end

data/lib/rutema/model.rb

@@ -0,0 +1,78 @@
+require 'rubygems'
+require 'active_record'
+require 'ruport/acts_as_reportable'
+#this fixes the AR Logger hack that annoys me sooooo much
+class Logger
+  private
+  def format_message(severity, datetime, progname, msg)
+    (@formatter || @default_formatter).call(severity, datetime, progname, msg)
+  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
+    #
+    #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
+        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, :time
+        end
+
+        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
+
+    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
+  end
+end

data/lib/rutema/reporter_ar.rb

@@ -1,87 +1,14 @@
 #  Copyright (c) 2007 Vassilis Rizopoulos. All rights reserved.
-require 'rutema/reporter'
 require 'yaml'
+require 'rutema/reporter'
+require 'rutema/model'
 require 'rubygems'
-require 'active_record'
-require 'ruport/acts_as_reportable'
 require 'patir/command'
 
-#this fixes the AR Logger hack that annoys me sooooo much
-class Logger
-  private
-  def format_message(severity, datetime, progname, msg)
-    (@formatter || @default_formatter).call(severity, datetime, progname, msg)
-  end
-end
-
-module Rutema 
-  #The DB module provides the ActiveRecord model for Rutema
-  module DB
-    #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
-        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, :time
-        end
-
-        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
-      acts_as_reportable
-    end
-
-    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
-  end
+module Rutema
   #The ActiveRecordReporter will store the results of a test run in a database using ActiveRecord.
   #
   #The current implementation uses SQLite as the DBMS until we get enough time to implement the rest of the configuration.
-  #
-  #We store the RutemaConfiguration#context for every run so that reports for past runs can be recreated without running the actual tests again.
   class ActiveRecordReporter<Reporter
     def initialize definition
       @definition=definition
@@ -90,20 +17,23 @@ module Rutema
       raise "No database file defined" unless definition[:dbfile]
       connect
     end
-
+    
+    #We get all the data for a Rutema::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
     def report specifications,runner_states,parse_errors,configuration
-      run_entry=DB::Run.new
+      run_entry=Model::Run.new
       if configuration && configuration.context
-        run_entry.context=YAML.dump(configuration.context)
+        run_entry.context=configuration.context
       end
       parse_errors.each do |pe|
-        er=DB::ParseError.new()
+        er=Model::ParseError.new()
         er.filename=pe[:filename]
         er.error=pe[:error]
         run_entry.parse_errors<<er
       end
       runner_states.each do |scenario|
-        sc=DB::Scenario.new
+        sc=Model::Scenario.new
         sc.name=scenario.sequence_name
         sc.number=scenario.sequence_id
         sc.start_time=scenario.start_time
@@ -122,7 +52,7 @@ module Rutema
           sc.attended=false
         end
         scenario.step_states.each do |number,step|
-          st=DB::Step.new
+          st=Model::Step.new
           st.name=step[:name]
           st.number=number
           st.status=step[:status].to_s
@@ -142,7 +72,7 @@ module Rutema
       @logger.info("Connecting with database '#{@definition[:dbfile]}'")
       ActiveRecord::Base.establish_connection(:adapter  => "sqlite3", 
       :database => @definition[:dbfile])
-      DB::Schema.migrate(:up) unless File.exists?(@definition[:dbfile])
+      Model::Schema.migrate(:up) unless File.exists?(@definition[:dbfile])
     end
   end
       

data/lib/rutema/system.rb

@@ -13,7 +13,7 @@ require 'patir/command'
 
 module Rutema
   VERSION_MAJOR=0
-  VERSION_MINOR=3
+  VERSION_MINOR=4
   #Is raised when an error is found in a specification
   class ParserError<RuntimeError
   end
@@ -176,7 +176,7 @@ module Rutema
       return spec
     end
   end
-  
+
   #This class coordinates parsing, execution and reporting of test specifications
   class Coordinator
     attr_accessor :configuration,:parse_errors,:parsed_files
@@ -201,23 +201,28 @@ module Rutema
     def run mode
       @configuration.context.start_time=Time.now
       @logger.info("Run started")
-      case mode
-      when :all
-        specs=parse_all_specifications
-        run_scenarios(specs)
-      when :attended
-        specs=parse_all_specifications
-        @logger.debug(specs)
-        run_scenarios(specs.select{|s| s.scenario && s.scenario.attended?})
-      when :unattended
-        specs=parse_all_specifications
-        @logger.debug(specs)
-        run_scenarios(specs.select{|s| s.scenario && !s.scenario.attended?})
-      when String
-        spec=parse_specification(mode)
-        run_test(spec) if spec
-      else
-        @logger.error("Don't know how to run '#{mode}'")
+      begin
+        case mode
+        when :all
+          specs=parse_all_specifications
+          run_scenarios(specs)
+        when :attended
+          specs=parse_all_specifications
+          @logger.debug(specs)
+          run_scenarios(specs.select{|s| s.scenario && s.scenario.attended?})
+        when :unattended
+          specs=parse_all_specifications
+          @logger.debug(specs)
+          run_scenarios(specs.select{|s| s.scenario && !s.scenario.attended?})
+        when String
+          spec=parse_specification(mode)
+          run_test(spec) if spec
+        else
+          @logger.error("Don't know how to run '#{mode}'")
+        end
+      rescue
+        @logger.error("Runner error: #{$!.message}")
+        @logger.debug($!)
       end
       @configuration.context.end_time=Time.now
       @logger.info("Run completed in #{@configuration.context.end_time-@configuration.context.start_time}s")
@@ -384,25 +389,31 @@ module Rutema
     private
     def run_scenario name,scenario
       state=Patir::CommandSequenceStatus.new(name,scenario.steps)
-      if scenario.attended? && !self.attended?
-        @logger.warn("Attended scenario cannot be run in unattended mode")
-        state..status=:warning
-      else
-        if scenario.attended?
-          state.strategy=:attended
-        else
-          state.strategy=:unattended
-        end
-        stps=scenario.steps
-        if stps.empty?
-          @logger.warn("Scenario #{name} contains no steps")
+      begin
+        if scenario.attended? && !self.attended?
+          @logger.warn("Attended scenario cannot be run in unattended mode")
           state.status=:warning
         else
-          stps.each do |s| 
-            state.step=run_step(s)
-            break if !state.success?
+          if scenario.attended?a
+            state.strategy=:attended
+          else
+            state.strategy=:unattended
+          end
+          stps=scenario.steps
+          if stps.empty?
+            @logger.warn("Scenario #{name} contains no steps")
+            state.status=:warning
+          else
+            stps.each do |s| 
+              state.step=run_step(s)
+              break if !state.success?
+            end
           end
         end
+      rescue  
+        @logger.error("Encountered error in #{name}: #{$!.message}")
+        @logger.debug($!)
+        state.status=:error
       end
       state.stop_time=Time.now
       state.sequence_id=@number_of_runs
@@ -474,6 +485,11 @@ module Rutema
         opt.on("--check","Runs just the check test"){@check=true}
         opt.on("-V", "--version","Displays the version") { $stdout.puts("v#{VERSION_MAJOR}.#{VERSION_MINOR}");exit 0 }
         opt.on("--help", "-h", "-?", "This text") { $stdout.puts opt; exit 0 }
+        opt.on("The commands are:")
+      	opt.on("\tall - Runs all tests")
+      	opt.on("\tattended - Runs all attended tests")
+      	opt.on("\tunattended - Runs all unattended tests")
+      	opt.on("You can also provide a specification filename in order to run a single test")
         opt.parse!
         #and now the rest
         if args.empty?
@@ -498,7 +514,7 @@ module Rutema
         end
       end
     end
-    
+
     def application_flow
       if @check
         #run just the check test

data/lib/rutemaweb/htdocs/index.html

@@ -0,0 +1,50 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<meta name="author" content="Vassilis Rizopoulos" />
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF8" />
+	<link rel="stylesheet" href="style.css" type="text/css" />
+	<title>Rutema Historian Web Interface</title>
+</head>
+<body>
+	<div id="page" align="center">
+		<div id="content" style="width:800px">
+			<div id="logo">
+				<div style="margin-top:70px" class="whitetitle">rutema</div>
+			</div>
+			<div id="topheader">
+				<div align="left" class="bodytext">
+					<br />
+				</div>
+			</div>
+			<div id="menu">
+			</div>
+			<div id="submenu">
+				<div align="right" class="smallgraytext" style="padding:9px;">
+				<!--	<a href="../index.html">patir</a> | <a href="index.html">rutema</a> | <a href="rdoc/index.html">rdoc</a> -->
+				</div>
+			</div>
+			<div id="contenttext">
+				<div style="padding:10px">
+					<span class="titletext">Intro</span>
+				</div>
+				<div class="bodytext" style="padding:12px;" align="justify">
+					<p>This is the rutema web interface.<br />
+					It allows you to browse the contents of the test results database.
+					</p>
+					<p>Currently you can view the results for each separate run, the results for a specific scenario (a complete list of all steps executed in the scenario with standard and error output logs) or the complete execution history of a scenario.</p>
+				</div>
+			</div>
+				<div id="leftpanel">
+					<div align="justify" class="graypanel">
+						<span class="bodytext"><a href="/rutema" class="smallgraytext">Run overview</a></span><br /><br />
+						<span class="bodytext"><a href="/rutema?scenarios=all" class="smallgraytext">Scenario overview</a></span><br /><br />
+					</div>
+				</div>
+			<div id="footer" class="smallgraytext">
+				<a href="/index.html">Home</a> |	&copy; 2007 Vassilis Rizopoulos</a> 
+			</div>
+		</div>
+	</div>
+</body>
+</html>

data/lib/rutemaweb/htdocs/style.css

@@ -0,0 +1,102 @@
+/* CSS Document */
+
+/*PAGE LAYOUT*/
+body {
+	margin-left: 0px;
+	margin-top: 0px;
+	margin-right: 0px;
+	margin-bottom: 0px;
+}
+table {
+	font: 0.9em Tahoma, sans-serif;
+	color: #666666;
+	text-align: center;
+	
+}
+#logo{float:left; background-image:url(tie_logo.gif); width:234px; height:213px;}
+#topheader{float:right; width:566px; height:97px; background-color:#F0F0F0; position:relative}
+#toplinks{position:absolute; right:10px; top:10px;}
+#menu{float:right; width:566px; height:32px; background-image:url(bg_menu.gif); background-repeat:repeat-x;}
+#submenu{float:right; width:566px; height:32px; background-image:url(bg_submenu.gif); background-position:top; background-repeat:repeat-x;}
+#contenttext{float:right; width:566px;}
+#contentnopanel{float:left; width:800px}
+#leftpanel{float:left; width:234px;}
+#footer{float:left; width:800px; background-color:#F0F0F0; padding:10px;}
+#footernopanel{float:left; width:800px; background-color:#F0F0F0; padding:10px;}
+/*GRAY PANEL*/
+.graypanel{
+	border:solid 1px #666666; background-color:#F7F7F7; padding:10px; margin:10px;
+}
+
+/*TEXT STYLES*/
+.bodytext {
+	font: 0.9em Tahoma, sans-serif;
+	color: #666666;
+}
+
+.titletext {
+	font: 0.7em Tahoma, sans-serif;
+	font-size:26px;
+	font-weight:bold;
+	color:#CC0000;
+}
+.whitetitle {
+	font: 0.7em Tahoma, sans-serif;
+	font-size:36px;
+	font-weight:bold;
+	color:#FFFFFF;
+}
+.smalltitle {
+	font: 0.7em Tahoma, sans-serif;
+	font-size:20px;
+	font-weight:bold;
+	color:#CC0000;
+}
+.smallwhitetext {
+	font: 0.7em Tahoma, sans-serif;
+	font-size: 11px;
+	font-weight:bold;
+	color: #FFFFFF;
+}
+.smallwhitetext a{
+	font: 0.7em Tahoma, sans-serif;
+	font-size: 11px;
+	font-weight:bold;
+	color: #FFFFFF;
+	text-decoration:none;
+}
+.smallwhitetext a:hover{
+	text-decoration:underline;
+}
+.smallgraytext {
+	font: 0.7em Tahoma, sans-serif;
+	font-size: 11px;
+	font-weight:bold;
+	color:#999999;
+}
+.smallgraytext a{
+	font: 0.7em Tahoma, sans-serif;
+	font-size: 11px;
+	font-weight:bold;
+	color:#999999;
+	text-decoration:none;
+}
+.smallgraytext a:hover{
+	text-decoration:underline;
+}
+.smallredtext {
+	font: 0.7em Tahoma, sans-serif;
+	font-size: 11px;
+	font-weight:bold;
+	color:#CC0000;
+}
+.smallredtext a{
+	font: 0.7em Tahoma, sans-serif;
+	font-size: 11px;
+	font-weight:bold;
+	color:#CC0000;
+	text-decoration:none;
+}
+.smallredtext a:hover{
+	text-decoration:underline;
+}

data/lib/rutemaweb/rutemaweb.rb

@@ -0,0 +1,240 @@
+#  Copyright (c) 2007 Vassilis Rizopoulos. All rights reserved.
+$:.unshift File.join(File.dirname(__FILE__),"..")
+
+require 'rutema/model'
+require 'rutema/historian'
+require 'webrick'
+require 'rubygems'
+require 'camping/webrick'
+
+
+Camping.goes :RutemaWeb
+
+#This is the module containing the Camping views and controllers for the web interface to rutema
+module RutemaWeb
+  #The rutema web interface controllers
+  module RutemaWeb::Controllers
+    #This is the main controller
+    #
+    #The various views on the data are found through the query keys
+    class Index < R '/'
+      def get
+        @head_title||="Rutema Historian"
+        @white_title||="Runs"
+        @title||="History"
+        @left_panel=:runs
+        if @input.empty?
+          render :start
+        else
+          if @input["scenario"]
+            @scenario_id=@input[:scenario]
+            scenario=Rutema::Model::Scenario.find(@scenario_id)
+            @title="#{scenario.name} from Run ##{scenario.run_id}"
+            @white_title="Scenario <br/>##{@scenario_id}"
+            render :scenario_in_a_run
+          elsif @input[:run]
+            @run_id=@input[:run]
+            @white_title="Run ##{@run_id}"
+            @title="Summary"
+            render :single_run
+          elsif @input["scenario_name"]
+            @spec_name=@input["scenario_name"]
+            @white_title=@spec_name
+            @title="Summary"
+            render :scenario_by_name
+          elsif @input["scenarios"]
+            @white_title="Scenarios"
+            @title="Summary"
+            @left_panel=:scenarios
+            render :start
+          elsif @input["runs"]
+            @white_title="Runs"
+            @title="Summary"
+            @left_panel=:runs
+            render :start
+          end
+        end
+      end
+    end
+  end
+  module RutemaWeb::Views
+    #Time format to use for the start and stop times
+    TIME_FORMAT="%y%m%d - %H:%M:%S"
+    #image filename to use for succesfull scenarios
+    IMG_SCE_OK="run_ok.png"
+    #image filename to use for failed scenarios
+    IMG_SCE_ERROR="run_error.png"
+    #image filename to use for unexecuted scenarios
+    IMG_SCE_WARN="run_warn.png"
+    #image filename to use for succesfull steps
+    IMG_STEP_OK="step_ok.png"
+    #image filename to use for failed steps
+    IMG_STEP_ERROR="step_error.png"
+    #image filename to use for unexecuted steps
+    IMG_STEP_WARN="step_warn.png"
+    #The whole page in Markaby
+    def layout
+      xhtml_transitional do
+        head do
+          meta(:name=>"author",:content=>"Vassilis Rizopoulos")
+          link(:rel=>"stylesheet",:href=>"style.css",:type=>"text/css")
+          title { @head_title }
+        end
+        body do 
+          div.page!(:align=>"center") do
+            div.content!(:style=>"width:800px") do
+              div.logo!{div.whitetitle(:style=>"margin-top:70px"){@white_title}}
+              div.topheader!{div.bodytext(:align=>"left"){br} }
+              div.menu!{}
+              div.submenu! do
+                div(:align=>"right",:class=>"smallgraytext",:style=>"padding:9px;") do
+                  a(:href=>"?runs=all"){"runs"}+" | "+a(:href=>"?scenarios=all"){"scenarios"}
+                end
+              end
+              div.contenttext! do
+                div(:style=>"padding:10px"){span.titletext{@title}}
+                div.bodytext(:style=>"padding:12px;", :align=>"justify"){self<<yield}
+              end
+              leftpanel
+              footer
+            end
+          end 
+        end
+      end
+    end
+    
+    #Start point: No rendering content
+    def start
+
+    end
+    
+    #Renders the information for a specific executed scenario
+    #giving a detailed list of the steps, with status and output
+    def scenario_in_a_run
+      table=Rutema::Model::Step.report_table(:all,:conditions=>["scenario_id = :scenario_id",{:scenario_id=>@scenario_id}])
+      table.replace_column("status") do |r| 
+        img_src=IMG_STEP_WARN if "not_executed"==r.status
+        img_src=IMG_STEP_OK if "success"==r.status
+        img_src=IMG_STEP_ERROR if "error"==r.status
+        img(:src=>img_src,:align=>"center")
+      end
+      table.reorder("number","status","name","output","error","duration")
+      table.to_html
+    end
+    #Renders the information for a single run providing the context and a list of the scenarios
+    def single_run
+      ret=""
+      run=Rutema::Model::Run.find(@run_id)
+      if run.context
+       ret<<context_table(run.context)
+      end
+      table=Rutema::Model::Scenario.report_table(:all,:conditions=>["run_id = :run_id",{:run_id=>@run_id}],:except=>["run_id"])
+      table.replace_column("status") do |r| 
+        if "not_executed"==r.status
+          img(:src=>IMG_SCE_WARN,:align=>"center")
+        else
+          img_src=IMG_SCE_OK if "success"==r.status
+          img_src=IMG_SCE_ERROR if "error"==r.status
+          a(:href=> "?scenario=#{r.data["id"]}"){img(:src=>img_src,:align=>"center")}
+        end
+      end
+      table.replace_column("version") {|r| r.version ? r.version : "N/A"}
+      table.replace_column("start_time"){|r| r.stop_time ? r.start_time.strftime(TIME_FORMAT) : nil}
+      table.replace_column("stop_time"){|r| r.stop_time.strftime(TIME_FORMAT)}
+      table.reorder("status","name","version","start_time","stop_time")
+      ret<<table.to_html
+      return ret
+    end
+    
+    #Renders the summary of all runs for a single scenario
+    def scenario_by_name
+      ret=""
+      begin
+        table=Rutema::Model::Scenario.report_table(:all,:conditions=>["name = :spec_name",{:spec_name=>@spec_name}])
+        if table.empty?
+          ret=p{"no results for #{@spec_name}"}
+        else
+          table.replace_column("status") do |r| 
+            if "not_executed"==r.status
+              img(:src=>IMG_SCE_WARN,:align=>"center")
+            else
+              img_src=IMG_SCE_OK if "success"==r.status
+              img_src=IMG_SCE_ERROR if "error"==r.status
+              a(:href=> "?scenario=#{r.data["id"]}"){img(:src=>img_src,:align=>"center")}
+            end
+          end
+          table.replace_column("version") {|r| r.version ? r.version : "N/A"}
+          table.replace_column("start_time"){|r| r.stop_time ? r.start_time.strftime(TIME_FORMAT) : nil}
+          table.replace_column("stop_time"){|r| r.stop_time.strftime(TIME_FORMAT)}
+          table.reorder("status","run_id","version","start_time","stop_time")
+          ret<<table.to_html
+        end
+      rescue
+        puts $!
+        ret=p{"could not retrieve data for #{@spec_name}"}
+      end
+      return ret
+    end
+    private
+    #Constructs the left panel of the page as a list of the test runs
+    def leftpanel
+      div.leftpanel! do
+        div.graypanel(:align=>"justify") do
+          span.bodytext do
+            if @left_panel==:runs
+              #<img src="run_error.png" align="center"/><a href="index.html" class="smallgraytext">1 - 28.06.2007</a>
+              Rutema::Model::Run.find(:all,:select=>"id").reverse.each do |r|
+                a.smallgraytext(:href=>"?run=#{r.id}"){"Run ##{r.id}"}
+                br
+              end
+            elsif @left_panel==:scenarios
+              result=Rutema::Model::Scenario.find(:all).collect{|r| r.name}
+              result.uniq.sort.each do |r|
+                a.smallgraytext(:href=>"?scenario_name=#{r}"){"#{r}"}
+                br
+              end
+            end
+          end
+        end
+      end
+    end
+    
+    #Just a bit of copyright info as a footer
+    def footer
+      div.footer!(:class=>"smallgraytext") do
+        "&copy; 2007 Vassilis Rizopoulos"
+      end
+    end
+    
+    #will render a hash in a table of key||value rows 
+    def context_table context
+       table do
+          tr do
+            context.each do |k,v|
+              td {k.to_s}
+              td {v.to_s}
+            end
+          end
+        end
+    end
+  end
+end
+
+#Starts a WEBRick server with the RutemaWeb controller in /rutema
+def start_server (port=3301,docroot=File.join(File.dirname(__FILE__),"htdocs"),mountpoint="/rutema")
+  include WEBrick 
+  dbfile=ARGV.shift
+  if !dbfile
+    puts "please provide a database filename"
+    exit 0
+  end
+  if File.exist?(dbfile)
+    ActiveRecord::Base.establish_connection(:adapter=>"sqlite3", :database=>dbfile )
+    s = HTTPServer.new(:Port => port, :DocumentRoot => docroot ) 
+    s.mount mountpoint, WEBrick::CampingHandler, RutemaWeb
+    trap("INT") { s.shutdown } 
+    s.start
+  else
+    $stderr.puts "Can't find database file '#{dbfile}'"
+  end
+end

data/test/test_historian.rb

@@ -7,25 +7,54 @@ require 'rutema/historian'
 #$DEBUG=true
 module TestRutema
   class TestHistorian<Test::Unit::TestCase
-    DB_FILE="test.db"
+    ActiveRecord::Base.establish_connection(:adapter  => "sqlite3",:database =>":memory:")
+    Rutema::Model::Schema.up
     def setup
-      @prev_dir=Dir.pwd
-      Dir.chdir(File.dirname(__FILE__))
       @configuration=OpenStruct.new
-      @configuration.source=DB_FILE
-      #FileUtils.rm_rf(DB_FILE)
+      @configuration.source=":memory:"
+      a_bunch_of_data
     end
     def teardown
-      Dir.chdir(@prev_dir)
     end
-    
     def test_history
       assert_nothing_raised() do
         h=Rutema::Historian.new(@configuration)
-        h.history(:all)
-        h.history("test1")
-        h.history("test5")
+        assert_not_nil( h.history("all"), "There should be some history there" )
+        assert_not_nil(h.history("TC001"), "TC001 should have some history" )
+        assert_nil(h.history("test5"), "NO history expected of test5" )
+        puts h.history("all")
+        puts h.history("TC002")
+      end
+    end
+    
+    def a_bunch_of_data
+      runs=[]
+      runs<<Rutema::Model::Run.new(:context=>{:version=>"0.4a"},:scenarios=>success_scenarios)
+      runs<<Rutema::Model::Run.new(:context=>{:version=>"0.4b"},:scenarios=>success_scenarios)
+      runs<<Rutema::Model::Run.new(:context=>{:version=>"0.4c"},:scenarios=>failure_scenarios)
+      runs.each{|r| r.save}
+    end
+    def success_scenarios
+      scenarios=[]
+      1.upto(2) do |i|
+        steps=[]
+        steps<<Rutema::Model::Step.new(:name=>"hard",:number=>1,:status=>"success",
+         :output=>"the first step is hard",:error=>"",:duration=>1)
+        steps<<Rutema::Model::Step.new(:name=>"easy",:number=>2,:status=>"success",
+          :output=>"the next step is easy",:error=>"",:duration=>1)
+        scenarios<<Rutema::Model::Scenario.new(:name=>"TC00#{i}",:version=>"100",
+           :attended=>false,:status=>"success",
+           :start_time=>(Time.now-10000*i),:stop_time=>(Time.now-10000*i),
+           :steps=>steps)
       end
+      return scenarios
+    end
+    def failure_scenarios
+      failed_step=Rutema::Model::Step.new(:name=>"echo",:number=>1,:status=>"error",
+         :output=>"Hel^.",:error=>"IO error",:duration=>1)
+      [Rutema::Model::Scenario.new(:name=>"TC003",:version=>"10",
+        :attended=>false,:status=>"error",:steps=>[failed_step],
+        :start_time=>(Time.now-10000),:stop_time=>Time.now)]
     end
     
   end

data/test/test_model.rb

@@ -0,0 +1,35 @@
+$:.unshift File.join(File.dirname(__FILE__),"..","lib")
+
+require 'test/unit'
+require 'rutema/model'
+require 'rubygems'
+require 'active_record/fixtures'
+
+module TestRutema
+  class TestModel<Test::Unit::TestCase
+    ActiveRecord::Base.establish_connection(:adapter=>"sqlite3",:dbfile=>":memory:")
+    Rutema::Model::Schema.up
+    #test the CRUD operations
+    def test_create_read_update_delete
+      #create
+      r=Rutema::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)
+      r.scenarios<<sc
+      assert(r.save, "Failed to save.")
+      #read
+      run=Rutema::Model::Run.find(r.id)
+      assert_equal(context,run.context)
+      assert_equal(sc.name, run.scenarios[0].name)
+      #update
+      new_context={:tester=>"tempelopoulos"}
+      run.context=new_context
+      assert(run.save, "Failed to update.")
+      #delete
+      assert(run.destroy, "Failed to delete.")
+      assert_raise(ActiveRecord::RecordNotFound) {Rutema::Model::Run.find(r.id)}
+    end
+  end
+end

data/test/test_reporter.rb

@@ -14,7 +14,7 @@ module TestRutema
     end
   end
   class TestActiveRecordReporter<Test::Unit::TestCase
-    DB_FILE="test.db"
+    DB_FILE=":memory:"
     def setup
       @prev_dir=Dir.pwd
       Dir.chdir(File.dirname(__FILE__))
@@ -29,7 +29,6 @@ module TestRutema
       test2.step=MockCommand.new(2)
       test2.step=MockCommand.new(3)
       @status=[test1,test2]
-      FileUtils.rm_rf(DB_FILE)
     end
     def teardown
       Dir.chdir(@prev_dir)
@@ -41,8 +40,7 @@ module TestRutema
       specs={"test1"=>spec1,
         "test2"=>spec2
       }
-      definition={:dbfile=>DB_FILE}
-      r=Rutema::ActiveRecordReporter.new(definition)
+      r=Rutema::ActiveRecordReporter.new(:dbfile=>DB_FILE)
       #without configuration
       assert_nothing_raised() { r.report(specs,@status,@parse_errors,nil)  }
       configuration=OpenStruct.new

data/test/test_system.rb

@@ -2,6 +2,8 @@ $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 $:.unshift File.join(File.dirname(__FILE__),"..","ext")
 require 'test/unit'
 require 'ostruct'
+require 'rubygems'
+require 'patir/command'
 
 #$DEBUG=true
 module TestRutema
@@ -86,7 +88,16 @@ EOT
       state2=runner.run("test2",scenario)
       assert_equal(2, runner.states.size)
     end
-
+    
+    def test_run_exceptions
+      runner=Rutema::Runner.new
+      scenario=Rutema::TestScenario.new
+      step=Rutema::TestStep.new("bad",Patir::RubyCommand.new("bad"){|cmd| raise "Bad command"})
+      scenario.add_step(step)
+      state1=:success
+      assert_nothing_raised() { state1=runner.run("test1",scenario) }
+      assert_equal(:error, state1.status)
+    end
     def test_reset
       runner=Rutema::Runner.new
       scenario=Rutema::TestScenario.new

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.1
 specification_version: 1
 name: rutema
 version: !ruby/object:Gem::Version 
-  version: "0.3"
-date: 2007-05-30 00:00:00 +02:00
+  version: "0.4"
+date: 2007-07-05 00:00:00 +02:00
 summary: rutema is a test execution and management framework for heterogeneous testing environments
 require_paths: 
 - lib
@@ -36,12 +36,26 @@ files:
 - Rakefile
 - bin/rutemax
 - bin/rutemah
+- bin/rutemaweb
 - lib/rutema/configuration.rb
 - lib/rutema/specification.rb
 - lib/rutema/system.rb
 - lib/rutema/reporter.rb
 - lib/rutema/reporter_ar.rb
 - lib/rutema/historian.rb
+- lib/rutema/model.rb
+- lib/rutemaweb/htdocs/bg_menu.gif
+- lib/rutemaweb/htdocs/bg_submenu.gif
+- lib/rutemaweb/htdocs/run_error.png
+- lib/rutemaweb/htdocs/run_ok.png
+- lib/rutemaweb/htdocs/run_warn.png
+- lib/rutemaweb/htdocs/step_error.png
+- lib/rutemaweb/htdocs/step_ok.png
+- lib/rutemaweb/htdocs/step_warn.png
+- lib/rutemaweb/htdocs/style.css
+- lib/rutemaweb/htdocs/tie_logo.gif
+- lib/rutemaweb/htdocs/index.html
+- lib/rutemaweb/rutemaweb.rb
 - test/test_configuration.rb
 - test/test_specification.rb
 - test/test_system.rb
@@ -58,6 +72,7 @@ files:
 test_files: 
 - test/test_configuration.rb
 - test/test_historian.rb
+- test/test_model.rb
 - test/test_reporter.rb
 - test/test_specification.rb
 - test/test_system.rb
@@ -72,6 +87,7 @@ extra_rdoc_files:
 executables: 
 - rutemax
 - rutemah
+- rutemaweb
 extensions: []
 
 requirements: []
@@ -122,6 +138,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.0.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: camping
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   version_requirement: