blastr 0.0.12 → 0.0.13

data/History.txt

@@ -1,3 +1,7 @@
+== 0.0.13 2009-02-20
+
+* Added support for multi-line comments in SVN.
+
 == 0.0.12 2009-01-19
 
 * Removed extra_dev_deps from newgem configuration (should fix the implicit

data/Manifest.txt

@@ -20,7 +20,9 @@ test/test_git_log_entry.rb
 test/test_git_revision.rb
 test/test_helper.rb
 test/test_mercurial_revision.rb
+test/test_scm_logentry.rb
 test/test_scm_url_matching.rb
+test/test_svn_log.rb
 test/test_svn_revision.rb
 test/test_tts.rb
 website/index.html

data/README.rdoc

@@ -1,5 +1,8 @@
 = Blastr, the audible commit radiator
 
+See the project website at Rubyforge[http://rubyforge.org/projects/blastr/]
+to file a bug report or submit a feature request.
+
 == DESCRIPTION:
 
 Blastr observes a version control repository for commits and makes audible 
@@ -78,16 +81,16 @@ your platform.
 === KNOWN PROBLEMS AND GOTCHAS:
 
 * Blastr currently does a full clone operation on every poll for 
-source repositories that don't support a purely remote operation (like
-"svn log [URL]"). This may take a while if your repository is big.
+  source repositories that don't support a purely remote operation (like
+  "svn log [URL]"). This may take a while if your repository is big.
 * Blastr doesn't treat non-ASCII characters in commit messages too well. 
-In other words, the developers make no promises whatsoever regarding 
-Blastr's behavior when encountering weird Norwegian scribble.
+  In other words, the developers make no promises whatsoever regarding 
+  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
-parallel but every now and then those two instances will speak over
-each other (i.e. all you can hear is cacophony).
+  paths or branches within a repository at the same time. Currently,
+  this is technically possible by running to 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).
 
 === LICENSE:
 

data/lib/blastr.rb

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

data/lib/scm/scm.rb

@@ -7,6 +7,9 @@ module Blastr::SourceControl
       @author = author
       @comment = comment
     end
+    def ==(other)
+      @revision == other.revision and @author == other.author and @comment == other.comment
+    end
     def to_s
       "revision #{@revision} by #{@author}: #{@comment}"
     end

data/lib/scm/svn.rb

@@ -14,6 +14,10 @@ module Blastr::SourceControl
       @name
     end
     
+    def ==(other)
+      @name == other.name
+    end
+    
     def before?(revision)
       return false if @name == "HEAD"
       return true if revision.name == "HEAD"
@@ -44,9 +48,14 @@ module Blastr::SourceControl
     end
 
     def commits_since(since_revision = 1)
+      svn_log_output = svn_log(since_revision)
+      svn_log_entries(svn_log_output)
+    end
+    
+    def svn_log_entries(log_output)
       nonascii = /([^a-zA-Z0-9\.,:;\-_\?!"'\s]+?)/u
       entries = []
-      svn_log(since_revision).scan(/r(\d+)\s\|\s(.*?)\s\|.*?\n\n(.*)\n-+/u).each do |entry|
+      log_output.scan(/r(\d+)\s\|\s(.*?)\s\|.*?\n\n(.*?)\n(-)+/mu).each do |entry|
         revision = as_revision(entry[0])
         author = entry[1]
         comment = entry[2].gsub(nonascii, 'X ')

data/test/test_scm_logentry.rb

@@ -0,0 +1,13 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestLogEntry < Test::Unit::TestCase  
+  def test_equality
+    assert_equal create_log_entry, create_log_entry
+  end
+  
+  private
+  def create_log_entry
+    rev = Blastr::SourceControl::SubversionRevision.new("707")
+    Blastr::SourceControl::LogEntry.new(rev, "author", "comment")
+  end
+end

data/test/test_svn_log.rb

@@ -0,0 +1,80 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestSubversionLogParsing < Test::Unit::TestCase
+  
+  def setup
+    @svn = Blastr::SourceControl::Subversion.new("svn://whatever")
+  end
+
+  def test_one_entry
+    log = <<EOS
+------------------------------------------------------------------------
+r123 | username | 2009-01-21 09:02:37 +0200 (Wed, 21 Jan 2009) | 1 line
+
+The commit message goes here
+------------------------------------------------------------------------
+EOS
+    entries = @svn.svn_log_entries(log)
+    assert_equal [ Blastr::SourceControl::LogEntry.new(Blastr::SourceControl::SubversionRevision.new("123"), "username", "The commit message goes here") ], entries
+  end
+
+  def test_multiple_entries
+    log = <<EOS
+------------------------------------------------------------------------
+r2 | janedoe | 2009-01-22 09:02:00 +0200 (Wed, 21 Jan 2009) | 1 line
+
+Second revision
+------------------------------------------------------------------------
+r1 | johndoe | 2009-01-21 09:03:00 +0200 (Wed, 21 Jan 2009) | 1 line
+
+First revision
+------------------------------------------------------------------------
+EOS
+    actual_entries = @svn.svn_log_entries(log)
+    expected_entries = [
+      create_entry("2", "janedoe", "Second revision"),
+      create_entry("1", "johndoe", "First revision")
+      ]
+    assert_equal expected_entries, actual_entries
+  end
+
+  def test_one_multiline_entry
+    log = <<EOS
+------------------------------------------------------------------------
+r123 | username | 2009-01-21 09:02:37 +0200 (Wed, 21 Jan 2009) | 1 line
+
+First line
+Second line
+Third line
+------------------------------------------------------------------------
+EOS
+      entries = @svn.svn_log_entries(log)
+      assert_equal [ create_entry("123", "username", "First line\nSecond line\nThird line") ], entries
+  end
+
+
+  def test_one_multiline_entry
+    log = <<EOS
+------------------------------------------------------------------------
+r2 | bob | 2009-01-21 09:02:00 +0200 (Wed, 21 Jan 2009) | 1 line
+
+First line of r2
+Second line of r2
+------------------------------------------------------------------------
+r1 | alf | 2009-01-21 09:01:00 +0200 (Wed, 21 Jan 2009) | 1 line
+
+First line of r1
+Second line of r1
+------------------------------------------------------------------------
+EOS
+        entries = @svn.svn_log_entries(log)
+        assert_equal [ create_entry("2", "bob", "First line of r2\nSecond line of r2"),
+                       create_entry("1", "alf", "First line of r1\nSecond line of r1") ], entries
+    end
+  
+  private
+  def create_entry(rev_string, author, comment)
+    revision = Blastr::SourceControl::SubversionRevision.new(rev_string)
+    Blastr::SourceControl::LogEntry.new(revision, author, comment)
+  end
+end

data/test/test_svn_revision.rb

@@ -6,6 +6,11 @@ class TestSubversionRevision < Test::Unit::TestCase
     rev = Blastr::SourceControl::SubversionRevision.new("123")
     assert rev.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::SubversionRevision.new("123")
@@ -15,9 +20,14 @@ class TestSubversionRevision < Test::Unit::TestCase
   end
 
   def test_before_comparison_with_HEAD
-    rev = Blastr::SourceControl::SubversionRevision.new("100")
-    head = Blastr::SourceControl::SubversionRevision.new("HEAD")
+    rev = revision("100")
+    head = revision("HEAD")
     assert rev.before?(head) == true
     assert head.before?(rev) == false
   end
+  
+  private
+  def revision(value)
+    Blastr::SourceControl::SubversionRevision.new(value)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: blastr
 version: !ruby/object:Gem::Version 
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors: 
 - Lasse Koskela
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-19 00:00:00 +02:00
+date: 2009-02-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,12 +67,14 @@ files:
 - test/test_git_revision.rb
 - test/test_helper.rb
 - test/test_mercurial_revision.rb
+- test/test_scm_logentry.rb
 - test/test_scm_url_matching.rb
+- test/test_svn_log.rb
 - test/test_svn_revision.rb
 - test/test_tts.rb
 - website/index.html
 has_rdoc: true
-homepage: 
+homepage: See the project website at Rubyforge[http://rubyforge.org/projects/blastr/]
 post_install_message: 
 rdoc_options: 
 - --main
@@ -104,6 +106,8 @@ test_files:
 - test/test_git_revision.rb
 - test/test_helper.rb
 - test/test_mercurial_revision.rb
+- test/test_scm_logentry.rb
 - test/test_scm_url_matching.rb
+- test/test_svn_log.rb
 - test/test_svn_revision.rb
 - test/test_tts.rb