codeclimate-test-reporter 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2f9c2cd5324d8649ca2a3d3a473525bedbe365c
-  data.tar.gz: 07804f41564354ff8d7123d6c3f6c2f3650b1c41
+  metadata.gz: 156905b7518e6be96dc1c73878da83eade488bc0
+  data.tar.gz: 2c67aaa1930dfab9d24dacbbc376fae4394ff112
 SHA512:
-  metadata.gz: 3e8a40570da4dc86aafa4f1b6d6aab911e779f1d65ea6b61e91ff7b18f84f688c9ea8fbe5dec34bbda8d876b8e8c0d500d0180627851dcaf62546dd61f940b4f
-  data.tar.gz: a161bca31e7d2cd5355eefe921f4c4f01056a95268d9bc72b8108e48462c8527eb89f727a3ff5044103e51cef9a8ae3e3515723fce89ef71a78c190482f825f5
+  metadata.gz: 03603fd7e4059e13bca3c819ad25d052e4640cd00ae3037f4545085c338e3d4c5841054d2569c8f67ebbcdeb16e942956fc51d7f9a1727fe37dad5422e5c0dbf
+  data.tar.gz: 0a230cfe3bb2bc53b49c36c8fe2b9d4cf2bd3c03fb58e6df10f9374065618203c4ef261f1d93bd7340cdd46732a600d59ff1a6a3cea28a1abe76419205f929ec

data/README.md

@@ -1,6 +1,6 @@
 # codeclimate-test-reporter
 
-[![Code Climate](https://codeclimate.com/github/codeclimate/ruby-test-reporter.png)](https://codeclimate.com/github/codeclimate/ruby-test-reporter)
+[![Code Climate](https://codeclimate.com/github/codeclimate/ruby-test-reporter/badges/gpa.svg)](https://codeclimate.com/github/codeclimate/ruby-test-reporter)
 
 Collects test coverage data from your Ruby test suite and sends it to Code
 Climate's hosted, automated code review service. Based on SimpleCov.

data/codeclimate-test-reporter.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
+  
+  spec.required_ruby_version = ">= 1.9"
 
   spec.add_dependency "simplecov", ">= 0.7.1", "< 1.0.0"
   spec.add_development_dependency "bundler", "~> 1.3"

data/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

data/lib/code_climate/test_reporter/formatter.rb

@@ -49,7 +49,7 @@ module CodeClimate
 
           {
             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 @@ module CodeClimate
         }
       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

data/lib/code_climate/test_reporter/version.rb

@@ -1,5 +1,5 @@
 module CodeClimate
   module TestReporter
-    VERSION = "0.4.1"
+    VERSION = "0.4.2"
   end
 end

data/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"
-

data/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

data/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codeclimate-test-reporter
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Bryan Helmkamp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-27 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
@@ -120,6 +120,7 @@ files:
 - codeclimate-test-reporter.gemspec
 - config/cacert.pem
 - lib/code_climate/test_reporter.rb
+- lib/code_climate/test_reporter/calculate_blob.rb
 - lib/code_climate/test_reporter/ci.rb
 - lib/code_climate/test_reporter/client.rb
 - lib/code_climate/test_reporter/configuration.rb
@@ -131,6 +132,7 @@ files:
 - lib/codeclimate-test-reporter.rb
 - spec/fixtures/encoding_test.rb
 - spec/fixtures/encoding_test_iso.rb
+- spec/lib/calculate_blob_spec.rb
 - spec/lib/ci_spec.rb
 - spec/lib/configuration_spec.rb
 - spec/lib/formatter_spec.rb
@@ -150,7 +152,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -165,6 +167,7 @@ summary: Uploads Ruby test coverage data to Code Climate.
 test_files:
 - spec/fixtures/encoding_test.rb
 - spec/fixtures/encoding_test_iso.rb
+- spec/lib/calculate_blob_spec.rb
 - spec/lib/ci_spec.rb
 - spec/lib/configuration_spec.rb
 - spec/lib/formatter_spec.rb
@@ -172,3 +175,4 @@ test_files:
 - spec/lib/payload_validator_spec.rb
 - spec/lib/test_reporter_spec.rb
 - spec/spec_helper.rb
+has_rdoc: