Print warning when falling back to git. Raise error if fallback fails

JR Richardson · JR Richardson · commit cec0f60818f7 · 2014-11-11T13:14:37.000-07:00
diff --git a/lib/code_climate/test_reporter/calculate_blob.rb b/lib/code_climate/test_reporter/calculate_blob.rb
@@ -8,7 +8,7 @@ def initialize(file_path)
       end
 
       def blob_id
-        calculate_with_file || calculate_with_git
+        calculate_with_file or calculate_with_git
       end
 
     private
@@ -22,10 +22,15 @@ def calculate_with_file
           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
-        Kernel.system("git hash-object -t blob #{@file_path}")
+        output = `git hash-object -t blob #{@file_path}`.chomp
+        raise 'ERROR: Failed to calculate blob with git' unless $?.success?
+
+        output
       end
 
     end
diff --git a/spec/lib/calculate_blob_spec.rb b/spec/lib/calculate_blob_spec.rb
@@ -17,8 +17,7 @@ module CodeClimate::TestReporter
 
       it 'falls back to git' do
         expect(File).to receive(:open).and_raise(EncodingError)
-        expect(Kernel).to receive(:system).with("git hash-object -t blob #{fixture}").and_return('123')
-        expect(subject.blob_id).to eq('123')
+        expect(subject.blob_id).to eq('eb82c22dadb9c47a7fed87211623f6856e112f46')
       end
 
     end
