rutema 1.2.1 → 1.2.2

data/Manifest.txt

@@ -26,6 +26,7 @@ README.txt
 test/distro_test/config/database.rutema
 test/distro_test/config/full.rutema
 test/distro_test/config/minimal.rutema
+test/distro_test/config/test_identifiers.rutema
 test/distro_test/specs/check.spec
 test/distro_test/specs/duplicate_name.spec
 test/distro_test/specs/fail.spec

data/lib/rutema/configuration.rb

@@ -1,6 +1,6 @@
 #  Copyright (c) 2007-2010 Vassilis Rizopoulos. All rights reserved.
 $:.unshift File.join(File.dirname(__FILE__),"..")
-
+require 'ostruct'
 module Rutema
   #This module defines the "configuration directives" used in the configuration of Rutema
   #

data/lib/rutema/system.rb

@@ -22,7 +22,7 @@ module Rutema
   module Version
     MAJOR=1
     MINOR=2
-    TINY=1
+    TINY=2
     STRING=[ MAJOR, MINOR, TINY ].join( "." )
   end
   #This class coordinates parsing, execution and reporting of test specifications
@@ -38,7 +38,6 @@ module Rutema
       raise "Could not instantiate parser" unless @parser
       @reporters=@configuration.reporters.collect{ |reporter| instantiate_class(reporter) }
       @reporters.compact!
-      @configuration.tests.collect!{|t| File.expand_path(t)}
       #this will hold any specifications that are succesfully parsed.
       @specifications=Hash.new
       @parsed_files=Array.new
@@ -161,30 +160,24 @@ module Rutema
       end
     end
 
-    def parse_specification spec_file
-      filename=File.expand_path(spec_file)
-      if File.exists?(filename)
-        begin
-          @parsed_files<<filename
-          @parsed_files.uniq!
-          spec=@parser.parse_specification(spec_file)
-          if @specifications[spec.name]
-            msg="Duplicate specification name '#{spec.name}' in '#{spec_file}'"
-            @logger.error(msg)
-            @parse_errors<<{:filename=>spec_file,:error=>msg}
-            @test_states[spec.name]=Patir::CommandSequenceStatus.new(spec.name,[])
-          else
-            @specifications[spec.name]=spec
-            @test_states[spec.name]=Patir::CommandSequenceStatus.new(spec.name,spec.scenario.steps)
-          end
-        rescue ParserError
-          @logger.error("Error parsing '#{spec_file}': #{$!.message}")
-          @parse_errors<<{:filename=>filename,:error=>$!.message}
+    def parse_specification spec_identifier
+      spec=nil
+      begin
+        @parsed_files<<spec_identifier
+        @parsed_files.uniq!
+        spec=@parser.parse_specification(spec_identifier)
+        if @specifications[spec.name]
+          msg="Duplicate specification name '#{spec.name}' in '#{spec_identifier}'"
+          @logger.error(msg)
+          @parse_errors<<{:filename=>spec_identifier,:error=>msg}
+          @test_states[spec.name]=Patir::CommandSequenceStatus.new(spec.name,[])
+        else
+          @specifications[spec.name]=spec
+          @test_states[spec.name]=Patir::CommandSequenceStatus.new(spec.name,spec.scenario.steps)
         end
-      else
-        msg="'#{filename}' not found."
-        @logger.error(msg)
-        @parse_errors<<{:filename=>filename,:error=>msg}
+      rescue ParserError
+        @logger.error("Error parsing '#{spec_identifier}': #{$!.message}")
+        @parse_errors<<{:filename=>spec_identifier,:error=>$!.message}
       end
       return spec
     end
@@ -283,12 +276,7 @@ module Rutema
           when "unattended"
             @mode=:unattended
           else
-            if File.exists?(command)
-              @mode=File.expand_path(command)
-            else
-              $stderr.puts "Can't find '#{command}' and it does not match any known commands. Don't know what to do with it."
-              raise "Can't find '#{command}' and it does not match any known commands. Don't know what to do with it."
-            end
+            @mode=command
           end
         end
       end

data/test/distro_test/config/test_identifiers.rutema

@@ -0,0 +1,7 @@
+require 'rutema/parsers/xml'
+configuration.parser={:class=>Rutema::MinimalXMLParser}
+configuration.tests=[
+"../specs/T001.spec",
+"22345",
+"../specs/T003.spec",
+]

data/test/test_configuration.rb

@@ -34,8 +34,12 @@ module TestRutema
     end
     
     def test_specification_paths
-      cfg=Rutema::RutemaConfigurator.new("distro_test/config/full.rutema").configuration
+      cfg=Rutema::RutemaConfigurator.new("distro_test/config/test_identifiers.rutema").configuration
       assert_not_nil(cfg.tests)
+      assert(File.exists?(cfg.tests[0]))
+      assert(File.exists?(cfg.tests[2]))
+      assert(cfg.tests.include?('22345'))
     end
+    
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rutema
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - Vassilis Rizopoulos
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-04 00:00:00 +03:00
+date: 2011-04-05 00:00:00 +03:00
 default_executable: rutema
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -195,6 +195,7 @@ files:
 - test/distro_test/config/database.rutema
 - test/distro_test/config/full.rutema
 - test/distro_test/config/minimal.rutema
+- test/distro_test/config/test_identifiers.rutema
 - test/distro_test/specs/check.spec
 - test/distro_test/specs/duplicate_name.spec
 - test/distro_test/specs/fail.spec