rscm 0.4.2 → 0.4.3

data/CHANGES

@@ -1,5 +1,11 @@
 = RSCM Changelog
 
+== 0.4.3
+
+This release fixes a subtle bug in revision detection for Subversion
+
+* Reintroduced the path parameter for svn log parser. It will be used as a fallback if a file path cannot be determined from looking at the URL. A RSCM::Subversion object with a URL pointing to the root of the repo *MUST* also specify path="", otherwise no files will be detected in the revisions. Instances with URLs that represent a subdirectory of the root URL don't need to specify path, unless the instance is used to install/uninstall triggers - or to create repositories.
+
 == 0.4.2
 
 This release fixes a number of subtle bugs related to command lines and logging

data/README

@@ -1,4 +1,4 @@
-= RSCM - Ruby Source Control Management (0.4.2)
+= RSCM - Ruby Source Control Management (0.4.3)
 
 RSCM is to SCM what DBI/JDBC/ODBC are to databases - an SCM-independent API for accessing different SCMs. The high level features are roughly:
 

data/lib/rscm/scm/subversion.rb

@@ -16,6 +16,8 @@ module RSCM
     include PathConverter
     
     attr_accessor :url
+    # Must be specified in order to create repo and install triggers. 
+    # Must also be specified as "" if the url represents the root of the repository, or files in revisions will not be detected.
     attr_accessor :path
     attr_accessor :username
     attr_accessor :password
@@ -76,7 +78,7 @@ module RSCM
     end
 
     def can_create_central?
-      local?
+      local? && !path.nil? && !(path == "")
     end
 
     def destroy_central
@@ -168,7 +170,7 @@ module RSCM
       revisions = nil
       command = "svn #{changes_command(options[:from_identifier], options[:to_identifier], options[:relative_path])}"
       execute(command, options) do |stdout|
-        parser = SubversionLogParser.new(stdout, @url, options[:from_identifier])
+        parser = SubversionLogParser.new(stdout, @url, options[:from_identifier], @path)
         revisions = parser.parse_revisions
       end
       revisions

data/lib/rscm/scm/subversion_log_parser.rb

@@ -4,9 +4,9 @@ require 'rscm/revision'
 module RSCM
 
   class SubversionLogParser
-    def initialize(io, url, exclude_below=nil)
+    def initialize(io, url, exclude_below=nil, path=nil)
       @io = io
-      @revision_parser = SubversionLogEntryParser.new(url)
+      @revision_parser = SubversionLogEntryParser.new(url, path)
       @exclude_below = exclude_below
     end
     
@@ -34,9 +34,10 @@ module RSCM
   
   class SubversionLogEntryParser < Parser
 
-    def initialize(url)
+    def initialize(url, path=nil)
       super(/^------------------------------------------------------------------------/)
       @url = url
+      @path = path
     end
 
     def parse(io, skip_line_parsing=false, &line_proc)
@@ -46,15 +47,15 @@ module RSCM
       revision
     end
 
-    def relative_path(url, repo_path)
-      repo_path = repo_path.chomp
+    def relative_path(url, path_from_root)
+      path_from_root = path_from_root.chomp
       url_tokens = url.split('/')
-      repo_path_tokens = repo_path.split('/')
+      path_from_root_tokens = path_from_root.split('/')
       
-      max_similar = repo_path_tokens.length
+      max_similar = path_from_root_tokens.length
       while(max_similar > 0)
         url = url_tokens[-max_similar..-1]
-        path = repo_path_tokens[0..max_similar-1]
+        path = path_from_root_tokens[0..max_similar-1]
         if(url == path)
           break
         end
@@ -63,7 +64,7 @@ module RSCM
       if(max_similar == 0) 
         nil
       else
-        repo_path_tokens[max_similar..-1].join("/")
+        path_from_root_tokens[max_similar..-1].join("/")
       end
     end
     
@@ -132,14 +133,15 @@ module RSCM
       path_from_root.gsub!(/\\/, "/")
       path_from_root = path_from_root[1..-1]
       rp = relative_path(@url, path_from_root)
-      return if rp.nil?
-      file.path = rp
-
-#      if(@path.length+1 == path_from_root.length)
-#        file.path = path_from_root[@path.length+1..-1]
-#      else
-#        file.path = path_from_root[@path.length+2..-1]
-#      end
+      if rp.nil?
+        if !@path.nil?
+          file.path = path_from_root[@path.length..-1]
+        else
+          return
+        end
+      else
+        file.path = rp
+      end
 
       file.native_revision_identifier =  @revision.identifier
       # http://jira.codehaus.org/browse/DC-204

data/lib/rscm/version.rb

@@ -2,7 +2,7 @@ module RSCM
   module VERSION
     MAJOR = 0
     MINOR = 4
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
 

data/test/rscm/scm/subversion_log_parser_test.rb

@@ -136,7 +136,7 @@ Updated website for 1.1.2 release.
 EOF
 
     def test_should_filter_out_unwanted_entries
-      parser = SubversionLogParser.new(StringIO.new(SVN_XSTREAM_LOG), "svn://foo/trunk/xstream")
+      parser = SubversionLogParser.new(StringIO.new(SVN_XSTREAM_LOG), "svn://foo/trunk/xstream/")
       revisions = parser.parse_revisions
       assert_equal(593, revisions[0].identifier)
       assert_equal("build.xml", revisions[0][0].path)
@@ -174,7 +174,7 @@ EOF
       assert_equal(4, revisions[0].length)
     end
 
-    def test_should_not_require_path
+    def test_should_find_relative_path_by_matching
       slep = SubversionLogEntryParser.new(nil)
       url = "svn://svn.xstream.codehaus.org/xstream/scm/trunk/xstream"
       assert_equal("build.xml", slep.relative_path(url, "trunk/xstream/build.xml"))
@@ -204,5 +204,24 @@ EOF
       assert_equal("abit/funny?/bla/bla", revisions[0][1].path)
       assert_equal("abit/funny*/bla/bla", revisions[0][2].path)
     end
+
+NO_PREFIX_LOG = <<-EOF
+------------------------------------------------------------------------
+r4 | aslakhellesoy | 2006-02-27 12:03:48 -0600 (Mon, 27 Feb 2006) | 1 line
+Changed paths:
+   M /Rakefile
+   M /lib/foo.rb
+
+bugzzz
+------------------------------------------------------------------------
+EOF
+    
+    # We support paths from root only if path is specified
+    def test_no_prefix_log
+      parser = SubversionLogParser.new(StringIO.new(NO_PREFIX_LOG), "svn://mooky/funny/", nil, "")
+      revisions = parser.parse_revisions
+      assert_equal("Rakefile", revisions[0][0].path)
+      assert_equal("lib/foo.rb", revisions[0][1].path)
+    end
   end
 end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: rscm
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.4.3
 date: 2006-02-27 00:00:00 -06:00
 summary: RSCM - Ruby Source Control Management
 require_paths: