rutema 1.0.6 → 1.0.7

data/History.txt

@@ -1,4 +1,8 @@
-== 1.0.6 / 2009-09-4
+== 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
+* activerecord dependency is now 2.3.4
+== 1.0.6 / 2009-09-04
 * The run context is now passed to the runner and subsequently to the TestStep#run method
 	This way you can pass informaton to the command being run (context contains information on the start time of the run, the spec filename as well as any information added in the configuration) 
 * Minor bugfix in the activerecord reporter to avoid crashes due to nil runner states

data/Rakefile

@@ -3,6 +3,7 @@
 $:.unshift File.join(File.dirname(__FILE__),"lib")
 $:.unshift File.join(File.dirname(__FILE__),"ext")
 require 'rubygems'
+require 'rutema/gems'
 require 'hoe'
 require 'rutema/system'
 
@@ -18,9 +19,9 @@ Hoe.spec('rutema') do |p|
   p.extra_deps<<['patir',">=0.6.4"]
   p.extra_deps<<['highline']
   p.extra_deps<<['mailfactory']
-  p.extra_deps<<['activerecord','=2.3.2']
-  p.extra_deps<<['ruport','=1.6.1']
-  p.extra_deps<<['acts_as_reportable','=1.1.1']
+  p.extra_deps<<['activerecord','2.3.4']
+  p.extra_deps<<['ruport','1.6.1']
+  p.extra_deps<<['acts_as_reportable','1.1.1']
   p.spec_extras={:executables=>["rutemax","rutema_upgrader"],
     :default_executable=>"rutemax"}
 end

data/lib/rutema/gems.rb

@@ -1,3 +1,3 @@
-gem 'activerecord','=2.3.2'
+gem 'activerecord','2.3.4'
 gem 'patir',">=0.6.4"
 gem 'acts_as_reportable','=1.1.1'

data/lib/rutema/reporters/activerecord.rb

@@ -78,6 +78,7 @@ module Rutema
         run_entry.scenarios<<sc
       end
       run_entry.save!
+      "activerecord reporter done"
     end
     
     def to_s

data/lib/rutema/specification.rb

@@ -1,6 +1,7 @@
 #  Copyright (c) 2007 Vassilis Rizopoulos. All rights reserved.
 $:.unshift File.join(File.dirname(__FILE__),"..")
 require 'rutema/reporters/standard_reporters'
+require 'patir/command'
 
 module Rutema
   #This module adds functionality that allows us to 
@@ -169,7 +170,7 @@ module Rutema
     end
     
     def name
-      return @attributes[:step_type]
+      return name_with_parameters
     end
     def output
       return "" unless @attributes[:cmd]
@@ -201,11 +202,29 @@ module Rutema
     def reset
       @attributes[:cmd].reset if @attributes[:cmd]
     end
+    def name_with_parameters
+      param=" - #{self.cmd.to_s}" if self.has_cmd?
+      return "#{@attributes[:step_type]}#{param}"
+    end
     def to_s
-      msg="#{self.number} - #{self.step_type} - #{self.status}"
+      param=""
+      param=" - #{self.cmd.to_s}" if self.has_cmd?
+      msg="#{self.number} - #{self.step_type}#{param} - #{self.status}"
       msg<<" in #{self.included_in}" if self.has_included_in?
       return msg
     end
   end
   
+end
+
+class Patir::ShellCommand
+  def to_s
+    return @command
+  end
+end
+
+class Patir::RubyCommand
+  def to_s
+    return @name
+  end
 end

data/lib/rutema/system.rb

@@ -13,7 +13,7 @@ module Rutema
   module Version
     MAJOR=1
     MINOR=0
-    TINY=6
+    TINY=7
     STRING=[ MAJOR, MINOR, TINY ].join( "." )
   end
   #The Elements module provides the namespace for the various modules adding parser functionality
@@ -338,7 +338,11 @@ module Rutema
     def report
       #get the states from the runner
       @runner.states.each do |k,v|
-        @test_states[k]=v
+        if v
+          @test_states[k]=v
+        else
+          @logger.warn("State for #{k} is nil")
+        end
       end
       threads=Array.new
       #get the runner stati and the configuration and give it to the reporters
@@ -570,7 +574,7 @@ module Rutema
       return state
     end
     def run_step step
-      @logger.info("Running step #{step.number} - #{step.step_type}")
+      @logger.info("Running step #{step.number} - #{step.name}")
       if step.has_cmd? && step.cmd.respond_to?(:run)
         step.cmd.run(@context)
       else

data/test/test_configuration.rb

@@ -1,6 +1,8 @@
 $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 
 require 'test/unit'
+require 'rubygems'
+require 'rutema/gems'
 #$DEBUG=true
 module TestRutema
   require 'rutema/system'

data/test/test_model.rb

@@ -4,6 +4,7 @@ require 'test/unit'
 require 'rutema/model'
 require 'fileutils'
 require 'rubygems'
+require 'rutema/gems'
 require 'active_record/fixtures'
 
 module TestRutema

data/test/test_specification.rb

@@ -1,6 +1,7 @@
 $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 require 'test/unit'
-
+require 'rubygems'
+require 'rutema/gems'
 module TestRutema
   require 'rutema/specification'
   class DummyCommand
@@ -10,6 +11,9 @@ module TestRutema
       @output="output"
       @error="error"
     end
+    def to_s
+      return ""
+    end
   end
   class Dummy
     include Rutema::SpecificationElement
@@ -19,7 +23,7 @@ module TestRutema
       step=Rutema::TestStep.new("test step",DummyCommand.new())
       assert(!step.attended?, "attended?")
       assert_not_equal("dummy", step.name)
-      assert_equal("step", step.name)
+      assert_equal("step - ", step.name)
       assert_equal("output", step.output)
       assert_equal("error", step.error)
       assert_equal(:not_executed, step.status)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rutema
 version: !ruby/object:Gem::Version 
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors: 
 - Vassilis Rizopoulos
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-04 00:00:00 +02:00
+date: 2009-09-11 00:00:00 +02:00
 default_executable: rutemax
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.3.2
+        version: 2.3.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: ruport