rutema 0.6.5 → 0.7.0

data/History.txt

@@ -1,3 +1,12 @@
+== 0.7.0 / 2008-05-16
+* Support for tools, paths and context information in the configuration solidified (http://patir.rubyforge.org/rutema/tool_configuration.html for more)
+* Changes in the configuration for Historian and ActiveRecordReporter. Check the distro_test samples
+* database connection code consolidated in db.rb
+* Added support for jdbc/h2 to work with jRuby
+* AR-reporter configuration expanded to support different adapters. Consistent with the Historian db configuration
+* rutema unit tests now run under jRuby
+* rutemah runs under jRuby
+
 == 0.6.5 / 2008-04-15
 * Updated rutemaweb controller to work with ramaze 0.3.9.1
 == 0.6.4 / 2008-03-30

data/Manifest.txt

@@ -13,6 +13,7 @@ lib/rutema/reporter.rb
 lib/rutema/reporter_ar.rb
 lib/rutema/historian.rb
 lib/rutema/model.rb
+lib/rutema/db.rb
 lib/rutemaweb/main.rb
 lib/rutemaweb/ramaze_controller.rb
 lib/rutemaweb/public/bg_menu.gif
@@ -39,8 +40,6 @@ test/samples/teardown.spec
 test/samples/test.spec
 test/samples/tests/no_title.spec
 test/samples/tests/sample.spec
-test/samples/valid_config.rb
-test/samples/rutemah_config.rb
 test/distro_test/config/minimal.rutema
 test/distro_test/config/database.rutema
 test/distro_test/config/database.rutemah

data/lib/rutema/configuration.rb

@@ -7,18 +7,24 @@ require 'patir/configuration'
 module Rutema
   #This module defines the "configuration directives" used in the configuration of RutemaX
   module RutemaXConfiguration
-    #Adds a path to a tools to the tools hash of the configuration
+    #Adds a hash of values to the tools hash of the configuration
+    #
+    #
+    #This hash is then accessible in the parser and reporters as a property of the configuration instance
     #
     #Required keys:
     # :name - the name to use for accessing the path in code
-    # :path - the path to the executable
     #Example:
-    # configuration.tool={:name=>"make",:path=>"/bin/make"}
+    # configuration.tool={:name=>"make",:path=>"/bin/make",:configuration=>{:important=>"info"}}
+    #
+    #The path to make can be accessed in the parser as
+    # @configuration.make[:path]
+    #
+    #This way you can pass configuration information for the tools you use
     def tool= definition
       @tools||=Hash.new
       raise Patir::ConfigurationException,"required key :name is missing from #{definition}" unless definition[:name]
-      raise Patir::ConfigurationException,"required key :path is missing from #{definition}" unless definition[:path]
-      @tools[definition[:name]]=definition[:path]
+      @tools[definition[:name]]=definition
     end
     #Adds a path to the paths hash of the configuration
     #
@@ -57,9 +63,9 @@ module Rutema
     end
     
     #Hash values for passing data to the system. It's supposed to be used in the reporters and contain 
-    #values such as verson numbers, tester names etc.
+    #values such as version numbers, tester names etc.
     #
-    def context_data= definition
+    def context= definition
       @context||=Hash.new
       raise Patir::ConfigurationException,"Only accepting hash values as context_data" unless definition.kind_of?(Hash)
       definition.each do |k,v|
@@ -98,6 +104,7 @@ module Rutema
     end
 
     private 
+    #Checks if a path exists and raises a Patir::ConfigurationException if not
     def check_path path
       path=File.expand_path(path)
       raise Patir::ConfigurationException,"#{path} does not exist" unless File.exists?(path)
@@ -113,13 +120,14 @@ module Rutema
   
   #This module defines the "configuration directives" used in the configuration of RutemaH
   module RutemaHConfiguration
-    #The configuration keys for the historian's database
-    def source= definition
-      if File.exists?(definition)
-        @source=File.expand_path(definition)
-      else
-        raise Patir::ConfigurationException,"DB file '#{definition}' not found"
-      end
+    #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
@@ -144,6 +152,8 @@ module Rutema
         @configuration.check=@check
         @configuration.context=OpenStruct.new(@context)
         @configuration.parser=@parser
+        raise Patir::ConfigurationException,"No parser defined" unless @configuration.parser
+        raise Patir::ConfigurationException,"Syntax error in parser definition - missing :class" unless @configuration.parser[:class]
         @configuration.reporters=@reporters
         @configuration.tests=@tests.collect{|e| File.expand_path(e) }
         @configuration.filename=@config_file
@@ -161,7 +171,10 @@ module Rutema
     
     def configuration
       cfg=super
-      cfg.source=@source
+      Dir.chdir(File.dirname(config_file)) do |path|
+        @db[:database]=File.expand_path(@db[:database])
+        cfg.db=@db
+      end
       return cfg
     end
   end

data/lib/rutema/db.rb

@@ -0,0 +1,125 @@
+module Rutema
+  
+  class SQLiteConnection
+    def initialize logger, database
+      @logger=logger
+      @database=database
+    end
+    
+    def adapter
+         "sqlite3"
+    end
+    
+    def connected?
+      result = ActiveRecord::Base.connected?
+      @logger.debug "Connected " + result.to_s
+      return result
+    end
+    
+    def connect
+      ActiveRecord::Base.establish_connection(:adapter=>adapter, :database=>@database )
+      @logger.warn("'#{@database}' does not exist") if !(File.exists?(@database)) && @database!=":memory:"
+      connected?
+    end
+    
+    def migrate
+      return if File.exists?(@database)
+      @logger.info "Migrating DB"
+      Model::Schema.migrate(:up) 
+    end
+  end
+  
+  class H2Connection
+    def initialize logger, database
+      @logger=logger
+      @database=database
+    end
+    
+    def adapter
+      "jdbch2"
+    end
+    def port
+      7098
+    end
+    def base_dir
+      "/"
+    end
+    def connected?
+      begin
+        ActiveRecord::Base.retrieve_connection
+      rescue RuntimeError
+      end
+      result = ActiveRecord::Base.connected?
+      @logger.debug "Connected " + result.to_s
+      result
+    end
+    
+    def connect
+      connect_server
+      if not connected?
+        start_server
+        connect_server
+      end
+      connected?
+    end
+    
+    def connect_server
+      url = server_url
+      @logger.info "Connecting to " + server_url
+      ActiveRecord::Base.establish_connection(:adapter=>adapter, 
+                                              :driver => 'org.h2.Driver', 
+      :url=> server_url)
+    end
+    
+    def server_url
+      # database is supposed to be an absolute path
+      "jdbc:h2:tcp://localhost:" + port.to_s + @database
+    end
+    
+    # Start a h2 server to allow mixed mode accessing. 
+    def start_server
+      args = ["-tcpPort", port.to_s, "-baseDir", base_dir]
+      @logger.info "Starting H2 server using arguments " + args.join(" ")
+      require 'jdbc/h2'
+      Rutema.includeJava
+      org.h2.tools.Server.createTcpServer(args.to_java(:string)).start()
+    end
+    
+    def migrate
+      return if File.exists?("#{@database}.data.db")
+      @logger.info "Migrating DB"
+      Model::Schema.migrate(:up) 
+    end
+    
+    
+  end
+  
+  
+  #Exception occuring when connecting to a database
+  class ConnectionError<RuntimeError
+  end
+  #Establishes an ActiveRecord connection
+  def self.connect_to_ar database,logger,perform_migration=true
+    raise ConnectionError,"No database source defined in the configuration" unless database
+    logger.debug("Connecting to #{database}")
+    conn = connection(logger, database)
+    conn.connect
+    conn.migrate if perform_migration
+  end
+  
+  private 
+  
+  @@connection=nil
+  
+  def self.connection logger, database
+    if not @@connection
+      @@connection = RUBY_PLATFORM =~ /java/ ? H2Connection.new(logger, database) : SQLiteConnection.new(logger, database)
+    end
+    @@connection
+  end
+  
+  def self.includeJava
+    # "undefined method 'include'" in instance method
+    include Java if RUBY_PLATFORM =~ /java/
+  end
+end

data/lib/rutema/historian.rb

@@ -1,6 +1,8 @@
-require 'rubygems'
+$:.unshift File.join(File.dirname(__FILE__),"..")
 require 'rutema/model'
 require 'rutema/system'
+require 'rutema/db'
+require 'rubygems'
 require "ruport"
 
 module Rutema
@@ -58,22 +60,31 @@ module Rutema
       @logger=logger
       @logger||=Patir.setup_logger
       @configuration=configuration
-      connect()
+      Rutema.connect_to_ar(@configuration.db[:database],@logger,false)
     end
 
     def history mode
-      case mode
-      when "all"
-        table=Model::Scenario.report_table(:all)
-        @logger.warn("No entries found") if table.empty?
-        ret=Ruport::Data::Grouping(beautify(table),:by=>"run_id")
-      when String
-        ret=per_spec(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"}
@@ -81,37 +92,15 @@ module Rutema
       return table
     end
     def per_spec spec_name
-      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
-      if @configuration.source
-        if ActiveRecord::Base.connected?
-          @logger.info("Using cached database connection")
-        else
-          if File.exist?(@configuration.source) || @configuration.source==":memory:"
-            @logger.info("Connecting with database '#{@configuration.source}'")
-            ActiveRecord::Base.establish_connection(:adapter=>"sqlite3", :database=>@configuration.source )
-          else
-            @logger.fatal("Could not find #{@configuration.source}")
-            exit 1
-          end
-        end
+      @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
-        @logger.fatal("No database source defined in the configuration")
-        exit 1
+        beautify(table)
       end
+
     end
   end
 end

data/lib/rutema/reporter_ar.rb

@@ -2,24 +2,31 @@
 require 'yaml'
 require 'rutema/reporter'
 require 'rutema/model'
+require 'rutema/db'
 require 'rubygems'
 require 'patir/command'
 
 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.
+  #The DBMSs supported are dependent on the platform: either SQLite3 or h2 (jruby)
   class ActiveRecordReporter<Reporter
+    #The required keys in this reporter's configuration are:
+    # :db - the database configuration. A Hash with the DB adapter information
+    #  :db=>{:database=>"sample.rb"}
+    #
+    #Optioanlly you can pass a Logger instance with the :logger key
     def initialize definition
       @logger=definition[:logger]
       @logger||=Patir.setup_logger
-      raise "No database file defined" unless definition[:dbfile]
-      unless definition[:dbfile]==":memory:"
-        @dbfile=File.expand_path(definition[:dbfile]) 
+      database_configuration = definition[:db]
+      raise "No database configuration defined" unless database_configuration
+      unless database_configuration[:database]==":memory:"
+        @dbfile=File.expand_path(database_configuration[:database]) 
       else
-        @dbfile=definition[:dbfile]
+        @dbfile=database_configuration[:database]
       end
-      connect
+      Rutema.connect_to_ar(@dbfile,@logger)
     end
     
     #We get all the data for a Rutema::Model::Run entry in here.
@@ -70,13 +77,5 @@ module Rutema
       run_entry.save!
     end
 
-    private
-    def connect
-      ActiveRecord::Base.logger = @logger
-      @logger.info("Connecting with database '#{@dbfile}'")
-      ActiveRecord::Base.establish_connection(:adapter  => "sqlite3", 
-        :database => @dbfile)
-      Model::Schema.migrate(:up) unless File.exists?(@dbfile)
-    end
   end   
 end

data/lib/rutema/system.rb

@@ -1,12 +1,10 @@
 #  Copyright (c) 2007 Vassilis Rizopoulos. All rights reserved.
 
 require 'rexml/document'
-
+$:.unshift File.join(File.dirname(__FILE__),"..")
 require 'rutema/specification'
 require 'rutema/configuration'
 require 'rutema/reporter_ar'
-
-
 require 'rubygems'
 require 'highline'
 require 'patir/command'
@@ -15,8 +13,8 @@ module Rutema
   #This module defines the version numbers for the library
   module Version
     MAJOR=0
-    MINOR=6
-    TINY=5
+    MINOR=7
+    TINY=0
     STRING=[ MAJOR, MINOR, TINY ].join( "." )
   end
   #Is raised when an error is found in a specification
@@ -604,10 +602,10 @@ module Rutema
       @logger.info("Report:\n#{@coordinator.to_s}")
       @coordinator.report
       if @coordinator.parse_errors.empty? && @coordinator.last_run_a_success?
-        @logger.info("All tests succesful")
+        @logger.info("All tests successful")
         exit 0
       else
-        @logger.warn("Not all tests were succesful")
+        @logger.warn("Not all tests were successful")
         exit 1
       end
     end

data/lib/rutemaweb/main.rb

@@ -7,30 +7,13 @@ def start_ramaze
   logger=Patir.setup_logger
   db_file=parse_command_line(ARGV)
   db_file=File.expand_path(db_file)
-  connect(db_file,logger)
+  Rutema.connect_to_ar(db_file,logger)
   require 'rutemaweb/ramaze_controller'
   Dir.chdir(File.dirname(__FILE__)) do
     Ramaze.start :force=>true#,:adapter=>:thin
   end
 end
-def connect db_file,logger
-  if db_file
-    if ActiveRecord::Base.connected?
-      logger.info("Using cached database connection")
-    else
-      if File.exist?(db_file)
-        logger.info("Connecting with database '#{db_file}'")
-        ActiveRecord::Base.establish_connection(:adapter=>"sqlite3", :database=>db_file )
-      else
-        logger.fatal("Could not find #{db_file}")
-        exit 1
-      end
-    end
-  else
-    logger.fatal("No database source defined in the configuration")
-    exit 1
-  end
-end
+
 
 def parse_command_line args
   args.options do |opt|

data/lib/rutemaweb/public/style.css

@@ -99,4 +99,7 @@ table {
 }
 .smallredtext a:hover{
 	text-decoration:underline;
+}
+.vtable tr td {
+	text-align: left;
 }

data/lib/rutemaweb/ramaze_controller.rb

@@ -3,6 +3,7 @@ $:.unshift File.join(File.dirname(__FILE__),"..")
 require 'rutema/system'
 require 'rubygems'
 require 'ramaze'
+require 'rutemaweb/ruport_formatter.rb'
 
 
 module Rutema
@@ -82,8 +83,7 @@ module Rutema
             img_src=IMG_STEP_ERROR if "error"==r.status
             "<img src=\"#{img_src}\" align=\"center\"/>"
           end
-          table.reorder("number","status","name","output","error","duration")
-          ret=table.to_html
+          ret=table.to_vhtml
         end
         return ret
       end

data/test/distro_test/config/database.rutema

@@ -1,5 +1,9 @@
+#The parser to use
 configuration.parser={:class=>Rutema::MinimalXMLParser}
-configuration.reporter={:class=>Rutema::ActiveRecordReporter, :dbfile=>"sample.db"}
+#Use the AR-Reporter. 
+#In case of reporters the whole Hash is passed to the reporter initializer, so any keys are dependent on the reporter to use
+#Check the appropriate RDoc entries
+configuration.reporter={:class=>Rutema::ActiveRecordReporter, :db=>{:database=>"sample.db"}}
 configuration.tests=[
 "../specs/T001.spec",
 "../specs/T002.spec",

data/test/distro_test/config/database.rutemah

@@ -1,2 +1,7 @@
+#include the configuration from database.rutema
 configuration.load_from_file("database.rutema")
-configuration.source="sample.db"
+#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/test_configuration.rb

@@ -1,7 +1,7 @@
 $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 
 require 'test/unit'
-
+#$DEBUG=true
 module TestRutema
   require 'rutema/system'
   
@@ -13,23 +13,35 @@ module TestRutema
     def teardown
       Dir.chdir(@prev_dir)
     end
-    def test_configuration
+    def test_rutemax_configuration
       cfg=nil
       #load the valid configuration
-      assert_nothing_raised() { cfg=Rutema::RutemaXConfigurator.new("samples/valid_config.rb").configuration}
+      assert_nothing_raised() { cfg=Rutema::RutemaXConfigurator.new("distro_test/config/full.rutema").configuration}
       assert_not_nil(cfg.parser)
       assert_not_nil(cfg.reporters)
       assert_equal(1, cfg.reporters.size)
       assert_not_nil(cfg.tools)
+      assert_not_nil(cfg.tools.test[:configuration])
+      assert_not_nil(cfg.tools.test[:path])
+      assert_equal("test", cfg.tools.test[:name])
       assert_not_nil(cfg.paths)
+      assert_not_nil(cfg.paths.test)
       assert_not_nil(cfg.setup)
       assert_not_nil(cfg.teardown)
       assert_not_nil(cfg.check)
       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("samples/valid_config.rb").configuration
+      cfg=Rutema::RutemaXConfigurator.new("distro_test/config/full.rutema").configuration
       assert_not_nil(cfg.tests)
     end
   end

data/test/test_historian.rb

@@ -1,5 +1,4 @@
 $:.unshift File.join(File.dirname(__FILE__),"..","lib")
-$:.unshift File.join(File.dirname(__FILE__),"..","ext")
 require 'test/unit'
 require 'ostruct'
 require 'fileutils'
@@ -7,23 +6,38 @@ require 'rutema/historian'
 #$DEBUG=true
 module TestRutema
   class TestHistorian<Test::Unit::TestCase
-    ActiveRecord::Base.establish_connection(:adapter  => "sqlite3",:database =>":memory:")
-    Rutema::Model::Schema.up
     def setup
       @configuration=OpenStruct.new
-      @configuration.source=":memory:"
-      a_bunch_of_data
+      @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" )
-        puts h.history("all")
-        puts h.history("TC002")
+        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
     
@@ -39,23 +53,30 @@ module TestRutema
       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)
+        :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)
+        :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)
+        :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)
+      :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
-end
+  end

data/test/test_model.rb

@@ -2,13 +2,24 @@ $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 
 require 'test/unit'
 require 'rutema/model'
+require 'fileutils'
 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
+    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
+    end
+    def teardown
+      ActiveRecord::Base.remove_connection
+      FileUtils.rm_rf("db/") if File.exists?("db/")
+    end
     #test the CRUD operations
     def test_create_read_update_delete
       #create

data/test/test_reporter.rb

@@ -14,7 +14,6 @@ module TestRutema
     end
   end
   class TestActiveRecordReporter<Test::Unit::TestCase
-    DB_FILE=":memory:"
     def setup
       @prev_dir=Dir.pwd
       Dir.chdir(File.dirname(__FILE__))
@@ -29,8 +28,12 @@ module TestRutema
       test2.step=MockCommand.new(2)
       test2.step=MockCommand.new(3)
       @status=[test1,test2]
+      @database={:db=>{:database=>":memory:"}}
+      @database={:db=>{:database=>"db/h2"}} if RUBY_PLATFORM =~ /java/
     end
     def teardown
+      ActiveRecord::Base.remove_connection
+      FileUtils.rm_rf("db")
       Dir.chdir(@prev_dir)
     end
     def test_report
@@ -39,7 +42,7 @@ module TestRutema
       specs={"test1"=>spec1,
         "test2"=>spec2
       }
