rscm-accurev 0.0.7 → 0.0.8

data/Rakefile

@@ -6,6 +6,8 @@ require 'rake/rdoctask'
 require 'rake/packagetask'
 require 'rake/gempackagetask'
 require 'tracer'
+$: << "lib"
+require 'test/rake/coveragetask'
 
 # this rakefile originally borrowed shamelessly from rscm
 
@@ -164,7 +166,8 @@ else
     s.version = PKG_VERSION
     s.summary = PKG_SUMMARY
     s.description = "RSCM::Accurev is an RSCM API for the SCM tool Accurev (http://www.accurev.com/)."
-    s.add_dependency( 'rscm', '>= 0.3.0' )
+    # rscm-accurev <= 0.0.8 are incompatible with rscm 0.4.x
+    s.add_dependency( 'rscm', '~> 0.3' )
     s.files = PKG_FILES.to_a
     s.require_path = 'lib'
     s.autorequire = 'rscm/accurev'
@@ -188,21 +191,11 @@ task :realclean do
   rm_rf f
 end
 
-desc "Coverage! (still a big hack)"
-task :coverage => [ :test_coverage, :coverage_summary ]
-
-Rake::TestTask.new( :test_coverage ) do |t|
+desc "Coverage! (still a hack)"
+Rake::Coverage::Task.new( :coverage ) do |t|
   t.libs << "test"
   t.test_files = test_files
   t.verbose = true
-  def t.rake_loader
-    'test/coverage/c_loader.rb'
-  end
-end
-
-task :coverage_summary do
-   # too many options!@
-  ruby "test/coverage/analyzer.rb xxx.trace html/coverage test/coverage/template.html test/coverage/index_tmpl.html"
 end
 
 desc "Perform various prerelease verifications"
@@ -212,8 +205,10 @@ task :verify do
     if FileTest.directory?(path)
       next
     end
+    next if path =~ /^\.\/\.svn\//      # ignore SVN base/control files
     next if path =~ /^.\/tmp\/cleaner.pl$/
-    next if path =~ /^.\/Rakefile$/
+    next if path =~ /^.\/Rakefile$/     # this Rakefile contains the bad terms
+    next if path =~ /~$/                # backups might, who cares
     if File.read(path) =~ /orbitz|duncllc|gfast|fduncan/i
       fail "Cannot release #{path}, please clean up"
     end

data/STATUS

@@ -5,6 +5,8 @@
 
 == Core RSCM API (RSCM::Accurev::API)
 
+Written against RSCM version 0.3.x
+
 [checkout()]  supported
 
     - basic checkouts work, with pop and with workspace stream

data/TODO

@@ -1,5 +1,10 @@
 # todo for rscm/scm/accurev.rb
 
+**** api - update to rscm 4.0 api
+ - numerous changes required
+
+** api - submit to rscm maintainers as stable(ish)
+
 #api - checkout
 # - there is no rscm-api update() (only checkout-to-existing-ws)
 # - `pop`, `update`
@@ -39,3 +44,22 @@ api - update: elements list should probably not include removed files
 #	  user *really* wants it
 # - yeargh...  how does update work with pop?  just nuke and/or overwrite?
 
+* XXXs in api
+
+* api.add() -> api.ac_add()
+  - `ac add` (does keep)
+
+api.ac_keep() - as cli
+
+api.ac_promote() - as cli
+
+api.ac_update
+ - doesn't seem to do right
+
+api.can_update?()
+ - `ac stat -n`
+
+? api.overlapped()
+ - list overlapped files
+
+

data/lib/rscm/accurev.rb

@@ -13,6 +13,6 @@ module RSCM
   # See RSCM::Accurev::API.
   #
   module Accurev
-    VERSION = '0.0.7'
+    VERSION = '0.0.8'
   end
 end

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

@@ -48,25 +48,24 @@ module RSCM::Accurev
   #   api.checkout() each{|f| ... }
   #
   class API < RSCM::Base
-    register self
 
-    ann :description => "Accurev Depot"
+    #ann :description => "Accurev Depot"
     attr_accessor :depot
 
-    ann :description => "Backing Stream (autodetected)"
+    #ann :description => "Backing Stream (autodetected)"
     attr_accessor :backing_stream
     
     # If workspace stream is nil (the default), checkout/update will be
     # done using `accurev pop`.  This is faster and more appropriate for 
     # read-only use; however a workspace is required for commits.
-    ann :description => "Workspace Stream"
+    #ann :description => "Workspace Stream"
     attr_accessor :workspace_stream
 
     # [defined in Base]
-    # ann :description => "Filesystem Path to Workspace"
+    # #ann :description => "Filesystem Path to Workspace"
     # attr_accessor :checkout_dir
 
-    ann :description => "Overwrite Mode: if true, co overwrites existing"
+    #ann :description => "Overwrite Mode: if true, co overwrites existing"
     attr_accessor :overwrite
     
     def initialize(checkout_dir=nil, backing_stream=nil, workspace_stream=nil)
@@ -172,11 +171,11 @@ module RSCM::Accurev
 
     # yeilds the TransactionData objects for the given time period
     # (promotes only)
-    def ac_hist( from, to=Time.infinite )
+    def ac_hist( from, to=Time.infinity )
       cmd = Command.instance
       lower = from.to_accurev
       upper = "now"
-      unless to == Time.infinite
+      unless to == Time.infinity
         upper = to.to_accurev
       end
       with_working_dir( self.co_filepath ) do
@@ -267,7 +266,12 @@ module RSCM::Accurev
     # Current, ac_update returns both files and directories, including
     # deleted files.
     #
-    def checkout( to_identifier=Time.infinite )
+    # @yield: +path+ for each file/directory updated
+    #         See also #update().
+    #
+    # XXX doesn't yield
+    #
+    def checkout( to_identifier=Time.infinity )
       co = RSCM::PathConverter.nativepath_to_filepath( @checkout_dir )
       if @backing_stream.nil?
         self.attempt_init_from_info()
@@ -277,25 +281,29 @@ module RSCM::Accurev
       else
         unless File.exists?( co )
           # create new workspace
-          self.checkout_workspace()
+          self.create_workspace()
         end
         # update workspace
-        self.update( to_identifier )
+        ret = []
+        self.update( to_identifier ).each do |e|
+          ret << e
+          yield e if block_given?
+        end
       end
     end
 
     def checkout_pop()
       co = RSCM::PathConverter.nativepath_to_filepath( @checkout_dir )
-      raise "A backing stream is required" if @backing_stream.nil?
-      raise "A working stream may not be given" unless @working_stream.nil?
+      raise AccurevException.new("A backing stream is required") if @backing_stream.nil?
+      raise AccurevException.new("A working stream may not be given") unless @workspace_stream.nil?
       # for `accurev pop`: remove and re-pop the checkout copy
       if File.exists?( co )
         unless @overwrite
-          raise "Checkout dir #{co} already exists (@overwrite=#@overwrite)"
+          raise AccurevException.new("Checkout dir #{co} already exists (@overwrite=#@overwrite)")
         end
         rm_rf( co )
       end
