rscm 0.4.5 → 0.5.0

data/lib/rscm/scm/subversion_log_parser.rb

@@ -1,13 +1,17 @@
 require 'rscm/parser'
 require 'rscm/revision'
+require 'rscm/revisions'
+require 'rscm/revision_file'
+require 'time'
 
 module RSCM
 
   class SubversionLogParser
-    def initialize(io, url, exclude_below=nil, path=nil)
+    def initialize(io, url, exclude_below_and_including=nil, exclude_above_and_including=nil, path=nil)
       @io = io
       @revision_parser = SubversionLogEntryParser.new(url, path)
-      @exclude_below = exclude_below
+      @exclude_below_and_including = exclude_below_and_including
+      @exclude_above_and_including = exclude_above_and_including
     end
     
     def parse_revisions(&line_proc)
@@ -16,16 +20,24 @@ module RSCM
       revisions = Revisions.new
       while(!@io.eof?)
         revision = @revision_parser.parse(@io, &line_proc)
-        if(revision)
+        unless(revision.nil?)
           # Filter out the lower bound to avoid inclusiveness of the lower bound (see contract)
           # We're doing this instead of increasing the from_identifer with 1, since that causes an error.
-          exclude = false
-          if(@exclude_below.is_a? Time)
-            exclude = revision.time <= @exclude_below
-          elsif(@exclude_below.is_a? Numeric)
-            exclude = revision.identifier <= @exclude_below
+          too_low = false
+          too_high = false
+          next if revision.time.nil?
+          if(@exclude_below_and_including.is_a? Time)
+            too_low = revision.time <= @exclude_below_and_including
+          elsif(@exclude_below_and_including.is_a? Numeric)
+            too_low = revision.identifier <= @exclude_below_and_including
           end
-          revisions.add(revision) unless exclude
+
+          if(@exclude_above_and_including.is_a? Time)
+            too_high = revision.time >= @exclude_above_and_including
+          elsif(@exclude_above_and_including.is_a? Numeric)
+            too_high = revision.identifier >= @exclude_above_and_including
+          end
+          revisions.add(revision) unless too_low || too_high
         end
       end
       revisions
@@ -61,8 +73,13 @@ module RSCM
         end
         max_similar -= 1
       end
+
       if(max_similar == 0) 
-        nil
+        if(@path.nil? || @path == "")
+          path_from_root
+        else
+          nil
+        end
       else
         path_from_root_tokens[max_similar..-1].join("/")
       end
@@ -79,10 +96,10 @@ module RSCM
         @parse_state = :parse_files
       elsif(@parse_state == :parse_files)
         file = parse_file(line)
-        if(file)
+        if(file && file.path)
           previously_added_file = @revision[-1]
           if(previously_added_file)
-            # remove previous revision_file it if it's a dir
+            # remove previous revision_file if it's a dir
             previous_tokens = previously_added_file.path.split("/")
             current_tokens = file.path.split("/")
             current_tokens.pop
@@ -90,7 +107,7 @@ module RSCM
               @revision.pop
             end
           end
-          @revision << file
+          @revision.add file
         end
       elsif(@parse_state == :parse_message)
         @revision.message << line.chomp << "\n"
@@ -112,8 +129,10 @@ module RSCM
       @revision.message = ""
       revision, developer, time, the_rest = line.split("|")
       @revision.identifier = revision.strip[1..-1].to_i unless revision.nil?
-      @revision.developer = developer.strip unless developer.nil?
-      @revision.time = parse_time(time.strip) unless time.nil?
+      developer.strip!
+      @revision.developer = developer unless developer.nil? || developer == "(no author)"
+      time.strip!
+      @revision.time = Time.parse(time).utc unless time.nil? || time == "(no date)"
     end
     
     def parse_file(line)
@@ -133,47 +152,14 @@ module RSCM
       path_from_root.gsub!(/\\/, "/")
       path_from_root = path_from_root[1..-1]
       rp = relative_path(@url, path_from_root)
