gitlab_git 7.2.14 → 7.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22bc4c47e1a258187a410d36f3c2dffe0f3050d7
-  data.tar.gz: 37d23dc67e7a89e6278bb346a2359ce8619cd2f5
+  metadata.gz: e8300790e0ccabd6e3bd4002e7d6cb7470dec69a
+  data.tar.gz: 2ab3c31f0b61acb76aa9f6cefa6a646a8935fb48
 SHA512:
-  metadata.gz: ec01d372f387f67a5e6df8f19262414f05590edc671e8615b85b92cfb04de7cccad3bd7bfb0eaf1ecb944730c61b2cb811a41574aaef5410f89c6b954bec713b
-  data.tar.gz: a059436ab41194d430a1a1f7a5ef0a79ca04c91d90a77aa72a9c6adcff4193e72e0f8d75d456ae968f8d977ff7074577caa1276237c7ea3e6b5552be21e9ed07
+  metadata.gz: 919ebd7a6bc0edd28c29a72f1c193a3852b4d1318ac13dcd343cdb99e9df45f2b809ac7cded4ba9aa554f284c31c17578387aebd84543ed840436558139da0cf
+  data.tar.gz: 701f5e05964311896a145e60771455e8dfea685611a8d20db05c8fb6fe45eff5b8f7bcf459224930b51e362dc917c418b7f86e12794d73cc9da91b7d0ea75578

data/VERSION

@@ -1 +1 @@
-7.2.14
+7.2.15

data/lib/gitlab_git/blame.rb

@@ -1,6 +1,10 @@
+require_relative 'encoding_helper'
+
 module Gitlab
   module Git
     class Blame
+      include EncodingHelper
+
       attr_reader :lines, :blames
 
       def initialize(repository, sha, path)
@@ -24,8 +28,10 @@ module Gitlab
 
       def load_blame
         cmd = %W(git --git-dir=#{@repo.path} blame -p #{@sha} -- #{@path})
-        raw_output = IO.popen(cmd) {|io| io.read }
-        process_raw_blame raw_output
+        # Read in binary mode to ensure ASCII-8BIT
+        raw_output = IO.popen(cmd, 'rb') {|io| io.read }
+        output = encode_utf8(raw_output)
+        process_raw_blame output
       end
 
       def process_raw_blame(output)

data/lib/gitlab_git/encoding_helper.rb

@@ -24,6 +24,15 @@ module EncodingHelper
     "--broken encoding: #{encoding}"
   end
 
+  def encode_utf8(message)
+    detect = CharlockHolmes::EncodingDetector.detect(message)
+    if detect
+      CharlockHolmes::Converter.convert(message, detect[:encoding], 'UTF-8')
+    else
+      clean(message)
+    end
+  end
+
   private
 
   def clean(message)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 7.2.14
+  version: 7.2.15
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2015-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab-linguist