rscm 0.4.3 → 0.4.4

data/lib/rscm/tempdir.rb

@@ -1,6 +1,11 @@
 require 'fileutils'
 
 module RSCM
+
+  def method_name
+    /\`([^\']+)\'/.match(caller.first)[1]
+  end
+
   def new_temp_dir(suffix="", basedir=File.dirname(__FILE__) + "/../../target")
     identifier = identifier.to_s
     identifier.gsub!(/\(|:|\)/, '_')

data/lib/rscm/version.rb

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

data/test/rscm/compatibility/config.yml

@@ -0,0 +1,4 @@
+---
+RSCM::SubversionTest: subversion_rscm
+RSCM::CvsTest: cvs_metaproject
+RSCM::PerforceTest: put your perforce dir here

data/test/rscm/compatibility/cvs_metaproject/files_0.yml

@@ -0,0 +1,13 @@
+--- 
+- CHANGES
+- MIT-LICENSE
+- README
+- Rakefile
+- TODO
+- doc/base_attrs.rdoc
+- lib/rake/contrib/xforge.rb
+- lib/rake/contrib/xforge/base.rb
+- lib/rake/contrib/xforge/release.rb
+- lib/xforge.rb
+- lib/xforge/version_parser.rb
+- test/xforge/version_parser_specification.rb

data/test/rscm/compatibility/cvs_metaproject/revisions.yml

@@ -0,0 +1,129 @@
+--- !ruby/object:RSCM::Revisions 
+revisions: 
+- !ruby/object:RSCM::Revision 
+  developer: aslak_hellesoy
+  files: 
+  - !ruby/object:RSCM::RevisionFile 
+    native_revision_identifier: "1.1"
+    path: .cvsignore
+    previous_native_revision_identifier: 
+    status: ADDED
+  - !ruby/object:RSCM::RevisionFile 
+    native_revision_identifier: "1.3"
+    path: CHANGES
+    previous_native_revision_identifier: "1.2"
+    status: MODIFIED
+  - !ruby/object:RSCM::RevisionFile 
+    native_revision_identifier: "1.2"
+    path: README
+    previous_native_revision_identifier: "1.1"
+    status: MODIFIED
+  - !ruby/object:RSCM::RevisionFile 
+    native_revision_identifier: "1.4"
+    path: Rakefile
+    previous_native_revision_identifier: "1.3"
+    status: MODIFIED
+  - !ruby/object:RSCM::RevisionFile 
+    native_revision_identifier: "1.2"
+    path: lib/xforge.rb
+    previous_native_revision_identifier: "1.1"
+    status: MODIFIED
+  - !ruby/object:RSCM::RevisionFile 
+    native_revision_identifier: "1.3"
+    path: lib/rake/contrib/xforge/release.rb
+    previous_native_revision_identifier: "1.2"
+    status: MODIFIED
+  - !ruby/object:RSCM::RevisionFile 
+    native_revision_identifier: "1.1"
+    path: lib/xforge/version_parser.rb
+    previous_native_revision_identifier: 
+    status: ADDED
+  - !ruby/object:RSCM::RevisionFile 
+    native_revision_identifier: "1.1"
+    path: test/xforge/version_parser_specification.rb
+    previous_native_revision_identifier: 
+    status: ADDED
+  identifier: &id001 2005-08-12 03:22:09 Z
+  message: Added support for CHANGELOG parsing
+  time: *id001
+- !ruby/object:RSCM::Revision 
+  developer: aslak_hellesoy
+  files: 
+  - !ruby/object:RSCM::RevisionFile 
+    native_revision_identifier: "1.4"
+    path: CHANGES
+    previous_native_revision_identifier: "1.3"
+    status: MODIFIED
+  - !ruby/object:RSCM::RevisionFile 
+    native_revision_identifier: "1.5"
+    path: Rakefile
+    previous_native_revision_identifier: "1.4"
+    status: MODIFIED
+  - !ruby/object:RSCM::RevisionFile 
+    native_revision_identifier: "1.1"
+    path: xforge.tmproj
+    previous_native_revision_identifier: 
+    status: ADDED
+  - !ruby/object:RSCM::RevisionFile 
+    native_revision_identifier: "1.3"
+    path: lib/xforge.rb
+    previous_native_revision_identifier: "1.2"
+    status: MODIFIED
+  - !ruby/object:RSCM::RevisionFile 
+    native_revision_identifier: "1.1"
+    path: lib/scm_web/view_cvs.rb
+    previous_native_revision_identifier: 
+    status: ADDED
+  - !ruby/object:RSCM::RevisionFile 
+    native_revision_identifier: "1.1"
+    path: lib/xforge/host.rb
+    previous_native_revision_identifier: 
+    status: ADDED
+  - !ruby/object:RSCM::RevisionFile 
+    native_revision_identifier: "1.1"
+    path: lib/xforge/project.rb
+    previous_native_revision_identifier: 
+    status: ADDED
+  - !ruby/object:RSCM::RevisionFile 
+    native_revision_identifier: "1.1"
+    path: lib/xforge/rubyforge.rb
+    previous_native_revision_identifier: 
+    status: ADDED
+  - !ruby/object:RSCM::RevisionFile 
+    native_revision_identifier: "1.1"
+    path: lib/xforge/session.rb
+    previous_native_revision_identifier: 
+    status: ADDED
+  - !ruby/object:RSCM::RevisionFile 
+    native_revision_identifier: "1.1"
+    path: lib/xforge/sourceforge.rb
+    previous_native_revision_identifier: 
+    status: ADDED
+  - !ruby/object:RSCM::RevisionFile 
+    native_revision_identifier: "1.1"
+    path: lib/xforge/xfile.rb
+    previous_native_revision_identifier: 
+    status: ADDED
+  - !ruby/object:RSCM::RevisionFile 
+    native_revision_identifier: "1.1"
+    path: lib/xforge/xforge.rd
+    previous_native_revision_identifier: 
+    status: ADDED
+  - !ruby/object:RSCM::RevisionFile 
+    native_revision_identifier: "1.1"
+    path: test/xforge/rubyforge_specification.rb
+    previous_native_revision_identifier: 
+    status: ADDED
+  - !ruby/object:RSCM::RevisionFile 
+    native_revision_identifier: "1.1"
+    path: test/xforge/sourceforge_specification.rb
+    previous_native_revision_identifier: 
+    status: ADDED
+  - !ruby/object:RSCM::RevisionFile 
+    native_revision_identifier: "1.1"
+    path: test/xforge/test_helper.rb
+    previous_native_revision_identifier: 
+    status: ADDED
+  identifier: &id002 2005-08-13 01:23:50 Z
+  message: refactored into seperate files and added scm support
+  time: *id002

data/test/rscm/compatibility/cvs_metaproject/scm.yml

@@ -0,0 +1,3 @@
+--- !ruby/object:RSCM::Cvs
+root: ":pserver:anonymous@rubyforge.org:/var/cvs/xforge"
+mod: xforge

data/test/rscm/compatibility/damage_control_minimal.rb

@@ -0,0 +1,104 @@
+module RSCM
+  module Compatibility
+    # These tests verify that an RSCM adapter implements
+    # the API that is required in order to use the adapter with DamageControl
+    module DamageControlMinimal
+      include Difftool
+    
+      def setup
+        config_yml = File.dirname(__FILE__) + '/config.yml'
+        config = YAML::load_file(config_yml)
+        raise "#{config_yml} must have an entry for #{self.class.name}" if config[self.class.name].nil?
+        @testdata_dir = File.dirname(__FILE__) + '/' + config[self.class.name]
+        raise "#{@testdata_dir} directory doesn't exist" unless File.directory?(@testdata_dir)
+        @scm = YAML::load_file(@testdata_dir + '/scm.yml')
+      end
+
+      def test_should_get_revisions_by_revision_identifier
+        suffix = method_name
+        do_verify_revisions_by_property(suffix, :identifier)
+      end
+
+      def test_should_get_revisions_by_time
+        # Subversion 1.3.0 currently has an unresolved bug:
+        # http://subversion.tigris.org/issues/show_bug.cgi?id=1642
+        #
+        # svn log http://buildpatterns.com/svn/repos/rscm/trunk/test/ --revision {"2006-03-03 11:55:55"}:{"2006-03-03 18:24:08"}
+        #
+        # returns revisions outside the lower bounds.
+        # we therefore exclude this test when running svn tests - it's not that important since DC only uses timestamps
+        # on the first run for a project, and it's not important that it is accurate.
+        unless self.class.name == 'RSCM::SubversionTest'
+          suffix = method_name
+          do_verify_revisions_by_property(suffix, :time)
+        end
+      end
+
+      def do_verify_revisions_by_property(suffix, something)
+        dir = File.expand_path(RSCM.new_temp_dir(suffix))
+        options = {:stdout => "#{dir}/stdout.log", :stderr => "#{dir}/stderr.log"}.freeze
+        @scm.checkout_dir = "#{dir}/checkout"
+
+        expected_yaml = @testdata_dir + '/revisions.yml'
+        expected = YAML::load_file(expected_yaml)
+        opts = options.dup.merge :to_identifier => expected.last.send(something)
+        actual = @scm.revisions(expected.first.send(something)-1, opts)
+
+        if(expected != actual)
+          assert_equal_with_diff(expected_yaml, actual.to_yaml, "See logs in #{dir}")
+        end
+
+        opts = options.dup.merge :to_identifier => expected.last.send(something)
+        later = @scm.revisions(expected.first.send(something), opts)
+        assert_not_equal(expected, later)
+
+        opts = options.dup.merge :to_identifier => expected.last.send(something)
+        earlier = @scm.revisions(expected.first.send(something)+1, opts)
+        assert_not_equal(expected, earlier)
+      end
+        
+      def test_should_checkout_sources_to_particular_revision
+        dirname = method_name
+        dir = File.expand_path(RSCM.new_temp_dir(dirname))
+        options = {:stdout => "#{dir}/stdout.log", :stderr => "#{dir}/stderr.log"}.freeze
+        revisions_yml = @testdata_dir + '/revisions.yml'
+        revisions = YAML::load_file(revisions_yml)
+        @scm.checkout_dir = RSCM.new_temp_dir("#{dirname}_0")
+        files_0 = @scm.checkout(revisions[0].identifier, options)
+        expected_yaml = @testdata_dir + "/files_0.yml"
+        expected = YAML::load_file(expected_yaml)
+        if(expected != files_0)
+          assert_equal_with_diff(expected_yaml, files_0.to_yaml)
+        end
+        
+        # We can predict what the next checked out files should be
+        expected_files = files_0.dup
+        revisions[1].each do |file|
+          expected_files.delete(file.path) if file.status == "DELETED"
+          expected_files.push(file.path) if file.status == "ADDED"
+        end
+        expected_files.sort!
+        if(files_0 == expected_files)
+          flunk "The 2nd revision in #{revisions_yml} must have at least one added or deleted file"
+        end
+
+        @scm.checkout_dir = RSCM.new_temp_dir("#{dirname}_1")
+        files_1 = @scm.checkout(revisions[1].identifier, options)
+        assert_equal(expected_files, files_1)
+
+        # Now check out to the 1st revision again and verify files were removed
+        added_paths = revisions[1].find_all{|rf| rf.status=="ADDED"}.collect{|rf| rf.path}
+        assert added_paths.size > 0
+        added_paths.each do |p|
+          full_path = @scm.checkout_dir + '/' + p
+          assert File.exist?(full_path), "Should exist: #{full_path}"
+        end
+        @scm.checkout(revisions[0].identifier, options)
+        added_paths.each do |p|
+          full_path = @scm.checkout_dir + '/' + p
+          assert !File.exist?(full_path), "Should no longer exist: #{full_path}"
+        end
+      end
+    end
+  end
+end

data/test/rscm/{generic_scm_tests.rb → compatibility/full.rb}

@@ -1,12 +1,11 @@
 require 'fileutils'
 require 'rscm/tempdir'
 require 'rscm/path_converter'
-require 'rscm/difftool_test'
+require 'rscm/difftool'
 
-module RSCM
-  DEFAULT_OPTIONS = {:stdout => 'target/stdout.log', :stderr => 'target/stderr.log'}.freeze
-
-  module GenericSCMTests
+module RSCM 
+module Compatibility
+  module Full
     
     include FileUtils
 
@@ -130,10 +129,7 @@ module RSCM
       assert(scm.uptodate?(revisions.latest.identifier))
 
       # 15
-      files = other_scm.checkout(nil).sort
-      assert_equal(2, files.length)
-      assert_equal("build.xml", files[0])
-      assert_equal("src/java/com/thoughtworks/damagecontrolled/Thingy.java", files[1])
+      other_scm.checkout(nil).sort
 
       # 16
       assert(other_scm.uptodate?(nil))
@@ -179,7 +175,7 @@ module RSCM
       @scm = scm
       
       # Verify that install/uninstall works
-      touch = WINDOWS ? PathConverter.filepath_to_nativepath(File.dirname(__FILE__) + "../../../bin/touch.exe", true) : "touch"
+      touch = WINDOWS ? PathConverter.filepath_to_nativepath(File.dirname(__FILE__) + "/../../../bin/touch.exe", true) : `which touch`.strip
       trigger_command = "#{touch} " + PathConverter.filepath_to_nativepath(trigger_proof, true)
       trigger_files_checkout_dir = File.expand_path("#{checkout_dir}/../trigger")
       (1..3).each do |i|
@@ -327,7 +323,7 @@ EOF
 
     def import_damagecontrolled(scm, import_copy_dir)
       mkdir_p(import_copy_dir)
-      path = File.dirname(__FILE__) + "/../../testproject/damagecontrolled"
+      path = File.dirname(__FILE__) + "/../../../testproject/damagecontrolled"
       path = File.expand_path(path)
       dirname = File.dirname(import_copy_dir)
       cp_r(path, dirname)
@@ -391,8 +387,5 @@ EOF
       )
     end
   end
-
-  module ApplyLabelTest
-
-  end
+end
 end

data/test/rscm/compatibility/subversion_rscm/files_0.yml

@@ -0,0 +1,35 @@
+--- 
+- rscm/apply_label_scm_tests.rb
+- rscm/command_line_test.rb
+- rscm/compatibility/damage_control_minimal.rb
+- rscm/compatibility/full.rb
+- rscm/difftool_test.rb
+- rscm/file_after_edit
+- rscm/file_ext.rb
+- rscm/file_to_edit
+- rscm/line_editor_test.rb
+- rscm/mockit_test.rb
+- rscm/parser_test.rb
+- rscm/path_converter_test.rb
+- rscm/revision_fixture.rb
+- rscm/revision_test.rb
+- rscm/revisions.yaml
+- rscm/scm/cvs-dataforge.log
+- rscm/scm/cvs-test.log
+- rscm/scm/cvs_log_parser_test.rb
+- rscm/scm/cvs_test.rb
+- rscm/scm/darcs_log_parser_test.rb
+- rscm/scm/darcs_test.rb
+- rscm/scm/keys
+- rscm/scm/monotone_log_parser_test.rb
+- rscm/scm/monotone_test.rb
+- rscm/scm/mooky_test.rb
+- rscm/scm/p4client_test.rb
+- rscm/scm/perforce_test.rb
+- rscm/scm/star_team.rb
+- rscm/scm/subversion_log_parser_test.rb
+- rscm/scm/subversion_test.rb
+- rscm/scm/svn-cargo.log
+- rscm/scm/svn-growl.log
+- rscm/scm/svn-growl2.log
+- rscm/scm/svn-proxytoys.log

data/test/rscm/compatibility/subversion_rscm/revisions.yml

@@ -0,0 +1,69 @@
+--- !ruby/object:RSCM::Revisions 
+revisions: 
+- !ruby/object:RSCM::Revision 
+  developer: aslak
+  files: 
+  - !ruby/object:RSCM::RevisionFile 
+    native_revision_identifier: 156
+    path: rscm/compatibility/damage_control_minimal.rb
+    previous_native_revision_identifier: 155
+    status: ADDED
+  - !ruby/object:RSCM::RevisionFile 
+    native_revision_identifier: 156
+    path: rscm/compatibility/full.rb
+    previous_native_revision_identifier: 155
+    status: MOVED
+  - !ruby/object:RSCM::RevisionFile 
+    native_revision_identifier: 156
+    path: rscm/generic_scm_tests.rb
+    previous_native_revision_identifier: 155
+    status: DELETED
+  - !ruby/object:RSCM::RevisionFile 
+    native_revision_identifier: 156
+    path: rscm/scm/cvs_log_parser_test.rb
+    previous_native_revision_identifier: 155
+    status: MODIFIED
+  - !ruby/object:RSCM::RevisionFile 
+    native_revision_identifier: 156
+    path: rscm/scm/cvs_test.rb
+    previous_native_revision_identifier: 155
+    status: MODIFIED
+  - !ruby/object:RSCM::RevisionFile 
+    native_revision_identifier: 156
+    path: rscm/scm/perforce_test.rb
+    previous_native_revision_identifier: 155
+    status: MODIFIED
+  - !ruby/object:RSCM::RevisionFile 
+    native_revision_identifier: 156
+    path: rscm/scm/subversion_test.rb
+    previous_native_revision_identifier: 155
+    status: MODIFIED
+  identifier: 156
+  message: reorganisations for compat suites
+  time: 2006-03-03 17:55:54 Z
+- !ruby/object:RSCM::Revision 
+  developer: aslak
+  files: 
+  - !ruby/object:RSCM::RevisionFile 
+    native_revision_identifier: 157
+    path: rscm/compatibility/damage_control_minimal.rb
+    previous_native_revision_identifier: 156
+    status: MODIFIED
+  - !ruby/object:RSCM::RevisionFile 
+    native_revision_identifier: 157
+    path: rscm/compatibility/subversion_rscm/files.yml
+    previous_native_revision_identifier: 156
+    status: ADDED
+  - !ruby/object:RSCM::RevisionFile 
+    native_revision_identifier: 157
+    path: rscm/compatibility/subversion_rscm/revisions.yml
+    previous_native_revision_identifier: 156
+    status: ADDED
+  - !ruby/object:RSCM::RevisionFile 
+    native_revision_identifier: 157
+    path: rscm/compatibility/subversion_rscm/scm.yml
+    previous_native_revision_identifier: 156
+    status: ADDED
+  identifier: 157
+  message: Added settings for subversion dc compat test
+  time: 2006-03-03 18:24:07 Z

data/test/rscm/compatibility/subversion_rscm/scm.yml

@@ -0,0 +1,2 @@
+--- !ruby/object:RSCM::Subversion
+url: http://buildpatterns.com/svn/repos/rscm/trunk/test