rutema 0.9.3 → 1.0.0

data/History.txt

@@ -1,3 +1,13 @@
+== 1.0.0 / 2008-10-06
+* DB schema change: title and description added to scenario table
+* footer parameter for the email reporter
+* Specification titles included in the text reports
+* When parsing multiple specifications a duplicate name will now generate a parser error
+* rutema_updater upgrades existing databases, check http://patir.rubyforge.org/rutema/update_090_to_100.html
+* rutemah scrapped
+* rutemax logs it's version always
+* activerecord 2.1.1 is now in use
+
 == 0.9.3 / 2008-09-10
 * Sorted result summaries in the text and the email reporter
 * ActiveRecordReporter registration logging

data/Manifest.txt

@@ -3,13 +3,12 @@ History.txt
 Manifest.txt
 README.txt
 Rakefile
-bin/rutemah
 bin/rutemax
+bin/rutema_upgrader
 distro_test.sh
 lib/rutema/configuration.rb
 lib/rutema/db.rb
 lib/rutema/gems.rb
-lib/rutema/historian.rb
 lib/rutema/model.rb
 lib/rutema/reporter.rb
 lib/rutema/reporters/activerecord.rb
@@ -19,11 +18,10 @@ lib/rutema/reporters/text.rb
 lib/rutema/specification.rb
 lib/rutema/system.rb
 selftest.sh
+test/data/sample09.db
 test/distro_test/config/database.rutema
-test/distro_test/config/database.rutemah
 test/distro_test/config/full.rutema
 test/distro_test/config/jruby.rutema
-test/distro_test/config/jruby.rutemah
 test/distro_test/config/minimal.rutema
 test/distro_test/specs/T001.spec
 test/distro_test/specs/T002.spec
@@ -35,8 +33,8 @@ test/distro_test/specs/no_title.spec
 test/distro_test/specs/sample.spec
 test/rutema.rutema
 test/rutema.spec
+test/migration.spec
 test/test_configuration.rb
-test/test_historian.rb
 test/test_model.rb
 test/test_reporter.rb
 test/test_specification.rb

data/Rakefile

@@ -14,13 +14,13 @@ Hoe.new('rutema', "#{Rutema::Version::STRING}") do |p|
   p.description = p.paragraphs_of('README.txt', 1..5).join("\n\n")
   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.5.7"]
+  p.extra_deps<<['patir',">=0.6.0"]
   p.extra_deps<<['highline']
   p.extra_deps<<['mailfactory']
-  p.extra_deps<<['activerecord','=2.0.2']
+  p.extra_deps<<['activerecord','=2.1.1']
   p.extra_deps<<['ruport']
   p.extra_deps<<['acts_as_reportable']