-      r=Rutema::ActiveRecordReporter.new(:dbfile=>DB_FILE)
+      r=Rutema::ActiveRecordReporter.new(@database)
       #without configuration
       assert_nothing_raised() { r.report(specs,@status,@parse_errors,nil)  }
       configuration=OpenStruct.new

data/test/test_system.rb

@@ -1,5 +1,4 @@
 $:.unshift File.join(File.dirname(__FILE__),"..","lib")
-$:.unshift File.join(File.dirname(__FILE__),"..","ext")
 require 'test/unit'
 require 'ostruct'
 require 'rubygems'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rutema
 version: !ruby/object:Gem::Version 
-  version: 0.6.5
+  version: 0.7.0
 platform: ruby
 authors: 
 - Vassilis Rizopoulos
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-15 00:00:00 +02:00
+date: 2008-05-16 00:00:00 +02:00
 default_executable: rutemax
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -122,6 +122,7 @@ files:
 - lib/rutema/reporter_ar.rb
 - lib/rutema/historian.rb
 - lib/rutema/model.rb
+- lib/rutema/db.rb
 - lib/rutemaweb/main.rb
 - lib/rutemaweb/ramaze_controller.rb
 - lib/rutemaweb/public/bg_menu.gif
@@ -148,8 +149,6 @@ files:
 - test/samples/test.spec
 - test/samples/tests/no_title.spec
 - test/samples/tests/sample.spec
