rscm 0.1.0.1338 → 0.2.0

data/lib/rscm/{svn/svn_log_parser.rb → scm/subversion_log_parser.rb}

@@ -3,10 +3,10 @@ require 'rscm/changes'
 
 module RSCM
 
-  class SVNLogParser
+  class SubversionLogParser
     def initialize(io, path, checkout_dir)
       @io = io
-      @changeset_parser = SVNLogEntryParser.new(path, checkout_dir)
+      @changeset_parser = SubversionLogEntryParser.new(path, checkout_dir)
     end
     
     def parse_changesets(&line_proc)
@@ -23,7 +23,7 @@ module RSCM
     end
   end
   
-  class SVNLogEntryParser < Parser
+  class SubversionLogEntryParser < Parser
 
     def initialize(path, checkout_dir)
       super(/^------------------------------------------------------------------------/)
@@ -50,7 +50,7 @@ module RSCM
       elsif(@parse_state == :parse_changes)
         change = parse_change(line)
         if change
-          # This unless won't work for new directories
+          # This unless won't work for new directories or if changesets are computed before checkout (which it usually is!)
           fullpath = "#{@checkout_dir}/#{change.path}"
           @changeset << change unless File.directory?(fullpath)
         end
@@ -67,7 +67,7 @@ module RSCM
 
   private
   
-    STATES = {"M" => Change::MODIFIED, "A" => Change::ADDED, "D" => Change::DELETED}
+    STATES = {"M" => Change::MODIFIED, "A" => Change::ADDED, "D" => Change::DELETED} unless defined? STATES
 
     def parse_header(line)
       @changeset = ChangeSet.new
@@ -84,8 +84,9 @@ module RSCM
       if(line =~ /^   [M|A|D|R] ([^\s]+) \(from (.*)\)/)
         path_from_root = $1
         change.status = Change::MOVED
-      elsif(line =~ /^   ([M|A|D]) (.+)$/)
-        status, path_from_root = line.split
+      elsif(line =~ /^   ([M|A|D|R]) (.+)$/)
+        status = $1
+        path_from_root = $2
         change.status = STATES[status]
       else
         raise "could not parse change line: '#{line}'"

data/test/rscm/abstract_scm_test.rb

@@ -0,0 +1,21 @@
+require 'test/unit'
+require 'rscm'
+
+module RSCM
+  class AbstractSCMTest < Test::Unit::TestCase
+    def test_should_load_all_scm_classes
+      expected_scms_classes = [
+        Cvs,
+        Darcs,
+        Monotone,
+        Mooky,
+        Perforce,
+        StarTeam,
+        Subversion
+      ]
+      assert_equal(
+        expected_scms_classes.collect{|c| c.name},
+        AbstractSCM.classes.collect{|c| c.name}.sort)
+    end
+  end
+end

data/test/rscm/annotations_test.rb

@@ -0,0 +1,57 @@
+require 'test/unit'
+require 'rscm/annotations'
+
+module RSCM
+  class Whatever
+    attr_accessor :no_annotation
+    ann :boo => "huba luba", :pip => "pip pip"
+    attr_accessor :foo
+  
+    ann :desc => "bang bang"
+    ann :tip => "a top tip"
+    attr_accessor :bar, :zap
+  end
+
+  class Other
+    attr_accessor :no_annotation
+    ann :boo => "boo"
+    ann :pip => "pip"
+    attr_accessor :foo
+  
+    ann :desc => "desc", :tip => "tip"
+    attr_accessor :bar, :zap
+  end
+  
+  class Subclass < Other
+  end
+
+  class AnnotationsTest < Test::Unit::TestCase
+    def test_should_handle_annotations_really_well
+      assert_equal("huba luba", Whatever.foo[:boo])
+      assert_equal("pip pip", Whatever.foo[:pip])
+
+      assert_nil(Whatever.bar[:pip])
+      assert_equal("bang bang", Whatever.bar[:desc])
+      assert_equal("a top tip", Whatever.bar[:tip])
+
+      assert_equal("bang bang", Whatever.zap[:desc])
+      assert_equal("a top tip", Whatever.zap[:tip])
+
+      assert_equal("boo", Other.foo[:boo])
+      assert_equal("pip", Other.foo[:pip])
+
+      assert_nil(Whatever.bar[:pip])
+      assert_equal("desc", Other.bar[:desc])
+      assert_equal("tip", Other.bar[:tip])
+
+      assert_equal("desc", Other.zap[:desc])
+      assert_equal("tip", Other.zap[:tip])
+    end
+
+    def test_should_inherit_attribute_annotations
+      assert_equal("boo", Subclass.foo[:boo])
+      assert_equal({:boo => "boo", :pip => "pip"}, Subclass.send("foo"))
+      assert_nil(Whatever.send("no_annotation"))
+    end
+  end
+end

data/test/rscm/changes_fixture.rb

@@ -5,16 +5,16 @@ module RSCM
   module ChangesFixture
     def setup_changes
       #1
-      @change1 = RSCM::Change.new("path/one",   "jon",   "Fixed CATCH-22", nil, Time.utc(2004,7,5,12,0,2))
-      @change2 = RSCM::Change.new("path/two",   "jon",   "Fixed CATCH-22", nil, Time.utc(2004,7,5,12,0,4))
+      @change1 = RSCM::Change.new("path/one", nil,   "jon",   "Fixed CATCH-22", nil, Time.utc(2004,7,5,12,0,2))
+      @change2 = RSCM::Change.new("path/two", nil,   "jon",   "Fixed CATCH-22", nil, Time.utc(2004,7,5,12,0,4))
       #2
-      @change3 = RSCM::Change.new("path/three", "jon",   "hipp hurra", nil, Time.utc(2004,7,5,12,0,6))
+      @change3 = RSCM::Change.new("path/three", nil, "jon",   "hipp hurra", nil, Time.utc(2004,7,5,12,0,6))
       #3
-      @change4 = RSCM::Change.new("path/four",  "aslak", "hipp hurraX", nil, Time.utc(2004,7,5,12,0,8))
+      @change4 = RSCM::Change.new("path/four", nil,  "aslak", "hipp hurraX", nil, Time.utc(2004,7,5,12,0,8))
       #4
-      @change5 = RSCM::Change.new("path/five",  "aslak", "hipp hurra", nil, Time.utc(2004,7,5,12,0,10))
-      @change6 = RSCM::Change.new("path/six",   "aslak", "hipp hurra", nil, Time.utc(2004,7,5,12,0,12))
-      @change7 = RSCM::Change.new("path/seven", "aslak", "hipp hurra", nil, Time.utc(2004,7,5,12,0,14))
+      @change5 = RSCM::Change.new("path/five", nil,  "aslak", "hipp hurra", nil, Time.utc(2004,7,5,12,0,10))
+      @change6 = RSCM::Change.new("path/six", nil,   "aslak", "hipp hurra", nil, Time.utc(2004,7,5,12,0,12))
+      @change7 = RSCM::Change.new("path/seven", nil, "aslak", "hipp hurra", nil, Time.utc(2004,7,5,12,0,14))
     end
   end
 end

data/test/rscm/changes_test.rb

@@ -97,9 +97,9 @@ module RSCM
     
     def test_reports_timestamp_of_latest_change
       changeset = ChangeSet.new
-      changeset << Change.new(nil, nil, nil, nil, Time.utc(2004))
-      changeset << Change.new(nil, nil, nil, nil, Time.utc(2005))
-      changeset << Change.new(nil, nil, nil, nil, Time.utc(2003))
+      changeset << Change.new(nil, nil, nil, nil, nil, Time.utc(2004))
+      changeset << Change.new(nil, nil, nil, nil, nil, Time.utc(2005))
+      changeset << Change.new(nil, nil, nil, nil, nil, Time.utc(2003))
       assert_equal(Time.utc(2005), changeset.time)
     end
 

