Merge pull request #57 from codeclimate/git_fallback

Fallback to git when calculating blob id

Author: JacobNinja

lib/code_climate/test_reporter/calculate_blob.rb

@@ -0,0 +1,39 @@
+module CodeClimate
+  module TestReporter
+
+    class CalculateBlob
+
+      def initialize(file_path)
+        @file_path = file_path
+      end
+
+      def blob_id
+        calculate_with_file or calculate_with_git
+      end
+
+    private
+
+      def calculate_with_file
+        File.open(@file_path, "rb") do |file|
+          header = "blob #{file.size}\0"
+          content = file.read
+          store = header + content
+
+          return Digest::SHA1.hexdigest(store)
+        end
+      rescue EncodingError
+        puts "WARNING: Unable to read #{@file_path}\nUsing git for blob calculation"
+        nil
+      end
+
+      def calculate_with_git
+        output = `git hash-object -t blob #{@file_path}`.chomp
+        raise 'ERROR: Failed to calculate blob with git' unless $?.success?
+
+        output
+      end
+
+    end
+
+  end
+end

lib/code_climate/test_reporter/formatter.rb

@@ -49,7 +49,7 @@ def to_payload(result)
 
           {
             name:             short_filename(file.filename),
-            blob_id:          calculate_blob_id(file.filename),
+            blob_id:          CalculateBlob.new(file.filename).blob_id,
             coverage:         file.coverage.to_json,
             covered_percent:  round(file.covered_percent, 2),
             covered_strength: round(file.covered_strength, 2),
@@ -81,15 +81,6 @@ def to_payload(result)
         }
       end
 
-      def calculate_blob_id(path)
-        File.open(path, "rb") do |file|
-          header  = "blob #{file.size}\0"
-          content = file.read.force_encoding("iso-8859-1").encode("utf-8", replace: nil)
-          store   = header + content
-
-          return Digest::SHA1.hexdigest(store)
-        end
-      end
 
       def short_filename(filename)
         return filename unless ::SimpleCov.root

lib/codeclimate-test-reporter.rb

@@ -1,8 +1,8 @@
 require "code_climate/test_reporter"
+require "code_climate/test_reporter/calculate_blob"
 require "code_climate/test_reporter/version"
 require "code_climate/test_reporter/client"
 require "code_climate/test_reporter/formatter"
 require "code_climate/test_reporter/configuration"
 require "code_climate/test_reporter/git"
 require "code_climate/test_reporter/ci"
-

spec/lib/calculate_blob_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+module CodeClimate::TestReporter
+
+  describe CalculateBlob do
+
+    subject { CalculateBlob.new(fixture) }
+    let(:fixture) { File.expand_path("../../fixtures/encoding_test.rb", __FILE__) }
+
+    it 'hex digests content of file' do
+      expect(subject.blob_id).to_not be_nil
+    end
+
+    context 'encoding error' do
+
+      let(:fixture) { File.expand_path("../../fixtures/encoding_test_iso.rb", __FILE__) }
+
+      it 'falls back to git' do
+        expect(File).to receive(:open).and_raise(EncodingError)
+        expect(subject.blob_id).to eq('eb82c22dadb9c47a7fed87211623f6856e112f46')
+      end
+
+    end
+
+  end
+
+end

spec/lib/formatter_spec.rb

@@ -137,15 +137,5 @@ module CodeClimate::TestReporter
         end
       end
     end
-
-    describe "#calculate_blob_id" do
-      it "forces UTF-8 as encoding for the file content" do
-        blob_id = formatter.calculate_blob_id(File.expand_path("../../fixtures/encoding_test_iso.rb", __FILE__))
-        expect(blob_id).to_not be_nil
-
-        blob_id = formatter.calculate_blob_id(File.expand_path("../../fixtures/encoding_test.rb", __FILE__))
-        expect(blob_id).to_not be_nil
-      end
-    end
   end
 end