rscm-accurev 0.0.3 → 0.0.4

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/rdoctask'
 require 'rake/packagetask'
 require 'rake/gempackagetask'
 
-# rakefile borrowed shamelessly from rscm
+# this rakefile originally borrowed shamelessly from rscm
 
 PKG_NAME = 'rscm-accurev'
 PKG_BUILD = ENV['PKG_BUILD'] ? '.'+ENV['PKG_BUILD'] : ''
@@ -17,20 +17,52 @@ PKG_SUMMARY = 'RSCM::Accurev - RSCM API for Accurev'
 desc "Default Task"
 task :default => [ :test, :gem ]
 
-# define a task to run tests
-Rake::TestTask.new do |t|
+#task :test => [ :backup_testresults, :xmltest ]
+
+# define a task(s) to run tests
+
+test_files = FileList.new( "test/**/t_*.rb" )
+TEST_OUTPUT = "doc"
+
+Rake::TestTask.new( :plaintest ) do |t|
   t.libs << "test"
-  t.test_files = FileList.new( "test/**/t_*.rb" )
+  t.test_files = test_files
   t.verbose = true
 end
 
+# requires a patch to rake_test_loader.rb to exclude options
+# requires a patch to rake/testtask.rb to support ruby_opts
+# (see doc/patches)
+Rake::TestTask.new( :xmltest ) do |t|
+  t.libs << "test"
+  t.test_files = test_files
+  t.verbose = true
+  t.ruby_opts << '-rtest/unit/ui/xml/testrunner'
+  ENV['XMLTEST_OUTPUT'] = "#{TEST_OUTPUT}/testresults.xml"
+  t.options = "--runner=xml"
+end
+
+# backs up existing testresults.xml files in test target dir
+task :backup_testresults do
+  old = "#{TEST_OUTPUT}/testresults.xml"
+  if File.exist?( old )
+    stat = File.stat( old )
+    bak = stat.ctime.strftime('testresults-%Y%m%d-%H%M.xml')
+    new = "#{TEST_OUTPUT}/#{bak}"
+    #puts "...Backing up previous test results to #{new}"
+    mv( old, new )
+  end
+end
+
 # define a task to create rdocs
 # keep a reference to it so we can reuse it in the gempkg task
-rd_task = Rake::RDocTask.new do |rdoc|
+rd_task = Rake::RDocTask.new( :rdoc ) do |rdoc|
   rdoc.title = PKG_SUMMARY
+  rdoc.template = "doc/jamis.rb" # so nice
   rdoc.options << '--line-numbers' << '--inline-source'
-  #rdoc.rdoc_files.include( 'TODO' )
+  rdoc.rdoc_files.include( 'STATUS' )
   rdoc.rdoc_files.include( 'lib/**/*.rb' )
+  rdoc.rdoc_files.include( 'doc/*.rd' )
 end
 
 PKG_FILES = FileList[
@@ -64,5 +96,10 @@ else
   end
 end
 
+desc "Delete all generated files (includes built packages)"
+task :realclean => :clean do
+  f = FileList[ 'pkg', 'html', 'doc/test*.xml' ]
+  rm f
+end
 
                                         

data/STATUS

@@ -0,0 +1,63 @@
+
+= RSCM::Accurev Status
+
+------------------------
+
+== Core RSCM API (RSCM::Accurev::API)
+
+[checkout()]  supported
+
+    - basic checkouts should work
+
+    - time-based checkouts do not work
+
+[update()]  basic updates work
+
+    - time-based updates ("update( yesterday )") not working
+
+    - elements list returned currently includes directories and removed files
+
+[add()]  unsupported, todo(?)
+
+[edit()]  supported (no-op)
+
+[revisions()]  supported
+
+    - time-based limits do not work
+
+    - should be history-based
+
+-------------------------------------------
+
+== Accurev-specific API (RSCM::Accurev::API)
+
+[ac_update()]  unsupported, todo
+
+[ac_files()]  supported
+
+[ac_info()]  supported
+
+[ac_stat()]  unsupported, use ac_files().
+
+[ac_move()]  unsupported, todo
+
+[ac_pop()]  unsupported, todo
+
+[ac_purge()]  unsupported, todo
+
+[ac_hist()]  unsupported, todo
+
+[ac_keep()]  unsupported, todo
+
+[ac_promote()]  unsupported, todo
+
+-------------------------------------------
+
+== Other Items
+
+[code docs]  woefully incomplete
+
+[usage docs]  virtually nonexistant
+
+[test coverage]  truly pitiful
+

data/TODO

@@ -1,13 +1,13 @@
 # todo for rscm/scm/accurev.rb
 
-**api - checkout
+api - checkout
  - there is no rscm-api update() (only checkout-to-existing-ws)
  - `pop`, `update`
 
 **api - revisions
  - `hist` (others?)
 
-**api - diff
+api - diff
  - `diff` (yukx)
 
 api - import_central, create_central
@@ -21,10 +21,21 @@ api - triggers?
 **api - identifiers (Time or revision) to ac format
  - is this even always applicable?  does stat/update take limits?
 
-xml - s/FileStatus/FileData/
+# xml - s/FileStatus/FileData/
 
 api - checkout(Time.infinite) just does update
       checkout(x) only works if ws not exist
         unless it implies nuke-and-re-checkout (slow)
 
-api - need ac_update which returns an acresponse
+api - need ac_update which returns an acresponse
+
+api - update: elements list should not contain directories
+
+api - update: elements list should probably not include removed files
+
+# command - Command.working_dir is bad: should use with_working_dir()
+
+*** api - checkout() should use `pop` instead of `mkws`, unless
+	  user *really* wants it
+
+

data/lib/rscm/accurev.rb

@@ -5,3 +5,13 @@ require 'rscm/scm/accurev/command'
 require 'rscm/scm/accurev/xml'
 require 'rscm/scm/accurev/filterio'
 
+module RSCM
+  #
+  # == module RSCM::Accurev
+  #
+  # Namespace for accurev api classes and utils.
+  #
+  # See RSCM::Accurev::API.
+  #
+  module Accurev; end
+end

data/lib/rscm/scm/accurev/api.rb

@@ -1,4 +1,10 @@
 # -*- ruby -*-
+#
+# = api.rb
+#
+# API for interacting with accurev workspaces.
+#
+require 'stringio'
 require 'rubygems'
 require 'rscm/base'
 require 'rscm/path_converter'
@@ -7,12 +13,16 @@ require 'rscm/scm/accurev/xml'
 require 'rscm/scm/accurev/filterio'
 require 'rscm/scm/accurev/command'
 
-module RSCM
-  module Accurev;  end
-end
+# need to define module within module before you can use module X::Y
+module RSCM; module Accurev; end; end
 
 module RSCM::Accurev
 
+  #
+  # General exception class for errors processing commands.
+  #
+  # @attr error_msg Error message output by accurev.
+  #
   class AccurevException < Exception 
     attr_reader :error_msg
     def initialize( msg, error_msg=nil )
@@ -21,12 +31,29 @@ module RSCM::Accurev
     end     
   end
 
+  #
+  # Exception thrown when an update is performed
+  # on a workspace with unkept/unanchored modifications.
+  # Accurev requires that all modifications be handled before
+  # an update is performed.
+  #
   class StaleWorkspaceException < AccurevException; end
 
-  # RSCM implementation for Accurev (http://www.accurev.com/).
   #
-  # Requires an accurev cli executable on the path, and the correct
-  # environment for ac server/principal/password.
+  # RSCM implementation for Accurev (http://www.accurev.com).
+  #
+  # Requires an accurev cli executable on the path (see also
+  # RSCM::Accurev::Command), and the correct environment
+  # configuration for ac server/principal/password.
+  #
+  # ---
+  #
+  # === Example
+  #
+  #   api = RSCM::Accurev::API.new( "./ws/proj-1", "proj", "proj-1" )
+  #   api.checkout() each do |file|
+  #     puts "Updated #{file}..."
+  #   end
   #
   class API < RSCM::Base
     register self
@@ -40,20 +67,21 @@ module RSCM::Accurev
     ann :description => "Workspace Stream"
     attr_accessor :workspace_stream
 
-# defined in Base
-#    ann :description => "Filesystem Path to Workspace"
-#    attr_accessor :checkout_dir
-
-      STATUSES = {
-        '(backed)'   => :backed,
-        '(external)' => :external,
-        '(modified)' => :modified,
-        '(kept)'     => :kept,
-        '(defunct)'  => :defunct,
-        '(missing)'  => :missing,
-        '(stranded)' => :stranded,
-        '(overlap)'  => :overlap
-      }
+    # [defined in Base]
+    # ann :description => "Filesystem Path to Workspace"
+    # attr_accessor :checkout_dir
+    
+    # status flag mappings for "stat", "file" commands
+    STATUSES = {
+      '(backed)'   => :backed,
+      '(external)' => :external,
+      '(modified)' => :modified,
+      '(kept)'     => :kept,
+      '(defunct)'  => :defunct,
+      '(missing)'  => :missing,
+      '(stranded)' => :stranded,
+      '(overlap)'  => :overlap
+    }
       
     def initialize( checkout_dir=nil, depot=nil, workspace_stream=nil )
       @depot = depot
@@ -66,7 +94,7 @@ module RSCM::Accurev
       return "Accurev"
     end
 
-    # Accurev operations are atomic:
+    # Accurev operations are atomic: returns true.
     def transactional?
       return true
     end
@@ -105,10 +133,12 @@ module RSCM::Accurev
     def ac_files( relative_path )
       cmd = Command.instance
       ret = []
-      acresponse = cmd.accurev( "files", relative_path )
-      acresponse['element'].each do |fd|
-        yield fd if block_given?
-        ret << fd
+      with_working_dir( @checkout_dir ) do
+        acresponse = cmd.accurev( "files", relative_path )
+        acresponse['element'].each do |fd|
+          yield fd if block_given?
+          ret << fd
+        end
       end
       return ret
     end
@@ -140,9 +170,32 @@ module RSCM::Accurev
       raise "XXX implement me"
     end
 
+    #
+    # Performs an "accurev info" command in the workspace.
+    # Returns a map of 
+    #
     # ac info: shows eg, backing stream
-    # but doesn't support -fx!
-    
+    # but doesn't support -fx!    
+    #
+    def ac_info()
+      co = RSCM::PathConverter.nativepath_to_filepath( @checkout_dir )
+      unless File.exists?( co )
+        raise AccurevException.new( "Checkout dir does not exist" )
+      end
+      info = {}
+      with_working_dir( co ) do
+        cmd = Command.instance
+        io = StringIO.new( cmd.accurev_nofx( "info" ) )
+        io.each_line do |line|
+          next unless line =~ /\S/
+          if line =~ /^(.*?):\s+(.*)$/
+            info[$1] = $2
+          end
+        end
+      end
+      return info
+    end
+
     # ac mkws 
     #   -b orbitz-host-gt3-0-impl 
     #   -w orbitz-host-gt3-0-impl-test2_gfast
@@ -156,7 +209,7 @@ module RSCM::Accurev
     # (eg, no in-process diffing ala cvs diff)
     # lists modified lines in xml
 
-    # checkout():
+    #
     # "Checks out or updates[!] contents from a central SCM 
     # to +checkout_dir+ - a local working copy."
     #
@@ -164,20 +217,21 @@ module RSCM::Accurev
     # obtain files up to a particular time or label."
     #
     # For accurev, this:
-    # * checks to see if @checkout_dir exists and appears checked out.
-    #   If it's already checked out, this calls update().
+    # * checks to see if +@checkout_dir+ exists and appears checked out.
+    #   If it's already checked out, this calls +update()+.  If
+    #   +@checkout_dir+ exists and +to_identifier+ is given, an
+    #   exception is raised.
     # * otherwise, this creates a new workspace stream and populates it
-    #   at @checkout_dir.
+    #   at +@checkout_dir+.
     #
-    # Unknown: support for +to_identifier+ (esp for update)?
+    # This both returns and yields a list of updated files.
+    # Only updated files are returned, not directories.
+    #
+    # Current, ac_update returns both files and directories, including
+    # deleted files.
     #
-    # This method yields files in the workspace and doesn't need to be
-    # overridden.
-    # The checkout_silent() method does the actual work.
-    # 
-    # Only yields files, not directories
     def checkout( to_identifier=Time.infinite )
-      co = PathConverter.nativepath_to_filepath( @checkout_dir )
+      co = RSCM::PathConverter.nativepath_to_filepath( @checkout_dir )
       unless File.exists?( co )
         puts "> creating new workspace..."
         if @backing_stream.nil?
@@ -186,13 +240,16 @@ module RSCM::Accurev
         if @workspace_stream.nil?
           raise "Workspace stream must be set"
         end
-        mkws_out = self.accurev_nofx( "mkws", 
-                                     "-b", @backing_stream,
-                                     "-w", @workspace_stream,
-                                     "-l", co )
-        # sucks:
-        if ( mkws_out =~ /already exists/ )
-          raise AccurevException.new( "Failed to checkout", mkws_out )
+        Command.instance do |cmd|
+          cmd.working_dir = co
+          mkws_out = cmd.accurev_nofx( "mkws", 
+                                       "-b", @backing_stream,
+                                       "-w", @workspace_stream,
+                                       "-l", co )
+          # sucks:
+          if ( mkws_out =~ /already exists/ )
+            raise AccurevException.new( "Failed to checkout", mkws_out )
+          end
         end
       end
       puts "> Updating workspace.."
@@ -205,8 +262,8 @@ module RSCM::Accurev
         raise AccurevException.new( "Workspace does not exist!" )
       end
       updated = []
-      Command.instance do |cmd|
-        cmd.working_dir = co
+      with_working_dir( co ) do
+        cmd = Command.instance
         acresponse = cmd.accurev( "update" )
         if acresponse.error
           if acresponse.error =~ /workspace have been modified/
@@ -219,8 +276,12 @@ module RSCM::Accurev
         end
         if acresponse['element']
           acresponse['element'].each do |up|
-            yield up.location if block_given?
-            updated << up.location
+            # "ac update" on a new workspace yields element locations
+            # with leading "/"s, which should be removed to get a proper
+            # relative path:
+            loc = up.location.sub( /^\//, "" )
+            yield loc if block_given?
+            updated << loc
           end
         end
       end
@@ -240,3 +301,7 @@ module RSCM::Accurev
   end
 
 end
+
+#
+# Copyright (c) 2005 Gregory D. Fast <gdf@speakeasy.net>
+#

data/lib/rscm/scm/accurev/command.rb

@@ -10,7 +10,7 @@ module RSCM
     #
     class Command
 
-      attr_accessor :debug, :debug_to, :accurev_bin, :working_dir
+      attr_accessor :debug, :debug_to, :accurev_bin
 
       # If you need to swap out the mapper class
       attr_accessor :xmlmapper
@@ -20,7 +20,6 @@ module RSCM
         @debug = false
         @debug_to = STDOUT
         @accurev_bin = "accurev"
-        @working_dir = "."
       end
 
       #
@@ -41,10 +40,10 @@ module RSCM
       # `-fx` for xml output.)
       #
       def accurev_nofx( cmd, *opts )
-        # nativepath_to_filepath is actually generic to native
-        dir = PathConverter.nativepath_to_filepath( @working_dir )
-        dir = File.expand_path( dir )
-        with_working_dir( dir ) do
+##        # nativepath_to_filepath is actually generic to native
+##        dir = PathConverter.nativepath_to_filepath( @working_dir )
+##        dir = File.expand_path( dir )
+##        with_working_dir( dir ) do
           cmdline = self.accurev_cmdline( cmd, opts )
           if @debug
             @debug_to.puts("ac> #{cmdline}")
@@ -52,7 +51,7 @@ module RSCM
           Better.popen( cmdline ) do |stdout|
             return stdout.read()
           end
-        end
+##        end
       end
 
       #
@@ -67,11 +66,11 @@ module RSCM
       # accurev subcommands support the "-fx" option.
       #
       def accurev_xml( cmd, *opts )
-        # nativepath_to_filepath is actually generic to native
-        dir = PathConverter.nativepath_to_filepath( @working_dir )
-        dir = File.expand_path( dir )
         opts << "-fx"
-        with_working_dir( dir ) do
+##        # nativepath_to_filepath is actually generic to native
+##        dir = PathConverter.nativepath_to_filepath( @working_dir )
+##        dir = File.expand_path( dir )
+##        with_working_dir( dir ) do
           cmdline = self.accurev_cmdline( cmd, opts )
           if @debug
             @debug_to.puts("ac> #{cmdline}")
@@ -88,7 +87,7 @@ module RSCM
               raise "Unexpected output from #{cmdline}: #{e}"
             end
           end
-        end
+##        end
       end
       
       #

data/lib/rscm/scm/accurev/filterio.rb

@@ -3,17 +3,19 @@ require 'stringio'
 module RSCM
   module Accurev
 
+    #
     # IO stream which cleans irregularities out of accurev xml output.
     #
     # In particular:
     #
-    #  * the -fx output from `accurev update` has a root element of
-    #    <acResponse>, not <AcResponse> like the other commands
+    # * Unlike other commands, the +-fx+ output from _accurev update_
+    #   has a root element of +<acResponse>+, not +<AcResponse>+.
     #
-    #  * `accurev update` emits broken XML when there are no files
-    #    needing updates.
+    # * _accurev update_ emits broken XML when there are no files
+    #   to update.
     #
     class AcXMLScrubIO < StringIO
+
       # @param: sourceio - io or string source to wrap
       def initialize( sourceio )
         if sourceio.respond_to?( :read )

data/lib/rscm/scm/accurev/xml.rb

@@ -11,9 +11,11 @@ module RSCM::Accurev
   # and builds a new object of that type from the element.
   #
   # The nodename-class associations are determined by finding all 
-  # classes derived from +RSCM::Accurev::ElementBackedClass+ and checking
+  # classes derived from ElementBackedClass and checking
   # each of those classes +element_name+ methods.
   #
+  # See ElementBackedClass for examples.
+  #
   class XMLMapper
 
     # Map of element (tag) names to (ruby) class.
@@ -55,19 +57,47 @@ module RSCM::Accurev
   end
 
   #
-  # Generic base class for defining typed mirror classes for XML elements.
+  # Abstract base class for defining typed mirror classes for XML elements.
   #
   # A subclass of ElementBackedClass has:
   #
-  #  * A class static +element_name+ method, identifying what
-  #    type of XML element it shadows
+  # * A class static +element_name+ method, identifying what
+  #   type of XML element it shadows
+  #
+  # * A set of attributes shadowing the XML attributes of its target element
+  #
+  # * A map (+children+) of child elements, keyed by element name
+  #
+  # * A (optional) +text_content+ attribute, populated when the
+  #   target element has text subnodes.
+  #
+  # ---
+  #
+  # === Example
+  #
+  # For the XML element:
+  #
+  #    <book title="The Monkey Wrench Gang" author="Edward Albee">
+  #      <note>Lots of beer and dynamite</note>
+  #    </book>
+  #
+  # You can define:
   #
-  #  * A set of attributes shadowing the XML attributes of its target element
+  #    class Book < ElementBackedClass
+  #      element_name 'book'
+  #      attr_accessor :title, :author
+  #    end
   #
-  #  * A map (+children+) of child elements, keyed by element name
+  # And then use XMLMapper to create instances:
   #
-  #  * A (optional) +text_content+ attribute, populated when the
-  #    target element has text subnodes.
+  #    e = ...; # <book> node: REXML::Element
+  #    book = XMLMapper.map(e)
+  #    puts "Title: #{book.title}"
+  #    puts "Author: #{book.author}"
+  #    puts "Notes:"
+  #    book['note'].each do |n|
+  #      puts n.text_content
+  #    end
   #
   class ElementBackedClass
 

data/lib/test/unit/ui/xml/testrunner.rb

@@ -0,0 +1,165 @@
+#!/usr/bin/env ruby
+
+require 'test/unit/ui/testrunnermediator'
+require 'test/unit/ui/testrunnerutilities'
+require 'test/unit/ui/console/testrunner'
+require 'test/unit/autorunner'
+require 'rexml/document'
+
+module Test
+  module Unit
+    module UI
+      module XML
+
+        #
+        # XML::TestRunner - generate xml output for test results
+        #
+        # Example use:
+        #
+        #   $ ruby -rtest/unit/ui/xml/testrunner test/test_1.rb --runner=xml
+        #
+        # By default, XML::TestRunner will output to stdout.
+        # You can set the environment variable $XMLTEST_OUTPUT to
+        # a filename to send the output to that file.
+        #
+        # The summary file created by this testrunner is XML, but 
+        # this module also includes a stylesheet
+        # (test/unit/ui/xml/xmltestrunner.xslt) which converts it to
+        # HTML.  Copy the XSLT file into the same directory as the 
+        # test results file, and open the results file with a browser.
+        #
+        # --- 
+        # 
+        # (todo: use with rake)
+        #
+        class TestRunner < Test::Unit::UI::Console::TestRunner
+
+          def initialize( suite, output_level )
+            super( suite )
+            if ENV['XMLTEST_OUTPUT']
+              fn = ENV['XMLTEST_OUTPUT']
+              puts "Writing to #{fn}"
+              @io = File.open( fn, "w" )
+              @using_stdout = false
+            else
+              puts "Writing to stdout (along with everyone else...)"
+              @io = STDOUT
+              @using_stdout = true
+            end
+            create_document()
+          end
+
+          def create_document()
+            @doc = REXML::Document.new()
+            @doc << REXML::XMLDecl.new()
+            
+            pi = REXML::Instruction.new(
+                   "xml-stylesheet",
+                   "type='text/xsl' href='xmltestrunner.xslt' "
+            )
+            @doc << pi
+
+            e = REXML::Element.new( "testsuite" )
+            e.attributes['rundate'] = Time.now
+            @doc << e
+          end
+
+          def to_s
+            @doc.to_s
+          end
+
+          def start
+            @current_test = nil
+            # setup_mediator
+            @mediator = TestRunnerMediator.new( @suite )
+            suite_name = @suite.to_s
+            if @suite.kind_of?(Module)
+              suite_name = @suite.name
+            end
+            @doc.root.attributes['name'] = suite_name
+            # attach_to_mediator - define callbacks
+            @mediator.add_listener( TestResult::FAULT, 
+                                    &method(:add_fault) )
+            @mediator.add_listener( TestRunnerMediator::STARTED,
+                                    &method(:started) )
+            @mediator.add_listener( TestRunnerMediator::FINISHED,
+                                    &method(:finished) )
+            @mediator.add_listener( TestCase::STARTED, 
+                                    &method(:test_started) )
+            @mediator.add_listener( TestCase::FINISHED, 
+                                    &method(:test_finished) )
+            # return start_mediator
+            return @mediator.run_suite
+          end
+
+          # callbacks
+
+          def add_fault( fault )
+            ##STDERR.puts "Fault:"
+            @faults << fault
+            e = REXML::Element.new( "fault" )
+            e << REXML::CData.new( fault.long_display ) 
+            @current_test << e
+          end
+
+          def started( result )
+            #STDERR.puts "Started"
+            @result = result
+          end
+
+          def finished( elapsed_time )
+            #STDERR.puts "Finished"
+            res = REXML::Element.new( "result" )
+            summ = REXML::Element.new( "summary" )
+            summ.text = @result
+            res << summ
+            # @result is a Test::Unit::TestResults
+            res.attributes['passed'] = @result.passed?
+            res.attributes['testcount'] = @result.run_count
+            res.attributes['assertcount'] = @result.assertion_count
+            res.attributes['failures'] = @result.failure_count
+            res.attributes['errors'] = @result.error_count
+            @doc.root << res
+
+            e = REXML::Element.new( "elapsed-time" )
+            e.text = elapsed_time
+            @doc.root << e
+            @io.puts( @doc.to_s )
+            
+            unless @using_stdout
+              puts @result
+            end
+          end
+          
+          def test_started( name )
+            #STDERR.puts "Test: #{name} started"
+            e = REXML::Element.new( "test" )
+            e.attributes['name'] = name
+            #e.attributes['status'] = "failed"
+            @doc.root << e
+            @current_test = e
+          end
+
+          def test_finished( name )
+            #STDERR.puts "Test: #{name} finished"
+            # find //test[@name='name']
+            @current_test = nil
+          end
+
+        end
+      end
+    end
+  end
+end
+
+# "plug in" xmltestrunner into autorunner's list of known runners
+# This enables the "--runner=xml" commandline option.
+Test::Unit::AutoRunner::RUNNERS[:xml] = proc do |r|
+  require 'test/unit/ui/xml/testrunner'
+  Test::Unit::UI::XML::TestRunner
+end
+
+if __FILE__ == $0
+  Test::Unit::UI::XML::TestRunner.start_command_line_test
+end
+

data/lib/test/unit/ui/xml/xmltestrunner.xslt

@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+<xsl:stylesheet
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+  >
+  
+  <xsl:output method="html" />
+
+  <xsl:template match="/testsuite">
+    <html>
+      <head>
+	<title>Test Suite Results for <xsl:value-of select="@name" /></title>
+	<style>
+	  .error { color: #ff0000; }
+	  .eresult {
+	    background: #ffcccc;
+	    color: #ff0000;
+	  }
+	  h1,h2 {
+	    background: #cccccc;
+	    color: #000055;
+	    border: 1px dotted black;
+	  }
+	</style>
+      </head>
+      <body>
+	<h1>Test Suite Results</h1>
+
+	<p>Results for: <xsl:value-of select="@name" /></p>
+	
+	<p>
+	  Test suite run at: <b><xsl:value-of select="@rundate" /></b>
+	</p>
+
+	<h2>Summary</h2>
+	
+	<p>
+	  <xsl:if test="result[@passed = 'false']">
+	    <xsl:attribute name="class">error</xsl:attribute>
+	  </xsl:if>
+	  <xsl:value-of select="result/summary/text()" />
+	</p>
+	<p>
+	  Elapsed time: <xsl:value-of select="elapsed-time/text()" />
+	</p>
+
+	<table border="1">
+	  <tr>
+	    <th>Case</th>
+	    <th>Result</th>
+	  </tr>
+	  <xsl:for-each select="test">
+	    <tr>
+	      <td>
+		<xsl:if test="fault/text()">
+		  <xsl:attribute name="class">error</xsl:attribute>
+		</xsl:if>
+		<xsl:value-of select="@name" />
+	      </td>
+	      <td>
+		<xsl:choose>
+		  <xsl:when test="fault/text()">
+		    <xsl:attribute name="class">eresult</xsl:attribute>
+		    <pre>
+		      <xsl:value-of select="fault/text()" />
+		    </pre>
+		  </xsl:when>
+		  <xsl:otherwise>
+		    (pass)
+		  </xsl:otherwise>
+		</xsl:choose>
+	      </td>
+	    </tr>
+	  </xsl:for-each>
+	</table>
+      </body>
+    </html>
+  </xsl:template>
+
+</xsl:stylesheet>

data/test/eg/info.txt

@@ -0,0 +1,14 @@
+
+Principal:	gfast
+Shell:		/bin/zsh
+Host:		gfast.duncllc.com
+Domain:		(none)
+server_name:	accurev.duncllc.com
+port:		5050
+ACCUREV_BIN:	/usr/local/accurev/bin
+client_time:	2005/08/16 08:56:13 CDT (1124200573)
+server_time:	2005/08/16 08:56:14 CDT (1124200574)
+Depot:		orbitz-api-hiredcar
+ws/ref:		orbitz-api-hiredcar-0-rc-testing_gfast
+Basis:		orbitz-api-hiredcar-1-rc
+Top:		/home/gfast/dev/orbitz-api-hirdcar-0-rc

data/test/t_api.rb

@@ -7,11 +7,10 @@ include RSCM::Accurev
 class AccurevAPITest < Test::Unit::TestCase
   
   def test_ac_files()
-    Command.instance do |cmd|
-      cmd.working_dir = "test"
+    Command.instance do |cmd| 
       cmd.accurev_bin = "./acreplay.rb eg/ac-files.xml"
     end
-    api = API.new( ".", "test-bogus-depot", "test-bogus-depot-0-impl" )
+    api = API.new( "test", "test-bogus-depot", "test-bogus-depot-0-impl" )
     # test array returns
     files = api.ac_files( "." )
     assert( files.length > 0, "Should get some stat-ed files" )
@@ -62,15 +61,61 @@ class AccurevAPITest < Test::Unit::TestCase
     assert_equal( 44, u_elements.length )
     u_elements.each do |location|
       # api.update returns a list of relative filenames
-      assert( location =~ /^\// )
+      assert( location =~ /^[^\/]/, "Location '#{location}' should be a relpath" )
     end
     # test yield and array return XXX
     updated = 0
     api.update().each do |location|
       updated += 1
-      assert( location =~ /^\// )
+      assert( location =~ /^[^\/]/, "Location '#{location}' should be a relpath" )
     end
     assert_equal( 44, updated )
   end
 
+  # update-updates.xml - update with updated files
+  def test_update_updates()
+    Command.instance do |cmd|
+      cmd.accurev_bin = "./acreplay.rb eg/update-updates.xml"
+    end
+    api = API.new( "test", "test-bogus-depot", "test-bogus-depot-0-impl" )
+    # XXX elements in elements list are just "modified" -
+    # may have been removed!
+    # XXX update() should return only filenames, right?  eliminate dirs
+    ue = api.update()
+    assert_not_nil( ue )
+    assert_equal( 23, ue.length )
+    ue.each do |location|
+      assert( location =~ /^[^\/]/, "Location '#{location}' should be a relpath" )
+    end
+    # yielding behavior
+    updated = 0
+    api.update().each do |location|
+      updated += 1
+      assert( location =~ /^[^\/]/, "Location '#{location}' should be a relpath" )
+    end
+    assert_equal( 23, updated )
+  end
+
+  def test_info()
+    Command.instance do |cmd|
+      cmd.accurev_bin = "./acreplay.rb eg/info.txt"
+    end
+    api = API.new( "test", "depot", "stream" )
+    info = api.ac_info()
+    assert( info.size == 13 )
+    # some crap
+    assert_equal( "gfast", info['Principal'] )
+    assert_equal( "5050", info['port'] )
+    assert_equal( "/usr/local/accurev/bin", info['ACCUREV_BIN'] )
+    # the interesting stuff:
+    #  - depot name
+    assert_equal( "orbitz-api-hiredcar", info['Depot'] )
+    #  - workspace or reference stream name
+    assert_equal( "orbitz-api-hiredcar-0-rc-testing_gfast", info['ws/ref'] )
+    #  - basis stream name
+    assert_equal( "orbitz-api-hiredcar-1-rc", info['Basis'] )
+    #  - workspace checkout location
+    assert_equal( "/home/gfast/dev/orbitz-api-hirdcar-0-rc", info['Top'] )
+  end
+
 end

data/test/t_command.rb

@@ -23,18 +23,20 @@ class CommandTest < Test::Unit::TestCase
 
   def test_a_e
     cmd = Command.instance
-    cmd.working_dir = "test"
+##    cmd.working_dir = "test"
     cmd.debug = true
     cmd.debug_to = File.open( "/tmp/testing.log", "w" )
     cmd.accurev_bin = "./acreplay.rb eg/update-newwksp.xml"
     # test listy output
-    acresponse = cmd.accurev( "files" )
-    assert_not_nil( acresponse )
-    assert( acresponse.kind_of?( AcResponseData ) )
-    assert( acresponse['element'].size == 44 )
-    assert( acresponse['message'].size == 44 )
-    acresponse['element'].each do |e|
-      assert( e.kind_of?( ElementData ) )
+    with_working_dir( "test" ) do
+      acresponse = cmd.accurev( "files" )
+      assert_not_nil( acresponse )
+      assert( acresponse.kind_of?( AcResponseData ) )
+      assert( acresponse['element'].size == 44 )
+      assert( acresponse['message'].size == 44 )
+      acresponse['element'].each do |e|
+        assert( e.kind_of?( ElementData ) )
+      end
     end
     Command.discard
   end
@@ -52,29 +54,29 @@ class CommandTest < Test::Unit::TestCase
     # instance returns this thread's Command object
     begin
       cmd = Command.instance
-      cmd.working_dir = "/one/two/three"
-      assert_equal( cmd.working_dir, "/one/two/three" )
+      cmd.accurev_bin = "/bin/bash"
+      assert_equal( cmd.accurev_bin, "/bin/bash" )
     end
     # and calling it again returns the same object
     begin
       cmd = Command.instance
-      assert_equal( cmd.working_dir, "/one/two/three" )
+      assert_equal( cmd.accurev_bin, "/bin/bash" )
     end
     # but instance in another thread should be different
     Thread.new do
       cmd = Command.instance
-      assert_not_equal( cmd.working_dir, "/one/two/three" )
+      assert_not_equal( cmd.accurev_bin, "/bin/bash" )
     end.join()
     # ...and calling it *again* returns the same object
     begin
       cmd = Command.instance
-      assert_equal( cmd.working_dir, "/one/two/three" )
+      assert_equal( cmd.accurev_bin, "/bin/bash" )
     end
     # but discard tosses this thread's object:
     Command.discard
     begin
       cmd = Command.instance
-      assert_not_equal( cmd.working_dir, "/one/two/three" )
+      assert_not_equal( cmd.accurev_bin, "/bin/bash" )
     end
 
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: rscm-accurev
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
-date: 2005-08-15 00:00:00 -05:00
+  version: 0.0.4
+date: 2005-08-21 00:00:00 -05:00
 summary: "RSCM::Accurev - RSCM API for Accurev"
 require_paths: 
   - lib
@@ -31,15 +31,17 @@ authors:
 files: 
   - apitest.rb
   - bumprelease.sh
+  - doc
   - lib
   - LICENSE
-  - pkg
   - Rakefile
   - README
+  - STATUS
   - test
   - tmp
   - TODO
   - lib/rscm
+  - lib/test
   - lib/rscm/accurev.rb
   - lib/rscm/scm
   - lib/rscm/scm/accurev
@@ -47,6 +49,11 @@ files:
   - lib/rscm/scm/accurev/command.rb
   - lib/rscm/scm/accurev/filterio.rb
   - lib/rscm/scm/accurev/xml.rb
+  - lib/test/unit
+  - lib/test/unit/ui
+  - lib/test/unit/ui/xml
+  - lib/test/unit/ui/xml/testrunner.rb
+  - lib/test/unit/ui/xml/xmltestrunner.xslt
   - test/acreplay.rb
   - test/eg
   - test/t_api.rb
@@ -56,6 +63,7 @@ files:
   - test/t_scrubio.rb
   - test/t_xmlmapper.rb
   - test/eg/ac-files.xml
+  - test/eg/info.txt
   - test/eg/update-i-nochanges.xml
   - test/eg/update-i-updates.xml
   - test/eg/update-newwksp.xml