-- test/samples/valid_config.rb
-- test/samples/rutemah_config.rb
 - test/distro_test/config/minimal.rutema
 - test/distro_test/config/database.rutema
 - test/distro_test/config/database.rutemah

data/test/samples/rutemah_config.rb

@@ -1,3 +0,0 @@
-#$:.unshift File.dirname(__FILE__)
-configuration.load_from_file("valid_config.rb")
-configuration.source="test.db"

data/test/samples/valid_config.rb

@@ -1,20 +0,0 @@
-require 'rake'
-#
-configuration.parser={:class=>Rutema::MinimalXMLParser}
-configuration.reporter={:class=>Rutema::EmailReporter,
-  :server=>"localhost",
-  :port=>25,
-  :recipients=>["test"],
-  :sender=>"rutema",
-  :subject=>"test",
-  :dummy=>true
-}
-configuration.tool={:name=>"echo",:path=>"echo.exe"}
-configuration.tool={:name=>"tool",:path=>"tool.exe"}
-configuration.path={:name=>"SourcePath",:path=>"../../lib"}
-configuration.setup="setup.spec"
-configuration.teardown="teardown.spec"
-configuration.check="check.spec"
-configuration.tests=["test.spec"]
-configuration.tests=Rake::FileList["tests/*.spec"]
-configuration.context_data={:tester=>"riva"}