rscm 0.2.1.1404 → 0.3.0

data/test/rscm/scm/monotone_log_parser_test.rb

@@ -22,29 +22,29 @@ imported
 sources
 EOF
 
-    def test_should_parse_CHANGESET_to_changeset
+    def test_should_parse_CHANGESET_to_revision
       parser = MonotoneLogParser.new
-      changeset = parser.parse_changeset(StringIO.new(CHANGESET), {})
+      revision = parser.parse_revision(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("a2c58e276439de7d9da549870e245776c592c7e8", revision.identifier)
+      assert_equal("tester@test.net", revision.developer)
+      assert_equal(Time.utc(2005,3,2,6,32,43), revision.time)
 
-      assert_equal(4, changeset.length)
+      assert_equal(4, revision.length)
 
-      assert_equal("build.xml", changeset[0].path)
-      assert_equal(Change::ADDED, changeset[0].status)
+      assert_equal("build.xml", revision[0].path)
+      assert_equal(RevisionFile::ADDED, revision[0].status)
 
-      assert_equal("project.xml", changeset[1].path)
-      assert_equal(Change::ADDED, changeset[1].status)
+      assert_equal("project.xml", revision[1].path)
+      assert_equal(RevisionFile::ADDED, revision[1].status)
 
-      assert_equal("src/java/com/thoughtworks/damagecontrolled/Thingy.java", changeset[2].path)
-      assert_equal(Change::ADDED, changeset[2].status)
+      assert_equal("src/java/com/thoughtworks/damagecontrolled/Thingy.java", revision[2].path)
+      assert_equal(RevisionFile::ADDED, revision[2].status)
 
-      assert_equal("src/test/com/thoughtworks/damagecontrolled/ThingyTestCase.java", changeset[3].path)
-      assert_equal(Change::ADDED, changeset[3].status)
+      assert_equal("src/test/com/thoughtworks/damagecontrolled/ThingyTestCase.java", revision[3].path)
+      assert_equal(RevisionFile::ADDED, revision[3].status)
 
-      assert_equal("imported\nsources", changeset.message)
+      assert_equal("imported\nsources", revision.message)
     end
 
 CHANGESETS = <<EOF
@@ -77,32 +77,50 @@ imported
 sources
 EOF
 
-    def test_should_parse_CHANGESETS_to_changesets
+    def test_should_parse_CHANGESETS_to_revisions
       parser = MonotoneLogParser.new
-      changesets = parser.parse_changesets(StringIO.new(CHANGESETS))
-      assert_equal(2, changesets.length)
-      changeset = changesets[0]
+      revisions = parser.parse_revisions(StringIO.new(CHANGESETS))
+      assert_equal(2, revisions.length)
+      revision = revisions[0]
 
-      assert_equal("build.xml", changeset[0].path)
-      assert_equal(Change::MODIFIED, changeset[0].status)
+      assert_equal("build.xml", revision[0].path)
+      assert_equal(RevisionFile::MODIFIED, revision[0].status)
 
-      assert_equal("src/java/com/thoughtworks/damagecontrolled/Thingy.java", changeset[1].path)
-      assert_equal(Change::MODIFIED, changeset[1].status)
+      assert_equal("src/java/com/thoughtworks/damagecontrolled/Thingy.java", revision[1].path)
+      assert_equal(RevisionFile::MODIFIED, revision[1].status)
     end
 
-    def test_should_parse_CHANGESETS_to_changesets_before
+    def test_should_parse_CHANGESETS_to_revisions_before
       parser = MonotoneLogParser.new
-      changesets = parser.parse_changesets(StringIO.new(CHANGESETS), Time.utc(2005,03,02,06,32,43))
-      assert_equal(2, changesets.length)
+      revisions = parser.parse_revisions(StringIO.new(CHANGESETS), Time.utc(2005,03,02,06,32,42))
+      assert_equal(2, revisions.length)
+
+      revisions = parser.parse_revisions(StringIO.new(CHANGESETS), Time.utc(2005,03,02,06,32,43))
+      assert_equal(1, revisions.length)
+
+      revisions = parser.parse_revisions(StringIO.new(CHANGESETS), Time.utc(2005,03,02,06,33,00))
+      assert_equal(1, revisions.length)
+
+      revisions = parser.parse_revisions(StringIO.new(CHANGESETS), Time.utc(2005,03,02,06,33,01))
+      assert_equal(0, revisions.length)
+    end
+
+    def test_should_parse_CHANGESETS_to_revisions_before_with_ids
+      parser = MonotoneLogParser.new
+      revisions = parser.parse_revisions(StringIO.new(CHANGESETS), "a2c58e276439de7d9da549870e245776c592c7e8")
+      assert_equal(1, revisions.length)
+      assert_equal("a2c58e276439de7d9da549870e245776c592c7e8", revisions[0][0].previous_native_revision_identifier)
+      assert_equal("abbe1eb8f75bdf9b27d440340ec329816c13985c", revisions[0][0].native_revision_identifier)
+
 
-      changesets = parser.parse_changesets(StringIO.new(CHANGESETS), Time.utc(2005,03,02,06,32,44))
-      assert_equal(1, changesets.length)
+      revisions = parser.parse_revisions(StringIO.new(CHANGESETS), "abbe1eb8f75bdf9b27d440340ec329816c13985c")
+      assert_equal(0, revisions.length)
     end
 
-    def test_should_parse_CHANGESET_to_changesets
+    def test_should_parse_CHANGESET_to_revisions
       parser = MonotoneLogParser.new
-      changesets = parser.parse_changesets(StringIO.new(CHANGESET))
-      assert_equal(1, changesets.length)
+      revisions = parser.parse_revisions(StringIO.new(CHANGESET))
+      assert_equal(1, revisions.length)
     end
 
   end

data/test/rscm/scm/monotone_test.rb

@@ -8,11 +8,12 @@ module RSCM
 
     def create_scm(repository_root_dir, path)
       mt = Monotone.new(
-        "#{repository_root_dir}/MT.db",
         "com.example.testproject",
         "tester@test.net",
         "tester@test.net",
-        File.dirname(__FILE__) + "/keys"
+        File.dirname(__FILE__) + "/keys",
+        "localhost",
+        "#{repository_root_dir}/central_repo"
       )
     end
   end

data/test/rscm/scm/p4client_test.rb

@@ -0,0 +1,33 @@
+require 'test/unit'
+require 'rscm'
+require 'rscm/generic_scm_tests'
+
+module RSCM
+  class P4Client 
+      
+      include Test::Unit::Assertions
+      
+      def p4(cmd)
+          assert_equal @expected, cmd
+          @returnValue
+      end
+      
+      def expect cmd, returnValue
+          @expected = cmd
+          @returnValue = returnValue
+      end
+  end
+
+  class P4ClientTests < Test::Unit::TestCase
+      def test_correctly_decodes_changes_specifiers
+          client = P4Client.new "foo"
+          client.expect "changes //...@1200,2036/01/01:00:00:00", ""
+          client.revisions("1200", Time.infinity) 
+      end
+      def test_should_accept_changespecs_for_from_and_to
+          client = P4Client.new "foo"
+          client.expect "changes //...@1200,@1300", ""
+          client.revisions("1200", "1300") 
+      end
+  end
+end

data/test/rscm/scm/perforce_test.rb

@@ -4,11 +4,33 @@ require 'rscm/generic_scm_tests'
 
 module RSCM
   class PerforceTest < Test::Unit::TestCase
-
     include GenericSCMTests
 
-    def create_scm(repository_root_dir, path)
-      Perforce.new(repository_root_dir)
+    def create_scm(repository_root_dir, path = nil)
+      p4 = Perforce.new
+      p4.repository_root_dir = repository_root_dir
+      p4
+    end
+
+    def test_shuld_create_new_client_only_if_it_does_not_already_exist
+      work_dir = RSCM.new_temp_dir("use_existing_client")
+      checkout_dir = "#{work_dir}/WorkingCopy"
+      repository_dir = "#{work_dir}/repository"
+      name = "client-one"
+
+      scm = create_scm(repository_dir)
+      scm.client_name = name
+      scm.checkout_dir = checkout_dir
+
+      scm.create_central
+      @scm = scm
+      import_damagecontrolled(scm, "#{work_dir}/damagecontrolled")
+      assert(!scm.uptodate?(nil))
+
+      other = create_scm(repository_dir)
+      other.client_name = name
+      other.checkout_dir = checkout_dir
+      assert(!other.uptodate?(nil))
     end
   end
 end

data/test/rscm/scm/star_team.rb

@@ -11,18 +11,18 @@ module RSCM
       StarTeam.new(ENV["STARTEAM_USER"], ENV["STARTEAM_PASS"], "192.168.254.21", 49201, "NGST Application", "NGST Application", "java")
     end
 
-    def test_changesets
+    def test_revisions
       from = Time.new - 2 * 3600 * 24
       to = Time.new - 1 * 3600 * 24
-      puts "Getting changesets for #{from} - #{to}"
+      puts "Getting revisions for #{from} - #{to}"
     
-      changesets = create_scm(nil, nil).changesets(nil, from, to)
-      assert_equal(1, changesets.length)
-      assert_equal(Time.utc(2004, 11, 30, 04, 52, 24), changesets[0][0].time)
-      assert_equal(Time.utc(2004, 11, 30, 04, 53, 23), changesets[0][1].time)
-      assert_equal(Time.utc(2004, 11, 30, 04, 53, 23), changesets[0].time)
-      assert_equal("rinkrank", changesets[0].developer)
-      assert_equal("En to\ntre buksa \nned\n", changesets[0].message)
+      revisions = create_scm(nil, nil).revisions(nil, from, to)
+      assert_equal(1, revisions.length)
+      assert_equal(Time.utc(2004, 11, 30, 04, 52, 24), revisions[0][0].time)
+      assert_equal(Time.utc(2004, 11, 30, 04, 53, 23), revisions[0][1].time)
+      assert_equal(Time.utc(2004, 11, 30, 04, 53, 23), revisions[0].time)
+      assert_equal("rinkrank", revisions[0].developer)
+      assert_equal("En to\ntre buksa \nned\n", revisions[0].message)
     end
 
     def test_checkout

data/test/rscm/scm/subversion_log_parser_test.rb

@@ -28,83 +28,83 @@ else
 EOF
     
     def test_can_parse_SIMPLE_LOG_ENTRIES
-      parser = SubversionLogEntryParser.new("damagecontrolled", "damagecontrolled")
+      parser = SubversionLogEntryParser.new("svn://foo/bar/zap/damagecontrolled")
       can_parse_simple_log_entry(parser, SIMPLE_LOG_ENTRY)
       can_parse_simple_log_entry(parser, SIMPLE_LOG_ENTRY_WITH_BACKSLASHES)
     end
     
     def can_parse_simple_log_entry(parser, entry)
-      changeset = parser.parse(StringIO.new(entry)) {|line|}
-
-      assert_equal(2, changeset.revision)
-      assert_equal("ahelleso", changeset.developer)
-      assert_equal(Time.utc(2004,7,11,13,29,35), changeset.time)
-      assert_equal("changed something\nelse", changeset.message)
-
-      assert_equal(2, changeset.length)
-      assert_equal("build.xml", changeset[0].path)
-      assert_equal(2, changeset[0].revision)
-      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)
+      revision = parser.parse(StringIO.new(entry)) {|line|}
+
+      assert_equal(2, revision.identifier)
+      assert_equal("ahelleso", revision.developer)
+      assert_equal(Time.utc(2004,7,11,13,29,35), revision.time)
+      assert_equal("changed something\nelse", revision.message)
+
+      assert_equal(2, revision.length)
+      assert_equal("build.xml", revision[0].path)
+      assert_equal(2, revision[0].native_revision_identifier)
+      assert_equal(RevisionFile::MODIFIED, revision[0].status)
+      assert_equal("src/java/com/thoughtworks/damagecontrolled/Thingy.java", revision[1].path)
+      assert_equal(RevisionFile::MODIFIED, revision[1].status)
     end
 
-    def test_parses_entire_log_into_changesets
+    def test_parses_entire_log_into_revisions
       File.open(File.dirname(__FILE__) + "/svn-proxytoys.log") do |io|
-        parser = SubversionLogParser.new(io, "trunk/proxytoys", nil)
+        parser = SubversionLogParser.new(io, "http://three/blind/mice/trunk/proxytoys")
 
-        changesets = parser.parse_changesets
+        revisions = parser.parse_revisions
         
-        assert_equal(66, changesets.length)
+        assert_equal(66, revisions.length)
         # just some random assertions
         assert_equal(
           "DecoratingInvoker now hands off to a SimpleInvoker rather than a DelegatingInvoker if constructed with an Object to decorate.\n" +
-          "Added protected getDelegateMethod(name, params)\n", changesets[0].message)
+          "Added protected getDelegateMethod(name, params)\n", revisions[0].message)
 
-        assert_equal(66, changesets[3].revision)
-        assert_equal("tastapod", changesets[3].developer)
-        assert_equal(Time.utc(2004,05,24,17,06,18,0), changesets[3].time)
-        assert_match(/Factored delegating behaviour out/ , changesets[3].message)
-        assert_equal(15, changesets[3].length)
+        assert_equal(66, revisions[3].revision)
+        assert_equal("tastapod", revisions[3].developer)
+        assert_equal(Time.utc(2004,05,24,17,06,18,0), revisions[3].time)
+        assert_match(/Factored delegating behaviour out/ , revisions[3].message)
+        assert_equal(15, revisions[3].length)
 
