rutema 1.0.7 → 1.0.8

data/History.txt

@@ -1,3 +1,7 @@
+== 1.0.8 / 2009-11-13
+* ActiveRecordReporter now accepts all activerecord adapter parameters - you can now connect to DBs other than sqlite3
+* Reporter delegation now more robust (rutemax will exit gracefully and log if one reporter bombs)
+* The old db connection code was removed. Explicit dependencies to adapters are also absent - you have to now have the appropriate gems for the ActiveRecordReporter to work properly
 == 1.0.7 / 2009-09-11
 * Steps now include the commandline (if there) in their name - makes the logs more readable
 * Added a check for nil states to ensure reporters always get valid data

data/Manifest.txt

@@ -7,7 +7,6 @@ bin/rutemax
 bin/rutema_upgrader
 distro_test.sh
 lib/rutema/configuration.rb
-lib/rutema/db.rb
 lib/rutema/gems.rb
 lib/rutema/model.rb
 lib/rutema/reporter.rb
@@ -21,7 +20,6 @@ selftest.sh
 test/data/sample09.db
 test/distro_test/config/database.rutema
 test/distro_test/config/full.rutema
-test/distro_test/config/jruby.rutema
 test/distro_test/config/minimal.rutema
 test/distro_test/specs/T001.spec
 test/distro_test/specs/T002.spec

data/lib/rutema/reporters/activerecord.rb

@@ -3,13 +3,45 @@ $:.unshift File.join(File.dirname(__FILE__),"..","..")
 require 'yaml'
 require 'rutema/reporter'
 require 'rutema/model'
-require 'rutema/db'
 
 module Rutema
+  #Exception occuring when connecting to a database
+  class ConnectionError<RuntimeError
+  end
+  
+  module ActiveRecordConnections
+     #Establishes an ActiveRecord connection
+     def connect_to_active_record cfg,logger
+       conn=connect(cfg,logger)
+       Rutema::Model::Schema.migrate(:up) if perform_migration?(cfg)
+     end
+     private
+     #Establishes an active record connection using the cfg hash
+     #There is only a rudimentary check to ensure the integrity of cfg
+     def connect cfg,logger
+       if cfg[:adapter] && cfg[:database]
+         logger.debug("Connecting to #{cfg[:database]}")
+         return ActiveRecord::Base.establish_connection(cfg)
+       else
+         raise ConnectionError,"Erroneous database configuration. Missing :adapter and/or :database"
+       end
+     end
+     
+     def perform_migration? cfg
+       return true if cfg[:migrate]
+       #special case for sqlite3
+       if cfg[:adapter]=="sqlite3" && !File.exists?(cfg[:database])
+         return true
+       end
+       return false
+     end
+  end
+
   #The ActiveRecordReporter will store the results of a test run in a database using ActiveRecord.
   #
   #The DBMSs supported are dependent on the platform: either SQLite3 (MRI) or h2 (jruby)
   class ActiveRecordReporter
+    include ActiveRecordConnections
     #The required keys in this reporter's configuration are:
     # :db - the database configuration. A Hash with the DB adapter information
     #  :db=>{:database=>"sample.rb"}
@@ -18,12 +50,7 @@ module Rutema
       @logger||=Patir.setup_logger
       database_configuration = definition[:db]
       raise "No database configuration defined, missing :db configuration key." unless database_configuration
-      unless database_configuration[:database]==":memory:"
-        @dbfile=File.expand_path(database_configuration[:database]) 
-      else
-        @dbfile=database_configuration[:database]
-      end
-      Rutema.connect_to_ar(@dbfile,@logger)
+      connect_to_active_record(database_configuration,@logger)
       @logger.info("Reporter #{self.to_s} registered")
     end
     
@@ -90,5 +117,7 @@ module Rutema
       return text.gsub("\000","") if text
       return ""
     end
-  end   
+   
+  end
+  
 end

data/lib/rutema/specification.rb

@@ -74,6 +74,10 @@ module Rutema
       @scenario=TestScenario.new(@attributes[:version])
       @requirements||=Array.new
     end
