rscm 0.4.5 → 0.5.0

data/testproject/damagecontrolled/src/java/com/thoughtworks/damagecontrolled/Thingy.java

@@ -1,7 +1,7 @@
-package com.thoughtworks.damagecontrolled;
-
-public class Thingy {
-	public String getBeer() {
-		return "Duvel";
-	}
+package com.thoughtworks.damagecontrolled;
+
+public class Thingy {
+	public String getBeer() {
+		return "Duvel";
+	}
 }

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: rscm
 version: !ruby/object:Gem::Version 
-  version: 0.4.5
-date: 2006-03-06 00:00:00 -06:00
+  version: 0.5.0
+date: 2006-05-18 00:00:00 -05:00
 summary: RSCM - Ruby Source Control Management
 require_paths: 
 - lib
@@ -37,13 +37,13 @@ files:
 - lib/rscm/base.rb
 - lib/rscm/command_line.rb
 - lib/rscm/difftool.rb
-- lib/rscm/historic_file.rb
 - lib/rscm/line_editor.rb
 - lib/rscm/mockit.rb
 - lib/rscm/parser.rb
 - lib/rscm/path_converter.rb
 - lib/rscm/platform.rb
 - lib/rscm/revision.rb
+- lib/rscm/revisions.rb
 - lib/rscm/revision_file.rb
 - lib/rscm/revision_poller.rb
 - lib/rscm/scm
@@ -77,20 +77,32 @@ files:
 - test/rscm/mockit_test.rb
 - test/rscm/parser_test.rb
 - test/rscm/path_converter_test.rb
-- test/rscm/revision_fixture.rb
+- test/rscm/revisions_test.rb
+- test/rscm/revision_file_test.rb
+- test/rscm/revision_poller_test.rb
 - test/rscm/revision_test.rb
-- test/rscm/revisions.yaml
 - test/rscm/scm
 - test/rscm/test_helper.rb
 - test/rscm/compatibility/config.yml
 - test/rscm/compatibility/cvs_metaproject
-- test/rscm/compatibility/damage_control_minimal.rb
 - test/rscm/compatibility/full.rb
+- test/rscm/compatibility/p4_gfx
+- test/rscm/compatibility/rscm_engine.rb
 - test/rscm/compatibility/subversion_rscm
+- test/rscm/compatibility/cvs_metaproject/diff.txt
+- test/rscm/compatibility/cvs_metaproject/file.txt
 - test/rscm/compatibility/cvs_metaproject/files_0.yml
+- test/rscm/compatibility/cvs_metaproject/old.yml
 - test/rscm/compatibility/cvs_metaproject/revisions.yml
 - test/rscm/compatibility/cvs_metaproject/scm.yml
+- test/rscm/compatibility/p4_gfx/files_0.yml
+- test/rscm/compatibility/p4_gfx/old.yml
+- test/rscm/compatibility/p4_gfx/revisions.yml
+- test/rscm/compatibility/p4_gfx/scm.yml
+- test/rscm/compatibility/subversion_rscm/diff.txt
+- test/rscm/compatibility/subversion_rscm/file.txt
 - test/rscm/compatibility/subversion_rscm/files_0.yml
+- test/rscm/compatibility/subversion_rscm/old.yml
 - test/rscm/compatibility/subversion_rscm/revisions.yml
 - test/rscm/compatibility/subversion_rscm/scm.yml
 - test/rscm/compatibility/subversion_rscm/svn_log_bug_irc.txt
@@ -106,7 +118,7 @@ files:
 - 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/star_team_test.rb
 - test/rscm/scm/subversion_log_parser_test.rb
 - test/rscm/scm/subversion_test.rb
 - test/rscm/scm/svn-cargo.log

data/lib/rscm/historic_file.rb

@@ -1,30 +0,0 @@
-module RSCM
-  # Represents the full history of a single file or directory.
-  class HistoricFile
-    attr_reader :relative_path
-    
-    def initialize(relative_path, directory, scm)
-      raise "Not a String: '#{relative_path}' (#{relative_path.class.name})" unless relative_path.is_a? String
-      @relative_path, @directory, @scm = relative_path, directory, scm
-    end
-    
-    def directory?
-      @directory
-    end
-    
-    # Returns an Array of RevisionFile - from Time.epoch until Time.infinity (now)
-    def revision_files(options={})
-      @scm.revisions(Time.epoch, options.dup.merge({:to_identifier => Time.infinity, :relative_path => @relative_path})).collect do |revision|
-        if revision.files.length != 1
-          files_s = revision.files.collect{|f| f.to_s}.join("\n")
-          raise "The file-specific revision didn't have exactly one file, but #{revision.files.length}:\n#{files_s}"
-        end
-        if(!revision.files[0].path.eql?(@relative_path))
-          raise "The file-specific revision didn't have expected path '#{@relative_path}', but '#{revision.files[0].path}'"
-        end
-        revision.files[0]
-      end
-    end
-    
-  end
-end

data/test/rscm/compatibility/damage_control_minimal.rb

@@ -1,104 +0,0 @@
-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/revision_fixture.rb

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

data/test/rscm/revisions.yaml

@@ -1,42 +0,0 @@
---- !ruby/object:RSCM::Revisions 
-revisions: 
-  - !ruby/object:RSCM::Revision 
-    files: 
-      - !ruby/object:RSCM::RevisionFile 
-        developer: rinkrank
-        message: "En to
-
-          tre buksa 
-
-          ned
-
-          "
-        path: server/damagecontrol/web/AbstractAdminServlet.rb
-        previous_native_revision_identifier: "1.42"
-        native_revision_identifier: "1.43"
-        status: MODIFIED
-        time: 2004-11-30 04:52:24 Z
-      - !ruby/object:RSCM::RevisionFile 
-        developer: rinkrank
-        message: "En to
-
-          tre buksa 
-
-          ned
-
-          "
-        path: server/damagecontrol/web/ProjectServlet.rb
-        previous_native_revision_identifier: "1.71"
-        native_revision_identifier: "1.72"
-        status: MODIFIED
-        time: 2004-11-30 04:53:23 Z
-    developer: rinkrank
-    message: "En to
-
-      tre buksa 
-
-      ned
-
-      "
-    revision: MAIN:rinkrank:20041130045224
-    time: 2004-11-30 04:52:24 Z

data/test/rscm/scm/star_team.rb

@@ -1,36 +0,0 @@
-require 'test/unit'
-require 'fileutils'
-require 'rscm'
-require 'rscm/generic_scm_tests'
-
-module RSCM
-  class StarTeamTest < Test::Unit::TestCase
-#    include GenericSCMTests
-
-    def create_scm(repository_root_dir, path)
-      StarTeam.new(ENV["STARTEAM_USER"], ENV["STARTEAM_PASS"], "192.168.254.21", 49201, "NGST Application", "NGST Application", "java")
-    end
-
-    def test_revisions
-      from = Time.new - 2 * 3600 * 24
-      to = Time.new - 1 * 3600 * 24
-      puts "Getting revisions for #{from} - #{to}"
-    
-      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
-      files = create_scm(nil, nil).checkout("target/starteam/checkout")
-      assert_equal(3, files.length)
-      assert_equal("eenie/meenie/minee/mo", files[0])
-      assert_equal("catch/a/redneck/by", files[1])
-      assert_equal("the/toe", files[2])
-    end
-  end
-end