rutema 1.0.8 → 1.0.9

data/History.txt

@@ -1,3 +1,8 @@
+== 1.0.9 / 2010-03-22
+* Fixed (hopefully) a nagging bug in activerecord reporter where it would crash if a step had status nil.
+* Fixed the same behaviour in the text reporter
+* Improved the logging of steps to avoid a debug logging exception that messed logs up
+* Thinned out the debug logs
 == 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)

data/lib/rutema/reporters/activerecord.rb

@@ -96,7 +96,7 @@ module Rutema
           st=Model::Step.new
           st.name=step[:name]
           st.number=number
-          st.status=step[:status].to_s
+          st.status="#{step[:status]}"
           st.output=sanitize(step[:output])
           st.error=sanitize(step[:error])
           st.duration=step[:duration]

data/lib/rutema/reporters/text.rb

@@ -24,6 +24,7 @@ module Rutema
       end
       msg<<"\n---"
       #Report on scenarios
+      runner_states.compact!#make sure no nil elements make it through
       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

data/lib/rutema/system.rb

@@ -13,7 +13,7 @@ module Rutema
   module Version
     MAJOR=1
     MINOR=0
-    TINY=8
+    TINY=9
     STRING=[ MAJOR, MINOR, TINY ].join( "." )
   end
   #The Elements module provides the namespace for the various modules adding parser functionality
@@ -144,7 +144,6 @@ module Rutema
       reqs.collect!{|r| r.attributes["name"]}
       spec.requirements=reqs
       #Get the scenario
-      @logger.debug("Parsing scenario element")
       Dir.chdir(File.dirname(filename)) do
         spec.scenario=parse_scenario(xmldoc.elements[ELEM_SCENARIO].to_s) if xmldoc.elements[ELEM_SCENARIO]
       end
@@ -204,7 +203,6 @@ module Rutema
     end
 
     def add_attribute element,attr,value
-      @logger.debug("Adding attribute #{attr} with value #{value}")
       if boolean?(value)
         element.attribute(attr,eval(value))
       else
@@ -292,21 +290,17 @@ module Rutema
         when :all
           @runner.attended=true
           specs=parse_all_specifications
-          @logger.debug(specs)
           run_scenarios(specs)
         when :attended
           @runner.attended=true
           specs=parse_all_specifications
-          @logger.debug(specs)
           run_scenarios(specs.select{|s| s.scenario && s.scenario.attended?})
         when :unattended
           specs=parse_all_specifications
-          @logger.debug(specs)
           run_scenarios(specs.select{|s| s.scenario && !s.scenario.attended?})
         when String
           @runner.attended=true
           spec=parse_specification(mode)
-          @logger.debug("Running #{spec}")
           run_test(spec) if spec
         else
           @logger.fatal("Don't know how to run '#{mode}'")
@@ -484,7 +478,8 @@ module Rutema
       @number_of_runs=0
       @context=context || Hash.new
     end
-
+    
+    #Tells you if the system runs in the mode that expects user input
     def attended?
       return @attended
     end
@@ -530,7 +525,8 @@ module Rutema
     def [](name)
       return @states[name]
     end
-
+    
+    #Resets the Runner's internal state
     def reset
       @states.clear
       @number_of_runs=0
@@ -582,28 +578,28 @@ module Rutema
       @logger.info("Running step #{step.number} - #{step.name}")
       if step.has_cmd? && step.cmd.respond_to?(:run)
         step.cmd.run(@context)
+        msg=step.to_s
+        if !step.cmd.success?
+          msg<<"\n#{step.cmd.output}" unless step.cmd.output.empty?
+          msg<<"\n#{step.cmd.error}" unless step.cmd.error.empty?
+        end
       else
         @logger.warn("No command associated with step '#{step.step_type}'. Step number is #{step.number}")
       end
-      msg=step.to_s
-      p step if $DEBUG
-      # we might not have a command object
-      if step.has_cmd? && step.cmd.executed? && !step.cmd.success?
-        msg<<"\n#{step.cmd.output}" unless step.cmd.output.empty?
-        msg<<"\n#{step.cmd.error}" unless step.cmd.error.empty?
-      end
+      step.status=:success if step.status==:error && step.ignore?
+      log_step_result(step,msg)
+      return step
+    end
+    def log_step_result step,msg
       if step.status==:error
         if step.ignore?
-          @logger.warn("Step failed but result is being ignored!")
-          @logger.warn(msg)
-          step.status=:success
+          @logger.warn("Step failed but result is being ignored!\n#{msg}")
         else
           @logger.error(msg) 
         end
       else
-        @logger.info(msg)
+        @logger.info(msg) if msg && !msg.empty?
       end
-      return step
     end
   end
 

data/test/test_system.rb

@@ -187,6 +187,7 @@ module TestRutema
     end
 
     def test_ignore
+      $DEBUG=true
       step=OpenStruct.new("status"=>:not_executed)
       step.stubs(:number).returns(1)
       step.stubs(:name).returns("mock")
@@ -197,7 +198,7 @@ module TestRutema
       step.stubs(:exec_time).returns(12)
       step.stubs(:has_cmd?).returns(false)
       step.expects(:ignore?).returns(true)
-      step.expects(:status).times(5).returns(:not_executed).then.returns(:not_executed).then.returns(:error).then.returns(:warning).then.returns(:warning)
+      step.expects(:status).times(6).returns(:not_executed).then.returns(:not_executed).then.returns(:error).then.returns(:warning).then.returns(:warning)
       scenario=Rutema::TestScenario.new
       scenario.expects(:attended?).returns(false)
       scenario.stubs(:steps).returns([step])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rutema
 version: !ruby/object:Gem::Version 
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors: 
 - Vassilis Rizopoulos
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-13 00:00:00 +01:00
+date: 2010-04-07 00:00:00 +03:00
 default_executable: rutemax
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,6 +72,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.1.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rubyforge
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: gemcutter
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.3.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -80,7 +100,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
+        version: 2.5.0
     version: 
 description: |-
   == DESCRIPTION: