rscm-accurev 0.0.1 → 0.0.2

data/{test.rb → apitest.rb}

@@ -9,6 +9,7 @@ require 'rscm/scm/accurev'
 #files;   puts "#{f.location}\t\t#{f.status}"
 #files; end
 
+# yes, i cannot spell, the dir is "hirdcar":
 ac = RSCM::Accurev.new( '/home/gfast/dev/orbitz-api-hirdcar-0-rc' )
 ac.backing_stream = "orbitz-api-hiredcar-0-rc"
 ac.workspace_stream = "orbitz-api-hiredcar-0-rc-testing_gfast"

data/bumprelease.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# gee, i bet you could stick this in the rakefile...
+
+LAST=`cat .version.minor`
+MINOR=$(( $LAST + 1 ))
+
+PKG_BUILD=$MINOR rake package gem && \
+    echo $MINOR > .version.minor
+

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

@@ -0,0 +1,226 @@
+# -*- ruby -*-
+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'
+
+module RSCM
+  module Accurev;  end
+end
+
+module RSCM::Accurev
+
+  class AccurevException < Exception ; end
+
+  # Indicates a failure of the update command due to unkept local modifications
+  class StaleWorkspaceError < 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.
+  #
+  class API < RSCM::Base
+    register self
+
+    ann :description => "Accurev Depot"
+    attr_accessor :depot
+
+    ann :description => "Backing Stream (autodetected)"
+    attr_accessor :backing_stream
+    
+    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
+      }
+      
+    def initialize( checkout_dir=nil, depot=nil, workspace_stream=nil )
+      @depot = depot
+      @checkout_dir = checkout_dir
+      @workspace_stream = workspace_stream
+      @backing_stream = nil # will be pulled from files cmd output
+    end
+
+    def name()
+      return "Accurev"
+    end
+
+    # Accurev operations are atomic:
+    def transactional?
+      return true
+    end
+
+    # "Adds +relative_filename+ to the working copy."
+    def add( relative_filename )
+      raise "XXX implement me"
+    end
+
+    def edit( relative_filename )
+      # NOP - not required for ac
+    end
+
+    # "Returns a Revisions object for the period specified ... (inclusive)."
+    def revisions( from_identifier, to_identifier=Time.infinity )
+      raise "XXX implement me"
+    end
+
+    # default impl depends on a correct impl of revisions()
+#     def uptodate?( identifier=nil )
+#       
+#     end   
+
+    # def checked_out? - base
+
+    # accurev actually does have triggers, but I haven't implemented that yet
+    def supports_trigger?
+      false
+    end
+
+    # def diff() XXX
+
+
+    # --- ac specific
+
+    def ac_files( relative_path )
+      cmd = Command.instance
+      # there must be a better way to do this yield->yield loopage
+      obj = []
+      cmd.accurev_elements( StatData, "files", relative_path ) do |fd|
+        yield fd if block_given?
+        obj << fd
+      end
+      return obj
+    end
+
+    def ac_keep( files=[], message="" )
+      raise "XXX implement me"
+    end
+
+    def ac_promote( files=[], message="" )
+      raise "XXX implement me"
+    end
+    
+    def ac_update( relative_path="." )
+      d = accurev( "update", relative_path )
+      if xxx_error_stale
+        raise StaleWorkspaceError.new( "#{relative_path} is stale -- keep/anchor all changes and re-update" )
+      end
+    end
+
+    def ac_purge( files=[] )
+      raise "XXX implement me"
+    end
+
+    def ac_revert( files=[] )
+      raise "XXX implement me"
+    end
+
+    def ac_move( current_file, new_file )
+      raise "XXX implement me"
+    end
+
+    # ac info: shows eg, backing stream
+    # but doesn't support -fx!
+    
+    # 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
+
+    # checkout():
+    # "Checks out or updates[!] contents from a central SCM 
+    # to +checkout_dir+ - a local working copy."
+    #
+    # "The +to_identifier+ parameter may be optionally specified to
+    # 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().
+    # * otherwise, this creates a new workspace stream and populates it
+    #   at @checkout_dir.
+    #
+    # Unknown: support for +to_identifier+ (esp for update)?
+    #
+    # 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 )
+      unless File.exists?( co )
+        puts "> creating new workspace..."
+        if @backing_stream.nil?
+          raise "Backing stream must be set"
+        end
+        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( mkws_out )
+        end
+      end
+      puts "> Updating workspace.."
+      self.update( to_identifier )
+    end
+
+    def update( to_identifier=Time.infinite )
+      co = PathConverter.nativepath_to_filepath( @checkout_dir )
+      unless File.exists?( co )
+        raise AccurevException.new( "Workspace does not exist!" )
+      end
+      updated = []
+      with_working_dir( co ) do
+        # XXX Command...
+        accurev_elements( UpdateData, "update" ) do |up|
+          yield up.location
+          updated << up.location
+        end
+      end
+      return updated
+    end
+
+
+    # --- internals
+
+  private
+    
+    # Takes a status flags line (eg, "(modified)(kept)")
+    # and returns a list of status flags.
+    def map_status( status_line )
+      l = status_line.split( " " ).map {|x| x.trim}
+    end
+
+  end
+
+end

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

@@ -98,19 +98,14 @@ module RSCM::Accurev
     # --- ac specific
 
     def ac_files( relative_path )
-      out = self.accurev( "files", relative_path )
-      # validate
-      raise AccurevException.new("Failed to get response") if out.nil?
-      if ( out.root.name!="AcResponse" )
-        raise AccurevException.new("Invalid response")
+      cmd = Command.instance
+      # there must be a better way to do this yield->yield loopage
+      obj = []
+      cmd.accurev_elements( StatData, "files", relative_path ) do |fd|
+        yield fd if block_given?
+        obj << fd
       end
-      files = []
-      out.elements.each( "/AcResponse/element" ) do |e|
-        f = FileStatus.new( e )
-        yield f if block_given?
-        files << f
-      end
-      return files
+      return obj
     end
 
     def ac_keep( files=[], message="" )

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

@@ -1,20 +1,26 @@
 # -*- ruby -*-
 
-require 'singleton'
-
 module RSCM
   module Accurev
 
+    #
+    # Executes accurev commands and deals with the output.
+    # This class is a thread local singleton: each thread
+    # calling +Command.instance+ gets a different instance.
+    #
     class Command
-      include Singleton
 
       attr_accessor :debug, :debug_to, :accurev, :working_dir
 
-      def initialize( working_dir="." )
+      # map of xml element types to classes
+      # used by accurev_element to return a list of objects
+      attr_accessor :classmap
+
+      def initialize()
         @debug = false
         @debug_to = STDOUT
         @accurev = "accurev"
-        @working_dir = working_dir
+        @working_dir = "."
       end
 
       def accurev_cmdline( cmd, *opts )
@@ -81,13 +87,47 @@ module RSCM
         if doc.elements.size==0
           raise "Unexpected output from #{cmd}: #{doc}"
         end
+        objs = []
         doc.elements.each( "/AcResponse/element" ) do |e|
           o = mapclass.new( e )
-          yield o
+          yield o if block_given?
+          objs << o
+        end
+        return objs
+      end
+
+      # Retrieve this thread's +Command+ instance.
+      #
+      # eg:
+      #    cmd = Command.instance
+      # eg:
+      #    Command.instance do |cmd|
+      #      cmd.workspace_dir = "/var/tmp"
+      #    end
+      #
+      def Command.instance()
+        if Thread.current[ :RSCM_ACCUREV_COMMAND ].nil?
+          Thread.current[ :RSCM_ACCUREV_COMMAND ] = Command.new
         end
+        yield Thread.current[ :RSCM_ACCUREV_COMMAND ] if block_given?
+        return Thread.current[ :RSCM_ACCUREV_COMMAND ]
+      end
+
+      # Discard the current thread's Command object.
+      # The next call to +Command.instance+ in this thread will
+      # return a new instance configured with the defaults.
+      def Command.discard()
+        Thread.current[ :RSCM_ACCUREV_COMMAND ] = nil
+      end
+
+      # new() is marked private, use Command.instance().
+      private
+      def new( *args )
+        super(args)
       end
 
-    end
+    end # class Command
+    
   end
 end
 

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

@@ -21,7 +21,7 @@ module RSCM::Accurev
   end
   
   # Data from "accurev file" command:
-  class FileStatus < ElementBackedClass
+  class StatData < ElementBackedClass
     element_name 'element'
     attr_accessor :location, :status, :dir, :id
     attr_accessor :elemType, :namedVersion, :Virtual, :Real

data/test/eg/ac-files.xml

@@ -0,0 +1,172 @@
+<?xml version="1.0"?>
+<AcResponse
+    Command="stat"
+    Directory="/home/gfast/dev/orbitz-host-gt3-0-impl">
+  <element
+      location="./.acignore"
+      dir="no"
+      id="197"
+      elemType="text"
+      Virtual="7/2"
+      namedVersion="orbitz-host-gt3-0-impl/2"
+      Real="8/2"
+      status="(backed)"/>
+  <element
+      location="./apps"
+      dir="yes"
+      id="6"
+      elemType="dir"
+      Virtual="4/1"
+      namedVersion="orbitz-host-gt3-0-rc/1"
+      Real="6/1"
+      status="(backed)"/>
+  <element
+      location="./bin"
+      dir="yes"
+      id="20"
+      elemType="dir"
+      Virtual="4/1"
+      namedVersion="orbitz-host-gt3-0-rc/1"
+      Real="6/1"
+      status="(backed)"/>
+  <element
+      location="./build"
+      dir="yes"
+      id="34"
+      elemType="dir"
+      Virtual="4/1"
+      namedVersion="orbitz-host-gt3-0-rc/1"
+      Real="6/1"
+      status="(backed)"/>
+  <element
+      location="./build-deps.xml"
+      dir="no"
+      id="2"
+      elemType="text"
+      Virtual="4/1"
+      namedVersion="orbitz-host-gt3-0-rc/1"
+      Real="6/1"
+      status="(backed)"/>
+  <element
+      location="./build.properties"
+      dir="no"
+      id="3"
+      elemType="text"
+      Virtual="4/1"
+      namedVersion="orbitz-host-gt3-0-rc/1"
+      Real="6/1"
+      status="(backed)"/>
+  <element
+      location="./build.xml"
+      dir="no"
+      id="4"
+      elemType="text"
+      Virtual="7/1"
+      namedVersion="orbitz-host-gt3-0-impl/1"
+      Real="8/1"
+      status="(backed)"/>
+  <element
+      location="./conf"
+      dir="yes"
+      id="65"
+      elemType="dir"
+      Virtual="4/1"
+      namedVersion="orbitz-host-gt3-0-rc/1"
+      Real="6/1"
+      status="(backed)"/>
+  <element
+      location="./doc"
+      dir="yes"
+      id="117"
+      elemType="dir"
+      Virtual="4/1"
+      namedVersion="orbitz-host-gt3-0-rc/1"
+      Real="6/1"
+      status="(backed)"/>
+  <element
+      location="./hosts.properties"
+      dir="no"
+      id="198"
+      elemType="text"
+      Virtual="7/2"
+      namedVersion="orbitz-host-gt3-0-impl/2"
+      Real="8/2"
+      status="(backed)"/>
+  <element
+      location="./logs"
+      dir="yes"
+      id="128"
+      elemType="dir"
+      Virtual="4/1"
+      namedVersion="orbitz-host-gt3-0-rc/1"
+      Real="6/1"
+      status="(backed)"/>
+  <element
+      location="./scripts"
+      dir="yes"
+      id="130"
+      elemType="dir"
+      Virtual="4/1"
+      namedVersion="orbitz-host-gt3-0-rc/1"
+      Real="6/1"
+      status="(backed)"/>
+  <element
+      location="./src"
+      dir="yes"
+      id="136"
+      elemType="dir"
+      Virtual="4/1"
+      namedVersion="orbitz-host-gt3-0-rc/1"
+      Real="6/1"
+      status="(backed)"/>
+  <element
+      location="./test"
+      dir="yes"
+      id="194"
+      elemType="dir"
+      Virtual="4/1"
+      namedVersion="orbitz-host-gt3-0-rc/1"
+      Real="6/1"
+      status="(backed)"/>
+  <element
+      location="./version.properties"
+      dir="no"
+      id="5"
+      elemType="text"
+      Virtual="7/1"
+      namedVersion="orbitz-host-gt3-0-impl/1"
+      Real="8/1"
+      status="(backed)"/>
+  <element
+      location="./install"
+      dir="yes"
+      status="(external)"/>
+  <element
+      location="./target"
+      dir="yes"
+      status="(external)"/>
+  <element
+      location="./ground.iml"
+      dir="no"
+      status="(external)"/>
+  <element
+      location="./.project"
+      dir="no"
+      status="(external)"/>
+  <element
+      location="./.eclipsebuild"
+      dir="yes"
+      status="(external)"/>
+  <element
+      location="./.classpath"
+      dir="no"
+      status="(external)"/>
+  <element
+      location="./ac-files.xml"
+      dir="no"
+      status="(external)"/>
+  <element
+      location="./TODO"
+      dir="no"
+      status="(external)"/>
+</AcResponse>

data/{testing.log → test/eg/update-newwksp.xml}

@@ -1,5 +1,3 @@
-ac> ./test/acreplay.rb eg/update-newwksp.xml files  -fx
-raw>
 <?xml version="1.0"?>
 <!-- ac update -fx on a newly created workspace (eg, no files yet) -->
 <acResponse
@@ -183,139 +181,3 @@ raw>
 </acResponse>
 
 
-<?xml version='1.0'?><!-- ac update -fx on a newly created workspace (eg, no files yet) --><AcResponse command='update'>
-  <message>Updating element /./ChangeLog
-</message>
-  <element location='/ChangeLog'/>
-  <message>Updating (creating) dir /./build
-</message>
-  <element location='/build'/>
-  <message>Updating (creating) dir /./build/filesets
-</message>
-  <element location='/build/filesets'/>
-  <message>Updating element /./build/filesets/orbitz-api-robot.exclude
-</message>
-  <element location='/build/filesets/orbitz-api-robot.exclude'/>
-  <message>Updating element /./build/filesets/orbitz-api-robot.include
-</message>
-  <element location='/build/filesets/orbitz-api-robot.include'/>
-  <message>Updating element /./build/filesets/orbitz-api-robot.metainf
-</message>
-  <element location='/build/filesets/orbitz-api-robot.metainf'/>
-  <message>Updating element /./build/filesets/orbitz-api-robot.src
-</message>
-  <element location='/build/filesets/orbitz-api-robot.src'/>
-  <message>Updating element /./build.properties
-</message>
-  <element location='/build.properties'/>
-  <message>Updating element /./build.sh
-</message>
-  <element location='/build.sh'/>
-  <message>Updating element /./build.xml
-</message>
-  <element location='/build.xml'/>
-  <message>Updating (creating) dir /./src
-</message>
-  <element location='/src'/>
-  <message>Updating (creating) dir /./src/java
-</message>
-  <element location='/src/java'/>
-  <message>Updating (creating) dir /./src/java/com
-</message>
-  <element location='/src/java/com'/>
-  <message>Updating (creating) dir /./src/java/com/orbitz
-</message>
-  <element location='/src/java/com/orbitz'/>
-  <message>Updating (creating) dir /./src/java/com/orbitz/dc
-</message>
-  <element location='/src/java/com/orbitz/dc'/>
-  <message>Updating (creating) dir /./src/java/com/orbitz/dc/client
-</message>
-  <element location='/src/java/com/orbitz/dc/client'/>
-  <message>Updating (creating) dir /./src/java/com/orbitz/dc/client/robot
-</message>
-  <element location='/src/java/com/orbitz/dc/client/robot'/>
-  <message>Updating element /./src/java/com/orbitz/dc/client/robot/RobotFactory.java
-</message>
-  <element location='/src/java/com/orbitz/dc/client/robot/RobotFactory.java'/>
-  <message>Updating element /./src/java/com/orbitz/dc/client/robot/RobotImpl.java
-</message>
-  <element location='/src/java/com/orbitz/dc/client/robot/RobotImpl.java'/>
-  <message>Updating (creating) dir /./src/java/com/orbitz/dc/core
-</message>
-  <element location='/src/java/com/orbitz/dc/core'/>
-  <message>Updating element /./src/java/com/orbitz/dc/core/ROBOT_STATE.java
-</message>
-  <element location='/src/java/com/orbitz/dc/core/ROBOT_STATE.java'/>
-  <message>Updating element /./src/java/com/orbitz/dc/core/THROTTLE_TYPE.java
-</message>
-  <element location='/src/java/com/orbitz/dc/core/THROTTLE_TYPE.java'/>
-  <message>Updating (creating) dir /./src/java/com/orbitz/dc/service
-</message>
-  <element location='/src/java/com/orbitz/dc/service'/>
-  <message>Updating (creating) dir /./src/java/com/orbitz/dc/service/robot
-</message>
-  <element location='/src/java/com/orbitz/dc/service/robot'/>
-  <message>Updating element /./src/java/com/orbitz/dc/service/robot/Robot.java
-</message>
-  <element location='/src/java/com/orbitz/dc/service/robot/Robot.java'/>
-  <message>Updating element /./src/java/com/orbitz/dc/service/robot/RobotAdminProperties.java
-</message>
-  <element location='/src/java/com/orbitz/dc/service/robot/RobotAdminProperties.java'/>
-  <message>Updating element /./src/java/com/orbitz/dc/service/robot/RobotInfo.java
-</message>
-  <element location='/src/java/com/orbitz/dc/service/robot/RobotInfo.java'/>
-  <message>Updating element /./src/java/com/orbitz/dc/service/robot/RobotProperties.java
-</message>
-  <element location='/src/java/com/orbitz/dc/service/robot/RobotProperties.java'/>
-  <message>Updating element /./src/java/com/orbitz/dc/service/robot/RobotStatus.java
-</message>
-  <element location='/src/java/com/orbitz/dc/service/robot/RobotStatus.java'/>
-  <message>Updating element /./src/java/com/orbitz/dc/service/robot/RobotUsageHistoryEntry.java
-</message>
-  <element location='/src/java/com/orbitz/dc/service/robot/RobotUsageHistoryEntry.java'/>
-  <message>Updating (creating) dir /./src/java/com/orbitz/dc/service/robot/remote
-</message>
-  <element location='/src/java/com/orbitz/dc/service/robot/remote'/>
-  <message>Updating element /./src/java/com/orbitz/dc/service/robot/remote/RobotServiceRemote.java
-</message>
-  <element location='/src/java/com/orbitz/dc/service/robot/remote/RobotServiceRemote.java'/>
-  <message>Updating (creating) dir /./src/java/com/orbitz/dc/service/util
-</message>
-  <element location='/src/java/com/orbitz/dc/service/util'/>
-  <message>Updating element /./src/java/com/orbitz/dc/service/util/ThrottleProperties.java
-</message>
-  <element location='/src/java/com/orbitz/dc/service/util/ThrottleProperties.java'/>
-  <message>Updating (creating) dir /./src/java/com/orbitz/dc/system
-</message>
-  <element location='/src/java/com/orbitz/dc/system'/>
-  <message>Updating (creating) dir /./src/java/com/orbitz/dc/system/core
-</message>
-  <element location='/src/java/com/orbitz/dc/system/core'/>
-  <message>Updating element /./src/java/com/orbitz/dc/system/core/ROBOT_TYPE.java
-</message>
-  <element location='/src/java/com/orbitz/dc/system/core/ROBOT_TYPE.java'/>
-  <message>Updating (creating) dir /./test
-</message>
-  <element location='/test'/>
-  <message>Updating (creating) dir /./test/src
-</message>
-  <element location='/test/src'/>
-  <message>Updating (creating) dir /./test/src/java
-</message>
-  <element location='/test/src/java'/>
-  <message>Updating (creating) dir /./test/src/java/com
-</message>
-  <element location='/test/src/java/com'/>
-  <message>Updating (creating) dir /./test/src/java/com/orbitz
-</message>
-  <element location='/test/src/java/com/orbitz'/>
-  <message>Updating element /./test/src/java/com/orbitz/package.html
-</message>
-  <element location='/test/src/java/com/orbitz/package.html'/>
-  <message>Updating element /./version.properties
-</message>
-  <element location='/version.properties'/>
-</AcResponse>
-
-

data/test/eg/update-stale.xml

@@ -0,0 +1,12 @@
+<acResponse
+    command="update"Scanning entire workspace for files touched since last scan - ok
+ ok
+>
+  <message
+      error="true">
+Some of the elements in your workspace have been modified
+and are not in your default group. Use &apos;accurev stat -n&apos; to
+get a list of these files. Then resolve all modifications
+with anchor, keep, or purge before trying update again.
+</message>
+</acResponse>

data/test/t_api.rb

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require 'rscm/accurev'
+include RSCM::Accurev
+
+class AccurevAPITest < Test::Unit::TestCase
+  
+  def test_ac_files()
+    Command.instance do |cmd|
+      cmd.working_dir = "test"
+      cmd.accurev = "./acreplay.rb eg/ac-files.xml"
+    end
+    api = API.new( ".", "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" )
+    assert_equal( files.length, 23 )
+    files.each do |fd|
+      assert( fd.respond_to?( :location ) )
+    end
+    # test block yield
+    count = 0
+    api.ac_files( "." ) do |fd|
+      assert( fd.respond_to?( :location ) )
+      count += 1
+    end
+    assert_equal( count, 23 )
+  end
+
+  def test_update()
+    Command.instance do |cmd|
+      cmd.working_dir = "test"
+      cmd.accurev = "./acreplay.rb eg/update-stale.xml"
+    end
+  end
+
+end

data/test/t_command.rb

@@ -7,6 +7,7 @@ include RSCM::Accurev
 class CommandTest < Test::Unit::TestCase
 
   def test_command_line_subs
+    Command.discard
     cmd = Command.instance
 
     s = cmd.accurev_cmdline( "foo", "bar" )
@@ -16,22 +17,70 @@ class CommandTest < Test::Unit::TestCase
 
     s = cmd.accurev_cmdline( "foo", "bar" )
     assert_equal( "xyzzy foo bar", s )
-    
+
+    Command.discard
   end
 
   def test_a_e
-    puts "XXX test skipped XXX"
-    return ## XXX
     cmd = Command.instance
-    cmd.working_dir = "." # xxx
-    cmd.debug = true
-    cmd.debug_to = File.open( "testing.log", "w" )
-    cmd.accurev = "./test/acreplay.rb eg/update-newwksp.xml"
-    list = cmd.accurev_elements( RSCM::Accurev::FileStatus, "files" )
+    cmd.working_dir = "test"
+    #cmd.debug = true
+    #cmd.debug_to = File.open( "testing.log", "w" )
+    cmd.accurev = "./acreplay.rb eg/update-newwksp.xml"
+    # test listy output
+    list = cmd.accurev_elements( RSCM::Accurev::StatData, "files" )
     assert( list.size > 0 )
     list.each do |fd|
-      assert( fd.respond_to?( location ) )
+      assert( fd.respond_to?( :location ) )
+    end
+    # test yieldy output
+    got_any = false
+    cmd.accurev_elements( RSCM::Accurev::StatData, "files" ) do |fd|
+      got_any = true
+      assert( fd.respond_to?( :location ) )
+    end
+    assert( got_any )
+    Command.discard
+  end
+
+  def test_threadlocal_private_new
+    begin
+      cmd = Command.new
+      flunk( "Command.new() should be private" )
+    rescue 
+      assert( true )
+    end
+  end
+
+  def test_threadlocal
+    # 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" )
+    end
+    # and calling it again returns the same object
+    begin
+      cmd = Command.instance
+      assert_equal( cmd.working_dir, "/one/two/three" )
     end
+    # but instance in another thread should be different
+    Thread.new do
+      cmd = Command.instance
+      assert_not_equal( cmd.working_dir, "/one/two/three" )
+    end.join()
+    # ...and calling it *again* returns the same object
+    begin
+      cmd = Command.instance
+      assert_equal( cmd.working_dir, "/one/two/three" )
+    end
+    # but discard tosses this thread's object:
+    Command.discard
+    begin
+      cmd = Command.instance
+      assert_not_equal( cmd.working_dir, "/one/two/three" )
+    end
+
   end
 
 end

data/test/t_scrubio.rb