+    
+    def to_s
+      return "#{@attributes[:name]} - #{@attributes[:title]}"
+    end
   end
     
   #A TestScenario is a sequence of TestStep instances.

data/lib/rutema/system.rb

@@ -13,7 +13,7 @@ module Rutema
   module Version
     MAJOR=1
     MINOR=0
-    TINY=7
+    TINY=8
     STRING=[ MAJOR, MINOR, TINY ].join( "." )
   end
   #The Elements module provides the namespace for the various modules adding parser functionality
@@ -348,7 +348,12 @@ module Rutema
       #get the runner stati and the configuration and give it to the reporters
       @reporters.each do |reporter|
         threads<<Thread.new(reporter,@specifications,@test_states.values,@parse_errors,@configuration) do |reporter,specs,status,perrors,configuration|
-          @logger.debug(reporter.report(specs,status,perrors,configuration))
+          begin
+            @logger.debug(reporter.report(specs,status,perrors,configuration))
+          rescue RuntimeError
+            @logger.error("Error in #{reporter.class}: #{$!.message}")
+            @logger.debug($!)
+          end
         end
       end
       threads.each do |t| 
@@ -433,7 +438,7 @@ module Rutema
           @logger.info("Parsing check test '#{@configuration.check}'")
           spec=parse_specification(@configuration.check)
           if spec
-            @logger.info("Running check test '#{spec}'")
+            @logger.info("Running check test '#{spec.to_s}'")
             if run_test(spec,false).success?
               specs.each{|s| run_test(s)}
             else

data/test/distro_test/config/database.rutema

@@ -3,7 +3,7 @@ configuration.parser={:class=>Rutema::MinimalXMLParser}
 #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.reporter={:class=>Rutema::ActiveRecordReporter, :db=>{:adpater=>"sqlite3",:database=>"sample.db"}}
 configuration.tests=[
 "../specs/T001.spec",
 "../specs/T002.spec",

data/test/distro_test/config/full.rutema

@@ -1,5 +1,5 @@
 configuration.parser={:class=>Rutema::MinimalXMLParser}
-configuration.reporter={:class=>Rutema::ActiveRecordReporter, :db=>{:database=>"sample.db"}}
+configuration.reporter={:class=>Rutema::ActiveRecordReporter, :db=>{:adapter=>"sqlite3",:database=>"sample.db"}}
 configuration.tests=[
 "../specs/T001.spec",
 "../specs/T002.spec",

data/test/rutema.rutema

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rutema
 version: !ruby/object:Gem::Version 
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors: 
 - Vassilis Rizopoulos
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-11 00:00:00 +02:00
+date: 2009-11-13 00:00:00 +01:00
 default_executable: rutemax
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -129,7 +129,6 @@ files:
 - bin/rutema_upgrader
 - distro_test.sh
 - lib/rutema/configuration.rb
-- lib/rutema/db.rb
 - lib/rutema/gems.rb
 - lib/rutema/model.rb
 - lib/rutema/reporter.rb
@@ -143,7 +142,6 @@ files:
 - test/data/sample09.db
 - test/distro_test/config/database.rutema
 - test/distro_test/config/full.rutema
-- test/distro_test/config/jruby.rutema
 - test/distro_test/config/minimal.rutema
 - test/distro_test/specs/T001.spec
 - test/distro_test/specs/T002.spec

data/lib/rutema/db.rb

@@ -1,128 +0,0 @@
-#  Copyright (c) 2008 Vassilis Rizopoulos, Markus Barchfeld. All rights reserved.
-$:.unshift File.join(File.dirname(__FILE__),"..")
-
-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/test/distro_test/config/jruby.rutema

@@ -1,10 +0,0 @@
-configuration.parser={:class=>Rutema::MinimalXMLParser}
-configuration.reporter={:class=>Rutema::ActiveRecordReporter, :db=>{:database=>"h2"}}
-configuration.tests=[
-"../specs/T001.spec",
-"../specs/T002.spec",
-"../specs/T003.spec",
-"../specs/T004.spec",
-"../specs/T005.spec",
-"../specs/T006.spec"
-]