-  p.spec_extras={:executables=>["rutemax","rutemah"],
+  p.spec_extras={:executables=>["rutemax","rutema_upgrader"],
     :default_executable=>"rutemax"}
 end
 

data/bin/rutema_upgrader

@@ -0,0 +1,74 @@
+#  Copyright (c) 2008 Vassilis Rizopoulos. All rights reserved.
+require 'rubygems'
+require 'rutema/system'
+require 'patir/base'
+
+#Parses the command line arguments
+def parse_command_line args
+  args.options do |opt|
+    opt.on("Usage:")
+    opt.on("rutema_upgrader [options] config_file")
+    opt.on("Options:")
+    opt.on("--debug", "-d","Turns on debug messages") { $DEBUG=true }
+    opt.on("-v", "--version","Displays the version") { $stdout.puts("v#{Version::STRING}");exit 0 }
+    opt.on("--help", "-h", "-?", "This text") { $stdout.puts opt; exit 0 }
+    opt.parse!
+    #and now the rest
+    if args.empty?
+      $stdout.puts opt 
+      exit 0
+    else
+      return args.shift
+    end
+  end
+end
+logger=Patir.setup_logger
+config_file=parse_command_line(ARGV)
+begin
+  raise "No configuration file defined!" if !config_file
+  configuration=Rutema::RutemaXConfigurator.new(config_file,logger).configuration
+  Dir.chdir(File.dirname(config_file)) do 
+   coordinator=Rutema::Coordinator.new(configuration,logger)
+   specs=coordinator.parse_all_specifications
+   specifications=Hash.new
+   specs.each do |s|
+    specifications[s.name]=[s.title,s.description]
+   end
+   database=nil
+   configuration.reporters.each do |rep|
+    if rep[:class]==Rutema::ActiveRecordReporter
+       database=rep[:db][:database]
+      break
+    end
+   end
+   if database && File.exists?(database)
+     Rutema.connect_to_ar(database,logger,false)
+     test_scenario=Rutema::Model::Scenario.find(:first)
+     if test_scenario.respond_to?(:title) && test_scenario.respond_to?(:description)
+       logger.info("Schema appears updated")
+     else
+       logger.info("Updating schema")
+       #Rutema::Model::UpgradeV9toV10.up
+     end
+     logger.info("Setting title and description values")
+      Rutema::Model::Scenario.find(:all).each do |sc|
+       if specifications[sc.name]
+         logger.info("Setting columns for #{sc.name}:#{sc.id}")
+         sc.title=specifications[sc.name][0]
+         sc.description=specifications[sc.name][1]
+         sc.save
+       end
+      end
+   else
+     logger.fatal("Database '#{database}' does not exist")
+   end
+  end 
+rescue Patir::ConfigurationException
+  logger.debug($!)
+  logger.fatal("Configuration error '#{$!.message}'")
+  exit 1
+rescue
+  logger.debug($!)
+  logger.fatal("#{$!.message}")
+  exit 1
+end

data/distro_test.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 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/database.rutema
 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/configuration.rb

@@ -63,7 +63,6 @@ module Rutema
     
     #Hash values for passing data to the system. It's supposed to be used in the reporters and contain 
     #values such as version numbers, tester names etc.
-    #
     def context= definition
       @context||=Hash.new
       raise Patir::ConfigurationException,"Only accepting hash values as context_data" unless definition.kind_of?(Hash)
@@ -72,7 +71,7 @@ module Rutema
       end
     end
     
-    #Adds the files to the specification available to RutemaX.
+    #Adds the files to the specifications available to RutemaX.
     def tests= array_of_files
       @tests||=Array.new
       @tests+=array_of_files
@@ -117,18 +116,6 @@ module Rutema
     end
   end
   
-  #This module defines the "configuration directives" used in the configuration of RutemaH
-  module RutemaHConfiguration
-    #The configuration keys for the historian's database. This is adapter dependent.
-    #
-    #Currently SQLite is supported on MRI and h2 on jRuby.
-    #
-    #:database defines the name of the file (or directory for h2) to use for the database and is the only required key.
-    def db= definition
-      raise Patir::ConfigurationException,"required key :database is missing from #{definition}" unless definition[:database]
-      @db=definition
-    end
-  end
   #This class reads a RutemaX configuration file
   class RutemaXConfigurator<Patir::Configurator
     include RutemaXConfiguration
@@ -161,20 +148,4 @@ module Rutema
     end
   end
   
-  #This class reads a RutemaH configuration file
-  class RutemaHConfigurator<RutemaXConfigurator
-    include RutemaHConfiguration
-    def initialize config_file,logger=nil
-      super(config_file,logger)
-    end
-    
-    def configuration
-      cfg=super
-      Dir.chdir(File.dirname(config_file)) do |path|
-        @db[:database]=File.expand_path(@db[:database])
-        cfg.db=@db
-      end
-      return cfg
-    end
-  end
 end

data/lib/rutema/gems.rb

@@ -1,9 +1,11 @@
 require 'rubygems'
-gem 'activerecord','=2.0.2'
+gem 'activerecord','=2.1.1'
 require 'active_record'
+gem 'patir','>=0.5.8'
 require 'patir/configuration'
 require 'patir/command'
 require 'patir/base'
+
 require 'ruport/acts_as_reportable'
 require 'mailfactory'
 require 'highline'

data/lib/rutema/model.rb

@@ -32,6 +32,8 @@ module Rutema
           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|
@@ -56,7 +58,7 @@ module Rutema
       has_many :scenarios
       has_many :parse_errors
       serialize :context
-      acts_as_reportable
+      acts_as_reportable      
     end
 
     class Scenario<ActiveRecord::Base
@@ -74,5 +76,19 @@ module Rutema
       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
 end

data/lib/rutema/reporters/activerecord.rb

@@ -25,7 +25,7 @@ module Rutema
         @dbfile=database_configuration[:database]
       end
       Rutema.connect_to_ar(@dbfile,@logger)
-      @logger.info("Reporter '#{self.to_s}' registered")
+      @logger.info("Reporter #{self.to_s} registered")
     end
     
     #We get all the data for a Rutema::Model::Run entry in here.
@@ -53,8 +53,12 @@ module Rutema
         spec=specifications[scenario.sequence_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 #{scenario.sequence_name}")
+          sc.title=scenario.sequence_name
+          sc.description=""
         end
         if scenario.strategy==:attended
           sc.attended=true

data/lib/rutema/reporters/email.rb

@@ -43,6 +43,8 @@ module Rutema
       #customize
       @subject=definition[:subject]
       @subject||=""
+      @footer=definition[:footer]
+      @footer||=""
       @logger.info("Reporter '#{self.to_s}' registered")
     end
 
@@ -54,6 +56,7 @@ module Rutema
     def report specifications,runner_states,parse_errors,configuration
       @mail.subject = "#{@subject}"
       @mail.text = TextReporter.new.report(specifications,runner_states,parse_errors,configuration)
+      @mail.text << "\n\n#{@footer}"
       begin
         if @recipients.empty?
           @logger.error("No recipients for the report mail")

data/lib/rutema/reporters/text.rb

@@ -27,15 +27,15 @@ module Rutema
       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
-      rstates=runner_states.sort_by{ |state| state.sequence_id.to_s }
+      rstates=runner_states.sort_by do |state| 
+        state.sequence_id.to_i
+      end
       rstates.each do |state|
+        msg<<"\n#{specifications[state.sequence_name].title}" if specifications[state.sequence_name]
         msg<<"\n#{state.summary}\n---"
       end
       return msg
     end
-    def sorted_scenario_report runner_states
-
-    end
   end
   
 end

data/lib/rutema/system.rb

@@ -9,9 +9,9 @@ require 'rutema/gems'
 module Rutema
   #This module defines the version numbers for the library
   module Version
-    MAJOR=0
-    MINOR=9
-    TINY=3
+    MAJOR=1
+    MINOR=0
+    TINY=0
     STRING=[ MAJOR, MINOR, TINY ].join( "." )
   end
   #The Elements module provides the namespace for the various modules adding parser functionality
@@ -61,7 +61,11 @@ module Rutema
   class ParserError<RuntimeError
   end
 
-  #Base class that bombs out when used....
+  #Base class that bombs out when used.
+  #
+  #Initialze expects a hash and as a base implementation assigns :logger as the internal logger.
+  #
+  #By default the internal logger will log to the console if no logger is provided.
   class SpecificationParser
     attr_reader :configuration
     def initialize params
@@ -313,7 +317,18 @@ module Rutema
       @configuration.context.end_time=Time.now
       @logger.info("Run completed in #{@configuration.context.end_time-@configuration.context.start_time}s")
     end
-
+    
+    #Parses all specification files defined in the configuration
+    def parse_all_specifications
+      @configuration.tests.collect do |t| 
+        begin
+          parse_specification(t)
+        rescue
+          @logger.debug($!)
+          @logger.error($!.message)
+        end
+      end.compact
+    end
     #Delegates reporting to all configured reporters spawning one thread per reporter
     #
     #It then joins the threads and returns when all of them are finished.
@@ -377,7 +392,13 @@ module Rutema
           @parsed_files<<filename
           @parsed_files.uniq!
           spec=@parser.parse_specification(spec_file)
-          @specifications[spec.name]=spec
+          if @specifications[spec.name]
+            msg="Duplicate specification name '#{spec.name}' in '#{spec_file}'"
+            @logger.error(msg)
+            @parse_errors<<{:filename=>spec_file,:error=>msg}
+          else
+            @specifications[spec.name]=spec
+          end
         rescue ParserError
           @logger.error("Error parsing '#{spec_file}': #{$!.message}")
           @parse_errors<<{:filename=>filename,:error=>$!.message}
@@ -389,16 +410,6 @@ module Rutema
       end
       return spec
     end
-    def parse_all_specifications
-      @configuration.tests.collect do |t| 
-        begin
-          parse_specification(t)
-        rescue
-          @logger.debug($!)
-          @logger.error($!.message)
-        end
-      end.compact
-    end
 
     def run_scenarios specs
       specs.compact!
@@ -591,6 +602,7 @@ module Rutema
     def initialize command_line_args
       parse_command_line(command_line_args)
       @logger=Patir.setup_logger(@log_file)
+      @logger.info("rutemax v#{Version::STRING}")
       begin
         raise "No configuration file defined!" if !@config_file
         @configuration=RutemaXConfigurator.new(@config_file,@logger).configuration
@@ -618,7 +630,7 @@ module Rutema
         opt.on("--log FILE", "-l FILE",String,"Redirects the log output to FILE") { |@log_file|}
         opt.on("--check","Runs just the check test"){@check=true}
         opt.on("--step","Runs test cases step by step"){@step=true}
-        opt.on("-v", "--version","Displays the version") { $stdout.puts("v#{Version::STRING}");exit 0 }
+        opt.on("-v", "--version","Displays the version") { $stdout.puts("rutemax v#{Version::STRING}");exit 0 }
         opt.on("--help", "-h", "-?", "This text") { $stdout.puts opt; exit 0 }
         opt.on("The commands are:")
         opt.on("\tall - Runs all tests")

data/test/migration.spec

@@ -0,0 +1,9 @@
+<specification name="TR002">
+<title>Migration v0.9 to v1.0</title>
+<description>Test that the database migration code is succesfull between versions 0.9.0 and 1.0.0</description>
+<scenario>
+	<command cmd="cp data/sample09.db data/test.db"/>
+	<command cmd="rutema_upgrader data/test.db"/>
+	<command cmd="rm data/test.db"/>
+</scenario>
+</specification>

data/test/rutema.rutema

@@ -1,3 +1,3 @@
 configuration.parser={:class=>Rutema::MinimalXMLParser}
 configuration.reporter={:class=>Rutema::ActiveRecordReporter, :db=>{:database=>"rutema.db"}}
-configuration.tests=["rutema.spec"]
+configuration.tests=["rutema.spec","migration.spec"]

data/test/rutema.spec

@@ -1,11 +1,10 @@
 <specification name="TR001">
 <title>Rutema self hosting test</title>
-<description>Test that rutemax and rutemah are usable as steps in a specification using the distro test example</description>
+<description>Test that rutemax is usable as a step in a specification using the distro test example</description>
 <scenario>
 	<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_configuration.rb

@@ -32,14 +32,7 @@ module TestRutema
       assert_not_nil(cfg.tests)
       assert_not_nil(cfg.context)
     end
-    def test_rutemah_configuration
-      cfg=nil
-      #load the valid configuration
-      assert_nothing_raised() { cfg=Rutema::RutemaHConfigurator.new("distro_test/config/database.rutemah").configuration}
-      assert_not_nil(cfg.db)
-      assert_nothing_raised() { cfg=Rutema::RutemaHConfigurator.new("distro_test/config/jruby.rutemah").configuration}
-      assert_not_nil(cfg.db)
-    end
+    
     def test_specification_paths
       cfg=Rutema::RutemaXConfigurator.new("distro_test/config/full.rutema").configuration
       assert_not_nil(cfg.tests)

data/test/test_reporter.rb

@@ -67,33 +67,57 @@ module TestRutema
       st.step=MockCommand.new(2)
       st.step=MockCommand.new(3)
       @status=[st]
+      
     end
     def test_new
+      spec=mock()
+      spec.expects(:title).returns("A test sequence")
+      specs={"test_seq"=>spec}
       definition={:server=>"localhost",:port=>25,:recipients=>["test"],:sender=>"rutema",:subject=>"test"}
       r=Rutema::EmailReporter.new(definition)
       Net::SMTP.expects(:start).times(2)
-      assert_nothing_raised() { puts r.report(nil,@status,@parse_errors,nil) }
-      assert_nothing_raised() { puts r.report(nil,[],[],nil) }
+      assert_nothing_raised() { puts r.report(specs,@status,@parse_errors,nil) }
+      assert_nothing_raised() { puts r.report(specs,[],[],nil) }
     end
     
     def test_multiple_scenarios
+      #The status mocks
       status1=mock()
-      status1.expects(:summary).returns("test1. Status - error. States 3\nStep status summary:\n\t1:'echo' - success\n\t2:'check' - warning\n\t3:'try' - error")
-      status1.expects(:sequence_id).returns(2)
+      status1.expects(:summary).returns("test6. Status - error. States 3\nStep status summary:\n\t1:'echo' - success\n\t2:'check' - warning\n\t3:'try' - error")
+      status1.expects(:sequence_id).returns(6)
+      status1.expects(:sequence_name).returns("T2").times(2)
       status2=mock()
-      status2.expects(:summary).returns("test2. Status - success. States 3\nStep status summary:\n\t1:'echo' - success\n\t2:'check' - success\n\t3:'try' - success")
-      status2.expects(:sequence_id).returns(1)
+      status2.expects(:summary).returns("test10. Status - success. States 3\nStep status summary:\n\t1:'echo' - success\n\t2:'check' - success\n\t3:'try' - success")
+      status2.expects(:sequence_id).returns(10)
+      status2.expects(:sequence_name).returns("T1").times(2)
       status3=mock()
-      status3.expects(:summary).returns("test3. Status - success. States 3\nStep status summary:\n\t1:'echo' - success\n\t2:'check' - success\n\t3:'try' - success")
+      status3.expects(:summary).returns("testNil. Status - success. States 3\nStep status summary:\n\t1:'echo' - success\n\t2:'check' - success\n\t3:'try' - success")
       status3.expects(:sequence_id).returns(nil)
+      status3.expects(:sequence_name).returns(nil)
       status4=mock()
-      status4.expects(:summary).returns("test4. Status - success. States 3\nStep status summary:\n\t1:'echo' - success\n\t2:'check' - success\n\t3:'try' - success")
-      status4.expects(:sequence_id).returns("1s")
-      @status=[status1,status2,status3,status4]
+      status4.expects(:summary).returns("test10s. Status - success. States 3\nStep status summary:\n\t1:'echo' - success\n\t2:'check' - success\n\t3:'try' - success")
+      status4.expects(:sequence_id).returns("10s")
+      status4.expects(:sequence_name).returns("Setup").times(2)
+      status5=mock()
+      status5.expects(:summary).returns("test60. Status - error. States 3\nStep status summary:\n\t1:'echo' - success\n\t2:'check' - warning\n\t3:'try' - error")
+      status5.expects(:sequence_id).returns(60)
+      status5.expects(:sequence_name).returns("T1").times(2)
+      stati=[status1,status2,status3,status4,status5]
+      #mock the mailing code
       definition={:server=>"localhost",:port=>25,:recipients=>["test"],:sender=>"rutema",:subject=>"test"}
       r=Rutema::EmailReporter.new(definition)
       Net::SMTP.expects(:start)
-      assert_nothing_raised() { puts r.report(nil,@status,@parse_errors,nil) }
+      #The specification mocks
+      spec1=mock()
+      spec1.expects(:title).times(2).returns("T1")
+      spec2=mock()
+      spec2.expects(:title).returns("T2")
+      spec3=mock()
+      spec3.expects(:title).returns("Setup")
+      specs={"T1"=>spec1,
+        "T2"=>spec2,
+        "Setup"=>spec3}
+      assert_nothing_raised() { puts r.report(specs,stati,@parse_errors,nil) }
     end
   end
 end

data/test/test_system.rb

@@ -120,19 +120,27 @@ EOT
       conf=OpenStruct.new(:parser=>{:class=>Rutema::BaseXMLParser},
       :tools=>{},
       :paths=>{},
-      :tests=>[],
+      :tests=>["distro_test/specs/sample.spec","distro_test/specs/duplicate_name.spec"],
       :reporters=>[],
       :context=>OpenStruct.new)
       coord=nil
-      assert_nothing_raised() {  coord=Rutema::Coordinator.new(conf) }
       assert_nothing_raised() do 
+        coord=Rutema::Coordinator.new(conf)
         coord.run(:all)
+        assert_equal(1,coord.parse_errors.size)
+        coord=Rutema::Coordinator.new(conf)
         coord.run(:attended)
+        assert_equal(1,coord.parse_errors.size)
+        coord=Rutema::Coordinator.new(conf)
         coord.run(:unattended)
+        assert_equal(1,coord.parse_errors.size)
+        coord=Rutema::Coordinator.new(conf)
         coord.run("distro_test/specs/sample.spec")
+        assert_equal(0,coord.parse_errors.size)
+        coord=Rutema::Coordinator.new(conf)
         coord.run("distro_test/specs/no_title.spec")
+        assert_equal(1,coord.parse_errors.size)
       end
-      assert_equal(1,coord.parse_errors.size)
       puts coord.to_s if $DEBUG
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rutema
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 1.0.0
 platform: ruby
 authors: 
 - Vassilis Rizopoulos
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-10 00:00:00 +02:00
+date: 2008-10-06 00:00:00 +02:00
 default_executable: rutemax
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.7
+        version: 0.6.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: highline
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.0.2
+        version: 2.1.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: ruport
@@ -86,7 +86,7 @@ description: "== DESCRIPTION: rutema is a test execution tool with a twist. It a
 email: riva@braveworld.net
 executables: 
 - rutemax
-- rutemah
+- rutema_upgrader
 extensions: []
 
 extra_rdoc_files: 
@@ -100,13 +100,12 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
-- bin/rutemah
 - bin/rutemax
+- bin/rutema_upgrader
 - distro_test.sh
 - lib/rutema/configuration.rb
 - lib/rutema/db.rb
 - lib/rutema/gems.rb
-- lib/rutema/historian.rb
 - lib/rutema/model.rb
 - lib/rutema/reporter.rb
 - lib/rutema/reporters/activerecord.rb
@@ -116,11 +115,10 @@ files:
 - lib/rutema/specification.rb
 - lib/rutema/system.rb
 - selftest.sh
+- test/data/sample09.db
 - test/distro_test/config/database.rutema
-- test/distro_test/config/database.rutemah
 - test/distro_test/config/full.rutema
 - test/distro_test/config/jruby.rutema
-- test/distro_test/config/jruby.rutemah
 - test/distro_test/config/minimal.rutema
 - test/distro_test/specs/T001.spec
 - test/distro_test/specs/T002.spec
@@ -132,8 +130,8 @@ files:
 - test/distro_test/specs/sample.spec
 - test/rutema.rutema
 - test/rutema.spec
+- test/migration.spec
 - test/test_configuration.rb
-- test/test_historian.rb
 - test/test_model.rb
 - test/test_reporter.rb
 - test/test_specification.rb
@@ -161,13 +159,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: patir
-rubygems_version: 1.2.0
+rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
 summary: rutema is a test execution and management framework for heterogeneous testing environments
 test_files: 
 - test/test_configuration.rb
-- test/test_historian.rb
 - test/test_model.rb
 - test/test_reporter.rb
 - test/test_specification.rb

data/bin/rutemah

@@ -1,9 +0,0 @@
-#  Copyright (c) 2007 Vassilis Rizopoulos. All rights reserved.
-begin
-  require 'rutema/historian'
-rescue LoadError
-  require 'rubygems'
-  require 'rutema/historian'
-end
-
-Rutema::RutemaH.new(ARGV)

data/lib/rutema/historian.rb

@@ -1,106 +0,0 @@
-#  Copyright (c) 2007 Vassilis Rizopoulos. All rights reserved.
-$:.unshift File.join(File.dirname(__FILE__),"..")
-require 'rutema/model'
-require 'rutema/system'
-require 'rutema/db'
-require 'rutema/gems'
-
-module Rutema
-  #The "historian" application class
-  #
-  #RutemaH provides reports for test results over time using the data stored by the ActiveRecordReporter
-  class RutemaH
-    require  'optparse'
-    def initialize command_line_args
-      parse_command_line(command_line_args)
-      logger=Patir.setup_logger(@log_file)
-      begin
-        raise "No configuration file defined!" if !@config_file
-        configuration=RutemaHConfigurator.new(@config_file,logger).configuration
-        historian=Historian.new(configuration,logger)
-        puts historian.history(@command)
-      rescue Patir::ConfigurationException
-        logger.debug($!)
-        logger.fatal("Configuration error '#{$!.message}'")
-        exit 1
-      rescue
-        logger.debug($!)
-        logger.fatal("#{$!.message}")
-        exit 1
-      end
-    end  
-    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::STRING}");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?
-          $stdout.puts opt 
-          exit 0
-        else
-          @command=args.shift
-        end
-      end   
-    end#parse_command_line
-  end
-
-  class Historian
-    def initialize configuration,logger=nil
-      @logger=logger
-      @logger||=Patir.setup_logger
-      @configuration=configuration
-      Rutema.connect_to_ar(@configuration.db[:database],@logger,false)
-    end
-
-    def history mode
-      begin
-        case mode
-        when "all"
-          table=Model::Scenario.report_table(:all)
-          if table.empty?
-            @logger.warn("No entries found") 
-          else
-            ret=Ruport::Data::Grouping(beautify(table),:by=>"run_id")
-          end
-        when String
-          ret=per_spec(mode)
-        end
-      rescue
-        @logger.debug($!)
-        @logger.error("Could not retrieve scenario data from the database")
-      end
-      return ret
-    end
-    private
-    def beautify table
-      @logger.debug("Beautifying...")
-      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
-      @logger.debug("History of #{spec_name}")
-      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
-
-    end
-  end
-end

data/test/distro_test/config/database.rutemah

@@ -1,7 +0,0 @@
-#include the configuration from database.rutema
-configuration.load_from_file("database.rutema")
-#This is the verbose version of the configuration entry:
-#configuration.db={:database=>"sample.db",:adapter=>"sqlite3"}
-#For the time being the adapter is being automatically set according to the platform we're running on, so the :adapter is ignored
-#SQLite for MRI and h2 for jRuby
-configuration.db={:database=>"sample.db"}

data/test/distro_test/config/jruby.rutemah

@@ -1,7 +0,0 @@
-#include the configuration from database.rutema
-configuration.load_from_file("database.rutema")
-#This is the verbose version of the configuration entry:
-#configuration.db=:database=>"db/h2",:adapter=>"jdbch2"}
-#For the time being the adapter is being automatically set according to the platform we're running on, so the :adapter is ignored
-#SQLite for MRI and h2 for jRuby
-configuration.db={:database=>"db/h2"}

data/test/test_historian.rb

@@ -1,82 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__),"..","lib")
-require 'test/unit'
-require 'ostruct'
-require 'fileutils'
-require 'rutema/historian'
-#$DEBUG=true
-module TestRutema
-  class TestHistorian<Test::Unit::TestCase
-    def setup
-      @configuration=OpenStruct.new
-      @configuration.db={:database=>":memory:"}
-      @configuration.db={:database=>"db/h2"} if RUBY_PLATFORM =~ /java/
-    end
-    def teardown
-      ActiveRecord::Base.remove_connection
-      FileUtils.rm_rf("db/") if File.exists?("db/")
-    end
-    def test_history
-      assert_nothing_raised() do
-        h=Rutema::Historian.new(@configuration)
-        Rutema::Model::Schema.up
-        a_bunch_of_data
-        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" )
-        assert_not_nil( h.history("all") )
-        assert_not_nil( h.history("TC002") )
-      end
-    end
-    def test_no_db
-      ActiveRecord::Base.remove_connection
-      if RUBY_PLATFORM =~ /java/
-        @configuration.db={:database=>"foo",:adapter=>"jdbch2"}
-      else
-        @configuration.db={:database=>"foo",:adapter=>"sqlite3"}
-
-      end
-      assert_nothing_raised() do
-        h=Rutema::Historian.new(@configuration)
-        assert_nothing_raised() {  h.history("all")}
-      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
-      def setup_for_mri
-        ActiveRecord::Base.establish_connection(:adapter  => "sqlite3",:database =>":memory:")
-        @configuration.db={:database=>":memory:",:adapter=>"sqlite3"}
-      end
-      def setup_for_java
-        ActiveRecord::Base.establish_connection(:adapter  => "jdbch2",:database =>"db/h2")
-        @configuration.db={:database=>"db/h2",:adapter=>"jdbch2"}
-      end
-    end
-  end