rutema_web 1.0.4 → 1.0.5

data/History.txt

@@ -1,3 +1,5 @@
+===1.0.5 / 2011-04-01
+* Updated to use the latest rutema (1.2.0) and sinatra releases
 === 1.0.4 / 2010-04-23
 * Fixed manifest missing entry for the flot lib
 * Fixed sequence of data in flot diagrams (was reversed)

data/Manifest.txt

@@ -1,12 +1,10 @@
+bin/rutema_web
 COPYING.txt
 History.txt
-Manifest.txt
-README.txt
-Rakefile
-bin/rutema_web
+lib/rutema_web/activerecord/model.rb
+lib/rutema_web/activerecord/ruport_formatter.rb
 lib/rutema_web/gems.rb
 lib/rutema_web/main.rb
-lib/rutema_web/model.rb
 lib/rutema_web/public/css/style.css
 lib/rutema_web/public/images/bg_menu.gif
 lib/rutema_web/public/images/bg_submenu.gif
@@ -24,9 +22,13 @@ lib/rutema_web/public/js/graph.js
 lib/rutema_web/public/js/jquery-1.3.2.min.js
 lib/rutema_web/public/js/jquery.flot.min.js
 lib/rutema_web/public/js/jquery.flot.stack.min.js
-lib/rutema_web/ruport_formatter.rb
 lib/rutema_web/sinatra.rb
 lib/rutema_web/views/flot.erb
 lib/rutema_web/views/main.erb
 lib/rutema_web/views/timeline.erb
-test/test_model.rb
+Manifest.txt
+Rakefile
+README.md
+README.txt
+test/config.yaml
+test/test_model.rb

data/README.md

@@ -0,0 +1,95 @@
+rutema_web [http://patir.rubyforge.org/rutema](http://patir.rubyforge.org/rutema)
+
+##DESCRIPTION:
+rutema_web is the web frontend for rutema. 
+
+It can be used as a viewer for database files created with the rutema ActiveRecord reporter.
+It also provides you with some basic statistics about the tests in your database in the form of 
+diagrams of debatable aesthetics but undoubtable value!
+
+##SYNOPSIS:
+rutema_web config.yaml and browse to http://localhost:7000 for the glorious view
+
+Here is a sample of the configuration YAML:
+<pre>
+--- 
+:db: 
+  :adapter: sqlite3
+  :database: rutema_test.db
+:settings: 
+  :page_size: 10
+  :last_n_runs: 20
+  :port: 7000
+  :show_setup_teardown: true
+</pre>
+The :db: section should be the activerecord adapter configuration. The :settings: section controls the behaviour of the web app.
+
+##REQUIREMENTS:
+* rutema (http://patir.rubyforge.org/rutema)
+* sinatra (http://www.sinatrarb.com/)
+* ruport (http://rubyreports.org/)
+
+##INSTALL:
+* sudo gem install rutema_web
+
+##LICENSE:
+(The Ruby License)
+
+rutema is copyright (c) 2007 - 2010 Vassilis Rizopoulos
+
+You can redistribute it and/or modify it under either the terms of the GPL
+(see COPYING.txt file), or the conditions below:
+
+  1. You may make and give away verbatim copies of the source form of the
+     software without restriction, provided that you duplicate all of the
+     original copyright notices and associated disclaimers.
+
+  2. You may modify your copy of the software in any way, provided that
+     you do at least ONE of the following:
+
+       a) place your modifications in the Public Domain or otherwise
+          make them Freely Available, such as by posting said
+	  modifications to Usenet or an equivalent medium, or by allowing
+	  the author to include your modifications in the software.
+
+       b) use the modified software only within your corporation or
+          organization.
+
+       c) rename any non-standard executables so the names do not conflict
+	  with standard executables, which must also be provided.
+
+       d) make other distribution arrangements with the author.
+
+  3. You may distribute the software in object code or executable
+     form, provided that you do at least ONE of the following:
+
+       a) distribute the executables and library files of the software,
+	  together with instructions (in the manual page or equivalent)
+	  on where to get the original distribution.
+
+       b) accompany the distribution with the machine-readable source of
+	  the software.
+
+       c) give non-standard executables non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  4. You may modify and include the part of the software into any other
+     software (possibly commercial).  But some files in the distribution
+     are not written by the author, so that they are not under this terms.
+
+     They are gc.c(partly), utils.c(partly), regex.[ch], st.[ch] and some
+     files under the ./missing directory.  See each file for the copying
+     condition.
+
+  5. The scripts and library files supplied as input to or produced as 
+     output from the software do not automatically fall under the
+     copyright of the software, but belong to whomever generated them, 
+     and may be sold commercially, and may be aggregated with this
+     software.
+
+  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.

data/README.txt

@@ -7,11 +7,22 @@ It can be used as a viewer for database files created with the rutema ActiveReco
 It also provides you with some basic statistics about the tests in your database in the form of 
 diagrams of debatable aesthetics but undoubtable value!
 
-== FEATURES/PROBLEMS:
-
 == SYNOPSIS:
 rutema_web config.yaml and browse to http://localhost:7000 for the glorious view
 
+Here is a sample of the configuration YAML:
+--- 
+:db: 
+  :adapter: sqlite3
+  :database: rutema_test.db
+:settings: 
+  :page_size: 10
+  :last_n_runs: 20
+  :port: 7000
+  :show_setup_teardown: true
+
+The :db: section should be the activerecord adapter configuration. The :settings: section controls the behaviour of the web app.
+
 == REQUIREMENTS:
 * rutema (http://patir.rubyforge.org/rutema)
 * sinatra (http://www.sinatrarb.com/)

data/Rakefile

@@ -1,8 +1,8 @@
 #  Copyright (c) 2008 Vassilis Rizopoulos. All rights reserved.
 # -*- ruby -*-
 $:.unshift File.join(File.dirname(__FILE__),"lib")
-require 'rutema_web/main'
 require 'rubygems'
+require 'rutema_web/main'
 require 'hoe'
 
 Hoe.spec('rutema_web') do |p|
@@ -12,11 +12,10 @@ Hoe.spec('rutema_web') do |p|
   p.email = "riva@braveworld.net"
   p.summary = 'rutema_web is the web frontend for rutema'
   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.url = "http://patir.rubyforge.org/rutema"
   p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
-  p.extra_deps<<['rutema',"=1.0.9"]
-  p.extra_deps<<['sinatra','=1.0.0']
+  p.extra_deps<<['rutema',"=1.2.0"]
+  p.extra_deps<<['sinatra','=1.2.1']
   p.extra_deps<<['ruport','>=1.6.1']
-  p.spec_extras={:executables=>["rutema_web"],
-    :default_executable=>"rutema_web"}
+  p.spec_extras={:executables=>["rutema_web"],:default_executable=>"rutema_web"}
 end

data/bin/rutema_web

@@ -1,5 +1,6 @@
 #  Copyright (c) 2007 Vassilis Rizopoulos. All rights reserved.
 #this locks on the versions we need
+require 'rubygems'
 require 'rutema_web/gems'
 require 'rutema_web/main'
 

data/lib/rutema_web/{model.rb → activerecord/model.rb}

@@ -1,10 +1,10 @@
 #  Copyright (c) 2008 Vassilis Rizopoulos. All rights reserved.
 $:.unshift File.join(File.dirname(__FILE__),"..") 
-require 'rutema/model'
+require 'rutema/models/activerecord'
 module Rutema
-  module Model
-    #Extensions of Rutema::Model::Run to accomodate specific view requirements for rutema_web
-    class Run <ActiveRecord::Base
+  module ActiveRecord
+    #Extensions of Rutema::ActiveRecord::Run to accomodate specific view requirements for rutema_web
+    class Run <::ActiveRecord::Base
       # The view wants to display runs grouped into pages, 
       # where each page shows page_size runs at a time. 
       # This method returns the runs on page page_num (starting 
@@ -35,16 +35,16 @@ module Rutema
       #number of unsuccessful scenarios (does not count setup or teardown scripts)
       def number_of_failed
         #self.scenarios.select{|sc| !sc.success? && !sc.not_executed? && sc.is_test? }.size
-        Rutema::Model::Scenario.count(:conditions=>"run_id=#{self.id} AND status = 'error' AND name NOT LIKE '%_teardown' AND name NOT LIKE '%_setup'")
+        Rutema::ActiveRecord::Scenario.count(:conditions=>"run_id=#{self.id} AND status = 'error' AND name NOT LIKE '%_teardown' AND name NOT LIKE '%_setup'")
       end
       #number of scenarios that did not run (does not count setup or teardown scripts)
       def number_of_not_executed
         #self.scenarios.select{|sc| sc.not_executed? && sc.is_test? }.size
-        Rutema::Model::Scenario.count(:conditions=>"run_id=#{self.id} AND status = 'not_executed' AND name NOT LIKE '%_teardown' AND name NOT LIKE '%_setup'")
+        Rutema::ActiveRecord::Scenario.count(:conditions=>"run_id=#{self.id} AND status = 'not_executed' AND name NOT LIKE '%_teardown' AND name NOT LIKE '%_setup'")
       end
       #returns the number of actual tests (so, don't take into account setup or teardown tests)
       def number_of_tests
-         Rutema::Model::Scenario.count(:conditions=>"run_id=#{self.id} AND name NOT LIKE '%_teardown' AND name NOT LIKE '%_setup'")
+         Rutema::ActiveRecord::Scenario.count(:conditions=>"run_id=#{self.id} AND name NOT LIKE '%_teardown' AND name NOT LIKE '%_setup'")
       end
       #the number of the configuration file used to run the test
       def config_file
@@ -53,8 +53,8 @@ module Rutema
       end
    
     end
-    #Extensions of Rutema::Model::Scenario to accomodate specific view requirements for rutema_web
-    class Scenario <ActiveRecord::Base
+    #Extensions of Rutema::ActiveRecord::Scenario to accomodate specific view requirements for rutema_web
+    class Scenario <::ActiveRecord::Base
       # The view wants to display scenarios grouped into pages, 
       # where each page shows page_size scenarios at a time. 
       # This method returns the scenarios grouped by name on page page_num (starting 
@@ -83,7 +83,3 @@ module Rutema
     end
   end
 end
-
-
-
-

data/lib/rutema_web/gems.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
-gem 'sinatra','=1.0.0'
-gem 'rutema',"=1.0.9"
-gem 'ruport','>=1.6.1'
+gem 'sinatra','=1.2.1'
+gem 'rutema',"=1.2.0"
+gem 'json','=1.5.1'

data/lib/rutema_web/main.rb

@@ -1,15 +1,15 @@
 $:.unshift File.join(File.dirname(__FILE__),"..")
-require 'rutema_web/sinatra'
 require 'optparse'
-require 'rutema/reporters/activerecord'
+require 'patir/base'
+require 'rutema_web/activerecord/model'
+require 'rutema_web/sinatra'
 #This is the web frontend for Rutema databases.
 module RutemaWeb
-  extend Rutema::ActiveRecordConnections
   #This module defines the version numbers for the library
   module Version
     MAJOR=1
     MINOR=0
-    TINY=4
+    TINY=5
     STRING=[ MAJOR, MINOR, TINY ].join( "." )
   end
   #Starts App
@@ -19,7 +19,7 @@ module RutemaWeb
     cfg_file=File.expand_path(cfg_file)
     configuration=YAML.load_file(cfg_file)
     if (configuration[:db])
-      self.connect_to_active_record(configuration[:db],logger)
+      Rutema::ActiveRecord.connect(configuration[:db],logger)
       RutemaWeb::UI::SinatraApp.define_settings(configuration[:settings])
       RutemaWeb::UI::SinatraApp.run!
     else
@@ -45,8 +45,5 @@ module RutemaWeb
       end
     end
   end
-
 end
 
-
-

data/lib/rutema_web/sinatra.rb

@@ -2,11 +2,9 @@
 $:.unshift File.join(File.dirname(__FILE__),"..")
 require 'sinatra/base'
 require 'erb'
-require 'patir/configuration'
-require 'patir/command'
 require 'patir/base'
-require 'rutema_web/model'
-require 'rutema_web/ruport_formatter'
+require 'rutema_web/activerecord/model'
+require 'rutema_web/activerecord/ruport_formatter'
 require 'json'
 
 module RutemaWeb
@@ -116,7 +114,7 @@ module RutemaWeb
       private
       #extract all the configuration names
       def configurations
-        runs=Rutema::Model::Run.find(:all)
+        runs=Rutema::ActiveRecord::Run.find(:all)
         return runs.map{|r| r.context[:config_file] if r.context.is_a?(Hash)}.compact.uniq
       end
       def panel_configurations type,action=nil
@@ -322,7 +320,7 @@ module RutemaWeb
       end
       #finds all the runs belonging to a specific configuration
       def all_runs_in_configuration configuration
-        runs=Rutema::Model::Run.find(:all,:order=>"id ASC")
+        runs=Rutema::ActiveRecord::Run.find(:all,:order=>"id ASC")
         #find all runs beloging to this configuration
         runs.select{|r| r.context[:config_file]==configuration if r.context.is_a?(Hash)} if configuration
       end
@@ -338,10 +336,10 @@ module RutemaWeb
         page_setup "All runs",nil,"All runs"
 
         dt=[]
-        total_pages=(Rutema::Model::Run.count/settings.page_size)+1
+        total_pages=(Rutema::ActiveRecord::Run.count/settings.page_size)+1
         page_number=validated_page_number(page,total_pages)
 
-        runs=Rutema::Model::Run.find_on_page(page_number,settings.page_size)
+        runs=Rutema::ActiveRecord::Run.find_on_page(page_number,settings.page_size)
         runs.each do |r| 
           dt<<[status_icon(r.status),run_summary(r),r.config_file]
         end
@@ -356,7 +354,7 @@ module RutemaWeb
         #find which runs contain each scenario with the same name
         #Ramaze::Log.debug("Getting the runs for each scenario")
         conditions="name NOT LIKE '%_teardown' AND name NOT LIKE '%_setup'"
-        Rutema::Model::Scenario.find(:all, :conditions=>conditions).each do |sc|
+        Rutema::ActiveRecord::Scenario.find(:all, :conditions=>conditions).each do |sc|
           nm=sc.name
           runs[nm]||=[]
           runs[nm]<<sc.run.id
@@ -365,7 +363,7 @@ module RutemaWeb
         total_pages=(runs.size / settings.page_size)+1
         page_number=validated_page_number(page,total_pages)
         #Ramaze::Log.debug("Getting scenarios for page #{page_number}")
-        scens=Rutema::Model::Scenario.find_on_page(page_number,settings.page_size,conditions)
+        scens=Rutema::ActiveRecord::Scenario.find_on_page(page_number,settings.page_size,conditions)
         #and now build the table data
         dt=Array.new
         scens.each do |sc|
@@ -395,7 +393,7 @@ module RutemaWeb
         ret=""
         page_setup "Runs for #{scenario_id}",nil,"Scenario #{scenario_id} runs"
         begin
-          table=Rutema::Model::Scenario.report_table(:all,:conditions=>["name = :spec_name",{:spec_name=>scenario_id}],
+          table=Rutema::ActiveRecord::Scenario.report_table(:all,:conditions=>["name = :spec_name",{:spec_name=>scenario_id}],
           :order=>"run_id DESC")
           if table.empty?
             ret="<p>no results for the given name</p>"
@@ -422,9 +420,9 @@ module RutemaWeb
       #giving a detailed list of the steps, with status and output
       def scenario_in_a_run scenario_id
         begin
-          scenario=Rutema::Model::Scenario.find(scenario_id)
+          scenario=Rutema::ActiveRecord::Scenario.find(scenario_id)
           page_setup "Summary for #{scenario.name} in run #{scenario.run_id}",panel_runs,"Summary for #{scenario.name} in run #{scenario.run_id}"
-          table=Rutema::Model::Step.report_table(:all,
+          table=Rutema::ActiveRecord::Step.report_table(:all,
           :conditions=>["scenario_id = :scenario_id",{:scenario_id=>scenario_id}],
           :order=>"number ASC")
           if table.empty?
@@ -447,7 +445,7 @@ module RutemaWeb
       def single_run run_id
         ret=""
         begin
-          run=Rutema::Model::Run.find(run_id)
+          run=Rutema::ActiveRecord::Run.find(run_id)
         rescue
           return "Could not find #{run_id}"
         end
@@ -455,7 +453,7 @@ module RutemaWeb
           ret<<context_table(run.context)
         end
         conditions="run_id = :run_id AND name NOT LIKE '%_teardown' AND name NOT LIKE '%_setup'"
-        table=Rutema::Model::Scenario.report_table(:all,
+        table=Rutema::ActiveRecord::Scenario.report_table(:all,
         :conditions=>[conditions,{:run_id=>run_id}],:except=>["run_id"],
         :order=>"start_time ASC")
         if table.empty?
@@ -474,14 +472,14 @@ module RutemaWeb
 
       def panel_runs
         ret=""
-        Rutema::Model::Run.find(:all,:limit=>10,:order=>"id DESC").each do |r|
+        Rutema::ActiveRecord::Run.find(:all,:limit=>10,:order=>"id DESC").each do |r|
           ret<<"#{status_icon(r.status)} #{run_link(r)}<br/>"
         end
         return ret
       end
 
       def failure_rate scenario_name
-        scenarios=Rutema::Model::Scenario.find(:all,:conditions=>["name = :spec_name",{:spec_name=>scenario_name}])
+        scenarios=Rutema::ActiveRecord::Scenario.find(:all,:conditions=>["name = :spec_name",{:spec_name=>scenario_name}])
         failures=0
         scenarios.each{|sc| failures+=1 unless sc.status=="success" }
         return ((failures.to_f/scenarios.size)*100).round

data/test/config.yaml

@@ -0,0 +1,9 @@
+--- 
+:db: 
+  :adapter: sqlite3
+  :database: rutema_test.db
+:settings: 
+  :page_size: 10
+  :last_n_runs: 20
+  :port: 7000
+  :show_setup_teardown: true

data/test/test_model.rb

@@ -1,27 +1,27 @@
+$:.unshift File.join(File.dirname(__FILE__),"..")
 require 'test/unit'
 require 'ostruct'
-require 'rutema_web/ramaze_controller'
 require 'rubygems'
 require 'mocha'
+require 'lib/rutema_web/activerecord/model'
 
 class TestModel <Test::Unit::TestCase
-  ActiveRecord::Base.establish_connection(:adapter  => "sqlite3",:database =>":memory:")
-  Rutema::Model::Schema.up
+  ::ActiveRecord::Base.establish_connection(:adapter  => "sqlite3",:database =>":memory:")
+  Rutema::ActiveRecord::Schema.up
   def setup
-    @stp=Rutema::Model::Scenario.new
-    @stp.name="test_setup"
-    @trd=Rutema::Model::Scenario.new
-    @trd.name="test_teardown"
-    @tst=Rutema::Model::Scenario.new
-    @tst.name="test"
-    @r=Rutema::Model::Run.new
+    @stp=Rutema::ActiveRecord::Scenario.new(:name=>"TC000_setup",:attended=>false,:status=>"success",:start_time=>Time.now)
+    @stp.steps<<Rutema::ActiveRecord::Step.new(:name=>"echo",:number=>1,:status=>"success",:output=>"testing is nice",:error=>"",:duration=>1)
+    @trd=Rutema::ActiveRecord::Scenario.new(:name=>"TC000_teardown",:attended=>false,:status=>"success",:start_time=>Time.now)
+    @trd.steps<<Rutema::ActiveRecord::Step.new(:name=>"echo",:number=>1,:status=>"success",:output=>"testing is nice",:error=>"",:duration=>1)
+    @tst=Rutema::ActiveRecord::Scenario.new(:name=>"TC000",:attended=>false,:status=>"success",:start_time=>Time.now)
+    @trd.steps<<Rutema::ActiveRecord::Step.new(:name=>"echo",:number=>1,:status=>"success",:output=>"testing is nice",:error=>"",:duration=>1)
+    @r=Rutema::ActiveRecord::Run.new
     @r.scenarios=[@stp,@tst,@trd]
+    @r.save
   end
   def test_status
     assert_equal(:success,@r.status)
-    t1=Rutema::Model::Scenario.new
-    t1.name="failed"
-    t1.stubs(:status).returns("error")
+    t1=Rutema::ActiveRecord::Scenario.new(:name=>"failed",:attended=>false,:status=>"error",:start_time=>Time.now)
     @r.scenarios<<t1
     assert_equal(:error,@r.status)
   end
@@ -34,15 +34,19 @@ class TestModel <Test::Unit::TestCase
     assert_equal(1, @r.number_of_tests)
   end
   def test_number_of_failed
-    t1=Rutema::Model::Scenario.new
-    t1.name="failed"
-    t1.stubs(:status).returns("error")
-    t2=Rutema::Model::Scenario.new
-    t2.name="not executed"
-    t2.stubs(:status).returns("not_executed")
+    t1=Rutema::ActiveRecord::Scenario.new(:name=>"failed",:attended=>false,:status=>"error",:start_time=>Time.now)
+    t2=Rutema::ActiveRecord::Scenario.new(:name=>"not executed",:attended=>false,:status=>"not_executed",:start_time=>Time.now)
     @tst.stubs(:status).returns("success")
     @r.scenarios<<t1
     @r.scenarios<<t2
-    assert_equal(2,@r.number_of_failed)
+    assert_equal(1,@r.number_of_failed)
+  end
+  def test_number_of_not_executed
+    t1=Rutema::ActiveRecord::Scenario.new(:name=>"failed",:attended=>false,:status=>"error",:start_time=>Time.now)
+    t2=Rutema::ActiveRecord::Scenario.new(:name=>"not executed",:attended=>false,:status=>"not_executed",:start_time=>Time.now)
+    @tst.stubs(:status).returns("success")
+    @r.scenarios<<t1
+    @r.scenarios<<t2
+    assert_equal(1,@r.number_of_not_executed)
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rutema_web
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 29
+  prerelease: 
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - Vassilis Rizopoulos
@@ -14,44 +15,50 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-23 00:00:00 +03:00
+date: 2011-04-01 00:00:00 +03:00
 default_executable: rutema_web
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rutema
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 1
+        - 2
         - 0
-        - 9
-        version: 1.0.9
+        version: 1.2.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: sinatra
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 1
-        - 0
-        - 0
-        version: 1.0.0
+        - 2
+        - 1
+        version: 1.2.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: ruport
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 6
@@ -60,33 +67,21 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: hoe
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 47
         segments: 
         - 2
-        - 0
-        - 4
-        version: 2.0.4
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
+        - 9
         - 2
-        - 6
-        - 0
-        version: 2.6.0
+        version: 2.9.2
   type: :development
-  version_requirements: *id005
+  version_requirements: *id004
 description: |-
   == DESCRIPTION:
   rutema_web is the web frontend for rutema. 
@@ -95,15 +90,21 @@ description: |-
   It also provides you with some basic statistics about the tests in your database in the form of 
   diagrams of debatable aesthetics but undoubtable value!
   
-  == FEATURES/PROBLEMS:
-  
   == SYNOPSIS:
   rutema_web config.yaml and browse to http://localhost:7000 for the glorious view
   
-  == REQUIREMENTS:
-  * rutema (http://patir.rubyforge.org/rutema)
-  * sinatra (http://www.sinatrarb.com/)
-  * ruport (http://rubyreports.org/)
+  Here is a sample of the configuration YAML:
+  --- 
+  :db: 
+    :adapter: sqlite3
+    :database: rutema_test.db
+  :settings: 
+    :page_size: 10
+    :last_n_runs: 20
+    :port: 7000
+    :show_setup_teardown: true
+  
+  The :db: section should be the activerecord adapter configuration. The :settings: section controls the behaviour of the web app.
 email: riva@braveworld.net
 executables: 
 - rutema_web
@@ -115,15 +116,13 @@ extra_rdoc_files:
 - Manifest.txt
 - README.txt
 files: 
+- bin/rutema_web
 - COPYING.txt
 - History.txt
-- Manifest.txt
-- README.txt
-- Rakefile
-- bin/rutema_web
+- lib/rutema_web/activerecord/model.rb
+- lib/rutema_web/activerecord/ruport_formatter.rb
 - lib/rutema_web/gems.rb
 - lib/rutema_web/main.rb
-- lib/rutema_web/model.rb
 - lib/rutema_web/public/css/style.css
 - lib/rutema_web/public/images/bg_menu.gif
 - lib/rutema_web/public/images/bg_submenu.gif
@@ -141,14 +140,19 @@ files:
 - lib/rutema_web/public/js/jquery-1.3.2.min.js
 - lib/rutema_web/public/js/jquery.flot.min.js
 - lib/rutema_web/public/js/jquery.flot.stack.min.js
-- lib/rutema_web/ruport_formatter.rb
 - lib/rutema_web/sinatra.rb
 - lib/rutema_web/views/flot.erb
 - lib/rutema_web/views/main.erb
 - lib/rutema_web/views/timeline.erb
+- Manifest.txt
+- Rakefile
+- README.md
+- README.txt
+- test/config.yaml
 - test/test_model.rb
+- .gemtest
 has_rdoc: true
-homepage: 
+homepage: http://patir.rubyforge.org/rutema
 licenses: []
 
 post_install_message: 
@@ -158,26 +162,29 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: patir
-rubygems_version: 1.3.6
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: rutema_web is the web frontend for rutema
 test_files: 
 - test/test_model.rb
-- test/test_rutema_web.rb

data/test/test_rutema_web.rb

@@ -1,107 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__),"..","lib")
-require 'test/unit'
-require 'ostruct'
-require 'rutema_web/ramaze_controller'
-require 'rubygems'
-require 'mocha'
-
-class TestRutemaWeb <Test::Unit::TestCase
-  ActiveRecord::Base.establish_connection(:adapter  => "sqlite3",:database =>":memory:")
-
-  def test_loading
-    controller=nil
-    assert_nothing_raised() { controller = Rutema::UI::MainController.new }
-    return controller
-  end
-  def test_run
-    cntlr=test_loading
-    r=mock()
-    r.expects(:id).returns(5).times(2)
-    r.stubs(:context).returns({:start_time=>Time.now,:config_file=>"test"})
-    r.stubs(:config_file).returns("test")
-    r.stubs(:status).returns(:success)
-    t=mock()
-    t.expects(:to_html).returns("mocked")
-    Rutema::Model::Run.expects(:find).returns([r])
-    Rutema::Model::Run.expects(:count).returns(1)
-    Ruport::Data::Table.expects(:new).returns(t)
-    #Check nothing is raised when calling run (with everything mocked)
-    assert_nothing_raised(){ cntlr.run}
-  end
-
-  def test_runs
-    cntlr=test_loading
-    mock_12_runs
-    #Check nothing is raised when calling run (with everything mocked)
-    assert_nothing_raised(){ cntlr.runs}
-    return cntlr
-  end
-  #unit tests for the pagination code of runs
-  def test_pagination
-    cntlr=test_loading
-    mock_12_runs
-    #Check nothing is raised when calling run (with everything mocked)
-    assert_nothing_raised(){ cntlr.runs(1)}
-    return cntlr
-  end
-  def test_page_number_to_large
-    cntlr=test_loading
-    mock_12_runs
-    #Check nothing is raised when calling run with a page number greater than the available
-    assert_nothing_raised(){ cntlr.runs(50)}
-  end
-  def test_page_number_negative
-    cntlr=test_loading
-    mock_12_runs
-    #Check nothing is raised when calling run with a negative page number greater than the available
-    assert_nothing_raised(){ cntlr.runs(-1)}
-  end
-  def test_page_number_bogus
-    cntlr=test_loading
-    mock_12_runs
-    #Check nothing is raised when calling run with a page number that is not a number
-    assert_nothing_raised(){ cntlr.runs("atttaaaaack!!")}
-  end
-
-  #unit tests for scenarios
-  def test_scenarios
-    ctlr=test_loading
-    mock_12_scenarios
-    Rutema::Model::Run.expects(:find).returns("")
-    assert_nothing_raised() { ctlr.scenarios }
-  end
-
-  def test_scenario_wrong_arguments
-    ctlr=test_loading
-    assert_raise(ArgumentError) { ctlr.scenario("bla","blu")  }
-  end
-  private 
-  def mock_12_runs
-    t=mock()
-    t.expects(:to_html).returns("mocked")
-    Ruport::Data::Table.expects(:new).returns(t)
-    runs=[mock(),mock(),mock(),mock(),mock(),mock(),mock(),mock(),mock(),mock(),mock(),mock()]
-    runs.each do |r|
-      r.stubs(:id).returns(5)
-      r.stubs(:context).returns({:start_time=>Time.now,:config_file=>"test"})
-      r.stubs(:status).returns(:success)
-      r.stubs(:config_file).returns("test")
-    end
-    Rutema::Model::Run.expects(:find).returns(runs)
-    Rutema::Model::Run.expects(:count).returns(12)
-  end
-
-  def mock_12_scenarios
-    t=mock()
-    t.expects(:to_html).returns("mocked")
-    Ruport::Data::Table.expects(:new).returns(t)
-    scenarios=[mock(),mock(),mock(),mock(),mock(),mock(),mock(),mock(),mock(),mock(),mock(),mock()]
-    scenarios.each do |sc|
-      sc.stubs(:name).returns(scenarios.index(sc).to_s)
-      sc.stubs(:status).returns(:success)
-      sc.expects(:title).returns(scenarios.index(sc).to_s)
-      sc.expects(:run).returns(scenarios.index(sc))
-    end
-    Rutema::Model::Scenario.stubs(:find).returns(scenarios)
-  end
-end