rscm-accurev 0.0.2 → 0.0.3

data/TODO

@@ -27,3 +27,4 @@ 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

data/lib/rscm/accurev.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'rubygems'
 require 'rscm/scm/accurev/api'
 require 'rscm/scm/accurev/command'

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

@@ -13,10 +13,15 @@ end
 
 module RSCM::Accurev
 
-  class AccurevException < Exception ; end
+  class AccurevException < Exception 
+    attr_reader :error_msg
+    def initialize( msg, error_msg=nil )
+      super( "#{msg}: #{error_msg}" )
+      @error_msg = error_msg
+    end     
+  end
 
-  # Indicates a failure of the update command due to unkept local modifications
-  class StaleWorkspaceError < AccurevException; end
+  class StaleWorkspaceException < AccurevException; end
 
   # RSCM implementation for Accurev (http://www.accurev.com/).
   #
@@ -52,9 +57,9 @@ module RSCM::Accurev
       
     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
+      @checkout_dir = checkout_dir
     end
 
     def name()
@@ -99,13 +104,13 @@ module RSCM::Accurev
 
     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|
+      ret = []
+      acresponse = cmd.accurev( "files", relative_path )
+      acresponse['element'].each do |fd|
         yield fd if block_given?
-        obj << fd
+        ret << fd
       end
-      return obj
+      return ret
     end
 
     def ac_keep( files=[], message="" )
@@ -187,7 +192,7 @@ module RSCM::Accurev
                                      "-l", co )
         # sucks:
         if ( mkws_out =~ /already exists/ )
-          raise AccurevException.new( mkws_out )
+          raise AccurevException.new( "Failed to checkout", mkws_out )
         end
       end
       puts "> Updating workspace.."
@@ -195,21 +200,33 @@ module RSCM::Accurev
     end
 
     def update( to_identifier=Time.infinite )
-      co = PathConverter.nativepath_to_filepath( @checkout_dir )
+      co = RSCM::PathConverter.nativepath_to_filepath( @checkout_dir )
       unless File.exists?( co )
         raise AccurevException.new( "Workspace does not exist!" )
       end
       updated = []
-      with_working_dir( co ) do
-        accurev_elements( UpdateData, "update" ) do |up|
-          yield up.location
-          updated << up.location
+      Command.instance do |cmd|
+        cmd.working_dir = co
+        acresponse = cmd.accurev( "update" )
+        if acresponse.error
+          if acresponse.error =~ /workspace have been modified/
+            raise StaleWorkspaceException.new( "Workspace stale",
+                                               acresponse.error )
+          else
+            # some other update problem
+            raise AccurevException.new( "Error on update", acresponse.error )
+          end
+        end
+        if acresponse['element']
+          acresponse['element'].each do |up|
+            yield up.location if block_given?
+            updated << up.location
+          end
         end
       end
       return updated
     end
 
-
     # --- internals
 
   private

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

@@ -10,27 +10,36 @@ module RSCM
     #
     class Command
 
-      attr_accessor :debug, :debug_to, :accurev, :working_dir
+      attr_accessor :debug, :debug_to, :accurev_bin, :working_dir
 
-      # map of xml element types to classes
-      # used by accurev_element to return a list of objects
-      attr_accessor :classmap
+      # If you need to swap out the mapper class
+      attr_accessor :xmlmapper
 
       def initialize()
+        @xmlmapper = XMLMapper
         @debug = false
         @debug_to = STDOUT
-        @accurev = "accurev"
+        @accurev_bin = "accurev"
         @working_dir = "."
       end
 
+      #
+      # Returns a command line string for executing the given
+      # accurev subcomment +cmd+ with arguments +opts+.
+      #
       def accurev_cmdline( cmd, *opts )
-        return "#{@accurev} #{cmd} #{opts.join(' ')}";
+        return "#{@accurev_bin} #{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.
+     
+      #
+      # Executes the given accurev subcommand +cmd+ with the
+      # given arguments +opts+.  The command will be executed with
+      # standard (non-xml) output format. This method returns
+      # the stdout from the command execution.
+      #
+      # (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 )
@@ -45,13 +54,19 @@ module RSCM
           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.
