rutema 1.2.0 → 1.2.1

data/History.txt

@@ -1,3 +1,6 @@
+== 1.2.1 /2011-04-04
+* The configuration code no longer assumes that you are passing files. configuration.tests= now assumes you're passing an array of strings and it is the responsibility of the parser to make heads or tails from that. The configuraiton is clever enough to detect paths relative to the configuration file and expand them.
+* some minor cosmetic changes in the documentation
 == 1.2.0 /2011-04-01
 * refactored library structure
 * More unit tests. We're now over the magical 80% coverage point

data/lib/rutema/configuration.rb

@@ -78,10 +78,13 @@ module Rutema
       end
     end
     
-    #Adds the files to the specifications available to Rutema.
-    def tests= array_of_files
+    #Adds the specification identifiers available to this instance of Rutema
+    #
+    #These will usually be files, but they can be anything.
+    #Essentially this is an Array of strings that mean something to your parser
+    def tests= array_of_identifiers
       @tests||=Array.new
-      @tests+=array_of_files
+      @tests+=array_of_identifiers
     end
     
     #A hash defining the parser to use.
@@ -150,7 +153,13 @@ module Rutema
         raise Patir::ConfigurationException,"No parser defined" unless @configuration.parser
         raise Patir::ConfigurationException,"Syntax error in parser definition - missing :class" unless @configuration.parser[:class]
         @configuration.reporters=@reporters
-        @configuration.tests=@tests.collect{|e| File.expand_path(e) }
+        @configuration.tests=@tests.collect do |t|  
+          if File.exists?(t) 
+            File.expand_path(t)
+          else
+            t
+          end
+        end
         @configuration.filename=@config_file
       end
       return @configuration

data/lib/rutema/system.rb

@@ -22,7 +22,7 @@ module Rutema
   module Version
     MAJOR=1
     MINOR=2
-    TINY=0
+    TINY=1
     STRING=[ MAJOR, MINOR, TINY ].join( "." )
   end
   #This class coordinates parsing, execution and reporting of test specifications
@@ -233,7 +233,7 @@ module Rutema
     def initialize command_line_args
       parse_command_line(command_line_args)
       @logger=Patir.setup_logger(@log_file)
-      @logger.info("rutemax v#{Version::STRING}")
+      @logger.info("rutema v#{Version::STRING}")
       begin
         raise "No configuration file defined!" if !@config_file
         @configuration=RutemaConfigurator.new(@config_file,@logger).configuration
@@ -262,7 +262,7 @@ module Rutema
         opt.on("--log FILE", "-l FILE",String,"Redirects the log output to FILE") { |@log_file|}
         opt.on("--check","Runs just the check test"){@check=true}
         opt.on("--step","Runs test cases step by step"){@step=true}
-        opt.on("-v", "--version","Displays the version") { $stdout.puts("rutemax v#{Version::STRING}");exit 0 }
+        opt.on("-v", "--version","Displays the version") { $stdout.puts("rutema v#{Version::STRING}");exit 0 }
         opt.on("--help", "-h", "-?", "This text") { $stdout.puts opt; exit 0 }
         opt.on("The commands are:")
         opt.on("\tall - Runs all tests")

data/test/test_couchdb.rb

@@ -1,6 +1,5 @@
 $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 require 'rubygems'
-require 'rutema/gems'
 require 'test/unit'
 require 'ostruct'
 require 'rutema/reporters/couchdb'
@@ -14,61 +13,51 @@ module TestRutema
       @number=number
     end
   end
-
-  class TestCouchDBModel<Test::Unit::TestCase
-    def setup
-      @db=CouchRest.database!("http://localhost:5984/rutema_test")
-    end
-    
-    def test_couchdb_model
-      run=Rutema::CouchDB::Run.new
-      run.database=@db
-      run.context="context"
-      run.scenarios=["1","2","#{self.object_id}"]
-      assert_nothing_raised() {  run.save }
-      
-      r=Rutema::CouchDB::Run.get(run.slug)
-      assert_equal(run.slug, r.slug)
-    end
-  end
   
   class TestCouchDBReporter<Test::Unit::TestCase
     CFG={:db=>{:url=>"http://localhost:5984", :database=>"rutema_test_sandbox"}}
-      def setup
-        @parse_errors=[{:filename=>"f.spec",:error=>"error"}]
-        st=Patir::CommandSequenceStatus.new("test_seq")
-        st.step=MockCommand.new(1)
-        st.step=MockCommand.new(2)
-        st.step=MockCommand.new(3)
-        @status=[st]
-      end
-      
-      def test_no_errors
-        spec=mock
-        r=Rutema::CouchDBReporter.new(CFG)
-        assert_nothing_raised() { r.report({"test"=>spec},[runner_state_mock()],[],nil) }
-      end
+    def setup
+      @parse_errors=[{:filename=>"f.spec",:error=>"error"}]
+      st=Patir::CommandSequenceStatus.new("test_seq")
+      st.step=MockCommand.new(1)
+      st.step=MockCommand.new(2)
+      st.step=MockCommand.new(3)
+      @status=[st]
+    end
+
+    def test_no_errors
+      spec=mock
+      db=mock
+      Rutema::CouchDB.expects(:connect).returns(db)
+      db.expects(:save_doc).returns({})
+      r=Rutema::CouchDBReporter.new(CFG)
+      assert_nothing_raised() { r.report({"test"=>spec},[runner_state_mock()],[],nil) }
+    end
+
+    def test_a_bit_of_everything
+      spec=mock
+      spec.expects(:has_version?).returns(false)
+      spec.expects(:title).returns("T")
+      spec.expects(:description).returns("cool test")
+      db=mock
+      Rutema::CouchDB.expects(:connect).returns(db)
+      db.expects(:save_doc).returns({})
       
-      def test_a_bit_of_everything
-        spec=mock
-        spec.expects(:has_version?).returns(false)
-        spec.expects(:title).returns("T")
-        spec.expects(:description).returns("cool test")
-       
-        r=Rutema::CouchDBReporter.new(CFG)
-        assert_nothing_raised() {  r.report({"1"=>spec},[runner_state_mock,runner_state_mock(1,:error)],[],nil) }
-      end
+      r=Rutema::CouchDBReporter.new(CFG)
       
-      def runner_state_mock n=0,status=:success,step_states=[]
-        rs=mock()
-        rs.expects(:sequence_name).returns("#{n}")
-        rs.expects(:sequence_id).returns("seq_id#{n}")
-        rs.expects(:start_time).returns(Time.now-3600)
-        rs.expects(:stop_time).returns(Time.now)
-        rs.expects(:status).returns(status)
-        rs.expects(:strategy).returns(:attended)
-        rs.expects(:step_states).returns(step_states)
-        return rs
-      end
+      assert_nothing_raised() {  r.report({"1"=>spec},[runner_state_mock,runner_state_mock(1,:error)],[],nil) }
+    end
+
+    def runner_state_mock n=0,status=:success,step_states=[]
+      rs=mock()
+      rs.expects(:sequence_name).returns("#{n}")
+      rs.expects(:sequence_id).returns("seq_id#{n}")
+      rs.expects(:start_time).returns(Time.now-3600)
+      rs.expects(:stop_time).returns(Time.now)
+      rs.expects(:status).returns(status)
+      rs.expects(:strategy).returns(:attended)
+      rs.expects(:step_states).returns(step_states)
+      return rs
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rutema
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Vassilis Rizopoulos
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-01 00:00:00 +03:00
+date: 2011-04-04 00:00:00 +03:00
 default_executable: rutema
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -122,12 +122,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 47
+        hash: 35
         segments: 
         - 2
         - 9
-        - 2
-        version: 2.9.2
+        - 4
+        version: 2.9.4
   type: :development
   version_requirements: *id007
 description: |-
@@ -219,7 +219,6 @@ files:
 - test/test_runners.rb
 - test/test_system.rb
 - test/test_couchdb.rb
-- test/test_rake.rb
 - .gemtest
 has_rdoc: true
 homepage: http://patir.rubyforge.org/rutema
@@ -262,7 +261,6 @@ test_files:
 - test/test_couchdb.rb
 - test/test_objectmodel.rb
 - test/test_parsers.rb
-- test/test_rake.rb
 - test/test_reporters.rb
 - test/test_runners.rb
 - test/test_system.rb

data/test/test_rake.rb

@@ -1,33 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__),"..","lib")
-require 'test/unit'
-require 'rubygems'
-require 'rake'
-require 'rutema/rake'
-
-module TestRutema
-  class TestRakeTask<Test::Unit::TestCase
-    def test_rake_task
-      t=nil
-      assert_nothing_raised() { t=Rutema::RakeTask.new(:config_file=>"rutema.rutema")  }
-      assert_not_nil(t)
-      assert_equal("rutema", t.rake_task.name)
-      assert_equal([], t.rake_task.prerequisites)
-      assert_nothing_raised() { t.add_dependency("some_task") }
-      assert_equal(["some_task"], t.rake_task.prerequisites)
-    end
-    
-    def test_rake_task_block
-      t=nil
-      assert_nothing_raised() { t=Rutema::RakeTask.new do |rt|
-        rt.name="test"
-        rt.config_file="rutema.rutema"
-        rt.add_dependency("some_task")
-      end  }
-      assert_equal("rutema:test", t.rake_task.name)
-      assert_equal(["some_task"], t.rake_task.prerequisites)
-      assert_nothing_raised() { t.add_dependency(:symbol_task) }
-      assert_nothing_raised() { t.add_dependency(:"ns:symbol_task") }
-      assert_equal(["some_task","symbol_task","ns:symbol_task"], t.rake_task.prerequisites)
-    end
-  end
-end