-      if rp.nil?
-        if !@path.nil?
-          file.path = path_from_root[@path.length..-1]
-        else
-          return
-        end
-      else
-        file.path = rp
-      end
-
+      return if rp.nil?
+      
+      file.path = rp
       file.native_revision_identifier =  @revision.identifier
       # http://jira.codehaus.org/browse/DC-204
       file.previous_native_revision_identifier = file.native_revision_identifier.to_i - 1;
       file
     end
-
-    def parse_time(svn_time)
-      if(svn_time =~ /(.*)-(.*)-(.*) (.*):(.*):(.*) (\+|\-)([0-9]*) (.*)/)
-        year  = $1.to_i
-        month = $2.to_i
-        day   = $3.to_i
-        hour  = $4.to_i
-        min   = $5.to_i
-        sec   = $6.to_i
-        time = Time.utc(year, month, day, hour, min, sec)
-        
-        time = adjust_offset(time, $7, $8)
-      else
-        raise "unexpected time format"
-      end
-    end
-
-    def adjust_offset(time, sign, offset)
-      hour_offset = offset[0..1].to_i
-      min_offset = offset[2..3].to_i
-      sec_offset = 3600*hour_offset + 60*min_offset
-      sec_offset = -sec_offset if(sign == "+")
-      time += sec_offset
-      time
-    end
-    
   end
 
 end

data/lib/rscm/time_ext.rb

@@ -7,6 +7,5 @@ class Time
     def infinity
       Time.utc(2036)
     end
-    
   end
 end

data/lib/rscm/version.rb

@@ -1,8 +1,8 @@
 module RSCM
   module VERSION
     MAJOR = 0
-    MINOR = 4
-    TINY  = 5
+    MINOR = 5
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
 

data/test/rscm/command_line_test.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require 'rscm/tempdir'
+require File.dirname(__FILE__) + '/test_helper'
 require 'rscm/command_line'
 
 module RSCM
@@ -14,17 +13,20 @@ module RSCM
       File.delete @stderr if File.exist? @stderr
     end
 