+
+      #
+      # Executes the given accurev subcommand +cmd+ with the 
+      # given arguments +opts+ in XML mode.  The output of the command
+      # will be converted to an REXML document and returned.
+      # The command's options list will have `-fx` appended, 
+      # to specify xml output format.
+      # 
       # Certain quirks in <AcResponse>-type documents will be 
-      # corrected (see Accurev::AcXMLScrubIO).
-      def accurev( cmd, *opts )
+      # corrected (see Accurev::AcXMLScrubIO).  Note that not all 
+      # 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 )
@@ -64,7 +79,8 @@ module RSCM
           Better.popen( cmdline ) do |stdout|
             output = stdout.read()
             if @debug
-              @debug_to.puts( "raw>\n#{output}" )
+              @debug_to.puts( "raw>" )
+              @debug_to.puts( output )
             end
             begin
               return REXML::Document.new( AcXMLScrubIO.new( output ) )
@@ -75,27 +91,28 @@ module RSCM
         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 )
+      #
+      # Execute the given accurev subcommand using +accurev_xml+,
+      # and return an object tree mirroring the structure of the 
+      # XML output.
+      #
+      # This uses +XMLMapper+ to build the object tree.
+      #
+      def accurev( cmd, *opts )
+        doc = self.accurev_xml( cmd, opts )
         if @debug
+          @debug_to.puts( "doc>" )
           @debug_to.puts( doc )
         end
         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 if block_given?
-          objs << o
-        end
-        return objs
+        mapper = @xmlmapper.new()
+        return mapper.map( doc.root )
       end
 
+  # static methods
+
       # Retrieve this thread's +Command+ instance.
       #
       # eg:
@@ -120,8 +137,9 @@ module RSCM
         Thread.current[ :RSCM_ACCUREV_COMMAND ] = nil
       end
 
+    private
+
       # new() is marked private, use Command.instance().
-      private
       def new( *args )
         super(args)
       end

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

@@ -1,36 +1,152 @@
 module RSCM; module Accurev; end; end
 
+require 'rexml/element'
+
 module RSCM::Accurev
 
+  #
+  # XMLMapper creates an object tree from an XML element and its children.
+  #
+  # For each XML node, it locates a class associated with that node's name,
+  # 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
+  # each of those classes +element_name+ methods.
+  #
+  class XMLMapper
+
+    # Map of element (tag) names to (ruby) class.
+    attr_accessor :classmap
+
+    def initialize()
+      @classmap = {}
+      ObjectSpace.each_object( Class ) do |k|
+        if k.ancestors.delete( ElementBackedClass ) and k != ElementBackedClass
+          if k.respond_to?( :element_name )
+            @classmap[ k.element_name ] = k
+          end
+        end
+      end
+    end
+
+    #
+    # Build an object tree from the given REXML element and its children.
+    # The returned object will be a subclass of +ElementBackedClass+.
+    #
+    def map( e )
+      unless @classmap.has_key?( e.name )
+        return nil
+      end
+      o = @classmap[e.name].new( e )
+      e.children.each do |child|
+        if child.kind_of?( REXML::Element )
+          a = self.map( child )
+          unless a.nil?
+            if o.children[ a.class.element_name ].nil?
+              o.children[ a.class.element_name ] = []
+            end
+            o.children[ a.class.element_name ] << a
+          end
+        end
+      end
+      return o
+    end
+  end
+
+  #
+  # Generic 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 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.
+  #
   class ElementBackedClass
+
+    attr_accessor :children
+
     def self.element_name( name )
-      @@name = name # this doesn't do what i think it does
+      class << self
+        self
+      end.send( :define_method, "element_name" ) {name}
     end
+
     def initialize( element=nil )
+      @children = {}
       unless element.nil?
         self.set_from_element(element)
       end
     end
+
+    # ebc['foo'] is a synonym for ebc.children['foo']   
+    def []( key )
+      return self.children[key]
+    end
+
+  protected
+    # Does the work of calling object setters for each XML attribute.
     def set_from_element( e )
       e.attributes.each do |attr, value|
-        if self.respond_to?( "#{attr}=" )
-          self.send( "#{attr}=", value )
+        # downcase the attr name for method-happiness
+        # (also hacks around some inconsistent accurev attr names...)
+        mattr = attr.downcase
+        if self.respond_to?( "#{mattr}=" )
+          self.send( "#{mattr}=", value )
         end
       end
+      if self.respond_to?( :text_content= ) and ! e.text.nil?
+        self.text_content = e.text
+      end
+    end
+
+  end
+
+  #
+  # Data from the typical AcResponse root node.
+  # 
+  class AcResponseData < ElementBackedClass
+    element_name 'AcResponse'
+    attr_accessor :command, :directory
+
+    # Returns this response's error message, or nil if no error detected.
+    def error
+      if self.children['message']
+        zmsg = self.children['message'][0]
+        if zmsg.error and zmsg.error == 'true'
+          return zmsg.text_content
+        end
+      else
+        return nil
+      end
     end
   end
   
-  # Data from "accurev file" command:
-  class StatData < ElementBackedClass
+  #
+  # Data from "accurev file", "accure update", "accurev stat" commands.
+  # Identifies workspace objects (files, directories, etc).
+  #
+  class ElementData < ElementBackedClass
     element_name 'element'
     attr_accessor :location, :status, :dir, :id
-    attr_accessor :elemType, :namedVersion, :Virtual, :Real
+    attr_accessor :elemType, :namedVersion, :virtual, :real
   end
-
-  # Data from "accurev update" command:
-  class UpdateData < ElementBackedClass
-    element_name 'element'
-    attr_accessor :location
+  
+  #
+  # Data from "accurev {file,update,stat}" commands.
+  # Streamed status/info messages, usually interleaved with ElementData
+  # nodes.
+  #
+  class MessageData < ElementBackedClass
+    element_name 'message'
+    attr_accessor :error, :text_content
   end
-    
+
 end

data/test/eg/update-i-nochanges.xml

@@ -0,0 +1,8 @@
+<acResponse
+    command="update"Scanning entire workspace for files touched since last scan - ok
+>
+  <progress
+      phase="Calculating changes"
+      increment="100"/>
+  <message>Transaction high-water mark would be updated</message>
+</acResponse>

data/test/eg/update-i-updates.xml

