codeclimate-services 1.9.2 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0da8a809a1d22bffa82ac7e9d0070c18a5dde1cb
-  data.tar.gz: baaf73d0204de17ed77a24f89339b1d912e46bed
+  metadata.gz: ed9a5c4b56c617ffde12f689f9f42633735c6d93
+  data.tar.gz: 623c26772ad31e593ab6f75f15f29145a065bc24
 SHA512:
-  metadata.gz: ffdb3821d630ddd2fa8f203c005ec362430d6a0697c6cd29fa93c0c190caf628f40c4f1d5b4442ffa5b552153de267aa6ba85637e678cf6a3894745280a04db8
-  data.tar.gz: 65ad997cc098da3a1abab7ed396b40403ed155c0bad4470aa5d5b9dc72dce6c7a809a0c68ed467a470d6ade61e5a5a4d3bff212f171da50f51567c4cb7d03a9a
+  metadata.gz: 9f159c9c3527889b527fdf1d2172adb0743e83ddb937e69496b7d1b639d405bffd3365aea93a8e1abf527102a73c2a7f5092c5cd3c059194641ca910789dc964
+  data.tar.gz: 0a51db3bc18c327aa409b4fb3f2b1d42c20156c35366fd1469e5aa3cfab583a56d098e8159a218d88779261657017ae2ff2f4bbcf31695ac19517eee9693cf0e

data/lib/cc/presenters/pull_requests_presenter.rb

@@ -40,42 +40,22 @@ module CC
       end
 
       def success_message
-        if both_issue_counts_zero?
-          "Code Climate didn't find any new or fixed issues."
+        if @new_count > 0 && @fixed_count > 0
+          "#{@new_count} new #{"issue".pluralize(@new_count)} (#{@fixed_count} fixed)"
+        elsif @new_count <= 0 && @fixed_count > 0
+          "#{@fixed_count} fixed #{"issue".pluralize(@fixed_count)}"
+        elsif @new_count > 0 && @fixed_count <= 0
+          "#{@new_count} new #{"issue".pluralize(@new_count)}"
         else
-          "Code Climate found #{formatted_issue_counts}."
+          "no new or fixed issues"
         end
       end
 
       private
 
-      def both_issue_counts_zero?
-        issue_counts.all?(&:zero?)
-      end
-
-      def formatted_fixed_issues
-        if @fixed_count > 0
-          "#{number_to_delimited(@fixed_count)} fixed #{"issue".pluralize(@fixed_count)}"
-        end
-      end
-
-      def formatted_new_issues
-        if @new_count > 0
-          "#{number_to_delimited(@new_count)} new #{"issue".pluralize(@new_count)}"
-        end
-      end
-
-      def formatted_issue_counts
-        [formatted_new_issues, formatted_fixed_issues].compact.to_sentence
-      end
-
       def formatted_percent(value)
         "%g" % ("%.2f" % value)
       end
-
-      def issue_counts
-        [@new_count, @fixed_count]
-      end
     end
   end
 end

data/lib/cc/services/version.rb

@@ -1,5 +1,5 @@
 module CC
   module Services
-    VERSION = "1.9.2".freeze
+    VERSION = "1.9.3".freeze
   end
 end

data/spec/cc/presenters/pull_requests_presenter_spec.rb

@@ -2,23 +2,28 @@ require "cc/presenters/pull_requests_presenter"
 
 describe CC::Service::PullRequestsPresenter, type: :service do
   it "message singular" do
-    expect("Code Climate found 1 new issue and 1 fixed issue.").to eq(build_presenter("fixed" => 1, "new" => 1).success_message)
+    expect(build_presenter("fixed" => 1, "new" => 1).success_message).
+      to eq("1 new issue (1 fixed)")
   end
 
   it "message plural" do
-    expect("Code Climate found 2 new issues and 1 fixed issue.").to eq(build_presenter("fixed" => 1, "new" => 2).success_message)
+    expect(build_presenter("fixed" => 1, "new" => 2).success_message).
+      to eq("2 new issues (1 fixed)")
   end
 
   it "message only fixed" do
