codeclimate-test-reporter 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7de001c91bea29ead523c91c8ed2d473d61623b2
-  data.tar.gz: c17f0b84be142110884b5222184f0a00390e9192
+  metadata.gz: 96de1473cbfbf76faf670cc24b20ee12aca01d56
+  data.tar.gz: 1ff2ca29aeea50a4e5262d4deec97ec4bd1a782c
 SHA512:
-  metadata.gz: e0dea2364420a4d20c378cf507701d9d19e4aabe23575dfd9ac77281ccf3655f16f6804159839dae7d7c569d976aa14d4bf6e0442e7fd0467d46ce6d18fb5c04
-  data.tar.gz: b55d230cccde14b89351682c1b1106e48ed93501c8b23fc87b3cd2b50a7ed61472aa8625c1d918023d03dedc884fc91564275b70ebdc338115d37843fb2945b7
+  metadata.gz: 6ba6945d29cf097912f36785ad4af4f8a7a6f81f37422fcbd8622cb279db1c6c4657c7fedf77e3b82708dc7804dd0d916c7606058ffa82b1d05f8c0baa623793
+  data.tar.gz: 54fb6f840f963be3b1360d6ae1771eecb9fce514e5c31a9d4926666bf375b4a88264db5e9871b8fbc8d43d34077ea8ef7c47bf2e88a5d88bf09fa0206d4dfa51

data/README.md

@@ -80,10 +80,10 @@ Since ruby-test-reporter 0.4.0 you can use `CodeClimate::TestReporter::Formatter
 ```ruby
 require 'codeclimate-test-reporter'
 SimpleCov.start do
-  formatter SimpleCov::Formatter::MultiFormatter[
+  formatter SimpleCov::Formatter::MultiFormatter.new([
     SimpleCov::Formatter::HTMLFormatter,
     CodeClimate::TestReporter::Formatter
-  ]
+  ])
   ...
 end
 ```

data/bin/cc-tddium-post-worker

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require 'codeclimate-test-reporter'
-require 'tmpdir'
+require "codeclimate-test-reporter"
+require "tmpdir"
 
 if ENV["CODECLIMATE_REPO_TOKEN"]
   tmpdir = Dir.tmpdir

data/lib/code_climate/test_reporter.rb

@@ -1,10 +1,9 @@
 module CodeClimate
   module TestReporter
-
     def self.start
       if run?
         require "simplecov"
-        ::SimpleCov.add_filter 'vendor'
+        ::SimpleCov.add_filter "vendor"
         ::SimpleCov.formatter = Formatter
         ::SimpleCov.start(configuration.profile) do
           skip_token CodeClimate::TestReporter.configuration.skip_token
@@ -51,6 +50,5 @@ module CodeClimate
     def self.logger
       CodeClimate::TestReporter.configuration.logger
     end
-
   end
 end

data/lib/code_climate/test_reporter/calculate_blob.rb

@@ -1,6 +1,5 @@
 module CodeClimate
   module TestReporter
-
     class CalculateBlob
 
       def initialize(file_path)
@@ -28,12 +27,11 @@ module CodeClimate
 
       def calculate_with_git
         output = `git hash-object -t blob #{@file_path}`.chomp
-        raise 'ERROR: Failed to calculate blob with git' unless $?.success?
+        raise "ERROR: Failed to calculate blob with git" unless $?.success?
 
         output
       end
 
     end
-
   end
 end

data/lib/code_climate/test_reporter/ci.rb

@@ -3,90 +3,97 @@ module CodeClimate
     class Ci
 
       def self.service_data(env = ENV)
-        if env['TRAVIS']
+        if env["TRAVIS"]
           {
             name:             "travis-ci",
-            branch:           env['TRAVIS_BRANCH'],
-            build_identifier: env['TRAVIS_JOB_ID'],
-            pull_request:     env['TRAVIS_PULL_REQUEST']
+            branch:           env["TRAVIS_BRANCH"],
+            build_identifier: env["TRAVIS_JOB_ID"],
+            pull_request:     env["TRAVIS_PULL_REQUEST"]
           }
-        elsif env['CIRCLECI']
+        elsif env["CIRCLECI"]
           {
-            name:             "circlci",
-            build_identifier: env['CIRCLE_BUILD_NUM'],
-            branch:           env['CIRCLE_BRANCH'],
-            commit_sha:       env['CIRCLE_SHA1']
+            name:             "circleci",
+            build_identifier: env["CIRCLE_BUILD_NUM"],
+            branch:           env["CIRCLE_BRANCH"],
+            commit_sha:       env["CIRCLE_SHA1"]
           }
-        elsif env['SEMAPHORE']
+        elsif env["SEMAPHORE"]
           {
             name:             "semaphore",
-            branch:           env['BRANCH_NAME'],
-            build_identifier: env['SEMAPHORE_BUILD_NUMBER']
+            branch:           env["BRANCH_NAME"],
+            build_identifier: env["SEMAPHORE_BUILD_NUMBER"]
           }
-        elsif env['JENKINS_URL']
+        elsif env["JENKINS_URL"]
           {
             name:             "jenkins",
-            build_identifier: env['BUILD_NUMBER'],
-            build_url:        env['BUILD_URL'],
-            branch:           env['GIT_BRANCH'],
-            commit_sha:       env['GIT_COMMIT']
+            build_identifier: env["BUILD_NUMBER"],
+            build_url:        env["BUILD_URL"],
+            branch:           env["GIT_BRANCH"],
+            commit_sha:       env["GIT_COMMIT"]
           }
-        elsif env['TDDIUM']
+        elsif env["TDDIUM"]
           {
             name:             "tddium",
-            build_identifier: env['TDDIUM_SESSION_ID'],
-            worker_id:        env['TDDIUM_TID']
+            build_identifier: env["TDDIUM_SESSION_ID"],
+            worker_id:        env["TDDIUM_TID"]
           }
-        elsif env['WERCKER']
+        elsif env["WERCKER"]
           {
             name:             "wercker",
-            build_identifier: env['WERCKER_BUILD_ID'],
-            build_url:        env['WERCKER_BUILD_URL'],
-            branch:           env['WERCKER_GIT_BRANCH'],
-            commit_sha:       env['WERCKER_GIT_COMMIT']
+            build_identifier: env["WERCKER_BUILD_ID"],
+            build_url:        env["WERCKER_BUILD_URL"],
+            branch:           env["WERCKER_GIT_BRANCH"],
+            commit_sha:       env["WERCKER_GIT_COMMIT"]
           }
-        elsif env['APPVEYOR']
+        elsif env["APPVEYOR"]
           {
             name:             "appveyor",
-            build_identifier: env['APPVEYOR_BUILD_ID'],
-            build_url:        env['APPVEYOR_API_URL'],
-            branch:           env['APPVEYOR_REPO_BRANCH'],
-            commit_sha:       env['APPVEYOR_REPO_COMMIT'],
-            pull_request:     env['APPVEYOR_PULL_REQUEST_NUMBER']
+            build_identifier: env["APPVEYOR_BUILD_ID"],
+            build_url:        env["APPVEYOR_API_URL"],
+            branch:           env["APPVEYOR_REPO_BRANCH"],
+            commit_sha:       env["APPVEYOR_REPO_COMMIT"],
+            pull_request:     env["APPVEYOR_PULL_REQUEST_NUMBER"]
           }
-        elsif env['CI_NAME'] =~ /DRONE/i
+        elsif env["CI_NAME"] =~ /DRONE/i
           {
             name:             "drone",
-            build_identifier: env['CI_BUILD_NUMBER'],
-            build_url:        env['CI_BUILD_URL'],
-            branch:           env['CI_BRANCH'],
-            commit_sha:       env['CI_BUILD_NUMBER'],
-            pull_request:     env['CI_PULL_REQUEST']
+            build_identifier: env["CI_BUILD_NUMBER"],
+            build_url:        env["CI_BUILD_URL"],
+            branch:           env["CI_BRANCH"],
+            commit_sha:       env["CI_BUILD_NUMBER"],
+            pull_request:     env["CI_PULL_REQUEST"]
           }
-        elsif env['CI_NAME'] =~ /codeship/i
+        elsif env["CI_NAME"] =~ /codeship/i
           {
             name:             "codeship",
-            build_identifier: env['CI_BUILD_NUMBER'],
-            build_url:        env['CI_BUILD_URL'],
-            branch:           env['CI_BRANCH'],
-            commit_sha:       env['CI_COMMIT_ID'],
+            build_identifier: env["CI_BUILD_NUMBER"],
+            build_url:        env["CI_BUILD_URL"],
+            branch:           env["CI_BRANCH"],
+            commit_sha:       env["CI_COMMIT_ID"],
           }
-        elsif env['CI_NAME'] =~ /VEXOR/i
+        elsif env["CI_NAME"] =~ /VEXOR/i
           {
-            name:             'vexor',
-            build_identifier: env['CI_BUILD_NUMBER'],
-            build_url:        env['CI_BUILD_URL'],
-            branch:           env['CI_BRANCH'],
-            commit_sha:       env['CI_BUILD_SHA'],
-            pull_request:     env['CI_PULL_REQUEST_ID']
+            name:             "vexor",
+            build_identifier: env["CI_BUILD_NUMBER"],
+            build_url:        env["CI_BUILD_URL"],
+            branch:           env["CI_BRANCH"],
+            commit_sha:       env["CI_BUILD_SHA"],
+            pull_request:     env["CI_PULL_REQUEST_ID"]
           }
-        elsif env['BUILDKITE']
+        elsif env["BUILDKITE"]
           {
             name:             "buildkite",
-            build_identifier: env['BUILDKITE_JOB_ID'],
-            build_url:        env['BUILDKITE_BUILD_URL'],
-            branch:           env['BUILDKITE_BRANCH'],
-            commit_sha:       env['BUILDKITE_COMMIT']
+            build_identifier: env["BUILDKITE_JOB_ID"],
+            build_url:        env["BUILDKITE_BUILD_URL"],
+            branch:           env["BUILDKITE_BRANCH"],
+            commit_sha:       env["BUILDKITE_COMMIT"]
+          }
+        elsif env["GITLAB_CI"]
+          {
+            name:             "gitlab-ci",
+            build_identifier: env["CI_BUILD_ID"],
+            branch:           env["CI_BUILD_REF_NAME"],
+            commit_sha:       env["CI_BUILD_REF"]
           }
         else
           {}

data/lib/code_climate/test_reporter/client.rb

@@ -4,11 +4,10 @@ require "net/https"
 
 module CodeClimate
   module TestReporter
-
     class Client
 
       DEFAULT_TIMEOUT = 5 # in seconds
-      USER_AGENT      = "Code Climate (Ruby Test Reporter v#{VERSION})"
+      USER_AGENT = "Code Climate (Ruby Test Reporter v#{VERSION})"
 
       def host
         ENV["CODECLIMATE_API_HOST"] ||
@@ -80,7 +79,7 @@ module CodeClimate
           if uri.scheme == "https"
             http.use_ssl = true
             http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-            http.ca_file = File.expand_path('../../../../config/cacert.pem', __FILE__)
+            http.ca_file = File.expand_path("../../../../config/cacert.pem", __FILE__)
             http.verify_depth = 5
           end
           http.open_timeout = CodeClimate::TestReporter.configuration.timeout
@@ -97,6 +96,5 @@ module CodeClimate
       end
 
     end
-
   end
 end

data/lib/code_climate/test_reporter/configuration.rb

@@ -1,4 +1,4 @@
-require 'logger'
+require "logger"
 
 module CodeClimate
   module TestReporter
@@ -52,6 +52,5 @@ module CodeClimate
         log
       end
     end
-
   end
 end

data/lib/code_climate/test_reporter/exception_message.rb

@@ -1,6 +1,5 @@
 module CodeClimate
   module TestReporter
-
     class WebMockMessage
       def library_name
         "WebMock"

data/lib/code_climate/test_reporter/formatter.rb

@@ -39,7 +39,7 @@ module CodeClimate
       # actually private ...
       def short_filename(filename)
         return filename unless ::SimpleCov.root
-        filename = filename.gsub(::SimpleCov.root, '.').gsub(/^\.\//, '')
+        filename = filename.gsub(/^#{::SimpleCov.root}/, ".").gsub(/^\.\//, "")
         apply_prefix filename
       end
 
@@ -52,9 +52,14 @@ module CodeClimate
       def to_payload(result)
         totals = Hash.new(0)
         source_files = result.files.map do |file|
-          totals[:total]      += file.lines.count
-          totals[:covered]    += file.covered_lines.count
-          totals[:missed]     += file.missed_lines.count
+          totals[:total] += file.lines.count
+          totals[:covered] += file.covered_lines.count
+          totals[:missed] += file.missed_lines.count
+
+          # Set coverage for all skipped lines to nil
+          file.skipped_lines.each do |skipped_line|
+            file.coverage[skipped_line.line_number - 1] = nil
+          end
 
           {
             name:             short_filename(file.filename),

data/lib/code_climate/test_reporter/git.rb

@@ -36,12 +36,12 @@ module CodeClimate
         end
 
         def committed_at
-          committed_at = git('log -1 --pretty=format:%ct')
+          committed_at = git("log -1 --pretty=format:%ct")
           committed_at.to_i.zero? ? nil : committed_at.to_i
         end
 
         def branch_from_git
-          git('rev-parse --abbrev-ref HEAD').chomp
+          git("rev-parse --abbrev-ref HEAD").chomp
         end
 
         def git(command)
@@ -50,7 +50,7 @@ module CodeClimate
 
         def git_dir
           return configured_git_dir unless configured_git_dir.nil?
-          rails_git_dir_present? ? Rails.root : '.'
+          rails_git_dir_present? ? Rails.root : "."
         end
 
         def configured_git_dir
@@ -59,7 +59,7 @@ module CodeClimate
 
         def rails_git_dir_present?
           const_defined?(:Rails) && Rails.respond_to?(:root) && !Rails.root.nil? &&
-            File.directory?(File.expand_path('.git', Rails.root))
+            File.directory?(File.expand_path(".git", Rails.root))
         end
       end
     end

data/lib/code_climate/test_reporter/payload_validator.rb

@@ -54,6 +54,5 @@ module CodeClimate
         @payload[:ci_service] && @payload[:ci_service][:commit_sha]
       end
     end
-
   end
 end

data/lib/code_climate/test_reporter/version.rb

@@ -1,5 +1,5 @@
 module CodeClimate
   module TestReporter
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codeclimate-test-reporter
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Bryan Helmkamp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov