rscm 0.3.8 → 0.3.9

data/CHANGES

@@ -1,5 +1,13 @@
 = RSCM Changelog
 
+== Version 0.3.9
+
+This release improves Subversion and ClearCase support
+
+* Subversion no longer needs a working copy to get revisions and diffs
+* Misc. ClearCase improvements
+* Added RSCM::Base.destroy_working_copy
+
 == Version 0.3.8
 
 Bugfix release

data/README

@@ -1,4 +1,4 @@
-= RSCM - Ruby Source Control Management (0.3.8)
+= RSCM - Ruby Source Control Management (0.3.9)
 
 RSCM is to SCM what DBI/JDBC/ODBC are to databases - an SCM-independent API for accessing different SCMs. The features are roughly:
 
@@ -31,12 +31,12 @@ If you want the latest and greatest, you can get the sources, which live alongsi
 
 == Supported SCMs
 
-* CVS - http://www.cvshome.org (stable)
+* CVS - http://www.nongnu.org/cvs (stable)
 * Subversion - http://subversion.tigris.org (stable)
+* ClearCase - http://www-306.ibm.com/software/awdtools/clearcase (not thoroughly tested)
 
 In progress:
 
-* ClearCase -http://www-306.ibm.com/software/awdtools/clearcase (half complete)
 * Darcs - http://www.abridgegame.org/darcs (very incomplete)
 * Monotone - http://www.venge.net/monotone (half complete)
 * Perforce - http://www.perforce.com (nearly complete - a little out of date with recent API)

data/Rakefile

@@ -10,7 +10,7 @@ require 'meta_project'
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME      = 'rscm'
-PKG_VERSION   = '0.3.8' + PKG_BUILD
+PKG_VERSION   = '0.3.9' + PKG_BUILD
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 desc "Default Task"

data/lib/rscm/base.rb

@@ -21,6 +21,7 @@ module RSCM
   # * revisions
   # * uptodate?
   # * file
+  # * destroy_working_copy
   #
   # In addition to operations related to working copies, the same instance should provide
   # methods to administer the working copy's associated 'central' repository. These are:
@@ -92,6 +93,11 @@ module RSCM
       props.sort!
     end
 
+    # Destroys the working copy
+    def destroy_working_copy
+      FileUtils.rm_rf(checkout_dir) unless checkout_dir.nil?
+    end
+
     # Whether the physical SCM represented by this instance exists.
     #
     def central_exists?

data/lib/rscm/scm/clearcase.rb

@@ -4,156 +4,176 @@ require 'fileutils'
 require 'tempfile'
 
 module RSCM
- class ClearCase < Base
-   register self
-
-   LOG_FORMAT = "- !ruby/object:RSCM::RevisionFile\\n  developer: %u\\n  time: \\\"%Nd\\\"\\n  native_revision_identifier: %Vn\\n  previous_native_revision_identifier: %PVn\\n  path: %En\\n  status: %o\\n  message: \\\"%Nc\\\"\\n\\n"
-   TIME_FORMAT = "%d-%b-%Y.%H:%M:%S"
-   MAGIC = "9q8w7e6r5t4y"
-   STATUSES = {
-     "checkin" => RevisionFile::MODIFIED,
-     "mkelem" => RevisionFile::ADDED,
-     "rmelem" => RevisionFile::DELETED,
-   }
-
-   attr_accessor :stream, :stgloc, :tag, :config_spec
-
-   def initialize(stream=nil, stgloc=nil, tag=nil, config_spec=nil)
-     @stream, @stgloc, @tag, @config_spec = stream, stgloc, tag, config_spec
-   end
-
-   def revisions(from_identifier, to_identifier=Time.infinity, relative_path=nil)
-     checkout unless checked_out?
-
-     rules = load_rules
-     vob = vob(rules[0])
-
-     result = Revisions.new
-     with_working_dir(checkout_dir) do
-       since = (from_identifier + 1).strftime(TIME_FORMAT)
-       cmd = "cleartool lshistory -recurse -nco -since #{since} -fmt \"#{LOG_FORMAT}\" -pname #{vob}"
-       Better.popen(cmd) do |io|
-         # escape all quotes, except the one at the beginning and end. this is a bit ugly...
-         raw_yaml = io.read
-         fixed_yaml = raw_yaml.gsub(/^  message: \"/, "  message: #{MAGIC}")
-         fixed_yaml = fixed_yaml.gsub(/\"\n\n/, "#{MAGIC}\n\n")
-         fixed_yaml = fixed_yaml.gsub(/\"/, "\\\"")
-         fixed_yaml = fixed_yaml.gsub(MAGIC, "\"")
-
-         files = YAML.load(fixed_yaml)
-         files.each do |file|
-           file.path.gsub!(/\\/, "/")
-           file.status = STATUSES[file.status]
-           rev = revision(file.native_revision_identifier)
-           if(rev && matches_load_rules?(rules, file.path))
-             file.native_revision_identifier = rev
-             file.previous_native_revision_identifier = revision(file.previous_native_revision_identifier)
-             t = file.time
-             # the time now has escaped quotes..
-             file.time = Time.utc(t[2..5],t[6..7],t[8..9],t[11..12],t[13..14],t[15..16])
-             file.message.strip!
-             result.add(file)
-           end
-         end
-       end
-     end
-     result
-   end
-
-   def checked_out?
-     File.exist?(checkout_dir)
-   end
-
-   def destroy_working_copy
-     Better.popen("cleartool rmview #{checkout_dir}") do |io|
-       io.read
-     end
-   end
-
- protected
-
-   def checkout_silent(to_identifier=nil)
-     if(checked_out?)
-       with_working_dir(checkout_dir) do
-         Better.popen("cleartool update .") do |io|
-           io.read
-         end
-       end
-     else
+  class ClearCase < Base
+    register self
+
+    LOG_FORMAT = "- !ruby/object:RSCM::RevisionFile\\n  developer: %u\\n  time: \\\"%Nd\\\"\\n  native_revision_identifier: %Vn\\n  previous_native_revision_identifier: %PVn\\n  path: %En\\n  status: %o\\n  message: \\\"%Nc\\\"\\n\\n"
+    TIME_FORMAT = "%d-%b-%Y.%H:%M:%S"
+    MAGIC_TOKEN = "9q8w7e6r5t4y"
+    STATUSES = {
+      "checkin" => RevisionFile::MODIFIED,
+      "mkelem" => RevisionFile::ADDED,
+      "rmelem" => RevisionFile::DELETED,
+    }
+    DEFAULT_CONFIG_SPEC = "element * CHECKEDOUT\nelement * /main/LATEST"
+
+    attr_accessor :stream, :stgloc, :tag, :config_spec
+
+    def initialize(stream=nil, stgloc=nil, tag=nil, config_spec=DEFAULT_CONFIG_SPEC)
+      @stream, @stgloc, @tag, @config_spec = stream, stgloc, tag, config_spec
+    end
+
+    def revisions(from_identifier, to_identifier=Time.infinity, relative_path=nil)
+      checkout unless checked_out?
+      rules = load_rules
+      vob = vob(rules[0])
+      result = Revisions.new
+      
+      unless vob
+        STDERR.puts "No vob found. Please set load rules in the view: #{checkout_dir}"
+        return result 
+      end
+      with_working_dir(checkout_dir) do
+        since = (from_identifier + 1).strftime(TIME_FORMAT)
+        cmd = "cleartool lshistory -recurse -nco -since #{since} -fmt \"#{LOG_FORMAT}\" -pname #{vob}"
+        Better.popen(cmd) do |io|
+          # escape all quotes, except the one at the beginning and end. this is a bit ugly...
+          raw_yaml = io.read
+          fixed_yaml = raw_yaml.gsub(/^  message: \"/, "  message: #{MAGIC_TOKEN}")
+          fixed_yaml = fixed_yaml.gsub(/\"\n\n/, "#{MAGIC_TOKEN}\n\n")
+          fixed_yaml = fixed_yaml.gsub(/\"/, "\\\"")
+          fixed_yaml = fixed_yaml.gsub(MAGIC_TOKEN, "\"")
+ 
+          files = YAML.load(fixed_yaml)
+          files.each do |file|
+            file.path.gsub!(/\\/, "/")
+            file.status = STATUSES[file.status]
+            rev = revision(file.native_revision_identifier)
+            if(rev && matches_load_rules?(rules, file.path))
+              file.native_revision_identifier = rev
+              file.previous_native_revision_identifier = revision(file.previous_native_revision_identifier)
+              t = file.time
+              # the time now has escaped quotes..
+              file.time = Time.utc(t[2..5],t[6..7],t[8..9],t[11..12],t[13..14],t[15..16])
+              file.message.strip!
+              result.add(file)
+            end
+          end
+        end
+      end
+      result
+    end
+
+    def checked_out?
+      !Dir["#{checkout_dir}/*"].empty?
+    end
+
+    def destroy_working_copy
+      Better.popen("cleartool rmview #{checkout_dir}") do |io|
+        io.read
+      end
+    end
+    
+    def import_central(dir, message)
+      Better.popen("clearfsimport -recurse -nsetevent #{dir} #{checkout_dir}") do |io|
+        io.read
+      end
+    end
+    
+    ## Non-RSCM API methods
+
+    def mkview!
        # Create view (working copy)
        mkview_cmd = "cleartool mkview -snapshot -stream #{@stream} -stgloc #{@stgloc} -tag #{@tag} #{@checkout_dir}"
        Better.popen(mkview_cmd) do |io|
          puts io.read
        end
-
-       # Set load rules (by setting config spec)
-       Dir.chdir(checkout_dir) do
-         # tempfile is broken on windows (!!)
-         cfg_spec_file = "__rscm.cfgspec"
-         config_spec_file = File.open(cfg_spec_file, "w") do |io|
-           io.write(@config_spec)
-         end
-
-         setcs_cmd = "cleartool setcs #{cfg_spec_file}"
-         Better.popen(setcs_cmd, "w") do |io|
-           io.write "yes\n"
-         end
-       end
-     end
-   end
-
-   # Administrative files that should be ignored when counting files.
-   def ignore_paths
-     return [/.*\.updt/]
-   end
-
- private
-
-   def vob(rule)
-     if(rule =~ /[\\\/]*([\w]*)/)
-       $1
-     else
-       nil
-     end
-   end
-
-   # What's loaded into view
-   def load_rules
-     result = []
-     config_spec do |io|
-       io.each_line do |line|
-         if(line =~ /^load[\s]*(.*)$/)
-           return result << $1
-         end
-       end
-     end
-     result
-   end
-
-   def config_spec
-     Dir.chdir(checkout_dir) do
-       catcs_cmd = "cleartool catcs"
-       Better.popen(catcs_cmd) do |io|
-         yield io
-       end
-     end
-   end
-
-   def revision(s)
-     if(s =~ /.*\\([\d]*)/)
-       $1.to_i
-     else
-       nil
-     end
-   end
-
-   def matches_load_rules?(rules, path)
-     rules.each do |rule|
-       rule.gsub!(/\\/, "/")
-       return true if path =~ /#{rule[1..-1]}/
-     end
-     false
-   end
-
- end
+    end
+
+    def update_load_rules!
+      Dir.chdir(checkout_dir) do
+        # tempfile is broken on windows (!!)
+        cfg_spec_file = "__rscm.cfgspec"
+        config_spec_file = File.open(cfg_spec_file, "w") do |io|
+          io.write(@config_spec)
+        end
+
+        setcs_cmd = "cleartool setcs #{cfg_spec_file}"
+        Better.popen(setcs_cmd, "w") do |io|
+          io.write "yes\n"
+        end
+      end
+    end
+
+    def catcs
+      Dir.chdir(checkout_dir) do
+        catcs_cmd = "cleartool catcs"
+        Better.popen(catcs_cmd) do |io|
+          yield io
+        end
+      end
+    end
+
+    def vob(load_rule)
+      if(load_rule =~ /[\\\/]*([\w]*)/)
+        $1
+      else
+        nil
+      end
+    end
+
+    # What's loaded into view
+    def load_rules
+      result = []
+      catcs do |io|
+        io.each_line do |line|
+          if(line =~ /^load[\s]*(.*)$/)
+            return result << $1
+          end
+        end
+      end
+      result
+    end
+
+  protected
+
+    def checkout_silent(to_identifier=nil)
+      if(checked_out?)
+        with_working_dir(checkout_dir) do
+          Better.popen("cleartool update .") do |io|
+            io.read
+          end
+        end
+      else
+        mkview!
+ 
+        # Set load rules (by setting config spec)
+        #update_load_rules!
+      end
+    end
+
+    # Administrative files that should be ignored when counting files.
+    def ignore_paths
+      return [/.*\.updt/]
+    end
+
+  private
+
+    def revision(s)
+      if(s =~ /.*\\([\d]*)/)
+        $1.to_i
+      else
+        nil
+      end
+    end
+
+    def matches_load_rules?(rules, path)
+      rules.each do |rule|
+        rule.gsub!(/\\/, "/")
+        return true if path =~ /#{rule[1..-1]}/
+      end
+      false
+    end
+
+  end
 end

data/lib/rscm/scm/cvs.rb

@@ -190,7 +190,11 @@ module RSCM
     end
 
     def destroy_central
-      FileUtils.rm_rf(path)
+      if(File.exist?(path) && local?)
+        FileUtils.rm_rf(path)
+      else
+        raise "Cannot destroy central repository. '#{path}' doesn't exist or central repo isn't local to this machine"
+      end
     end
     
     def central_exists?

data/lib/rscm/scm/subversion.rb

@@ -107,11 +107,9 @@ module RSCM
     end
 
     def diff(file, &block)
-      with_working_dir(@checkout_dir) do
-        cmd = "svn diff --revision #{file.previous_native_revision_identifier}:#{file.native_revision_identifier} \"#{url}/#{file.path}\""
-        Better.popen(cmd) do |io|
-          return(yield(io))
-        end
+      cmd = "svn diff --revision #{file.previous_native_revision_identifier}:#{file.native_revision_identifier} \"#{url}/#{file.path}\""
+      Better.popen(cmd) do |io|
+        return(yield(io))
       end
     end
     
@@ -126,7 +124,11 @@ module RSCM
     end
 
     def destroy_central
-      FileUtils.rm_rf(svnrootdir)
+      if(File.exist?(svnrootdir) && local?)
+        FileUtils.rm_rf(svnrootdir)
+      else
+        raise "Cannot destroy central repository. '#{svnrootdir}' doesn't exist or central repo isn't local to this machine"
+      end
     end
 
     def central_exists?
@@ -200,11 +202,9 @@ module RSCM
       revisions = nil
       command = "svn #{changes_command(from_identifier, to_identifier, relative_path)}"
 
-      with_working_dir(@checkout_dir) do
-        Better.popen(command) do |stdout|
-          parser = SubversionLogParser.new(stdout, @url)
-          revisions = parser.parse_revisions
-        end
+      Better.popen(command) do |stdout|
+        parser = SubversionLogParser.new(stdout, @url)
+        revisions = parser.parse_revisions
       end
       revisions
     end
@@ -238,12 +238,10 @@ module RSCM
       # We therefore don't specify it and get the latest revision from the full url instead.
       # cmd = "svn log #{login_options} #{repourl} -r HEAD"
       cmd = "svn log #{login_options} #{url}"
-      with_working_dir(@checkout_dir) do
-        Better.popen(cmd) do |stdout|
-          parser = SubversionLogParser.new(stdout, @url)
-          revisions = parser.parse_revisions
-          revisions[0].identifier.to_i
-        end
+      Better.popen(cmd) do |stdout|
+        parser = SubversionLogParser.new(stdout, @url)
+        revisions = parser.parse_revisions
+        revisions[0].identifier.to_i
       end
     end
 

data/test/rscm/generic_scm_tests.rb

@@ -11,10 +11,11 @@ module RSCM
     def teardown
       if @scm
         begin
-          @scm.destroy_centra
+          @scm.destroy_working_copy
+          @scm.destroy_central
         rescue => e
           # Fails on windows with TortoiseCVS' cvs because of resident cvslock.exe
-          STDERR.puts "Couldn't destroy central #{@scm.class.name}"
+          STDERR.puts "Couldn't destroy central #{@scm.class.name}: #{e.message}"
         end
       end
     end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: rscm
 version: !ruby/object:Gem::Version 
-  version: 0.3.8
-date: 2005-10-11 00:00:00 -04:00
+  version: 0.3.9
+date: 2005-10-12 00:00:00 -04:00
 summary: "RSCM - Ruby Source Control Management"
 require_paths: 
   - lib