@@ -0,0 +1,125 @@
+<acResponse
+    command="update"Scanning entire workspace for files touched since last scan - ok
+>
+  <progress
+      phase="Calculating changes"
+      increment="100"/>
+  <progress
+      phase="results"
+      number="23"/>
+  <message>Would remove &quot;src/java/com/orbitz/dc/service/hc/HcItinerary.java&quot; .
+</message>
+  <element
+      location="src/java/com/orbitz/dc/service/hc/HcItinerary.java"/>
+  <checkpoint/>
+  <message>Would replace content of &quot;src/java/com/orbitz/dc/core/Pricing.java&quot; .
+</message>
+  <element
+      location="src/java/com/orbitz/dc/core/Pricing.java"/>
+  <checkpoint/>
+  <message>Would replace content of &quot;src/java/com/orbitz/dc/service/hc/HcSearchRequest.java&quot; .
+</message>
+  <element
+      location="src/java/com/orbitz/dc/service/hc/HcSearchRequest.java"/>
+  <checkpoint/>
+  <message>Would replace content of &quot;src/java/com/orbitz/dc/service/hc/HcCreateReservationRequest.java&quot; .
+</message>
+  <element
+      location="src/java/com/orbitz/dc/service/hc/HcCreateReservationRequest.java"/>
+  <checkpoint/>
+  <message>Would replace content of &quot;src/java/com/orbitz/dc/core/HcJourney.java&quot; .
+</message>
+  <element
+      location="src/java/com/orbitz/dc/core/HcJourney.java"/>
+  <checkpoint/>
+  <message>Would replace content of &quot;src/java/com/orbitz/dc/service/hc/HcCreateReservationResponse.java&quot; .
+</message>
+  <element
+      location="src/java/com/orbitz/dc/service/hc/HcCreateReservationResponse.java"/>
+  <checkpoint/>
+  <message>Would replace content of &quot;src/java/com/orbitz/dc/service/hc/HcCancelReservationRequest.java&quot; .
+</message>
+  <element
+      location="src/java/com/orbitz/dc/service/hc/HcCancelReservationRequest.java"/>
+  <checkpoint/>
+  <message>Would replace content of &quot;src/java/com/orbitz/dc/service/hc/HcCancelReservationResponse.java&quot; .
+</message>
+  <element
+      location="src/java/com/orbitz/dc/service/hc/HcCancelReservationResponse.java"/>
+  <checkpoint/>
+  <message>Would replace content of &quot;src/java/com/orbitz/dc/service/hc/HcModifyReservationResponse.java&quot; .
+</message>
+  <element
+      location="src/java/com/orbitz/dc/service/hc/HcModifyReservationResponse.java"/>
+  <checkpoint/>
+  <message>Would replace content of &quot;src/java/com/orbitz/dc/service/hc/HcModifyReservationRequest.java&quot; .
+</message>
+  <element
+      location="src/java/com/orbitz/dc/service/hc/HcModifyReservationRequest.java"/>
+  <checkpoint/>
+  <message>Would replace content of &quot;src/java/com/orbitz/dc/core/RateInfo.java&quot; .
+</message>
+  <element
+      location="src/java/com/orbitz/dc/core/RateInfo.java"/>
+  <checkpoint/>
+  <message>Would replace content of &quot;src/java/com/orbitz/dc/core/VariableRateInfo.java&quot; .
+</message>
+  <element
+      location="src/java/com/orbitz/dc/core/VariableRateInfo.java"/>
+  <checkpoint/>
+  <message>Would replace content of &quot;src/java/com/orbitz/dc/core/RATE_CATEGORY.java&quot; .
+</message>
+  <element
+      location="src/java/com/orbitz/dc/core/RATE_CATEGORY.java"/>
+  <checkpoint/>
+  <message>Would replace content of &quot;src/java/com/orbitz/dc/core/RATE_COVERAGE.java&quot; .
+</message>
+  <element
+      location="src/java/com/orbitz/dc/core/RATE_COVERAGE.java"/>
+  <checkpoint/>
+  <message>Would replace content of &quot;src/java/com/orbitz/dc/core/FlatRateInfo.java&quot; .
+</message>
+  <element
+      location="src/java/com/orbitz/dc/core/FlatRateInfo.java"/>
+  <checkpoint/>
+  <message>Would replace content of &quot;src/java/com/orbitz/dc/core/HcItinerary.java&quot; .
+</message>
+  <element
+      location="src/java/com/orbitz/dc/core/HcItinerary.java"/>
+  <checkpoint/>
+  <message>Would replace content of &quot;src/java/com/orbitz/dc/service/hc/HcSearch.java&quot; .
+</message>
+  <element
+      location="src/java/com/orbitz/dc/service/hc/HcSearch.java"/>
+  <checkpoint/>
+  <message>Would replace content of &quot;src/java/com/orbitz/dc/service/hc/HcCreateReservation.java&quot; .
+</message>
+  <element
+      location="src/java/com/orbitz/dc/service/hc/HcCreateReservation.java"/>
+  <checkpoint/>
+  <message>Would replace content of &quot;src/java/com/orbitz/dc/service/hc/HcModifyReservation.java&quot; .
+</message>
+  <element
+      location="src/java/com/orbitz/dc/service/hc/HcModifyReservation.java"/>
+  <checkpoint/>
+  <message>Would replace content of &quot;src/java/com/orbitz/dc/service/hc/HcCancelReservation.java&quot; .
+</message>
+  <element
+      location="src/java/com/orbitz/dc/service/hc/HcCancelReservation.java"/>
+  <checkpoint/>
+  <message>Would replace content of &quot;src/java/com/orbitz/dc/service/hc/HcRetrieveItinerary.java&quot; .
+</message>
+  <element
+      location="src/java/com/orbitz/dc/service/hc/HcRetrieveItinerary.java"/>
+  <checkpoint/>
+  <message>Would replace content of &quot;src/java/com/orbitz/dc/service/hc/HcRetrieveItineraryRequest.java&quot; .
+</message>
+  <element
+      location="src/java/com/orbitz/dc/service/hc/HcRetrieveItineraryRequest.java"/>
+  <checkpoint/>
+  <message>Would replace content of &quot;src/java/com/orbitz/dc/service/hc/HcRetrieveItineraryResponse.java&quot; .
+</message>
+  <element
+      location="src/java/com/orbitz/dc/service/hc/HcRetrieveItineraryResponse.java"/>
+  <checkpoint/>
+</acResponse>

data/test/eg/update-nochanges.xml

@@ -0,0 +1,7 @@
+<acResponse
+    command="update"Scanning entire workspace for files touched since last scan - ok
+>
+  <progress
+      phase="Calculating changes"
+      increment="100"/>
+</acResponse>

data/test/eg/update-updates.xml

@@ -0,0 +1,147 @@
+<acResponse
+    command="update"Scanning entire workspace for files touched since last scan - ok
+>
+  <progress
+      phase="Calculating changes"
+      increment="100"/>
+  <progress
+      phase="results"
+      number="23"/>
+  <message>Removing &quot;src/java/com/orbitz/dc/service/hc/HcItinerary.java&quot; .
+</message>
+  <element
+      location="src/java/com/orbitz/dc/service/hc/HcItinerary.java"/>
+  <checkpoint/>
+  <message>Content (1 K) of &quot;src/java/com/orbitz/dc/core/Pricing.java&quot; - ok
+</message>
+  <element
+      location="src/java/com/orbitz/dc/core/Pricing.java"
+      size="1398"/>
+  <checkpoint/>
+  <message>Content (1 K) of &quot;src/java/com/orbitz/dc/service/hc/HcSearchRequest.java&quot; - ok
+</message>
+  <element
+      location="src/java/com/orbitz/dc/service/hc/HcSearchRequest.java"
+      size="793"/>
+  <checkpoint/>
+  <message>Content (1 K) of &quot;src/java/com/orbitz/dc/service/hc/HcCreateReservationRequest.java&quot; - ok
+</message>
+  <element
+      location="src/java/com/orbitz/dc/service/hc/HcCreateReservationRequest.java"
+      size="1712"/>
+  <checkpoint/>
+  <message>Content (3 K) of &quot;src/java/com/orbitz/dc/core/HcJourney.java&quot; - ok
+</message>
+  <element
+      location="src/java/com/orbitz/dc/core/HcJourney.java"
+      size="3846"/>
+  <checkpoint/>
+  <message>Content (1 K) of &quot;src/java/com/orbitz/dc/service/hc/HcCreateReservationResponse.java&quot; - ok
+</message>
+  <element
+      location="src/java/com/orbitz/dc/service/hc/HcCreateReservationResponse.java"
+      size="849"/>
+  <checkpoint/>
+  <message>Content (3 K) of &quot;src/java/com/orbitz/dc/service/hc/HcCancelReservationRequest.java&quot; - ok
+</message>
+  <element
+      location="src/java/com/orbitz/dc/service/hc/HcCancelReservationRequest.java"
+      size="3046"/>
+  <checkpoint/>
+  <message>Content (1 K) of &quot;src/java/com/orbitz/dc/service/hc/HcCancelReservationResponse.java&quot; - ok
+</message>
+  <element
+      location="src/java/com/orbitz/dc/service/hc/HcCancelReservationResponse.java"
+      size="756"/>
+  <checkpoint/>
+  <message>Content (1 K) of &quot;src/java/com/orbitz/dc/service/hc/HcModifyReservationResponse.java&quot; - ok
+</message>
+  <element
+      location="src/java/com/orbitz/dc/service/hc/HcModifyReservationResponse.java"
+      size="849"/>
+  <checkpoint/>
+  <message>Content (1 K) of &quot;src/java/com/orbitz/dc/service/hc/HcModifyReservationRequest.java&quot; - ok
+</message>
+  <element
+      location="src/java/com/orbitz/dc/service/hc/HcModifyReservationRequest.java"
+      size="1806"/>
+  <checkpoint/>
+  <message>Content (3 K) of &quot;src/java/com/orbitz/dc/core/RateInfo.java&quot; - ok
+</message>
+  <element
+      location="src/java/com/orbitz/dc/core/RateInfo.java"
+      size="3495"/>
+  <checkpoint/>
+  <message>Content (2 K) of &quot;src/java/com/orbitz/dc/core/VariableRateInfo.java&quot; - ok
+</message>
+  <element
+      location="src/java/com/orbitz/dc/core/VariableRateInfo.java"
+      size="2523"/>
+  <checkpoint/>
+  <message>Content (2 K) of &quot;src/java/com/orbitz/dc/core/RATE_CATEGORY.java&quot; - ok
+</message>
+  <element
+      location="src/java/com/orbitz/dc/core/RATE_CATEGORY.java"
+      size="2513"/>
+  <checkpoint/>
+  <message>Content (2 K) of &quot;src/java/com/orbitz/dc/core/RATE_COVERAGE.java&quot; - ok
+</message>
+  <element
+      location="src/java/com/orbitz/dc/core/RATE_COVERAGE.java"
+      size="2537"/>
+  <checkpoint/>
+  <message>Content (1 K) of &quot;src/java/com/orbitz/dc/core/FlatRateInfo.java&quot; - ok
+</message>
+  <element
+      location="src/java/com/orbitz/dc/core/FlatRateInfo.java"
+      size="975"/>
+  <checkpoint/>
+  <message>Content (2 K) of &quot;src/java/com/orbitz/dc/core/HcItinerary.java&quot; - ok
+</message>
+  <element
+      location="src/java/com/orbitz/dc/core/HcItinerary.java"
+      size="2707"/>
+  <checkpoint/>
+  <message>Content (1 K) of &quot;src/java/com/orbitz/dc/service/hc/HcSearch.java&quot; - ok
+</message>
+  <element
+      location="src/java/com/orbitz/dc/service/hc/HcSearch.java"
+      size="1123"/>
+  <checkpoint/>
+  <message>Content (1 K) of &quot;src/java/com/orbitz/dc/service/hc/HcCreateReservation.java&quot; - ok
+</message>
+  <element
+      location="src/java/com/orbitz/dc/service/hc/HcCreateReservation.java"
+      size="1146"/>
+  <checkpoint/>
+  <message>Content (1 K) of &quot;src/java/com/orbitz/dc/service/hc/HcModifyReservation.java&quot; - ok
+</message>
+  <element
+      location="src/java/com/orbitz/dc/service/hc/HcModifyReservation.java"
+      size="1156"/>
+  <checkpoint/>
+  <message>Content (1 K) of &quot;src/java/com/orbitz/dc/service/hc/HcCancelReservation.java&quot; - ok
+</message>
+  <element
+      location="src/java/com/orbitz/dc/service/hc/HcCancelReservation.java"
+      size="1150"/>
+  <checkpoint/>
+  <message>Content (1 K) of &quot;src/java/com/orbitz/dc/service/hc/HcRetrieveItinerary.java&quot; - ok
+</message>
+  <element
+      location="src/java/com/orbitz/dc/service/hc/HcRetrieveItinerary.java"
+      size="1150"/>
+  <checkpoint/>
+  <message>Content (1 K) of &quot;src/java/com/orbitz/dc/service/hc/HcRetrieveItineraryRequest.java&quot; - ok
+</message>
+  <element
+      location="src/java/com/orbitz/dc/service/hc/HcRetrieveItineraryRequest.java"
+      size="1477"/>
+  <checkpoint/>
+  <message>Content (1 K) of &quot;src/java/com/orbitz/dc/service/hc/HcRetrieveItineraryResponse.java&quot; - ok
+</message>
+  <element
+      location="src/java/com/orbitz/dc/service/hc/HcRetrieveItineraryResponse.java"
+      size="756"/>
+  <checkpoint/>
+</acResponse>

