codeclimate-services 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a4f61a5b3f784878457cd8e81bfe7982eae48d4
-  data.tar.gz: 5af929445d6091a1c6694eecd0a5f2d4985c8382
+  metadata.gz: 5df730afefd8e53147faaab840a08cc8a7b8a6e2
+  data.tar.gz: e3228551b4e7acae238ee5da6fbb3f46ea2074e2
 SHA512:
-  metadata.gz: 3cf81df8fcfe3d364fc4024e2b89529177c5d5e6206b74ce8545168c78c6f3d7424ddeb56d7785f682790f6912a3fe8093764b54fa66f021bd1ed76b8363713b
-  data.tar.gz: efd09827e835d99ed4210525bba7bc764441925670477c7726002e9b02e8d45cbae2f9a9d1aa50589bdfd9e156aed314d97600e5f29699846a4b28d5ed740be6
+  metadata.gz: d40a0916c6ebf0d981f0731db49d25c1c748dc296efbd2d04e749b4fa848644e423cb3d157afd57dbbeeb825112be3ab525b67ca22549b27c476fb6ff84b545c
+  data.tar.gz: a8e1a740ba27e3c743b80e4d1245d5bc6b0a72173f799608eb57c64b36a876a8f6579338176fafebcd6ef1ca85cefb0c8c6181ac2769182cc6f4fbebf2493cf6

data/lib/cc/presenters/pull_requests_presenter.rb

@@ -12,6 +12,7 @@ module CC
         end
 
         @covered_percent = payload["covered_percent"]
+        @covered_percent_delta = payload["covered_percent_delta"]
       end
 
       def error_message
@@ -26,8 +27,16 @@ module CC
         "Code Climate has skipped analysis of this commit."
       end
 
-      def coverage_success_message
-        "Test coverage for this commit: #{@covered_percent}%"
+      def coverage_message
+        message = "#{formatted_percent(@covered_percent)}% test coverage"
+
+        if @covered_percent_delta.positive?
+          message += " (+#{formatted_percent(@covered_percent_delta)}%)"
+        elsif @covered_percent_delta.negative?
+          message += " (#{formatted_percent(@covered_percent_delta)}%)"
+        end
+
+        message
       end
 
       def success_message
@@ -64,6 +73,10 @@ module CC
         [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

data/lib/cc/services/github_pull_requests.rb

@@ -5,14 +5,6 @@ class CC::Service::GitHubPullRequests < CC::Service
     attribute :oauth_token, Axiom::Types::String,
       label: "OAuth Token",
       description: "A personal OAuth token with permissions for the repo."
-    attribute :update_status, Axiom::Types::Boolean,
-      label: "Update analysis status?",
-      description: "Update the pull request status after analyzing?",
-      default: true
-    attribute :update_coverage_status, Axiom::Types::Boolean,
-      label: "Update coverage status?",
-      description: "Update the pull request status with test coverage reports?",
-      default: false
     attribute :base_url, Axiom::Types::String,
       label: "Github API Base URL",
       description: "Base URL for the Github API",
@@ -34,38 +26,30 @@ class CC::Service::GitHubPullRequests < CC::Service
   def receive_test
     setup_http
 
-    if update_status?
-      receive_test_status
-    else
-      simple_failure("Nothing happened")
-    end
+    receive_test_status
   end
 
   def receive_pull_request
-    if update_status?
-      setup_http
-      state = @payload["state"]
-
-      if %w[pending success failure skipped error].include?(state)
-        send("update_status_#{state}")
-      else
-        @response = simple_failure("Unknown state")
-      end
+    setup_http
+    state = @payload["state"]
+
+    if %w[pending success failure skipped error].include?(state)
+      send("update_status_#{state}")
+    else
+      @response = simple_failure("Unknown state")
     end
 
     response
   end
 
   def receive_pull_request_coverage
-    if update_coverage_status?
-      setup_http
-      state = @payload["state"]
-
-      if state == "success"
-        update_coverage_status_success
-      else
-        @response = simple_failure("Unknown state")
-      end
+    setup_http
+    state = @payload["state"]
+
+    if state == "success"
+      update_coverage_status_success
+    else
+      @response = simple_failure("Unknown state")
     end
 
     response
@@ -73,18 +57,6 @@ class CC::Service::GitHubPullRequests < CC::Service
 
 private
 
-  def update_status?
-    effective_boolean?(config.update_status)
-  end
-
-  def update_coverage_status?
-    effective_boolean?(config.update_coverage_status)
-  end
-
-  def effective_boolean?(value)
-    [true, "1"].include?(value)
-  end
-
   def simple_failure(message)
     { ok: false, message: message }
   end
@@ -102,7 +74,7 @@ private
   end
 
   def update_coverage_status_success
-    update_status("success", presenter.coverage_success_message, "#{config.context}/coverage")
+    update_status("success", presenter.coverage_message, "#{config.context}/coverage")
   end
 
   def update_status_failure

data/lib/cc/services/version.rb

@@ -1,5 +1,5 @@
 module CC
   module Services
-    VERSION = "1.3.0"
+    VERSION = "1.4.0"
   end
 end

data/pull_request_test.rb

@@ -30,7 +30,6 @@ end
 
 service = CC::Service::GitHubPullRequests.new({
   oauth_token:   ENV.fetch("OAUTH_TOKEN"),
-  update_status: true,
 }, {
   name:        "pull_request",
   # https://github.com/codeclimate/nillson/pull/33

data/service_test.rb

@@ -83,4 +83,4 @@ ServiceTest.new(CC::Service::Slack, :webhook_url).test
 ServiceTest.new(CC::Service::Flowdock, :api_token).test
 ServiceTest.new(CC::Service::Jira, :username, :password, :domain, :project_id).test
 ServiceTest.new(CC::Service::Asana, :api_key, :workspace_id, :project_id).test
-ServiceTest.new(CC::Service::GitHubPullRequests, :oauth_token, :update_status, :add_comment).test({ github_slug: "codeclimate/codeclimate" })
+ServiceTest.new(CC::Service::GitHubPullRequests, :oauth_token).test({ github_slug: "codeclimate/codeclimate" })

data/test/github_pull_requests_test.rb

@@ -7,7 +7,7 @@ class TestGitHubPullRequests < CC::Service::TestCase
       "description" => /is analyzing/,
     })
 
-    receive_pull_request({ update_status: true }, {
+    receive_pull_request({}, {
       github_slug: "pbrisbin/foo",
       commit_sha:  "abc123",
       state:       "pending",
@@ -21,7 +21,7 @@ class TestGitHubPullRequests < CC::Service::TestCase
     })
 
     receive_pull_request(
-      { update_status: true },
+      {},
       {
         github_slug: "pbrisbin/foo",
         commit_sha:  "abc123",
@@ -37,7 +37,7 @@ class TestGitHubPullRequests < CC::Service::TestCase
     })
 
     receive_pull_request(
-      { update_status: true },
+      { },
       {
         github_slug: "pbrisbin/foo",
         commit_sha:  "abc123",
@@ -52,7 +52,7 @@ class TestGitHubPullRequests < CC::Service::TestCase
       "description" => /found 2 new issues and 1 fixed issue/,
     })
 
-    receive_pull_request({ update_status: true }, {
+    receive_pull_request({}, {
       github_slug: "pbrisbin/foo",
       commit_sha:  "abc123",
       state:       "success",
@@ -65,7 +65,7 @@ class TestGitHubPullRequests < CC::Service::TestCase
       "description" => "Code Climate encountered an error attempting to analyze this pull request.",
     })
 
-    receive_pull_request({ update_status: true }, {
+    receive_pull_request({}, {
       github_slug: "pbrisbin/foo",
       commit_sha:  "abc123",
       state:       "error",
@@ -79,7 +79,7 @@ class TestGitHubPullRequests < CC::Service::TestCase
       "description" => "descriptive message",
     })
 
-    receive_pull_request({ update_status: true }, {
+    receive_pull_request({}, {
       github_slug: "pbrisbin/foo",
       commit_sha:  "abc123",
       state:       "error",
@@ -93,75 +93,45 @@ class TestGitHubPullRequests < CC::Service::TestCase
       "description" => /skipped analysis/,
     })
 
-    receive_pull_request({ update_status: true }, {
+    receive_pull_request({}, {
       github_slug: "pbrisbin/foo",
       commit_sha:  "abc123",
       state:       "skipped",
     })
   end
 
-  def test_pull_request_coverage_status_success
+  def test_pull_request_coverage_status
     expect_status_update("pbrisbin/foo", "abc123", {
       "state"       => "success",
-      "description" => "Test coverage for this commit: 87%",
+      "description" => "87% test coverage (+2%)",
     })
 
-    receive_pull_request_coverage({ update_coverage_status: true }, {
+    receive_pull_request_coverage({},
       github_slug:     "pbrisbin/foo",
       commit_sha:      "abc123",
       state:           "success",
-      covered_percent: 87
-    })
-  end
-
-  def test_no_status_update_for_skips_when_update_status_config_is_falsey
-    # With no POST expectation, test will fail if request is made.
-
-    receive_pull_request({ update_status: false }, {
-      github_slug: "pbrisbin/foo",
-      commit_sha:  "abc123",
-      state:       "skipped",
-    })
-  end
-
-  def test_no_status_update_for_pending_when_update_status_config_is_falsey
-    # With no POST expectation, test will fail if request is made.
-
-    receive_pull_request({ update_status: false }, {
-      github_slug: "pbrisbin/foo",
-      commit_sha:  "abc123",
-      state:       "pending",
-    })
-  end
-
-  def test_no_status_update_for_error_when_update_status_config_is_falsey
-    # With no POST expectation, test will fail if request is made.
-
-    receive_pull_request({ update_status: false }, {
-      github_slug: "pbrisbin/foo",
-      commit_sha:  "abc123",
-      state:       "error",
-      message:     nil,
-    })
+      covered_percent: 87,
+      covered_percent_delta: 2.0,
+    )
   end
 
   def test_pull_request_status_test_success
     @stubs.post("/repos/pbrisbin/foo/statuses/#{"0" * 40}") { |env| [422, {}, ""] }
 
-    assert receive_test({ update_status: true }, { github_slug: "pbrisbin/foo" })[:ok], "Expected test of pull request to be true"
+    assert receive_test({}, { github_slug: "pbrisbin/foo" })[:ok], "Expected test of pull request to be true"
   end
 
   def test_pull_request_status_test_doesnt_blow_up_when_unused_keys_present_in_config
     @stubs.post("/repos/pbrisbin/foo/statuses/#{"0" * 40}") { |env| [422, {}, ""] }
 
-    assert receive_test({ update_status: true, add_comment: true, wild_flamingo: true }, { github_slug: "pbrisbin/foo" })[:ok], "Expected test of pull request to be true"
+    assert receive_test({ wild_flamingo: true }, { github_slug: "pbrisbin/foo" })[:ok], "Expected test of pull request to be true"
   end
 
   def test_pull_request_status_test_failure
     @stubs.post("/repos/pbrisbin/foo/statuses/#{"0" * 40}") { |env| [401, {}, ""] }
 
     assert_raises(CC::Service::HTTPError) do
-      receive_test({ update_status: true }, { github_slug: "pbrisbin/foo" })
+      receive_test({}, { github_slug: "pbrisbin/foo" })
     end
   end
 
@@ -171,19 +141,13 @@ class TestGitHubPullRequests < CC::Service::TestCase
     assert_equal({ ok: false, message: "Unknown state" }, response)
   end
 
-  def test_pull_request_nothing_happened
-    response = receive_pull_request({ update_status: false }, { state: "success" })
-
-    assert_equal({ ok: false, message: "Nothing happened" }, response)
-  end
-
   def test_different_base_url
     @stubs.post("/repos/pbrisbin/foo/statuses/#{"0" * 40}") do |env|
       assert env[:url].to_s == "http://example.com/repos/pbrisbin/foo/statuses/#{"0" * 40}"
       [422, { "x-oauth-scopes" => "gist, user, repo" }, ""]
     end
 
-    assert receive_test({ update_status: true, base_url: "http://example.com" }, { github_slug: "pbrisbin/foo" })[:ok], "Expected test of pull request to be true"
+    assert receive_test({ base_url: "http://example.com" }, { github_slug: "pbrisbin/foo" })[:ok], "Expected test of pull request to be true"
   end
 
   def test_default_context
@@ -192,7 +156,7 @@ class TestGitHubPullRequests < CC::Service::TestCase
       "state" => "pending",
     })
 
-    response = receive_pull_request({ update_status: true }, {
+    response = receive_pull_request({}, {
       github_slug: "gordondiggs/ellis",
       commit_sha:  "abc123",
       state:       "pending",
@@ -205,25 +169,13 @@ class TestGitHubPullRequests < CC::Service::TestCase
       "state" => "pending",
     })
 
-    response = receive_pull_request({ context: "sup", update_status: true }, {
+    response = receive_pull_request({ context: "sup" }, {
       github_slug: "gordondiggs/ellis",
       commit_sha:  "abc123",
       state:       "pending",
     })
   end
 
-  def test_config_coerce_bool_true
-    c = CC::Service::GitHubPullRequests::Config.new(oauth_token: "a1b2c3", update_status: "1")
-    assert c.valid?
-    assert_equal true, c.update_status
-  end
-
-  def test_config_coerce_bool_false
-    c = CC::Service::GitHubPullRequests::Config.new(oauth_token: "a1b2c3", update_status: "0")
-    assert c.valid?
-    assert_equal false, c.update_status
-  end
-
 private
 
   def expect_status_update(repo, commit_sha, params)

data/test/presenters/pull_requests_presenter_test.rb

@@ -37,13 +37,34 @@ class TestPullRequestsPresenter < CC::Service::TestCase
     )
   end
 
+  def test_message_coverage_same
+    assert_equal(
+      "85% test coverage",
+      build_presenter({}, "covered_percent" => 85, "covered_percent_delta" => 0).coverage_message
+    )
+  end
+
+  def test_message_coverage_up
+    assert_equal(
+      "85.5% test coverage (+2.46%)",
+      build_presenter({}, "covered_percent" => 85.5, "covered_percent_delta" => 2.4567).coverage_message
+    )
+  end
+
+  def test_message_coverage_down
+    assert_equal(
+      "85.35% test coverage (-3%)",
+      build_presenter({}, "covered_percent" => 85.348, "covered_percent_delta" => -3.0).coverage_message
+    )
+  end
+
 private
 
   def build_payload(issue_counts)
     { "issue_comparison_counts" => issue_counts }
   end
 
-  def build_presenter(issue_counts)
-    CC::Service::PullRequestsPresenter.new(build_payload(issue_counts))
+  def build_presenter(issue_counts, payload = {})
+    CC::Service::PullRequestsPresenter.new(build_payload(issue_counts).merge(payload))
   end
 end

metadata

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