blastr 0.0.13 → 0.0.14

data/History.txt

@@ -1,5 +1,9 @@
 == 0.0.13 2009-02-20
 
+* Added support for multi-line comments in Mercurial.
+
+== 0.0.13 2009-02-20
+
 * Added support for multi-line comments in SVN.
 
 == 0.0.12 2009-01-19

data/Manifest.txt

@@ -19,6 +19,7 @@ test/test_blastr.rb
 test/test_git_log_entry.rb
 test/test_git_revision.rb
 test/test_helper.rb
+test/test_mercurial_log.rb
 test/test_mercurial_revision.rb
 test/test_scm_logentry.rb
 test/test_scm_url_matching.rb

data/README.rdoc

@@ -12,7 +12,7 @@ systems as well.
 
 === FEATURES:
 
-Blastr can observe a single "branch" (identified by a URL) by polling the
+Blastr can observe a "branch" (identified by a URL) by polling the
 repository for a commit log. Any new commits will be announced. When 
 starting Blastr, it can be told to start observing from a given revision
 or let it figure out the latest revision and start from that.
@@ -88,7 +88,7 @@ your platform.
   Blastr's behavior when encountering weird Norwegian scribble.
 * Some folks might want to monitor multiple repositories or multiple 
   paths or branches within a repository at the same time. Currently,
-  this is technically possible by running to instances of Blastr in
+  this is technically possible by running two instances of Blastr in
   parallel but every now and then those two instances will speak over
   each other (i.e. all you can hear is cacophony).
 

data/lib/blastr.rb

@@ -6,7 +6,7 @@ module Blastr
   require 'tts/tts.rb'
   require 'people/people.rb'
 
-  VERSION = '0.0.13'
+  VERSION = '0.0.14'
   COPYRIGHT = 'Copyright (c) 2009, Lasse Koskela. All Rights Reserved.'
   puts "Blastr #{VERSION}\n#{COPYRIGHT}\n"
   

data/lib/scm/hg.rb

@@ -14,6 +14,10 @@ module Blastr::SourceControl
       @name
     end
     
+    def ==(other)
+      @name == other.name
+    end
+    
     def before?(revision)
       return false if @name == "tip"
       return true if revision.name == "tip"
@@ -49,28 +53,24 @@ module Blastr::SourceControl
       end
     end
     