@@ -99,12 +99,6 @@ end
 
 class BrokenGarbleTest3 < Test::Unit::TestCase
   include TestBase
-
-  def test_parse
-    # commented out for build only
-    puts "XXX test skipped XXX"
-  end
-
   def broken; true; end
   def fixable; true; end
   def input

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: rscm-accurev
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 date: 2005-08-10 00:00:00 -05:00
 summary: "RSCM::Accurev - RSCM API for Accurev"
 require_paths: 
@@ -29,30 +29,34 @@ cert_chain:
 authors: 
   - Greg Fast
 files: 
-  - eg
+  - apitest.rb
+  - bumprelease.sh
   - lib
   - LICENSE
   - Rakefile
   - README
   - test
-  - test.rb
-  - testing.log
   - tmp
   - TODO
   - lib/rscm
   - lib/rscm/accurev.rb
   - lib/rscm/scm
   - lib/rscm/scm/accurev
-  - "lib/rscm/scm/accurev/#command.rb#"
+  - "lib/rscm/scm/accurev/#api.rb#"
   - lib/rscm/scm/accurev/api.rb
   - lib/rscm/scm/accurev/command.rb
   - lib/rscm/scm/accurev/filterio.rb
   - lib/rscm/scm/accurev/xml.rb
   - test/acreplay.rb
+  - test/eg
+  - test/t_api.rb
   - test/t_command.rb
   - test/t_filterio.rb
   - test/t_load.rb
   - test/t_scrubio.rb
+  - test/eg/ac-files.xml
+  - test/eg/update-newwksp.xml
+  - test/eg/update-stale.xml
 test_files: []
 rdoc_options: 
   - "--line-numbers"

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

@@ -1,95 +0,0 @@
-# -*- ruby -*-
-
-require 'singleton'
-
-module RSCM
-  module Accurev
-
-    class Command
-      include Singleton
-      #Thread.current[:foo]
-
-      attr_accessor :debug, :debug_to, :accurev, :working_dir
-
-      def initialize( working_dir="." )
-        @debug = false
-        @debug_to = STDOUT
-        @accurev = "accurev"
-        @working_dir = working_dir
-      end
-
-      def accurev_cmdline( cmd, *opts )
-        return "#{@accurev} #{cmd} #{opts.join(' ')}";
-      end
-
-      # Execute the given accurev subcommand, and return its
-      # output as a plain uninterpreted string.
-      # Not all accurev subcommands (eg, `accurev info`) support 
-      # `-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
-          cmdline = self.accurev_cmdline( cmd, opts )
-          if @debug
-            @debug_to.puts("ac> #{cmdline}")
-          end
-          Better.popen( cmdline ) do |stdout|
-            return stdout.read()
-          end
-        end
-      end
-      
-      # Execute the given accurev subcommand, and return its
-      # output as an REXML document.  The options list to the command
-      # will automatically have `-fx` prepended, to specify xml output.
-      # Certain quirks in <AcResponse>-type documents will be 
-      # corrected (see Accurev::AcXMLScrubIO).
-      def accurev( 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
-          cmdline = self.accurev_cmdline( cmd, opts )
-          if @debug
-            @debug_to.puts("ac> #{cmdline}")
-          end
-          Better.popen( cmdline ) do |stdout|
-            output = stdout.read()
-            if @debug
-              @debug_to.puts( "raw>\n#{output}" )
-            end
-            begin
-              return REXML::Document.new( AcXMLScrubIO.new( output ) )
-            rescue Exception => e
-              raise "Unexpected output from #{cmdline}: #{e}"
-            end
-          end
-        end
-      end
-      
-      # Execute the given accurev subcommand using +accurev+,
-      # and return the <element> REXML elements from the 
-      # resulting document.
-      # For ac commands which emit the common <elements> format.
-      def accurev_elements( mapclass, cmd, *opts )
-        doc = self.accurev( cmd, opts )
-        if @debug
-          @debug_to.puts( doc )
-        end
-        if doc.elements.size==0
-          raise "Unexpected output from #{cmd}: #{doc}"
-        end
-        doc.elements.each( "/AcResponse/element" ) do |e|
-          o = mapclass.new( e )
-          yield o
-        end
-      end
-
-    end
-  end
-end
-
-