-    expect("Code Climate found 1 fixed issue.").to eq(build_presenter("fixed" => 1, "new" => 0).success_message)
+    expect(build_presenter("fixed" => 1, "new" => 0).success_message).
+      to eq("1 fixed issue")
   end
 
   it "message only new" do
-    expect("Code Climate found 3 new issues.").to eq(build_presenter("fixed" => 0, "new" => 3).success_message)
+    expect(build_presenter("fixed" => 0, "new" => 3).success_message).
+      to eq("3 new issues")
   end
 
   it "message no new or fixed" do
-    expect("Code Climate didn't find any new or fixed issues.").to eq(build_presenter("fixed" => 0, "new" => 0).success_message)
+    expect(build_presenter("fixed" => 0, "new" => 0).success_message).
+      to eq("no new or fixed issues")
   end
 
   it "message coverage same" do

data/spec/cc/service/github_pull_requests_spec.rb

@@ -10,7 +10,7 @@ describe CC::Service::GitHubPullRequests, type: :service do
 
   it "pull request status success detailed" do
     expect_status_update("pbrisbin/foo", "abc123", "state" => "success",
-      "description" => "Code Climate found 2 new issues and 1 fixed issue.")
+      "description" => "2 new issues (1 fixed)")
 
     receive_pull_request(
       {},
@@ -22,7 +22,7 @@ describe CC::Service::GitHubPullRequests, type: :service do
 
   it "pull request status failure" do
     expect_status_update("pbrisbin/foo", "abc123", "state" => "failure",
-      "description" => "Code Climate found 2 new issues and 1 fixed issue.")
+      "description" => "2 new issues (1 fixed)")
 
     receive_pull_request(
       {},
@@ -34,7 +34,7 @@ describe CC::Service::GitHubPullRequests, type: :service do
 
   it "pull request status success generic" do
     expect_status_update("pbrisbin/foo", "abc123", "state" => "success",
-      "description" => /found 2 new issues and 1 fixed issue/)
+      "description" => /2 new issues \(1 fixed\)/)
 
     receive_pull_request({}, github_slug: "pbrisbin/foo",
                              commit_sha:  "abc123",

data/spec/cc/service/gitlab_merge_requests_spec.rb

@@ -20,7 +20,7 @@ describe CC::Service::GitlabMergeRequests, type: :service do
       "hal/hal9000",
       "abc123",
       "state" => "success",
-      "description" => "Code Climate found 2 new issues and 1 fixed issue.",
+      "description" => "2 new issues (1 fixed)",
     )
 
     receive_merge_request(
@@ -36,7 +36,7 @@ describe CC::Service::GitlabMergeRequests, type: :service do
       "hal/hal9000",
       "abc123",
       "state" => "failed",
-      "description" => "Code Climate found 2 new issues and 1 fixed issue.",
+      "description" => "2 new issues (1 fixed)",
     )
 
     receive_merge_request(

data/spec/cc/service/stash_pull_requests_spec.rb

@@ -31,7 +31,7 @@ describe CC::Service::StashPullRequests, type: :service do
 
   it "pull request status success detailed" do
     expect_status_update("abc123", "state" => "SUCCESSFUL",
-      "description" => "Code Climate found 2 new issues and 1 fixed issue.")
+      "description" => "2 new issues (1 fixed)")
 
     receive_pull_request(
       commit_sha: "abc123",
@@ -41,7 +41,7 @@ describe CC::Service::StashPullRequests, type: :service do
 
   it "pull request status failure" do
     expect_status_update("abc123", "state" => "FAILED",
-      "description" => "Code Climate found 2 new issues and 1 fixed issue.")
+      "description" => "2 new issues (1 fixed)")
 
     receive_pull_request(
       commit_sha: "abc123",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codeclimate-services
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.9.3
 platform: ruby
 authors:
 - Bryan Helmkamp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-21 00:00:00.000000000 Z
+date: 2016-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday