blastr 0.0.16 → 0.0.17

data/History.txt

@@ -1,4 +1,8 @@
-== 0.0.16 2009-02-22
+== 0.0.17 2009-02-21
+
+* Removed replacement of non-ascii characters in commit messages.
+
+== 0.0.16 2009-02-21
 
 * Added support for HTTP-based, SSH-based, Rsync-based, and file system-based Git URLs.
 

data/lib/blastr.rb

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

data/lib/scm/hg.rb

@@ -54,7 +54,6 @@ module Blastr::SourceControl
     end
     
     def hg_log_entries(output)
-      nonascii = /([^a-zA-Z0-9\.,:;\-_\?!"'\s]+?)/u
       entries = []
       current_changeset = {}
       output.split(/-{69,71}/).each do |entry|

data/lib/scm/svn.rb

@@ -53,12 +53,11 @@ module Blastr::SourceControl
     end
     
     def svn_log_entries(log_output)
-      nonascii = /([^a-zA-Z0-9\.,:;\-_\?!"'\s]+?)/u
       entries = []
       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 ')
+        comment = entry[2]
         entries << LogEntry.new(revision, author, comment)
       end
       entries

data/test/test_mercurial_log.rb

@@ -7,17 +7,16 @@ class TestMercurialLogParsing < Test::Unit::TestCase
   end
 
   def test_one_entry
-    log = <<EOS
+    @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
+    should_produce_entries [ create_entry("24", "username", "This is the commit message") ]
   end
 
   def test_multiple_entries
-    log = <<EOS
+    @log = <<EOS
 changeset 10:e8a2a4d187773a62f3309b0fa265c13425bc2258 by alf:
 Revision 10
 ----------------------------------------------------------------------
@@ -28,14 +27,32 @@ 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
+    should_produce_entries [
+      create_entry("10", "alf", "Revision 10"),
+      create_entry("9", "bob", "Revision 9"),
+      create_entry("8", "alf", "Revision 8") ]
   end
 
-  def test_one_multiline_entry_with_dashes_in_the_commit_message
-    log = <<EOS
+  def test_special_characters_in_commit_message
+    @log = <<EOS
+changeset 10:e8a2a4d187773a62f3309b0fa265c13425bc2258 by cat:
+Revision 10
+----------------------------------------------------------------------
+changeset 9:d7744e86dedc21a8ecf6bdb73eb191b8eaf5b0da by bob:
+Revision 9 with special ä and ö characters
+----------------------------------------------------------------------
+changeset 8:4ae9f4bfdb98f65bd957e3fe72471b320150b38e by alf:
+Revision 8
+----------------------------------------------------------------------
+EOS
+    should_produce_entries [
+      create_entry("10", "cat", "Revision 10"),
+      create_entry("9", "bob", "Revision 9 with special ä and ö characters"),
+      create_entry("8", "alf", "Revision 8") ]
+  end
+
+  def test_dashes_in_the_commit_message
+    @log = <<EOS
 changeset 123:e8a2a4d187773a62f3309b0fa265c13425bc2258 by ohair:
    ---
 -----
@@ -43,13 +60,11 @@ changeset 123:e8a2a4d187773a62f3309b0fa265c13425bc2258 by ohair:
 - Bullet
 ----------------------------------------------------------------------
 EOS
-    entries = @hg.hg_log_entries(log)
-    assert_equal [ create_entry("123", "ohair", "---\n-----\n-\n- Bullet") ], entries
+    should_produce_entries [ create_entry("123", "ohair", "---\n-----\n-\n- Bullet") ]
   end
 
-
   def test_multiple_multiline_entries_with_empty_lines_within_commit_message
-    log = <<EOS
+    @log = <<EOS
 changeset 2:e8a2a4d187773a62f3309b0fa265c13425bc2258 by cat:
 --
 ----------------------------------------------------------------------
@@ -60,13 +75,18 @@ 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
+    should_produce_entries [
+      create_entry("2", "cat", "--"),
+      create_entry("1", "bob", "-"),
+      create_entry("0", "alf", "") ]
+  end
   
   private
+  
+  def should_produce_entries(expected_entries)
+    assert_equal expected_entries, @hg.hg_log_entries(@log)
+  end
+
   def create_entry(rev_string, author, comment)
     revision = Blastr::SourceControl::MercurialRevision.new(rev_string)
     Blastr::SourceControl::LogEntry.new(revision, author, comment)

data/test/test_svn_log.rb

@@ -7,19 +7,20 @@ class TestSubversionLogParsing < Test::Unit::TestCase
   end
 
   def test_one_entry
-    log = <<EOS
+    @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
+    should_produce_entries [
+      create_entry("123", "username", "The commit message goes here")
+    ]
   end
 
   def test_multiple_entries
-    log = <<EOS
+    @log = <<EOS
 ------------------------------------------------------------------------
 r2 | janedoe | 2009-01-22 09:02:00 +0200 (Wed, 21 Jan 2009) | 1 line
 
@@ -30,16 +31,14 @@ 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 = [
+    should_produce_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
+    @log = <<EOS
 ------------------------------------------------------------------------
 r123 | username | 2009-01-21 09:02:37 +0200 (Wed, 21 Jan 2009) | 1 line
 
@@ -48,13 +47,13 @@ Second line
 Third line
 ------------------------------------------------------------------------
 EOS
-      entries = @svn.svn_log_entries(log)
-      assert_equal [ create_entry("123", "username", "First line\nSecond line\nThird line") ], entries
+    should_produce_entries [
+      create_entry("123", "username", "First line\nSecond line\nThird line")
+    ]
   end
 
-
-  def test_one_multiline_entry
-    log = <<EOS
+  def test_multiple_multiline_entries
+    @log = <<EOS
 ------------------------------------------------------------------------
 r2 | bob | 2009-01-21 09:02:00 +0200 (Wed, 21 Jan 2009) | 1 line
 
@@ -67,12 +66,41 @@ 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
+    should_produce_entries [
+      create_entry("2", "bob", "First line of r2\nSecond line of r2"),
+      create_entry("1", "alf", "First line of r1\nSecond line of r1")
+    ]
+  end
+
+  def test_special_characters_in_commit_message
+    @log = <<EOS
+------------------------------------------------------------------------
+r3 | cat | 2009-01-21 09:03:00 +0200 (Wed, 21 Jan 2009) | 1 line
+
+Revision 3
+------------------------------------------------------------------------
+r2 | bob | 2009-01-21 09:02:00 +0200 (Wed, 21 Jan 2009) | 1 line
+
+Revision 2 with special ö character
+------------------------------------------------------------------------
+r1 | alf | 2009-01-21 09:01:00 +0200 (Wed, 21 Jan 2009) | 1 line
+
+Revision 1
+------------------------------------------------------------------------
+EOS
+    should_produce_entries [
+      create_entry("3", "cat", "Revision 3"),
+      create_entry("2", "bob", "Revision 2 with special ö character"),
+      create_entry("1", "alf", "Revision 1")
+    ]
+  end
   
   private
+  
+  def should_produce_entries(expected_entries)
+    assert_equal expected_entries, @svn.svn_log_entries(@log)
+  end
+  
   def create_entry(rev_string, author, comment)
     revision = Blastr::SourceControl::SubversionRevision.new(rev_string)
     Blastr::SourceControl::LogEntry.new(revision, author, comment)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: blastr
 version: !ruby/object:Gem::Version 
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors: 
 - Lasse Koskela