-    def test_should_write_to_both_when_both_streams_specified_and_no_block
+    def test_should_write_to_both_files_when_both_files_specified_and_no_block
       setup_dir(method_name)
       CommandLine.execute("echo \"<hello\" && echo world", {:dir => @dir, :stdout => @stdout, :stderr => @stderr})
       assert_match(/.* echo \"<hello\"\s*\n.?\<hello.?\s*\n.* echo world\s*\nworld/n, File.open(@stdout).read)
       assert_match(/.* echo \"<hello\"\s*\n.* echo world\s*/n, File.open(@stderr).read)
     end
     
-    def test_should_not_write_to_stdout_when_no_stdout_specified
+    def test_should_not_write_to_stdout_file_when_no_stdout_specified
       setup_dir(method_name)
+      orgout = STDOUT.dup
+      STDOUT.reopen(@stdout)
       CommandLine.execute("echo hello", {:dir => @dir, :stderr => @stderr})
-      assert(!File.exist?(@stdout))
+      STDOUT.reopen(orgout)
+      assert_equal("#{@prompt} echo hello\nhello", File.open(@stdout).read.strip)
       assert_equal("#{@prompt} echo hello", File.open(@stderr).read.strip)
     end
     

data/test/rscm/compatibility/config.yml

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

data/test/rscm/compatibility/cvs_metaproject/diff.txt

@@ -0,0 +1,52 @@
+Index: CHANGES
+===================================================================
+RCS file: /var/cvs/xforge/xforge/CHANGES,v
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -r1.2 -r1.3
+--- CHANGES     18 Jul 2005 08:49:33 -0000      1.2
++++ CHANGES     12 Aug 2005 03:22:09 -0000      1.3
+@@ -1,8 +1,43 @@
+ = XForge Changelog
+ 
++== Version 0.1.4
++
++This is the first functional release of XForge, a Ruby library and Rake task to automate release of
++files on RubyForge and other SourceForge clones.
++
++It's as simple as this:
++
++require 'xforge'
++
++desc "Create a new release on RubyForge"
++task :publish_files => [:gem] do
++  release_files = FileList[
++    "pkg/#{PKG_FILE_NAME}.gem"
++  ]
++
++  Rake::XForge::Release.new(PKG_NAME) do |release|
++    # Never hardcode user name and password in the Rakefile!
++    release.user_name = ENV['RUBYFORGE_USER']
++    release.password = ENV['RUBYFORGE_PASSWORD']
++    release.files = release_files.to_a
++    release.release_name = "XForge #{PKG_VERSION}"
++    # The rest of the options are defaults (among others, release_notes and release_changes, parsed from CHANGES)
++  end
++end
++
++* Added logic for parsing of CHANGES files and include it in the release notes when publishing.
++* Wrote some proper release notes for once.
++
++== Version 0.1.3
++
++* Added logic for parsing of CHANGES files and include it in the release notes when publishing.
++
+ == Version 0.1.2
+ 
++This release is a minor release with fixes in the Rake script.
++
+ * Fixed RDoc for gem
++* Cleaned up documentation
+ 
+ == Version 0.1.1
+ 

data/test/rscm/compatibility/cvs_metaproject/file.txt

@@ -0,0 +1,48 @@
+= XForge Changelog
+
+== Version 0.1.4
+
+This is the first functional release of XForge, a Ruby library and Rake task to automate release of
+files on RubyForge and other SourceForge clones.
+
+It's as simple as this:
+
+require 'xforge'
+
+desc "Create a new release on RubyForge"
+task :publish_files => [:gem] do
+  release_files = FileList[
+    "pkg/#{PKG_FILE_NAME}.gem"
+  ]
+
+  Rake::XForge::Release.new(PKG_NAME) do |release|
+    # Never hardcode user name and password in the Rakefile!
+    release.user_name = ENV['RUBYFORGE_USER']
+    release.password = ENV['RUBYFORGE_PASSWORD']
+    release.files = release_files.to_a
+    release.release_name = "XForge #{PKG_VERSION}"
+    # The rest of the options are defaults (among others, release_notes and release_changes, parsed from CHANGES)
+  end
+end
+
+* Added logic for parsing of CHANGES files and include it in the release notes when publishing.
+* Wrote some proper release notes for once.
+
+== Version 0.1.3
+
+* Added logic for parsing of CHANGES files and include it in the release notes when publishing.
+
+== Version 0.1.2
+
+This release is a minor release with fixes in the Rake script.
+
+* Fixed RDoc for gem
+* Cleaned up documentation
+
+== Version 0.1.1
+
+* Rakefile: Don't include old gems in release.
+
+== Version 0.1
+
+* Added support for file releases

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

@@ -0,0 +1,13 @@
+---
+start: 2005-08-14 00:00:00 Z
+identifiers:
+  - 2005-07-18 07:53:39 Z
+  - 2005-07-18 08:49:33 Z
+  - 2005-07-18 09:01:23 Z
+  - 2005-08-12 03:22:09 Z
+  - 2005-08-13 01:23:50 Z
+  - 2005-08-13 01:26:31 Z
+  - 2005-08-13 08:48:42 Z
+  - 2005-08-13 08:53:03 Z
+  - 2005-08-13 08:54:44 Z
+  - 2005-08-13 08:56:51 Z

data/test/rscm/compatibility/full.rb

@@ -21,136 +21,12 @@ module Compatibility
       end
     end
 
-    #  Acceptance test for scm implementations 
-    #
-    #  1) Create a central repository
-    #  2) Import a test project to the central repository
-    #  3) Verify that WorkingCopy is not uptodate (not yet checked out)
-    #  4) Check out the contents of the central repo to WorkingCopy
-    #  5) Verify that the checked out files were those imported
-    #  6) Verify that the initial total revisions (from epoch to infinity) represents those from the import
-    #  7) Verify that WorkingCopy is uptodate
-    #  8) Change some files in WorkingCopy without committing them (yet)
-    #  9) Check out the contents of the central repo to OtherWorkingCopy
-    # 10) Verify that OtherWorkingCopy is uptodate
-    # 11) Verify that WorkingCopy is uptodate
-    # 12) Commit modifications in WorkingCopy
-    # 13) Verify that there is one revision since the previous one, and that it corresponds to the changed files in 8.
-    # 14) Verify that OtherWorkingCopy is *not* uptodate
-    # 15) Check out OtherWorkingCopy
-    # 16) Verify that OtherWorkingCopy is now uptodate
-    # 17) Add and commit a file in WorkingCopy
-    # 18) Verify that the revision (since last revision) for CheckoutHereToo contains only one file
-    # 19) Get directory listings
-    def test_basics
-      work_dir = RSCM.new_temp_dir("basics")
-      checkout_dir = "#{work_dir}/WorkingCopy"
-      other_checkout_dir = "#{work_dir}/OtherWorkingCopy"
-      repository_dir = "#{work_dir}/repository"
-      scm = create_scm(repository_dir, "damagecontrolled")
-      scm.default_options = DEFAULT_OPTIONS
-      scm.checkout_dir = checkout_dir
-
-      other_scm = create_scm(repository_dir, "damagecontrolled")
-      other_scm.default_options = DEFAULT_OPTIONS
-      other_scm.checkout_dir = other_checkout_dir
-
-      raise "This scm (#{scm.name}) can't create 'central' repositories." unless scm.can_create_central?
-
-      # 1
-      scm.create_central 
-      @scm = scm
-
-      # 2
-      import_damagecontrolled(scm, "#{work_dir}/damagecontrolled")
-      
-      # 3
-      assert(!scm.uptodate?(nil))
-      assert(!scm.uptodate?(nil))
-      
-      # 4
-      files = scm.checkout nil
-
-      # 5
-      assert_equal(4, files.length, files.join("\n"))
-      files.sort!
-      assert_equal("build.xml", files[0])
-      assert_equal("project.xml", files[1])
-      assert_equal("src/java/com/thoughtworks/damagecontrolled/Thingy.java", files[2])
-      assert_equal("src/test/com/thoughtworks/damagecontrolled/ThingyTestCase.java", files[3])
-
-      # 6
-      initial_revisions = scm.revisions(nil)
-      assert_equal("imported sources", initial_revisions[0].message)
-      # Subversion seems to add a revision with message "Added directories"
-      #assert_equal(1, initial_revisions.length)
-      assert_equal(4, initial_revisions[0].length)
-
-      # 7
-      assert(scm.uptodate?(initial_revisions.latest.identifier))
-
-      # 8
-      change_file(scm, "#{checkout_dir}/build.xml")
-      change_file(scm, "#{checkout_dir}/src/java/com/thoughtworks/damagecontrolled/Thingy.java")
-
-      assert(!other_scm.uptodate?(initial_revisions.latest.identifier))
-      other_scm.checkout nil
-      assert(other_scm.uptodate?(initial_revisions.latest.identifier))
-
-      sleep(1)
-      scm.commit("changed something") 
-
-      # 13
-      revisions = scm.revisions(initial_revisions.latest.identifier)
-      assert_equal(1, revisions.length, "Actual revisions:\n" + revisions.collect{|cs| cs.to_s}.join("\n"))
-
-      assert(revisions[0].identifier)
-      revision = revisions[0]
-      assert_equal(2, revision.length, "Actual files:\n" + revision.collect{|file| file.path}.join("\n"))
-
-      assert_equal("changed something", revision.message)
-
-      # why is this nil when running as the dcontrol user on codehaus? --jon
-      #assert_equal(username, revision.developer)
-      assert(revision.developer)
-      assert(revision.identifier)
-
-      assert_equal("build.xml", revision[0].path)
-      assert(revision[0].native_revision_identifier)
-      assert(revision[0].previous_native_revision_identifier)
-      assert_equal("src/java/com/thoughtworks/damagecontrolled/Thingy.java", revision[1].path)
-      assert(revision[1].native_revision_identifier)
-      assert(revision[1].previous_native_revision_identifier)      
-
-      # 14
-      assert(!other_scm.uptodate?(revisions.latest.identifier))
-      assert(!other_scm.uptodate?(revisions.latest.identifier))
-      assert(scm.uptodate?(revisions.latest.identifier))
-      assert(scm.uptodate?(revisions.latest.identifier))
-
-      # 15
-      other_scm.checkout(nil).sort
-
-      # 16
-      assert(other_scm.uptodate?(nil))
-
-      # 17
-      add_or_edit_and_commit_file(scm, checkout_dir, "src/java/com/thoughtworks/damagecontrolled/Hello.txt", "Bla bla")
-      assert(!other_scm.uptodate?(nil))
-      revisions = other_scm.revisions(revisions.latest.identifier)
-
-      # 18
-      assert_equal(1, revisions.length)
-      assert_equal(1, revisions[0].length)
-      assert_equal("src/java/com/thoughtworks/damagecontrolled/Hello.txt", revisions[0][0].path)
-    end
 
     def test_create_destroy
       work_dir = RSCM.new_temp_dir("create_destroy")
       checkout_dir = "#{work_dir}/checkout"
       repository_dir = "#{work_dir}/repository"
       scm = create_scm(repository_dir, "killme")
-      scm.default_options = DEFAULT_OPTIONS
       scm.checkout_dir = checkout_dir
 
       (1..3).each do
@@ -169,14 +45,13 @@ module Compatibility
       repository_dir = "#{work_dir}/repository"
       trigger_proof = "#{work_dir}/trigger_proof"
       scm = create_scm(repository_dir, "damagecontrolled")
-      scm.default_options = DEFAULT_OPTIONS
       scm.checkout_dir = checkout_dir
       scm.create_central 
       @scm = scm
       
       # Verify that install/uninstall works
       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_command = touch + " " + PathConverter.filepath_to_nativepath(trigger_proof, true)
       trigger_files_checkout_dir = File.expand_path("#{checkout_dir}/../trigger")
       (1..3).each do |i|
         assert(!scm.trigger_installed?(trigger_command, trigger_files_checkout_dir))
@@ -195,38 +70,11 @@ module Compatibility
       assert(File.exist?(trigger_proof))
     end
 
-    def test_checkout_revision_identifier
-      work_dir = RSCM.new_temp_dir("ids")
-      checkout_dir = "#{work_dir}/checkout"
-      repository_dir = "#{work_dir}/repository"
-      scm = create_scm(repository_dir, "damagecontrolled")
-      scm.default_options = DEFAULT_OPTIONS
-      scm.checkout_dir = checkout_dir
-      scm.create_central 
-      @scm = scm
-
-      import_damagecontrolled(scm, "#{work_dir}/damagecontrolled")
-      scm.checkout nil
-      add_or_edit_and_commit_file(scm, checkout_dir, "before.txt", "Before label")
-      before_cs = scm.revisions(Time.epoch)
-
-      add_or_edit_and_commit_file(scm, checkout_dir, "after.txt", "After label")
-      after_cs = scm.revisions(before_cs.latest.identifier)
-      assert_equal(1, after_cs.length)
-      assert_equal("after.txt", after_cs[0][0].path)
-
-      scm.checkout(before_cs.latest.identifier)
-
-      assert(File.exist?("#{checkout_dir}/before.txt"))
-      assert(!File.exist?("#{checkout_dir}/after.txt"))
-    end
-
     def test_should_move
       work_dir = RSCM.new_temp_dir("move")
       checkout_dir = "#{work_dir}/checkout"
       repository_dir = "#{work_dir}/repository"
       scm = create_scm(repository_dir, "damagecontrolled")
-      scm.default_options = DEFAULT_OPTIONS
       scm.checkout_dir = checkout_dir
       scm.create_central 
       @scm = scm
@@ -251,74 +99,6 @@ module Compatibility
       assert_same(scm.class, scm2.class)
     end
 
-    EXPECTED_DIFF = <<EOF
--one two three
--four five six
-+one two three four
-+five six
-EOF
-    
-    def test_diffs_and_historic_file
-      work_dir = RSCM.new_temp_dir("diff")
-      checkout_dir = "#{work_dir}/checkout"
-      repository_dir = "#{work_dir}/repository"
-      import_dir = "#{work_dir}/import/diffing"
-      scm = create_scm(repository_dir, "diffing")
-      scm.default_options = DEFAULT_OPTIONS
-      scm.checkout_dir = checkout_dir
-      scm.create_central 
-      @scm = scm
-      
-      mkdir_p(import_dir)
-      File.open("#{import_dir}/afile.txt", "w") do |io|
-        io.puts("just some")
-        io.puts("initial content")
-      end      
-      scm.import_central :dir=>import_dir, :message=>"Importing"
-      scm.checkout nil
-      initial_revision = scm.revisions(nil).latest
-      sleep(1)
-
-      scm.edit("#{checkout_dir}/afile.txt")
-      File.open("#{checkout_dir}/afile.txt", "w") do |io|
-        io.puts("one two three")
-        io.puts("four five six")
-      end
-      scm.commit("Modified existing file")
-      sleep(1)
-
-      scm.edit("#{checkout_dir}/afile.txt")
-      File.open("#{checkout_dir}/afile.txt", "w") do |io|
-        io.puts("one two three four")
-        io.puts("five six")
-      end
-      scm.commit("Modified same file again")
-
-      revisions = scm.revisions(initial_revision.identifier)
-      assert_equal(2, revisions.length)
-      assert_equal("Modified existing file", revisions[0].message)
-      assert_equal("Modified same file again", revisions[1].message)
-      
-      got_diff = false
-      scm.diff(revisions[1][0]) do |diff_io|
-        got_diff = true
-        diff_string = diff_io.read
-        assert_match(/^\-one two three/, diff_string)
-        assert_match(/^\-four five six/, diff_string)
-        assert_match(/^\+one two three four/, diff_string)
-        assert_match(/^\+five six/, diff_string)
-      end
-      assert(got_diff)
-      
-      # TODO: make separate test. Make helper method for the cumbersome setup!
-      historic_afile = scm.file("afile.txt", false)
-      revision_files = historic_afile.revision_files 
-      assert_equal(Array, revision_files.class)
-      assert(revision_files.length >= 2)
-      assert(revision_files.length <= 3)
-      assert_equal("one two three four\nfive six\n", revision_files[-1].open(scm){|io| io.read})
-    end
-
   private
 
     def import_damagecontrolled(scm, import_copy_dir)
@@ -329,7 +109,7 @@ EOF
       cp_r(path, dirname)
       todelete = Dir.glob("#{import_copy_dir}/**/.svn")
       rm_rf(todelete)
-      scm.import_central :dir => import_copy_dir, :message => "imported sources"
+      scm.import_central import_copy_dir, :message => "imported sources"
     end
     
     def change_file(scm, file)
@@ -363,7 +143,6 @@ EOF
       checkout_dir = "#{work_dir}/LabelTest"
       repository_dir = "#{work_dir}/repository"
       scm = create_scm(repository_dir, "damagecontrolled")
-      scm.default_options = DEFAULT_OPTIONS
       scm.checkout_dir = checkout_dir
       scm.create_central 
       @scm = scm