-    private
-    def hg_log(revision = 0)
+    def hg_log_entries(output)
       nonascii = /([^a-zA-Z0-9\.,:;\-_\?!"'\s]+?)/u
       entries = []
       current_changeset = {}
-      %x[hg log -r #{revision}:].each_line do |line|
-        if line =~ /^changeset:\s+(.+?):(.+?)$/
-          entries << current_changeset unless current_changeset.empty?
-          current_changeset = { :revision => $1, :hash => $2 }
-        elsif line =~ /^user:\s+(.+?)(\s<(.+?)@(.+?)>)?$/
-          current_changeset[:author] = $1
-        elsif line =~ /^summary:\s+(.+?)$/
-          current_changeset[:comment] = $1.strip
-        elsif current_changeset.key? :comment
-          current_changeset[:comment] = "#{current_changeset[:comment]} #{line.strip}"
+      output.split(/-{69,71}/).each do |entry|
+        if entry =~ /^changeset (\d+):(.+) by (.+):\n(.*)/mu
+          entries << LogEntry.new(as_revision($1), $3, $4.strip)
         end
       end
-      entries << current_changeset unless current_changeset.empty?
-      
-      entries.collect do |map|
-        LogEntry.new(as_revision(map[:revision]), map[:author], map[:comment].gsub(nonascii, 'X '))
-      end
+      entries
+    end
+    
+    private
+    def hg_log(revision = 0)
+      separator = "-" * 70
+      template = "\\nchangeset {rev}:{node} by {author}:\\n{desc}\\n#{separator}"
+      output = %x[hg log -r '#{revision}:' --template '#{template}'].strip
+      hg_log_entries(output)
     end
     
     private

data/test/test_mercurial_log.rb

@@ -0,0 +1,74 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestMercurialLogParsing < Test::Unit::TestCase
+  
+  def setup
+    @hg = Blastr::SourceControl::Mercurial.new("hg:http://whatever")
+  end
+
+  def test_one_entry
+    log = <<EOS
+changeset 24:e8a2a4d187773a62f3309b0fa265c13425bc2258 by username:
+This is the commit message
+----------------------------------------------------------------------
+EOS
+    entries = @hg.hg_log_entries(log)
+    assert_equal [ create_entry("24", "username", "This is the commit message") ], entries
+  end
+
+  def test_multiple_entries
+    log = <<EOS
+changeset 10:e8a2a4d187773a62f3309b0fa265c13425bc2258 by alf:
+Revision 10
+----------------------------------------------------------------------
+changeset 9:d7744e86dedc21a8ecf6bdb73eb191b8eaf5b0da by bob:
+Revision 9
+----------------------------------------------------------------------
+changeset 8:4ae9f4bfdb98f65bd957e3fe72471b320150b38e by alf:
+Revision 8
+----------------------------------------------------------------------
+EOS
+    entries = @hg.hg_log_entries(log)
+    assert_equal [ create_entry("10", "alf", "Revision 10"),
+                   create_entry("9", "bob", "Revision 9"),
+                   create_entry("8", "alf", "Revision 8") ], entries
+  end
+
+  def test_one_multiline_entry_with_dashes_in_the_commit_message
+    log = <<EOS
+changeset 123:e8a2a4d187773a62f3309b0fa265c13425bc2258 by ohair:
+   ---
+-----
+-
+- Bullet
+----------------------------------------------------------------------
+EOS
+    entries = @hg.hg_log_entries(log)
+    assert_equal [ create_entry("123", "ohair", "---\n-----\n-\n- Bullet") ], entries
+  end
+
+
+  def test_multiple_multiline_entries_with_empty_lines_within_commit_message
+    log = <<EOS
+changeset 2:e8a2a4d187773a62f3309b0fa265c13425bc2258 by cat:
+--
+----------------------------------------------------------------------
+changeset 1:d7744e86dedc21a8ecf6bdb73eb191b8eaf5b0da by bob:
+-
+----------------------------------------------------------------------
+changeset 0:4ae9f4bfdb98f65bd957e3fe72471b320150b38e by alf:
+
+----------------------------------------------------------------------
+EOS
+        entries = @hg.hg_log_entries(log)
+        assert_equal [ create_entry("2", "cat", "--"),
+                       create_entry("1", "bob", "-"),
+                       create_entry("0", "alf", "") ], entries
+    end
+  
+  private
+  def create_entry(rev_string, author, comment)
+    revision = Blastr::SourceControl::MercurialRevision.new(rev_string)
+    Blastr::SourceControl::LogEntry.new(revision, author, comment)
+  end
+end

data/test/test_mercurial_revision.rb

@@ -3,21 +3,30 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 class TestMercurialRevision < Test::Unit::TestCase
 
   def test_to_s
-    rev = Blastr::SourceControl::MercurialRevision.new("123")
-    assert rev.to_s == "123"
+    assert revision("123").to_s == "123"
+  end
+  
+  def test_equality_comparison
+    assert_equal revision("123"), revision("123")
+    assert revision("456") == revision("456")
   end
 
   def test_before_comparison_between_revisions
-    rev123 = Blastr::SourceControl::MercurialRevision.new("123")
-    rev456 = Blastr::SourceControl::MercurialRevision.new("456")
+    rev123 = revision("123")
+    rev456 = revision("456")
     assert rev123.before?(rev456) == true
     assert rev456.before?(rev123) == false
   end
 
   def test_before_comparison_with_tip
-    rev = Blastr::SourceControl::MercurialRevision.new("100")
-    tip = Blastr::SourceControl::MercurialRevision.new("tip")
+    rev = revision("100")
+    tip = revision("tip")
     assert rev.before?(tip) == true
     assert tip.before?(rev) == false
   end
+  
+  private
+  def revision(value)
+    Blastr::SourceControl::MercurialRevision.new(value)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: blastr
 version: !ruby/object:Gem::Version 
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors: 
 - Lasse Koskela
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-20 00:00:00 +02:00
+date: 2009-02-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,6 +66,7 @@ files:
 - test/test_git_log_entry.rb
 - test/test_git_revision.rb
 - test/test_helper.rb
+- test/test_mercurial_log.rb
 - test/test_mercurial_revision.rb
 - test/test_scm_logentry.rb
 - test/test_scm_url_matching.rb
@@ -105,6 +106,7 @@ test_files:
 - test/test_git_log_entry.rb
 - test/test_git_revision.rb
 - test/test_helper.rb
+- test/test_mercurial_log.rb
 - test/test_mercurial_revision.rb
 - test/test_scm_logentry.rb
 - test/test_scm_url_matching.rb