autobuild 1.5.13 → 1.5.14

data/Changes.txt

@@ -1,3 +1,6 @@
+== Version 1.5.14
+* fix Ruby 1.9 rejecting some git logs if they have a weird encoding
+
 == Version 1.5.13
 * fix error messages in the oroGen packages, when the loaded oroGen file has an
   error

data/lib/autobuild.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.5.13" unless defined? Autobuild::VERSION
+    VERSION = "1.5.14" unless defined? Autobuild::VERSION
 end
 
 require 'autobuild/config'

data/lib/autobuild/import/git.rb

@@ -168,11 +168,22 @@ module Autobuild
             end
 
             def log(from, to)
-                log = `git log --pretty=format:"%h %cr %cn %s" #{from}..#{to}`
-                if log.respond_to?(:force_encoding)
-                    log.force_encoding('UTF-8')
+                log = `git log --encoding=UTF-8 --pretty=format:"%h %cr %cn %s" #{from}..#{to}`.chomp
+
+                if log.respond_to?(:encode)
+                    log = log.encode
+                end
+
+                encodings = ['UTF-8', 'iso8859-1']
+                begin
+                    log.split("\n")
+                rescue
+                    if encodings.empty?
+                        return "[some log messages have invalid characters, cannot display/parse them]"
+                    end
+                    log.force_encoding(encodings.pop)
+                    retry
                 end
-                log.chomp.split("\n")
             end
         end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 13
-  version: 1.5.13
+  - 14
+  version: 1.5.14
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-11 00:00:00 +02:00
+date: 2010-06-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency