rscm-accurev 0.0.4 → 0.0.6

data/Rakefile

@@ -5,6 +5,7 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 require 'rake/packagetask'
 require 'rake/gempackagetask'
+require 'tracer'
 
 # this rakefile originally borrowed shamelessly from rscm
 
@@ -15,14 +16,24 @@ PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_SUMMARY = 'RSCM::Accurev - RSCM API for Accurev'
 
 desc "Default Task"
-task :default => [ :test, :gem ]
+task :default => [ :test, :verify, :gem ]
 
-#task :test => [ :backup_testresults, :xmltest ]
+RAKEVERSION =~ /^(\d+)\.(\d+).(.*)/
+rake_maj,rake_min,rake_patch = $1,$2,$3
+if rake_maj.to_f < 1 and rake_min.to_f <= 5 and rake_patch.to_f <= 4
+  # use this for rake <= 0.5.4:
+  task :test => [ :plaintest ]
+  HAVEXMLTEST = false
+else
+  # rake 0.5.4.6+ (0.5.5)
+  task :test => [ :backup_testresults, :xmltest ]
+  HAVEXMLTEST = true
+end
 
 # define a task(s) to run tests
 
 test_files = FileList.new( "test/**/t_*.rb" )
-TEST_OUTPUT = "doc"
+TEST_OUTPUT = "html/test"
 
 Rake::TestTask.new( :plaintest ) do |t|
   t.libs << "test"
@@ -30,8 +41,9 @@ Rake::TestTask.new( :plaintest ) do |t|
   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
+if HAVEXMLTEST
+# rake<0.5.5 requires a patch to rake_test_loader.rb to exclude options
+# rake<0.5.5 requires a patch to rake/testtask.rb to support ruby_opts
 # (see doc/patches)
 Rake::TestTask.new( :xmltest ) do |t|
   t.libs << "test"
@@ -41,9 +53,14 @@ Rake::TestTask.new( :xmltest ) do |t|
   ENV['XMLTEST_OUTPUT'] = "#{TEST_OUTPUT}/testresults.xml"
   t.options = "--runner=xml"
 end
+end # !HAVEXMLTEST
+
 
 # backs up existing testresults.xml files in test target dir
 task :backup_testresults do
+  unless File.exist?( TEST_OUTPUT )
+    mkdir_p( TEST_OUTPUT )
+  end
   old = "#{TEST_OUTPUT}/testresults.xml"
   if File.exist?( old )
     stat = File.stat( old )
@@ -97,9 +114,39 @@ else
 end
 
 desc "Delete all generated files (includes built packages)"
-task :realclean => :clean do
+task :realclean do
   f = FileList[ 'pkg', 'html', 'doc/test*.xml' ]
-  rm f
+  rm_rf f
 end
 
-                                        
+desc "Coverage! (still a big hack)"
+task :coverage => [ :test_coverage, :coverage_summary ]
+
+Rake::TestTask.new( :test_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"
+task :verify do
+  require 'find'
+  Find.find(".") do |path|
+    if FileTest.directory?(path)
+      next
+    end
+    next if path =~ /^.\/tmp\/cleaner.pl$/
+    next if path =~ /^.\/Rakefile$/
+    if File.read(path) =~ /orbitz|duncllc|gfast|fduncan/i
+      fail "Cannot release #{path}, please clean up"
+    end
+  end
+end

data/TODO

@@ -37,5 +37,5 @@ api - update: elements list should probably not include removed files
 
 *** api - checkout() should use `pop` instead of `mkws`, unless
 	  user *really* wants it
-
+ - yeargh...  how does update work with pop?  just nuke and/or overwrite?
 

data/bumprelease.sh

@@ -5,6 +5,9 @@
 LAST=`cat .version.minor`
 MINOR=$(( $LAST + 1 ))
 
+perl -i~~ -pe "s/VERSION = '0.0.\d+'/VERSION = '0.0.$MINOR'/" \
+  lib/rscm/accurev.rb
+
 PKG_BUILD=$MINOR rake package gem && \
     echo $MINOR > .version.minor
 

data/lib/rscm/accurev.rb

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-require 'rubygems'
 require 'rscm/scm/accurev/api'
 require 'rscm/scm/accurev/command'
 require 'rscm/scm/accurev/xml'
@@ -13,5 +12,7 @@ module RSCM
   #
   # See RSCM::Accurev::API.
   #
-  module Accurev; end
+  module Accurev
+    VERSION = '0.0.6'
+  end
 end

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

@@ -4,41 +4,24 @@
 #
 # API for interacting with accurev workspaces.
 #
+# Includes:
+#
+# * API
+#
 require 'stringio'
-require 'rubygems'
 require 'rscm/base'
 require 'rscm/path_converter'
 require 'rexml/document'
 require 'rscm/scm/accurev/xml'
 require 'rscm/scm/accurev/filterio'
 require 'rscm/scm/accurev/command'
+require 'rscm/scm/accurev/exception'
 
 # 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 )
-      super( "#{msg}: #{error_msg}" )
-      @error_msg = error_msg
-    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).
   #
@@ -64,30 +47,25 @@ module RSCM::Accurev
     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"
     attr_accessor :workspace_stream
 
     # [defined in Base]
     # ann :description => "Filesystem Path to Workspace"
     # attr_accessor :checkout_dir
+
+    ann :description => "Overwrite Mode: if true, co overwrites existing"
+    attr_accessor :overwrite
     
-    # 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
+    def initialize(checkout_dir=nil, backing_stream=nil, workspace_stream=nil)
+      @depot = nil # will be pulled from files cmd output
       @workspace_stream = workspace_stream
-      @backing_stream = nil # will be pulled from files cmd output
+      @backing_stream = backing_stream
       @checkout_dir = checkout_dir
+      @overwrite = false
     end
 
     def name()
@@ -109,8 +87,30 @@ module RSCM::Accurev
     end
 
     # "Returns a Revisions object for the period specified ... (inclusive)."
+    #
+    # list txns (promotes to bs) from hist within the period
+    #
     def revisions( from_identifier, to_identifier=Time.infinity )
-      raise "XXX implement me"
+      revisions = RSCM::Revisions.new()
+      self.ac_hist( from_identifier, to_identifier ).each do |txn|
+        txnrev = RSCM::Revision.new
+        txnrev.identifier = txn.id
+        txnrev.developer = txn.user
+        txnrev.message = txn['comment'].join("\n") unless txn['comment'].nil?
+        txnrev.time = Time.at( txn.time.to_i )
+        txn['version'].each do |v|
+          f = RSCM::RevisionFile.new()
+          f.path = v.path
+          # i think to get real status, you'd need to analyze keep txns
+          f.status = RSCM::RevisionFile::MODIFIED # XXX? txn.type==promote here
+          f.developer = txn.user
+          f.native_revision_identifier = v.real # XXX or .virtual?
+          f.time = Time.at( txn.time.to_i )
+          txnrev << f
+        end
+        revisions.add( txnrev )
+      end
+      return revisions
     end
 
     # default impl depends on a correct impl of revisions()
@@ -130,11 +130,29 @@ module RSCM::Accurev
 
     # --- ac specific
 
+    # remember: ac_files is non-recursive
     def ac_files( relative_path )
       cmd = Command.instance
       ret = []
-      with_working_dir( @checkout_dir ) do
+      with_working_dir( co_filepath ) do
         acresponse = cmd.accurev( "files", relative_path )
+        if acresponse['element'].nil?
+          return []
+        end
+        acresponse['element'].each do |fd|
+          yield fd if block_given?
+          ret << fd
+        end
+      end
+      return ret
+    end
+
+    def ac_stat( flag="-a" )
+      cmd = Command.instance
+      ret = []
+      with_working_dir( co_filepath ) do
+        acresponse = cmd.accurev( "stat", flag )
+        return [] if acresponse['element'].nil?
         acresponse['element'].each do |fd|
           yield fd if block_given?
           ret << fd
@@ -143,6 +161,29 @@ module RSCM::Accurev
       return ret
     end
 
+    # yeilds the TransactionData objects for the given time period
+    # (promotes only)
+    def ac_hist( from, to=Time.infinite )
+      cmd = Command.instance
+      lower = from.to_accurev
+      upper = "now"
+      unless to == Time.infinite
+        upper = to.to_accurev
+      end
+      with_working_dir( self.co_filepath ) do
+        acresponse = cmd.accurev( "hist",
+                                  "-t", "'#{upper}-#{lower}'",
+                                  "-k", "promote"
+                                 )
+        ret = []
+        acresponse['transaction'].each do |txn|
+          ret << txn
+          yield txn if block_given?
+        end
+        return ret
+      end
+    end
+
     def ac_keep( files=[], message="" )
       raise "XXX implement me"
     end
@@ -180,7 +221,7 @@ module RSCM::Accurev
     def ac_info()
       co = RSCM::PathConverter.nativepath_to_filepath( @checkout_dir )
       unless File.exists?( co )
-        raise AccurevException.new( "Checkout dir does not exist" )
+        raise AccurevException.new( "Checkout dir #{co} does not exist" )
       end
       info = {}
       with_working_dir( co ) do