-        assert_equal("src/com/thoughtworks/proxy/toys/delegate/DelegatingInvoker.java" , changesets[3][1].path)
-        assert_equal(Change::ADDED , changesets[3][1].status)
-        assert_equal(66 , changesets[3][1].revision)
-        assert_equal(65, changesets[3][1].previous_revision)
+        assert_equal("src/com/thoughtworks/proxy/toys/delegate/DelegatingInvoker.java" , revisions[3][1].path)
+        assert_equal(RevisionFile::ADDED , revisions[3][1].status)
+        assert_equal(66 , revisions[3][1].revision)
+        assert_equal(65, revisions[3][1].previous_native_revision_identifier)
 
-        assert_equal("src/com/thoughtworks/proxy/toys/delegate/ObjectReference.java" , changesets[3][3].path)
-        assert_equal(Change::MOVED, changesets[3][3].status)
+        assert_equal("src/com/thoughtworks/proxy/toys/delegate/ObjectReference.java" , revisions[3][3].path)
+        assert_equal(RevisionFile::MOVED, revisions[3][3].status)
 
-        assert_equal("src/com/thoughtworks/proxy/toys/delegate/OldDelegatingInvoker.java" , changesets[3][4].path)
-        assert_equal(Change::DELETED, changesets[3][4].status)
+        assert_equal("src/com/thoughtworks/proxy/toys/delegate/OldDelegatingInvoker.java" , revisions[3][4].path)
+        assert_equal(RevisionFile::DELETED, revisions[3][4].status)
 
-        assert_equal("test/com/thoughtworks/proxy/toys/echo/EchoingTest.java" , changesets[3][14].path)
-        assert_equal(Change::MODIFIED , changesets[3][14].status)
+        assert_equal("test/com/thoughtworks/proxy/toys/echo/EchoingTest.java" , revisions[3][14].path)
+        assert_equal(RevisionFile::MODIFIED , revisions[3][14].status)
 
       end
     end
 
-    def test_parses_entire_log_into_changesets
+    def test_parses_entire_log_into_revisions
       File.open(File.dirname(__FILE__) + "/svn-cargo.log") do |io|
-        parser = SubversionLogParser.new(io, "trunk/proxytoys", nil)
-        changesets = parser.parse_changesets
-        assert_equal(16, changesets.length)
+        parser = SubversionLogParser.new(io, "svn://foo/cargo/trunk")
+        revisions = parser.parse_revisions
+        assert_equal(16, revisions.length)
       end
     end
 
     def test_parses_another_tricky_log
       File.open(File.dirname(__FILE__) + "/svn-growl.log") do |io|
-        parser = SubversionLogParser.new(io, "trunk", nil)
-        changesets = parser.parse_changesets
-        assert_equal(82, changesets.length)
+        parser = SubversionLogParser.new(io, "svn://some/where/trunk")
+        revisions = parser.parse_revisions
+        assert_equal(82, revisions.length)
       end
     end
 
     def test_parses_log_with_spaces_in_file_names
       File.open(File.dirname(__FILE__) + "/svn-growl2.log") do |io|
-        parser = SubversionLogParser.new(io, "trunk", nil)
-        changesets = parser.parse_changesets
-        change = changesets[1][0]
+        parser = SubversionLogParser.new(io, "svn://some/where/trunk")
+        revisions = parser.parse_revisions
+        change = revisions[1][0]
         assert_equal("Display Plugins/Bezel/English.lproj/GrowlBezelPrefs.nib/classes.nib", change.path)
       end
     end
@@ -118,9 +118,69 @@ nothing
 EOF
 
     def test_should_retrieve_head_revision
-      parser = SubversionLogParser.new(StringIO.new(SVN_R_LOG_HEAD_DATA), "blah", nil)
-      changesets = parser.parse_changesets
-      assert_equal(48, changesets[0].revision)
+      parser = SubversionLogParser.new(StringIO.new(SVN_R_LOG_HEAD_DATA), "svn://foo/bar")
+      revisions = parser.parse_revisions
+      assert_equal(48, revisions[0].identifier)
+    end
+
+SVN_XSTREAM_LOG = <<-EOF
+------------------------------------------------------------------------
+r593 | joe | 2005-04-30 07:56:45 -0400 (Sat, 30 Apr 2005) | 1 line
+Changed paths:
+   M /trunk/xstream/build.xml
+   M /trunk/xstream-website/src/content/download.html
+   M /trunk/xstream-website/src/content/news.html
+
+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")
+      revisions = parser.parse_revisions
+      assert_equal(593, revisions[0].identifier)
+      assert_equal("build.xml", revisions[0][0].path)
+      assert_equal(1, revisions[0].length)
+    end
+
+LOG_WITH_DIRS = <<-EOF
+------------------------------------------------------------------------
+r1 | aslakhellesoy | 2005-05-03 18:27:14 -0400 (Tue, 03 May 2005) | 2 lines
+Changed paths:
+   A /damagecontrolled
+   A /damagecontrolled/build.xml
+   A /damagecontrolled/project.xml
+   A /damagecontrolled/src
+   A /damagecontrolled/src/java
+   A /damagecontrolled/src/java/com
+   A /damagecontrolled/src/java/com/thoughtworks
+   A /damagecontrolled/src/java/com/thoughtworks/damagecontrolled
+   A /damagecontrolled/src/java/com/thoughtworks/damagecontrolled/Thingy.java
+   A /damagecontrolled/src/test
+   A /damagecontrolled/src/test/com
+   A /damagecontrolled/src/test/com/thoughtworks
+   A /damagecontrolled/src/test/com/thoughtworks/damagecontrolled
+   A /damagecontrolled/src/test/com/thoughtworks/damagecontrolled/ThingyTestCase.java
+
+imported
+sources
+------------------------------------------------------------------------
+EOF
+
+    def test_should_ignore_directories
+      parser = SubversionLogParser.new(StringIO.new(LOG_WITH_DIRS), "svn://mooky/damagecontrolled")
+      revisions = parser.parse_revisions
+      assert_equal(1, revisions[0].identifier)
+      assert_equal(4, revisions[0].length)
+    end
+
+    def test_should_not_require_path
+      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"))
+      assert_equal("build.xml", slep.relative_path(url, "scm/trunk/xstream/build.xml"))
+      assert_equal("boo/build.xml", slep.relative_path(url, "trunk/xstream/boo/build.xml"))
+      assert_equal(nil, slep.relative_path(url, "trunk/xstream-website/boo/build.xml"))
     end
   end
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.6
+rubygems_version: 0.8.8
 specification_version: 1
 name: rscm
 version: !ruby/object:Gem::Version 
-  version: 0.2.1.1404
-date: 2005-03-10
+  version: 0.3.0
+date: 2005-07-18
 summary: "RSCM - Ruby Source Control Management"
 require_paths: 
   - lib
@@ -30,26 +30,25 @@ files:
   - CHANGELOG
   - Rakefile
   - README
-  - lib/multipart.rb
   - lib/rscm
   - lib/rscm.rb
-  - lib/rubyforge_file_publisher.rb
   - lib/rscm/abstract_log_parser.rb
-  - lib/rscm/abstract_scm.rb
   - lib/rscm/annotations.rb
-  - lib/rscm/changes.rb
-  - lib/rscm/example.yaml
+  - lib/rscm/base.rb
+  - lib/rscm/better.rb
   - lib/rscm/line_editor.rb
   - lib/rscm/logging.rb
   - lib/rscm/parser.rb
   - lib/rscm/path_converter.rb
-  - lib/rscm/RSS.txt
+  - lib/rscm/revision.rb
+  - lib/rscm/revision_file.rb
   - lib/rscm/scm
   - lib/rscm/time_ext.rb
   - lib/rscm/scm/clearcase.rb
   - lib/rscm/scm/cvs.rb
   - lib/rscm/scm/cvs_log_parser.rb
   - lib/rscm/scm/darcs.rb
+  - lib/rscm/scm/darcs_log_parser.rb
   - lib/rscm/scm/monotone.rb
   - lib/rscm/scm/monotone_log_parser.rb
   - lib/rscm/scm/mooky.rb
@@ -59,13 +58,11 @@ files:
   - lib/rscm/scm/subversion_log_parser.rb
   - bin/diff.exe
   - bin/Diff_StdDisclaimer.html
+  - bin/touch.exe
   - test/rscm
-  - test/rscm/abstract_scm_test.rb
   - test/rscm/annotations_test.rb
   - test/rscm/apply_label_scm_tests.rb
-  - test/rscm/changes_fixture.rb
-  - test/rscm/changes_test.rb
-  - test/rscm/changesets.yaml
+  - test/rscm/base_test.rb
   - test/rscm/difftool_test.rb
   - test/rscm/file_after_edit
   - test/rscm/file_ext.rb
@@ -76,17 +73,24 @@ files:
   - test/rscm/mockit_test.rb
   - test/rscm/parser_test.rb
   - test/rscm/path_converter_test.rb
+  - test/rscm/revision_fixture.rb
+  - test/rscm/revision_test.rb
+  - test/rscm/revisions.yaml
   - test/rscm/scm
   - test/rscm/tempdir.rb
+  - test/rscm/scm/clearcase.log
+  - test/rscm/scm/clearcase_test.rb
   - test/rscm/scm/cvs-dataforge.log
   - test/rscm/scm/cvs-test.log
   - test/rscm/scm/cvs_log_parser_test.rb
   - test/rscm/scm/cvs_test.rb
+  - test/rscm/scm/darcs_log_parser_test.rb
   - test/rscm/scm/darcs_test.rb
   - test/rscm/scm/keys
   - test/rscm/scm/monotone_log_parser_test.rb
   - test/rscm/scm/monotone_test.rb
   - test/rscm/scm/mooky_test.rb
+  - test/rscm/scm/p4client_test.rb
   - test/rscm/scm/perforce_test.rb
   - test/rscm/scm/star_team.rb
   - test/rscm/scm/subversion_log_parser_test.rb