data/test/rscm/generic_scm_tests.rb

@@ -57,7 +57,7 @@ module RSCM
       assert_equal("src/java/com/thoughtworks/damagecontrolled/Thingy.java", files[2])
       assert_equal("src/test/com/thoughtworks/damagecontrolled/ThingyTestCase.java", files[3])
 
-      initial_changesets = scm.changesets(checkout_dir, nil, nil, files)
+      initial_changesets = scm.changesets(checkout_dir, nil, nil)
       assert_equal(1, initial_changesets.length)
       initial_changeset = initial_changesets[0]
       assert_equal("imported\nsources", initial_changeset.message)
@@ -77,7 +77,7 @@ module RSCM
       # check that we now have one more change
       changesets = scm.changesets(checkout_dir, initial_changesets.time + 1)
 
-      assert_equal(1, changesets.length)
+      assert_equal(1, changesets.length, changesets.collect{|cs| cs.to_s})
       changeset = changesets[0]
       assert_equal(2, changeset.length)
 

data/test/rscm/{cvs → scm}/cvs_log_parser_test.rb

@@ -1,16 +1,15 @@
 require 'test/unit'
 require 'stringio'
 require 'fileutils'
-require 'rscm/changes'
-require 'rscm/cvs/cvs_log_parser'
+require 'rscm'
 
 module RSCM
-  class CVSLogParserTest < Test::Unit::TestCase
+  class CvsLogParserTest < Test::Unit::TestCase
   
     include FileUtils
     
     def setup
-      @parser = CVSLogParser.new(nil)
+      @parser = CvsLogParser.new(nil)
       @parser.cvspath = "/scm/damagecontrol"
       @parser.cvsmodule = "damagecontrol"
     end
@@ -20,12 +19,12 @@ module RSCM
     end
     
     def test_read_log_entry
-      assert_equal(nil, CVSLogParser.new(StringIO.new("")).next_log_entry)
+      assert_equal(nil, CvsLogParser.new(StringIO.new("")).next_log_entry)
     end
     
     def test_parses_entire_log_into_changesets
       File.open(File.dirname(__FILE__) + "/cvs-test.log") do |io|
-        @parser = CVSLogParser.new(io)
+        @parser = CvsLogParser.new(io)
         changesets = @parser.parse_changesets
         
         assert_equal(24, changesets.length)
@@ -37,7 +36,7 @@ module RSCM
     # http://jira.codehaus.org/browse/DC-312
     def test_jira_dc_312
       File.open(File.dirname(__FILE__) + "/cvs-dataforge.log") do |io|
-        @parser = CVSLogParser.new(io)
+        @parser = CvsLogParser.new(io)
         changesets = @parser.parse_changesets
         
         assert_equal(271, changesets.length)
@@ -110,7 +109,7 @@ EOF
     end
     
     def test_log_from_e2e_test
-      @parser = CVSLogParser.new(StringIO.new(LOG_FROM_E2E_TEST))
+      @parser = CvsLogParser.new(StringIO.new(LOG_FROM_E2E_TEST))
       changesets = @parser.parse_changesets
       assert_equal(2, changesets.length)
       assert_match(/foo/, changesets[1].message)
@@ -195,7 +194,7 @@ description:
 EOF
 
     def test_can_parse_LOG_FROM_05_07_2004_19_41
-      @parser = CVSLogParser.new(StringIO.new(LOG_FROM_05_07_2004_19_41))
+      @parser = CvsLogParser.new(StringIO.new(LOG_FROM_05_07_2004_19_41))
       assert_equal(11, @parser.split_entries(LOG_FROM_05_07_2004_19_41).size)
       assert_equal("server/damagecontrol/scm/CVS.rb", @parser.parse_path(@parser.split_entries(LOG_FROM_05_07_2004_19_41)[0]))
       changesets = @parser.parse_changesets
@@ -359,7 +358,7 @@ fixed broken url (NANO-8)
 EOF
 
     def test_can_parse_LOG_WITH_DELETIONS
-      @parser = CVSLogParser.new(StringIO.new(LOG_WITH_DELETIONS))
+      @parser = CvsLogParser.new(StringIO.new(LOG_WITH_DELETIONS))
       changesets = @parser.parse_changesets
       assert_equal(2, changesets.length)
 
@@ -415,7 +414,7 @@ description:
 EOF
 
     def test_can_parse_LOG_WITH_MISSING_ENTRIES
-      @parser = CVSLogParser.new(StringIO.new(LOG_WITH_MISSING_ENTRIES))
+      @parser = CvsLogParser.new(StringIO.new(LOG_WITH_MISSING_ENTRIES))
       changesets = @parser.parse_changesets
       assert_equal(0, changesets.length)
     end
@@ -461,7 +460,7 @@ installer!!!!!! it's getting close to release!!!
 EOF
 
     def test_can_distinguish_new_file_from_old_file
-      @parser = CVSLogParser.new(StringIO.new(LOG_WITH_NEW_AND_OLD_FILE))
+      @parser = CvsLogParser.new(StringIO.new(LOG_WITH_NEW_AND_OLD_FILE))
       changesets = @parser.parse_changesets
 
       assert_equal(Change::ADDED,    changesets[0][0].status)
@@ -566,7 +565,7 @@ Final changes for 2.1 release
 EOF
 
     def test_can_parse_logs_with_cvs_and_dashes_in_commit_message
-      @parser = CVSLogParser.new(StringIO.new(LOG_WITH_WEIRD_CVS_AND_MANY_DASHES))
+      @parser = CvsLogParser.new(StringIO.new(LOG_WITH_WEIRD_CVS_AND_MANY_DASHES))
       changesets = @parser.parse_changesets
       assert_equal(6, changesets.length)
     end

data/test/rscm/{cvs → scm}/cvs_test.rb

@@ -1,30 +1,30 @@
 require 'test/unit'
 require 'rscm/path_converter'
-require 'rscm/cvs/cvs'
+require 'rscm'
 require 'rscm/generic_scm_tests'
 
 module RSCM
 
-  class CVS
+  class Cvs
     # Convenience factory method used in testing
-    def CVS.local(cvsroot_dir, mod)
+    def Cvs.local(cvsroot_dir, mod)
       cvsroot_dir = PathConverter.filepath_to_nativepath(cvsroot_dir, true)
-      CVS.new(":local:#{cvsroot_dir}", mod)
+      Cvs.new(":local:#{cvsroot_dir}", mod)
     end
   end
   
-  class CVSTest < Test::Unit::TestCase
+  class CvsTest < Test::Unit::TestCase
     
     include GenericSCMTests
     include ApplyLabelTest
     
     def create_scm(repository_root_dir, path)
-      CVS.local(repository_root_dir, path)
+      Cvs.local(repository_root_dir, path)
     end
 
     def test_should_fail_on_bad_command
       assert_raise(RuntimeError) do
-        CVS.new("").create
+        Cvs.new("").create
       end
     end
     

data/test/rscm/{darcs → scm}/darcs_test.rb

@@ -1,7 +1,7 @@
 require 'test/unit'
 require 'fileutils'
+require 'rscm'
 require 'rscm/generic_scm_tests'
-require 'rscm/darcs/darcs'
 
 module RSCM
   class DarcsTest < Test::Unit::TestCase

data/test/rscm/scm/monotone_log_parser_test.rb

@@ -0,0 +1,109 @@
+require 'test/unit'
+require 'stringio'
+require 'rscm'
+
+module RSCM
+  class MonotoneLogParserTest < Test::Unit::TestCase
+  
+CHANGESET = <<EOF
+-----------------------------------------------------------------
+Revision: a2c58e276439de7d9da549870e245776c592c7e8
+Author: tester@test.net
+Date: 2005-03-02T06:32:43
+
+Added files:
+        build.xml project.xml
+        src/java/com/thoughtworks/damagecontrolled/Thingy.java
+        src/test/com/thoughtworks/damagecontrolled/ThingyTestCase.java
+
+ChangeLog:
+
+imported
+sources
+EOF
+
+    def test_should_parse_CHANGESET_to_changeset
+      parser = MonotoneLogParser.new
+      changeset = parser.parse_changeset(StringIO.new(CHANGESET), {})
+
+      assert_equal("a2c58e276439de7d9da549870e245776c592c7e8", changeset.revision)
+      assert_equal("tester@test.net", changeset.developer)
+      assert_equal(Time.utc(2005,3,2,6,32,43), changeset.time)
+
+      assert_equal(4, changeset.length)
+
+      assert_equal("build.xml", changeset[0].path)
+      assert_equal(Change::ADDED, changeset[0].status)
+
+      assert_equal("project.xml", changeset[1].path)
+      assert_equal(Change::ADDED, changeset[1].status)
+
+      assert_equal("src/java/com/thoughtworks/damagecontrolled/Thingy.java", changeset[2].path)
+      assert_equal(Change::ADDED, changeset[2].status)
+
+      assert_equal("src/test/com/thoughtworks/damagecontrolled/ThingyTestCase.java", changeset[3].path)
+      assert_equal(Change::ADDED, changeset[3].status)
+
+      assert_equal("imported\nsources", changeset.message)
+    end
+
+CHANGESETS = <<EOF
+-----------------------------------------------------------------
+Revision: abbe1eb8f75bdf9b27d440340ec329816c13985c
+Author: tester@test.net
+Date: 2005-03-02T06:33:01
+
+Modified files:
+        build.xml
+        src/java/com/thoughtworks/damagecontrolled/Thingy.java
+
+ChangeLog:
+
+changed
+something
+-----------------------------------------------------------------
+Revision: a2c58e276439de7d9da549870e245776c592c7e8
+Author: tester@test.net
+Date: 2005-03-02T06:32:43
+
+Added files:
+        build.xml project.xml
+        src/java/com/thoughtworks/damagecontrolled/Thingy.java
+        src/test/com/thoughtworks/damagecontrolled/ThingyTestCase.java
+
+ChangeLog:
+
+imported
+sources
+EOF
+
+    def test_should_parse_CHANGESETS_to_changesets
+      parser = MonotoneLogParser.new
+      changesets = parser.parse_changesets(StringIO.new(CHANGESETS))
+      assert_equal(2, changesets.length)
+      changeset = changesets[0]
+
+      assert_equal("build.xml", changeset[0].path)
+      assert_equal(Change::MODIFIED, changeset[0].status)
+
+      assert_equal("src/java/com/thoughtworks/damagecontrolled/Thingy.java", changeset[1].path)
+      assert_equal(Change::MODIFIED, changeset[1].status)
+    end
+
+    def test_should_parse_CHANGESETS_to_changesets_before
+      parser = MonotoneLogParser.new
+      changesets = parser.parse_changesets(StringIO.new(CHANGESETS), Time.utc(2005,03,02,06,32,43))
+      assert_equal(2, changesets.length)
+
+      changesets = parser.parse_changesets(StringIO.new(CHANGESETS), Time.utc(2005,03,02,06,32,44))
+      assert_equal(1, changesets.length)
+    end
+
+    def test_should_parse_CHANGESET_to_changesets
+      parser = MonotoneLogParser.new
+      changesets = parser.parse_changesets(StringIO.new(CHANGESET))
+      assert_equal(1, changesets.length)
+    end
+
+  end
+end

data/test/rscm/{monotone → scm}/monotone_test.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
+require 'rscm'
 require 'rscm/generic_scm_tests'
-require 'rscm/monotone/monotone'
 
 module RSCM
   class MonotoneTest < Test::Unit::TestCase