-      mkdir(co)
+      Dir.mkdir(co) unless File.exists?(co)
       with_working_dir( co ) do
         cmd = Command.instance
         pop_out = cmd.accurev_nofx("pop",
@@ -315,12 +323,12 @@ module RSCM::Accurev
       end
     end
 
-    def checkout_workspace()
+    def create_workspace()
       co = RSCM::PathConverter.nativepath_to_filepath( @checkout_dir )
-      raise "A backing stream is required" if @backing_stream.nil?
-      raise "A workspace is required" if @working_stream.nil?
+      raise AccurevException.new("A backing stream is required") if @backing_stream.nil?
+      raise AccurevException.new("A workspace is required") if @workspace_stream.nil?
       if File.exist?( co ) and !@overwrite
-        raise "Checkout dir #{co} already exists (@overwrite=#@overwrite)"
+        raise AccurevException.new("Checkout dir #{co} already exists (@overwrite=#@overwrite)")
       end
       cmd = Command.instance
       mkws_out = cmd.accurev_nofx( "mkws", 
@@ -336,7 +344,7 @@ module RSCM::Accurev
     #
     # Updates an existing workspace stream checked out to @checkout_dir
     #
-    def update( to_identifier=Time.infinite )
+    def update( to_identifier=Time.infinity )
       co = RSCM::PathConverter.nativepath_to_filepath( @checkout_dir )
       unless File.exists?( co )
         raise AccurevException.new( "Workspace does not exist!" )
@@ -409,9 +417,11 @@ module RSCM::Accurev
     end
     
     # Takes a status flags line (eg, "(modified)(kept)")
-    # and returns a list of status flags.
+    # and returns a list of status flags (eg, ["modified", "kept"]).
     def map_status( status_line )
-      l = status_line.split( " " ).map {|x| x.trim}
+      s = status_line.split( /\W/ ).delete_if do |x|
+        x.nil? or x.length==0
+      end
     end
 
   end

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

@@ -12,13 +12,17 @@
 #
 module RSCM
   module Accurev
+
+    # XXX - i'm using StandardError as the base class, rather than
+    #       Exception, because test::unit only catches that.
+    #       i'd like to have a better reason...
     
     #
     # General exception class for errors processing commands.
     #
     # @attr error_msg Error message output by accurev.
     #
-    class AccurevException < Exception
+    class AccurevException < StandardError
       attr_reader :error_msg
       def initialize( msg, error_msg=nil )
         super( "#{msg}: #{error_msg}" )

data/lib/test/rake/coverage_summary.rb

@@ -0,0 +1,142 @@
+#!/usr/bin/ruby
+require 'erb'
+require 'fileutils'
+include FileUtils
+
+module Rake
+  module Coverage
+
+    class Summarizer
+      attr_accessor :trace_log, :output_dir, :index_template, :page_template
+
+      def initialize( trace_log, output_dir, index_template, page_template )
+        @trace_log = trace_log
+        @output_dir = output_dir
+        @index_template = index_template
+        @page_template = page_template
+      end
+
+      def summarize()
+        raise "@trace_log must be set" if @trace_log.nil?
+        raise "@output_dir must be set" if @output_dir.nil?
+
+        # stdout.printf("#%d:%s:%d:%s:%s: %s",
+        #    get_thread_no,
+        #    file,
+        #    line,
+        #    klass || '',
+        #    EVENT_SYMBOL[event],
+        #    get_line(file, line))
+
+        puts "Reading trace data #{@trace_log}..."
+        files = {}
+        File.open( @trace_log, "r" ).each_line do |line|
+          data, linedump = line.split(/ /)
+          threadno, file, n, classname, eventsym = data.split(/:/)
+          files[file] ||= []
+          files[file][n.to_i] ||= 0
+          files[file][n.to_i] += 1
+        end
+
+        page_tmpl = File.read( @page_template )
+        index_tmpl = File.read( @index_template )
+        
+        puts "Outputting to #{@output_dir}..."
+        mkdir_p( @output_dir )
+        summary = {}
+        files.each do |file, linelist|
+          s = Summary.new( file )
+          lineno = 0
+          File.open( file ).each_line do |line|
+            lineno += 1
+            seen_this = false
+            # basic: line was traced
+            unless linelist[lineno].nil?
+              seen_this = true
+            end
+            # misc: various comments, blank lines, other "untraceables"
+            #  mark them as seen
+            if line =~ /^\s*$/
+              seen_this = true
+            end
+            if line =~ /^\s*#/
+              seen_this = true
+            end
+            if line =~ /^\s*(require|class|module|end|else|include|def)/
+              seen_this = true
+            end
+            if line =~ /^\s*(attr_)/
+              seen_this = true
+            end
+            if line =~ /^\s*(private|protected|public)*\s$/
+              seen_this = true
+            end
+            s.seen << seen_this
+            if seen_this
+              s.covered_lines += 1
+            end
+            s.total_lines +=1
+            s.lines << line
+          end
+          summary[file] = s
+          raise "XXX" if s.nil?
+          pretty( page_tmpl, summary[file] )
+        end
+        index( index_tmpl, summary )
+      end
+      
+    private # --------------------------------------------------------
+
+      def pretty( page_tmpl, s )
+        htmlfile = "#{@output_dir}/#{s.htmlfile}"
+        puts htmlfile
+        File.open( htmlfile, "w" ) do |out|
+          rhtml = ERB.new( page_tmpl )
+          out.print( rhtml.result( s.get_binding ) )
+        end
+      end
+      
+      def index( index_tmpl, summaries )
+        idx = IndexSummary.new
+        idx.summary = summaries
+        puts "#{@output_dir}/index.html"
+        File.open( "#{@output_dir}/index.html", "w" ) do |out|
+          rhtml = ERB.new( index_tmpl )
+          out.print( rhtml.result( idx.get_binding ) )
+        end
+      end
+
+    end
+
+    # data objects for erb binding -----------------------------------
+
+    class Summary
+      attr_accessor :filename, :total_lines, :covered_lines
+      attr_accessor :lines, :seen
+      def initialize( filename )
+        @filename = filename
+        @total_lines = 0
+        @covered_lines = 0
+        @lines = []
+        @seen = []
+      end
+      def pct
+        @covered_lines.to_f / @total_lines.to_f
+      end
+      def htmlfile
+        @filename.gsub(/[\.\/]/, '_') + ".html"
+      end
+      def get_binding
+        binding
+      end
+    end
+    
+    class IndexSummary
+      attr_accessor :summary
+      def get_binding
+        binding
+      end
+    end
+    
+  end
+end

data/lib/test/rake/coveragetask.rb

@@ -0,0 +1,75 @@
+#!/usr/bin/env ruby
+
+require 'rake'
+require 'rake/testtask'
+require 'test/rake/coverage_summary'
+
+module Rake
+  module Coverage
+  
+    class Task < TestTask
+
+      @@loader = "test/rake/coverage_loader.rb"
+
+      attr_accessor :trace_log
+      
+      # set @name to "test_$name"
+      # will define two tasks, and a $name task depending on both of those
+      def initialize( name=:coverage )
+        @name = "#{name}__testtask".intern
+        @real_name = name
+        @summary_name = "#{name}__summarytask".intern
+        @trace_log = "xxx.trace"
+        @output_dir = "html/coverage"
+        # super.initialize() calls define()
+        super( @name )
+      end
+      
+      # create tasks defined by this task object
+      # called from constructor
+      def define
+        task @real_name => [ @name, @summary_name ]
+        super # the testing task with trace logging turned on
+        desc "Generate coverage summary report"
+        task @summary_name do
+          s = Rake::Coverage::Summarizer.new(
+            @trace_log, @output_dir,
+            self.summary_index_template, self.summary_page_template )
+          s.summarize()
+        end
+        return self
+      end
+
+      # mod of testtask.rb's find_file:
+      #  - fails if resource not found
+      #  - takes descr of resource for fail message
+      #  - does not append ".rb" to resource name
+      def find_file_or_die( resource, desc=nil ) # :nodoc:
+        desc="resource" if desc.nil?
+        $LOAD_PATH.each do |path|
+          file_path = File.join( path, resource )
+          return file_path if File.exist?( file_path )
+        end
+        fail "unable to find #{desc} (#{resource}) in load path"
+      end
+      
+      # XXX loader assumes output to xxx.trace
+      # XXX should have the loader print to a pipe object in here,
+      #     which can be stream-processed by Summarizer
+      def rake_loader # :nodoc:
+        find_file_or_die( @@loader, "coverage test loader" )
+      end
+
+      def summary_page_template # :nodoc:
+        find_file_or_die( "test/rake/page_template.html", "summary page template" )
+      end
+
+      def summary_index_template # :nodoc:
+        find_file_or_die( "test/rake/index_template.html", "summary index template" )
+      end
+      
+    end
+    
+  end
+end
+    

data/{test/coverage/index_tmpl.html → lib/test/rake/index_template.html}

@@ -26,8 +26,9 @@
 	  <td>Covered</td>
 	  <td>% Covered</td>
 	</tr>
-	
-	<% summary.each do |filename,s| %>
+
+	<% summary.keys.sort.each do |filename| %>
+	<%   s = summary[filename] %>
 	<tr>
 	  <td><a href="<%= s.htmlfile %>"><%= filename %></a></td>
 	  <td><%= s.total_lines %></td>

data/test/t_api.rb

@@ -9,14 +9,25 @@ include RSCM::Accurev
 
 class AccurevAPITest < Test::Unit::TestCase
 
+  @@tmpdir_count = 0
+
+  def setup
+    @pwd = FileUtils.pwd
+    @acreplay = "#@pwd/test/acreplay.rb"
+    # give each fixture a distinct tmpdir to use
+    @tmpdir = "#{Dir.tmpdir}/#{$$}-#{@@tmpdir_count}.test"
+    @@tmpdir_count += 1
+  end
+
   #def test_deduce_backing_workspace_streams()
   #  flunk( "XXX implement me" )
   #end
 
   def test_ac_hist()
     Command.instance do |cmd|
-      cmd.accurev_bin = "./acreplay.rb eg/hist-oneweek-promotes.xml"
+      cmd.accurev_bin = "#@acreplay #@pwd/test/eg/hist-oneweek-promotes.xml"
     end
+    # no backing/ws streams given: update-only workspace
     api = API.new( "test" )
     # test array returns
     txns = api.ac_hist( Time.utc(1980) ) # bound don't matter for this test
@@ -35,9 +46,9 @@ class AccurevAPITest < Test::Unit::TestCase
   
   def test_ac_files()
     Command.instance do |cmd| 
-      cmd.accurev_bin = "./acreplay.rb eg/ac-files.xml"
+      cmd.accurev_bin = "#@acreplay #@pwd/test/eg/ac-files.xml"
     end
-    api = API.new( "test", "test-bogus-depot", "test-bogus-depot-0-impl" )
+    api = API.new( "test", "backing-stream", "workspace-stream" )
     # test array returns
     files = api.ac_files( "." )
     assert( files.length > 0, "Should get some stat-ed files" )
@@ -56,9 +67,9 @@ class AccurevAPITest < Test::Unit::TestCase
 
   def test_update_stale()
     Command.instance do |cmd|
-      cmd.accurev_bin = "./acreplay.rb eg/update-stale.xml"
+      cmd.accurev_bin = "#@acreplay #@pwd/test/eg/update-stale.xml"
     end
-    api = API.new( "test", "test-bogus-depot", "test-bogus-depot-0-impl" )
+    api = API.new( "test", "backing-stream", "workspace-stream" )
     begin
       u_elements = api.update()
       flunk( "Simulated update with stale data should throw exception" )
@@ -70,9 +81,9 @@ class AccurevAPITest < Test::Unit::TestCase
 
   def test_update_nochanges()
     Command.instance do |cmd|
-      cmd.accurev_bin = "./acreplay.rb eg/update-nochanges.xml"
+      cmd.accurev_bin = "#@acreplay #@pwd/test/eg/update-nochanges.xml"
     end
-    api = API.new( "test", "test-bogus-depot", "test-bogus-depot-0-impl" )
+    api = API.new( "test", "backing-stream", "workspace-stream" )
     u_elements = api.update()
     assert_not_nil( u_elements )
     assert( u_elements.size == 0 )
@@ -80,9 +91,9 @@ class AccurevAPITest < Test::Unit::TestCase
 
   def test_update_newwksp()
     Command.instance do |cmd|
-      cmd.accurev_bin = "./acreplay.rb eg/update-newwksp.xml"
+      cmd.accurev_bin = "#@acreplay #@pwd/test/eg/update-newwksp.xml"
     end
-    api = API.new( "test", "test-bogus-depot", "test-bogus-depot-0-impl" )
+    api = API.new( "test", "backing-stream", "workspace-stream" )
     u_elements = api.update()
     assert_not_nil( u_elements )
     assert_equal( 44, u_elements.length )
@@ -102,9 +113,9 @@ class AccurevAPITest < Test::Unit::TestCase
   # update-updates.xml - update with updated files
   def test_update_updates()
     Command.instance do |cmd|
-      cmd.accurev_bin = "./acreplay.rb eg/update-updates.xml"
+      cmd.accurev_bin = "#@acreplay #@pwd/test/eg/update-updates.xml"
     end
-    api = API.new( "test", "test-bogus-depot", "test-bogus-depot-0-impl" )
+    api = API.new( "test", "backing-stream", "workspace-stream" )
     # XXX elements in elements list are just "modified" -
     # may have been removed!
     # XXX update() should return only filenames, right?  eliminate dirs
@@ -125,9 +136,9 @@ class AccurevAPITest < Test::Unit::TestCase
 
   def test_info()
     Command.instance do |cmd|
-      cmd.accurev_bin = "./acreplay.rb eg/info.txt"
+      cmd.accurev_bin = "#@acreplay #@pwd/test/eg/info.txt"
     end
-    api = API.new( "test", "depot", "stream" )
+    api = API.new( "test", "backing-stream", "workspace-stream" )
     info = api.ac_info()
     assert( info.size == 13 )
     # some crap
@@ -146,13 +157,13 @@ class AccurevAPITest < Test::Unit::TestCase
   end
 
   def test_pop()
-    pwd = FileUtils.pwd
     # want to use a tempdir since checkout_pop does a mkdir
-    tmpdir = "#{Dir.tmpdir}/#{$$}.test"
     Command.instance do |cmd|
-      cmd.accurev_bin = "#{pwd}/test/acreplay.rb #{pwd}/test/eg/ac-pop.txt"
+      cmd.accurev_bin = "#@acreplay #{@pwd}/test/eg/ac-pop.txt"
     end
-    api = API.new( tmpdir, "depot" )
+    # pops, because api obj is constructed with backing stream but
+    # no workspace stream
+    api = API.new( @tmpdir, "backing-stream" )
     files = api.checkout_pop()
     assert_equal( 162, files.size() )
     files.each do |f|
@@ -160,4 +171,55 @@ class AccurevAPITest < Test::Unit::TestCase
     end
   end
 
+#XXX; commented out tests for not-yet-implemented functionality
+#XXX;   def test_pop_bug()
+#XXX;     Command.instance do |cmd|
+#XXX;       cmd.accurev_bin = "/usr/bin/xyzzy-fool" # won't exist
+#XXX;     end
+#XXX;     api = API.new( @tmpdir, "backing-stream", "workspace-stream" )
+#XXX;     begin
+#XXX;       api.checkout_pop()
+#XXX;       fail( "checkout_pop should have failed" )
+#XXX;     rescue AccurevException => e
+#XXX;       assert( (e.error_msg =~ /may not be given/), "Unexpected error: #{$!}" )
+#XXX;     end
+#XXX;   end
+#XXX; 
+#XXX;   def test_checkout()
+#XXX;     # check that checkout yields modded files XXX
+#XXX;     # need mock output for mkws; update
+#XXX;     Command.instance do |cmd|
+#XXX;       cmd.accurev_bin = "#@acreplay #{@pwd}/test/eg/update-updates.xml"
+#XXX;     end
+#XXX;     api = API.new( @tmpdir, "backing-stream", "workspace-stream" )
+#XXX;     paths = []
+#XXX;     api.checkout() do |path|
+#XXX;       paths << path
+#XXX;     end
+#XXX;     assert( paths.length == 251 ) # XXX
+#XXX;   end
+#XXX: 
+#XXX:   # XXX should support checking out an existing workspace (by reparenting?)
+#XXX:   # XXX should not create workspace with ac mkws unless ws does not exist
+#XXX:   # XXX should recover from name collision in mkws (eg, if ws is deleted)
+#XXX:   def test_checkout_workspace()
+#XXX:     raise "XXX implement me!"
+#XXX:   end
+
+  def test_name()
+    api = API.new( @tmpdir, "depot" )
+    name = api.name()
+    assert( name == 'Accurev' )
+  end
+
+  def test_transactional_p()
+    api = API.new( @tmpdir, "depot" )
+    assert( api.transactional? )
+  end
+
+  def test_supports_trigger_p()
+    api = API.new( @tmpdir, "depot" )
+    assert( ! api.supports_trigger? )
+  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.7
-date: 2005-09-06 00:00:00 -05:00
+  version: 0.0.8
+date: 2006-01-24 00:00:00 -06:00
 summary: "RSCM::Accurev - RSCM API for Accurev"
 require_paths: 
   - lib
@@ -32,7 +32,6 @@ files:
   - bumprelease.sh
   - doc
   - eg
-  - html
   - lib
   - LICENSE
   - Rakefile
@@ -51,16 +50,19 @@ files:
   - lib/rscm/scm/accurev/exception.rb
   - lib/rscm/scm/accurev/filterio.rb
   - lib/rscm/scm/accurev/xml.rb
+  - lib/test/rake
   - lib/test/unit
+  - lib/test/rake/coverage_loader.rb
+  - lib/test/rake/coverage_summary.rb
+  - lib/test/rake/coveragetask.rb
+  - lib/test/rake/index_template.html
+  - lib/test/rake/page_template.html
   - 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/coverage
   - test/eg
-  - test/fl
-  - test/suite_all.rb
   - test/t_api.rb
   - test/t_command.rb
   - test/t_filterio.rb
@@ -68,13 +70,6 @@ files:
   - test/t_rscm.rb
   - test/t_scrubio.rb
   - test/t_xmlmapper.rb
-  - test/coverage/analyzer.rb
-  - test/coverage/c_loader.rb
-  - test/coverage/cover.rb
-  - test/coverage/coverage_loader.rb
-  - test/coverage/coveragetask.rb
-  - test/coverage/index_tmpl.html
-  - test/coverage/template.html
   - test/eg/ac-files.xml
   - test/eg/ac-pop.txt
   - test/eg/files-various-states.xml
@@ -108,7 +103,7 @@ dependencies:
     version_requirements: !ruby/object:Gem::Version::Requirement 
       requirements: 
         - 
-          - ">="
+          - "~>"
           - !ruby/object:Gem::Version 
-            version: 0.3.0
+            version: "0.3"
       version: 

data/test/coverage/analyzer.rb

@@ -1,127 +0,0 @@
-#!/usr/bin/ruby
-require 'erb'
-require 'fileutils'
-include FileUtils
-
-# 
-# usage:
-#   rake coverage
-#
-#
-
-trace_file = ARGV.shift
-output_dir = ARGV.shift
-template_file = ARGV.shift
-template_index = ARGV.shift
-
-if trace_file.nil? or output_dir.nil?
-  raise "Usage: $0 <tracefile> <output_dir> <template> <index_template>"
-end
-
-# stdout.printf("#%d:%s:%d:%s:%s: %s",
-#    get_thread_no,
-#    file,
-#    line,
-#    klass || '',
-#    EVENT_SYMBOL[event],
-#    get_line(file, line))
-
-puts "Reading trace data #{trace_file}..."
-files = {}
-File.open( trace_file, "r" ).each_line do |line|
-  data, linedump = line.split(/ /)
-  threadno, file, n, classname, eventsym = data.split(/:/)
-  files[file] ||= []
-  files[file][n.to_i] ||= 0
-  files[file][n.to_i] += 1
-end
-
-class Summary
-  attr_accessor :filename, :total_lines, :covered_lines
-  attr_accessor :lines, :seen
-  def initialize( filename )
-    @filename = filename
-    @total_lines = 0
-    @covered_lines = 0
-    @lines = []
-    @seen = []
-  end
-  def pct
-    @covered_lines.to_f / @total_lines.to_f
-  end
-  def htmlfile
-    @filename.gsub(/[\.\/]/, '_') + ".html"
-  end
-  def get_binding
-    binding
-  end
-end
-
-class IndexSummary
-  attr_accessor :summary
-  def get_binding
-    binding
-  end
-end
-
-def pretty( template, output_dir, s )
-  htmlfile = "#{output_dir}/#{s.htmlfile}"
-  puts htmlfile
-  File.open( htmlfile, "w" ) do |out|
-    rhtml = ERB.new( template )
-    out.print( rhtml.result( s.get_binding ) )
-  end
-end
-
-def index( template, output_dir, summaries )
-  idx = IndexSummary.new
-  idx.summary = summaries
-  puts "#{output_dir}/index.html"
-  File.open( "#{output_dir}/index.html", "w" ) do |out|
-    rhtml = ERB.new( template )
-    out.print( rhtml.result( idx.get_binding ) )
-  end
-end
-
-template = File.read( template_file )
-index_tmpl = File.read( template_index )
-
-puts "Outputting to #{output_dir}..."
-mkdir_p( output_dir )
-summary = {}
-files.each do |file, linelist|
-  s = Summary.new( file )
-  lineno = 0
-  File.open( file ).each_line do |line|
-    lineno += 1
-    seen_this = false
-    # basic: line was traced
-    unless linelist[lineno].nil?
-      seen_this = true
-    end
-    # misc: various comments, blank lines, other "untraceables"
-    #  mark them as seen
-    if line =~ /^\s*$/
-      seen_this = true
-    end
-    if line =~ /^\s*#/
-      seen_this = true
-    end
-    if line =~ /^\s*(require|class|module|end|else|include|def)/
-      seen_this = true
-    end
-    s.seen << seen_this
-    if seen_this
-      s.covered_lines += 1
-    end
-    s.total_lines +=1
-    s.lines << line
-  end
-  summary[file] = s
-  pretty( template, output_dir, summary[file] )
-end
-index( index_tmpl, output_dir, summary )
-
-
-
-

data/test/coverage/cover.rb

@@ -1,91 +0,0 @@
-#!/usr/bin/env ruby
-
-# set_trace_func proc do |event,file,line,id,binding,classname|
-#   'c-call' # call into clib -  file:line -> caller
-#   'c-return' # return out of clib -  file:line -> caller
-#   'call'  # call into ruby fn -  file:line -> fn def
-#   'class' # start class/mod def (only for dyn classes?)
-#   'end' # end class/mod def
-#   'line' # exec line
-#   'raise' # exception
-#   'return' # return from ruby fn -  file:line -> returning stmt
-# end
-
-require 'rexml/document'
-include REXML
-
-# defining script_lines make ruby dump all scripts into this hash
-SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__
-
-
-module Test
-
-  class Cover
-
-    attr_accessor :codebase_files
-
-    def initialize()
-      @codebase_files = []
-      # seen_lines is a hash of hashes
-      @seen_lines = {}
-    end
-
-    def trace_func( event, file, line, id, binding, classname )
-      return if event == 'c-call'
-      return if event == 'c-return'
-      return if event == 'class'
-      @seen_lines[file] ||= {}
-      @seen_lines[file][line] ||= 0
-      @seen_lines[file][line] += 1
-    end
-
-    def coverage()
-      set_trace_func( self.method(:trace_func).to_proc )
-      yield self
-      set_trace_func( nil )
-    end
-    
-    def coverage_all()
-      set_trace_func( self.method(:trace_func).to_proc )
-    end
-
-    def coverage_clear()
-      set_trace_func( nil )
-    end
-
-    def to_xml
-      doc = Document.new()
-      doc << XMLDecl.new()
-      root = Element.new( "coverage" )
-      doc << root
-      root.attributes['timestamp'] = Time.now
-      codebase = Element.new( "codebase" )
-      root << codebase
-      @codebase_files.each do |file|
-        e = Element.new( "file" )
-        e.attributes['name'] = file
-        codebase << e
-        if @seen_lines.has_key?( file )
-          seen = Element.new( "seen" )
-          e << seen
-          linehash = @seen_lines[file]
-          next unless SCRIPT_LINES__.has_key?( file )
-          linehash.each do |n,occur|
-            le = Element.new( "line" )
-            le.attributes['n'] = n
-            le.attributes['occur'] = occur
-            seen << le
-          end
-          ce = Element.new( "coverage" )
-          ce.attributes['seen'] = linehash.size
-          ce.attributes['total'] = SCRIPT_LINES__[file].size
-          ce.attributes['pct'] = linehash.size.to_f / SCRIPT_LINES__[file].size.to_f
-          seen << ce
-        end
-      end
-      return doc
-    end
-    
-  end
-
-end

data/test/coverage/coverage_loader.rb

@@ -1,21 +0,0 @@
-#!/usr/bin/env ruby
-require 'rubygems'
-#require 'tracer'
-require 'test/cover'
-
-cover = Test::Cover.new()
-cover.coverage_all
-cover.codebase_files << "./lib/rscm/accurev.rb"
-cover.codebase_files << "./lib/rscm/scm/accurev/command.rb"
-
-#Tracer.on
-ARGV.each do |f|
-  load f unless f =~ /^-/
-end
-
-END {
-  cover.coverage_clear
-  File.open( "xxx.xml", "w" ) do |f|
-    f.puts( cover.to_xml )
-  end
-}

data/test/coverage/coveragetask.rb

@@ -1,38 +0,0 @@
-#/usr/bin/env ruby
-require 'rubygems'
-require 'rake'
-require 'rake/tasklib'
-
-module Rake
-  
-  class CoverageTask < TaskLib
-    attr_accessor :name
-    attr_accessor :libs
-    attr_accessor :test_files
-    attr_accessor :ruby_opts
-
-    def initialize( name=:coverage )
-      @name = name
-      @libs = ["lib"]
-      @test_files = nil
-      @ruby_opts = []
-      yield self if block_given?
-      define
-    end
-
-    def define
-      lib_path = @libs.join( File::PATH_SEPARATOR )
-      @ruby_opts.unshift( "-I#{lib_path}" )
-      task @name do
-        ruby @ruby_opts.join(" ") +
-          "test/coverage_loader.rb " +
-          file_list.collect {|fn| "\"#{fn}\"".join(" ")
-      end
-    end
-
-    def test_loader()
-      find_file( 'test/coverage_loader' ) or fail "I DIE"
-    end
-
-  end
-end

data/test/fl

@@ -1,18 +0,0 @@
-ac-files.xml
-ac-pop.txt
-files-various-states.xml
-hist-oneweek-all.xml
-hist-oneweek-external.xml
-hist-oneweek-promotes.xml
-info.txt
-stat-a-various.xml
-stat-m.xml
-stat-overlap.xml
-stat-x.xml
-update-i-mods-and-updates-and-overlap.xml
-update-i-nochanges.xml
-update-i-updates.xml
-update-newwksp.xml
-update-nochanges.xml
-update-stale.xml
-update-updates.xml

data/test/suite_all.rb

@@ -1,34 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'test/unit'
-require 'test/unit/ui/console/testrunner'
-require 'rubygems'
-#require 'coverage'
-
-class SuiteCrap
-  def self.suite
-    suite = Test::Unit::TestSuite.new
-    Dir.glob( 'test/t_*.rb' ) do |t|
-      require t
-    end
-    ObjectSpace.each_object( Test::Unit::TestCase ) do |k|
-      puts ">Adding #{k}"
-      suite << k.suite
-    end
-    return suite
-  end
-end
-
-class SuiteAll
-  def self.suite
-    suite = Test::Unit::TestSuite.new
-    require 'test/t_api.rb'
-    suite << AccurevAPITest
-    return suite
-  end
-end
-
-if $0 == __FILE__
-  Test::Unit::UI::Console::TestRunner.run( SuiteAll )
-end
-