@@ -196,19 +237,6 @@ module RSCM::Accurev
       return info
     end
 
-    # ac mkws 
-    #   -b orbitz-host-gt3-0-impl 
-    #   -w orbitz-host-gt3-0-impl-test2_gfast
-    #   -l `pwd`    
-    # - does not support fx (argh!@)
-    # - does not pop
-    # 
-
-    # diff: /usr/local/bin/acdiff (!) --fx
-    # (after an ac cat on the backed file)
-    # (eg, no in-process diffing ala cvs diff)
-    # lists modified lines in xml
-
     #
     # "Checks out or updates[!] contents from a central SCM 
     # to +checkout_dir+ - a local working copy."
@@ -232,28 +260,68 @@ module RSCM::Accurev
     #
     def checkout( to_identifier=Time.infinite )
       co = RSCM::PathConverter.nativepath_to_filepath( @checkout_dir )
-      unless File.exists?( co )
-        puts "> creating new workspace..."
-        if @backing_stream.nil?
-          raise "Backing stream must be set"
+      if @backing_stream.nil?
+        self.attempt_init_from_info()
+      end
+      if @workspace_stream.nil?
+        self.checkout_pop()
+      else
+        unless File.exists?( co )
+          # create new workspace
+          self.checkout_workspace()
         end
-        if @workspace_stream.nil?
-          raise "Workspace stream must be set"
+        # update workspace
+        self.update( to_identifier )
+      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?
+      # for `accurev pop`: remove and re-pop the checkout copy
+      if File.exists?( co )
+        unless @overwrite
+          raise "Checkout dir #{co} already exists (@overwrite=#@overwrite)"
         end
-        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 )
+        rm_rf( co )
+      end
+      mkdir(co)
+      with_working_dir( co ) do
+        cmd = Command.instance
+        pop_out = cmd.accurev_nofx("pop",
+                                   "-R",
+                                   "-v", @backing_stream,
+                                   "-L", ".", ".")
+        elems = []
+        popio = StringIO.new( pop_out )
+        popio.each_line do |line|
+          if line =~ /^Populating element \/.\/(.*)$/
+            loc = $1
+            elems << loc
+            yield loc if block_given?
           end
         end
+        return elems
+      end
+    end
+
+    def checkout_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?
+      if File.exist?( co ) and !@overwrite
+        raise "Checkout dir #{co} already exists (@overwrite=#@overwrite)"
+      end
+      cmd = Command.instance
+      mkws_out = cmd.accurev_nofx( "mkws", 
+                                  "-b", @backing_stream,
+                                  "-w", @workspace_stream,
+                                  "-l", co )
+      # kinda sucks:
+      if ( mkws_out =~ /already exists/ )
+        raise AccurevException.new( "Failed to checkout", mkws_out )
       end
-      puts "> Updating workspace.."
-      self.update( to_identifier )
     end
 
     def update( to_identifier=Time.infinite )
@@ -290,7 +358,43 @@ module RSCM::Accurev
 
     # --- internals
 
-  private
+    # status flag mappings for "stat", "file" commands
+    STATUSES = {
+      '(backed)'   => :backed,
+      '(external)' => :external,
+      '(modified)' => :modified,
+      '(kept)'     => :kept,
+      '(defunct)'  => :defunct,
+      '(missing)'  => :missing,
+      '(stranded)' => :stranded,
+      '(overlap)'  => :overlap
+    }
+
+#  private
+      
+    # psuedo-accessor (cached)
+    def co_filepath
+      if @co_filepath.nil?
+        @co_filepath = RSCM::PathConverter.nativepath_to_filepath( @checkout_dir )
+      end
+      return @co_filepath
+    end
+
+    #
+    # Runs an `ac info` command in +@checkout_dir+, and tries to
+    # set +@backing_stream+ and +@workspace_stream+ from the output.
+    #
+    def attempt_init_from_info()
+      if File.exists?( self.co_filepath )
+        info = self.ac_info
+        if info.has_key?( "Basis" )
+          @backing_stream = info["Basis"]
+        end
+        if info.has_key?( "ws/ref" )
+          @workspace_stream = info["ws/ref"]
+        end
+      end
+    end
     
     # Takes a status flags line (eg, "(modified)(kept)")
     # and returns a list of status flags.
@@ -302,6 +406,12 @@ module RSCM::Accurev
 
 end
 
+class Time
+  def to_accurev
+    self.strftime( "%Y/%m/%d %H:%M:%S" )
+  end
+end
+
 #
 # Copyright (c) 2005 Gregory D. Fast <gdf@speakeasy.net>
 #