data/test/t_api.rb

@@ -9,7 +9,7 @@ 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"
+      cmd.accurev_bin = "./acreplay.rb eg/ac-files.xml"
     end
     api = API.new( ".", "test-bogus-depot", "test-bogus-depot-0-impl" )
     # test array returns
@@ -28,11 +28,49 @@ class AccurevAPITest < Test::Unit::TestCase
     assert_equal( count, 23 )
   end
 
-  def test_update()
+  def test_update_stale()
     Command.instance do |cmd|
-      cmd.working_dir = "test"
-      cmd.accurev = "./acreplay.rb eg/update-stale.xml"
+      cmd.accurev_bin = "./acreplay.rb eg/update-stale.xml"
+    end
+    api = API.new( "test", "test-bogus-depot", "test-bogus-depot-0-impl" )
+    begin
+      u_elements = api.update()
+      flunk( "Simulated update with stale data should throw exception" )
+    rescue StaleWorkspaceException => e
+      assert( true, "Caught expected exception" )
+      assert( e.error_msg =~ /workspace have been modified/ )
+    end
+  end
+
+  def test_update_nochanges()
+    Command.instance do |cmd|
+      cmd.accurev_bin = "./acreplay.rb eg/update-nochanges.xml"
+    end
+    api = API.new( "test", "test-bogus-depot", "test-bogus-depot-0-impl" )
+    u_elements = api.update()
+    assert_not_nil( u_elements )
+    assert( u_elements.size == 0 )
+  end
+
+  def test_update_newwksp()
+    Command.instance do |cmd|
+      cmd.accurev_bin = "./acreplay.rb eg/update-newwksp.xml"
+    end
+    api = API.new( "test", "test-bogus-depot", "test-bogus-depot-0-impl" )
+    u_elements = api.update()
+    assert_not_nil( u_elements )
+    assert_equal( 44, u_elements.length )
+    u_elements.each do |location|
+      # api.update returns a list of relative filenames
+      assert( location =~ /^\// )
+    end
+    # test yield and array return XXX
+    updated = 0
+    api.update().each do |location|
+      updated += 1
+      assert( location =~ /^\// )
     end
+    assert_equal( 44, updated )
   end
 
 end

data/test/t_command.rb

@@ -13,7 +13,7 @@ class CommandTest < Test::Unit::TestCase
     s = cmd.accurev_cmdline( "foo", "bar" )
     assert_equal( "accurev foo bar", s )
 
-    cmd.accurev = "xyzzy"
+    cmd.accurev_bin = "xyzzy"
 
     s = cmd.accurev_cmdline( "foo", "bar" )
     assert_equal( "xyzzy foo bar", s )
@@ -24,22 +24,18 @@ class CommandTest < Test::Unit::TestCase
   def test_a_e
     cmd = Command.instance
     cmd.working_dir = "test"
-    #cmd.debug = true
-    #cmd.debug_to = File.open( "testing.log", "w" )
-    cmd.accurev = "./acreplay.rb eg/update-newwksp.xml"
+    cmd.debug = true
+    cmd.debug_to = File.open( "/tmp/testing.log", "w" )
+    cmd.accurev_bin = "./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 ) )
+    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
-    # 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
 

data/test/t_xmlmapper.rb

@@ -0,0 +1,74 @@
+#!/usr/bin/env ruby
+require 'test/unit'
+require 'stringio'
+require 'rexml/document'
+require 'rscm/scm/accurev/xml'
+include REXML
+include RSCM::Accurev
+
+class ReadQueue < ElementBackedClass
+  element_name 'readqueue'
+  attr_accessor :owner
+end
+
+class Book < ElementBackedClass
+  element_name 'book'
+  attr_accessor :title, :author
+end
+
+class Paper < ElementBackedClass
+  element_name 'paper'
+  attr_accessor :uri
+end
+
+class Note < ElementBackedClass
+  element_name 'note'
+  attr_accessor :text, :text_content
+end
+
+INPUT = <<-EOI
+<?xml version="1.0"?>
+<readqueue owner="gdf">
+  <book title="Iron Council" author="China Mieville" />
+  <paper uri="http://svk.elixus.org?SVKTutorial">
+    <note text="re-read" />
+  </paper>
+  <book title="Someone Comes to Town, Someone Leaves Town"
+        author="Cory Doctorow" />
+  <book title="Concurrent Programming in Java" author="Doug Lea">
+    <note>Need Brains</note>
+  </book>
+</readqueue>
+EOI
+
+class XMLMapperTest < Test::Unit::TestCase
+  def testmap
+    d = Document.new( StringIO.new( INPUT ) )
+    assert_equal( "readqueue", d.root.name )
+    mapper = XMLMapper.new
+    o = mapper.map( d.root )
+    assert( o.kind_of?( ElementBackedClass ) )
+    assert( o.kind_of?( ReadQueue ) )
+    assert_equal( 3, o.children['book'].length )
+    assert_equal( 1, o.children['paper'].length )
+    paper = o.children['paper'][0]
+    assert( paper.kind_of?( Paper ) )
+    assert_equal( "paper", paper.class.element_name )
+    assert_equal( "http://svk.elixus.org?SVKTutorial", paper.uri )
+    assert_equal( 1, paper.children['note'].length )
+    note = paper.children['note'][0]
+    assert_equal( "re-read", note.text )
+    b = nil
+    o.children['book'].each do |book|
+      b = book if book.author == "Doug Lea"
+    end
+    assert_equal( "Concurrent Programming in Java", b.title )
+    note = b.children['note'][0]
+    assert( note.text.nil? )
+    assert_equal( "Need Brains", note.text_content )
+
+    # test []
+    assert_equal( 3, o['book'].length )
+  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.2
-date: 2005-08-10 00:00:00 -05:00
+  version: 0.0.3
+date: 2005-08-15 00:00:00 -05:00
 summary: "RSCM::Accurev - RSCM API for Accurev"
 require_paths: 
   - lib
@@ -33,6 +33,7 @@ files:
   - bumprelease.sh
   - lib
   - LICENSE
+  - pkg
   - Rakefile
   - README
   - test
@@ -42,7 +43,6 @@ files:
   - lib/rscm/accurev.rb
   - lib/rscm/scm
   - lib/rscm/scm/accurev
-  - "lib/rscm/scm/accurev/#api.rb#"
   - lib/rscm/scm/accurev/api.rb
   - lib/rscm/scm/accurev/command.rb
   - lib/rscm/scm/accurev/filterio.rb
@@ -54,9 +54,14 @@ files:
   - test/t_filterio.rb
   - test/t_load.rb
   - test/t_scrubio.rb
+  - test/t_xmlmapper.rb
   - test/eg/ac-files.xml
+  - test/eg/update-i-nochanges.xml
+  - test/eg/update-i-updates.xml
   - test/eg/update-newwksp.xml
+  - test/eg/update-nochanges.xml
   - test/eg/update-stale.xml
+  - test/eg/update-updates.xml
 test_files: []
 rdoc_options: 
   - "--line-numbers"

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

@@ -1,226 +0,0 @@
-# -*- 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