rscm-accurev 0.0 → 0.0.1

data/Rakefile

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

data/TODO

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

data/lib/rscm/accurev.rb

@@ -1,18 +1,6 @@
-#!/usr/bin/env ruby
+require 'rubygems'
 require 'rscm/scm/accurev/api'
 require 'rscm/scm/accurev/command'
 require 'rscm/scm/accurev/xml'
 require 'rscm/scm/accurev/filterio'
 
-module RSCM
-  #
-  # == module RSCM::Accurev
-  #
-  # Namespace for accurev api classes and utils.
-  #
-  # See RSCM::Accurev::API.
-  #
-  module Accurev
-    VERSION = '0.0.5'
-  end
-end

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

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