codeclimate-services 1.9.7 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d335e785112de10c1ca27413100d2624c373f911
-  data.tar.gz: b66f6c1ca29ec76b6e5d951e8e024fa560990568
+SHA256:
+  metadata.gz: 8980a3e6294016d7483aedd981ee4c54f56c45f8526274e9516013825d9f626a
+  data.tar.gz: ef2aaaa203bc911dbb348b5e4f1d3e0b7b6a7eaab0e7857156e4318d6c6ac74b
 SHA512:
-  metadata.gz: eca2b1994c1d9916108a743faff0dd4f16e754f2554d70fb42ffff73259a36565e36ff7412621dcc1a615bdb81367860bcecab4a0042f2f4b826850905610609
-  data.tar.gz: 50fca613d93497132f2b79c2ccb3ced9dc6cd323df1d26a9626b5331e67b7961d74f6beb885d6ae9b7400660e3455dc2bad08cc0bf7b6ceddfdc33b605de762a
+  metadata.gz: bcf20aee515217c99ab7d09ee592bba7b3ec16f732e9bd7ffd3698b18d3a6e5bab3ab7c6f5dcf1bb0806d6e0c4f4179b551de756a545a2d93ccaef0467e7b87d
+  data.tar.gz: 3941929485b68f39e67ee5c02f03faad637e3273b16c87dc92c7b85fcf8c6025a17c40e62a1306b64b2d9ddc4d7d33e63ae4b8de5a59abd1c1d009415962673e

data/.circleci/config.yml

@@ -0,0 +1,16 @@
+version: 2
+
+jobs:
+  test:
+    machine:
+      docker_layer_caching: true
+    working_directory: ~/codeclimate/codeclimate-services
+    steps:
+      - checkout
+      - run: bundle install && bundle exec rake && bundle exec codeclimate-test-reporter
+
+workflows:
+  version: 2
+  test:
+    jobs:
+      - test

data/.ruby-version

@@ -1 +1 @@
-2.2.2
+2.4.4

data/codeclimate-services.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email = ["bryan@brynary.com"]
   spec.summary = "Service classes for Code Climate"
   spec.description = "Service classes for Code Climate"
-  spec.homepage = ""
+  spec.homepage = "https://codeclimate.com/"
   spec.license = "MIT"
 
   spec.files = `git ls-files`.split($/)

data/lib/axiom/types/token.rb

@@ -0,0 +1,7 @@
+class Axiom::Types::Token < Axiom::Types::String
+  def self.infer(object)
+    if object == Axiom::Types::Token
+      self
+    end
+  end
+end

data/lib/cc/presenters/pull_requests_presenter.rb

@@ -36,9 +36,11 @@ module CC
       def coverage_message
         message = "#{formatted_percent(@covered_percent)}%"
 
-        if @covered_percent_delta > 0
+        return message if @covered_percent_delta.nil?
+
+        if @covered_percent_delta.round(2) > 0
           message += " (+#{formatted_percent(@covered_percent_delta)}%)"
-        elsif @covered_percent_delta < 0
+        elsif @covered_percent_delta.round(2) < 0
           message += " (#{formatted_percent(@covered_percent_delta)}%)"
         end
 
@@ -48,14 +50,12 @@ module CC
       def success_message
         if @approved_by
           approved_message
-        elsif @new_count > 0 && @fixed_count > 0
-          "#{@new_count} new #{"issue".pluralize(@new_count)} (#{@fixed_count} fixed)"
-        elsif @new_count <= 0 && @fixed_count > 0
+        elsif @new_count > 0
+          "#{@new_count} #{"issue".pluralize(@new_count)} to fix"
+        elsif @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
-          "no new or fixed issues"
+          "All good!"
         end
       end
 

data/lib/cc/service.rb

@@ -6,6 +6,7 @@ module CC
     require "cc/service/formatter"
     require "cc/service/invocation"
     require "axiom/types/password"
+    require "axiom/types/token"
 
     dir = File.expand_path "../helpers", __FILE__
     Dir["#{dir}/*_helper.rb"].sort.each do |helper|

data/lib/cc/service/http.rb

@@ -58,7 +58,10 @@ module CC::Service::HTTP
       CC::Service::SafeWebhook.ensure_safe!(url)
 
       http.send(method) do |req|
-        req.url(url) if url
+        if url
+          req.url(url)
+          req.options.proxy = http.proxy_from_env(url)
+        end
         req.headers.update(headers) if headers
         req.body = body if body
         block.call req if block

data/lib/cc/services/asana.rb

@@ -1,7 +1,7 @@
 class CC::Service::Asana < CC::Service
   class Config < CC::Service::Config
-    attribute :personal_access_token, Axiom::Types::String, label: "Personal Access Token"
-    attribute :api_key, Axiom::Types::String, label: "API key (Deprecated)"
+    attribute :personal_access_token, Axiom::Types::Token, label: "Personal Access Token"
+    attribute :api_key, Axiom::Types::Token, label: "API key (Deprecated)"
 
     attribute :workspace_id, Axiom::Types::String, label: "Workspace ID"
 

data/lib/cc/services/campfire.rb

@@ -2,7 +2,7 @@ class CC::Service::Campfire < CC::Service
   class Config < CC::Service::Config
     attribute :subdomain, Axiom::Types::String,
       description: "The Campfire subdomain for the account"
-    attribute :token, Axiom::Types::String,
+    attribute :token, Axiom::Types::Token,
       description: "Your Campfire API auth token"
     attribute :room_id, Axiom::Types::String,
       description: "Check your campfire URL for a room ID. Usually 6 digits."

data/lib/cc/services/flowdock.rb

@@ -1,6 +1,6 @@
 class CC::Service::Flowdock < CC::Service
   class Config < CC::Service::Config
-    attribute :api_token, Axiom::Types::String,
+    attribute :api_token, Axiom::Types::Token,
       label: "API Token",
       description: "The API token of the Flow to send notifications to",
       link: "https://www.flowdock.com/account/tokens"

data/lib/cc/services/github_issues.rb

@@ -1,6 +1,6 @@
 class CC::Service::GitHubIssues < CC::Service
   class Config < CC::Service::Config
-    attribute :oauth_token, Axiom::Types::String,
+    attribute :oauth_token, Axiom::Types::Token,
       label: "OAuth Token",
       description: "A personal OAuth token with permissions for the repo"
     attribute :project, Axiom::Types::String,

data/lib/cc/services/github_pull_requests.rb

@@ -2,7 +2,7 @@ require "cc/presenters/pull_requests_presenter"
 
 class CC::Service::GitHubPullRequests < CC::PullRequests
   class Config < CC::Service::Config
-    attribute :oauth_token, Axiom::Types::String,
+    attribute :oauth_token, Axiom::Types::Token,
       label: "OAuth Token",
       description: "A personal OAuth token with permissions for the repo."
     attribute :base_url, Axiom::Types::String,

data/lib/cc/services/gitlab_merge_requests.rb

@@ -4,7 +4,7 @@ class CC::Service::GitlabMergeRequests < CC::PullRequests
   class Config < CC::Service::Config
     CONTEXT = "codeclimate".freeze
 
-    attribute :access_token, Axiom::Types::String,
+    attribute :access_token, Axiom::Types::Token,
       label: "Access Token",
       description: "A personal access token with permissions for the repo."
     attribute :base_url, Axiom::Types::String,
@@ -58,12 +58,12 @@ class CC::Service::GitlabMergeRequests < CC::PullRequests
 
   def setup_http
     http.headers["Content-Type"] = "application/json"
-    http.headers["PRIVATE-TOKEN"] = config.access_token
+    http.headers["Private-Token"] = config.access_token
     http.headers["User-Agent"] = "Code Climate"
   end
 
   def base_status_url(commit_sha)
-    "#{config.base_url}/api/v3/projects/#{CGI.escape(slug)}/statuses/#{commit_sha}"
+    "#{config.base_url}/api/v4/projects/#{CGI.escape(slug)}/statuses/#{commit_sha}"
   end
 
   def slug

data/lib/cc/services/hipchat.rb

@@ -1,6 +1,6 @@
 class CC::Service::HipChat < CC::Service
   class Config < CC::Service::Config
-    attribute :auth_token, Axiom::Types::String,
+    attribute :auth_token, Axiom::Types::Token,
       description: "Your HipChat API auth token"
 
     attribute :room_id, Axiom::Types::String,

data/lib/cc/services/jira.rb

@@ -3,7 +3,7 @@ require "base64"
 class CC::Service::Jira < CC::Service
   class Config < CC::Service::Config
     attribute :domain, Axiom::Types::String,
-      description: "Your JIRA host domain (e.g. yourjira.com:PORT, please exclude https://)"
+      description: "Your JIRA host domain (e.g. yourjira.com[:PORT], please exclude https:// and only add PORT if you are using a different port number to access your own server that is not the default)"
 
     attribute :username, Axiom::Types::String,
       description: "Must exactly match the 'username' that appears on your JIRA profile page."

data/lib/cc/services/lighthouse.rb

@@ -3,7 +3,7 @@ class CC::Service::Lighthouse < CC::Service
     attribute :subdomain, Axiom::Types::String,
       description: "Your Lighthouse subdomain"
 
-    attribute :api_token, Axiom::Types::String,
+    attribute :api_token, Axiom::Types::Token,
       label: "API Token",
       description: "Your Lighthouse API Key (http://help.lighthouseapp.com/kb/api/how-do-i-get-an-api-token)"
 

data/lib/cc/services/pivotal_tracker.rb

@@ -1,6 +1,6 @@
 class CC::Service::PivotalTracker < CC::Service
   class Config < CC::Service::Config
-    attribute :api_token, Axiom::Types::String,
+    attribute :api_token, Axiom::Types::Token,
       description: "Your Pivotal Tracker API Token, from your profile page"
 
     attribute :project_id, Axiom::Types::String,

data/lib/cc/services/version.rb

@@ -1,5 +1,5 @@
 module CC
   module Services
-    VERSION = "1.9.7".freeze
+    VERSION = "1.11.1".freeze
   end
 end

data/spec/axiom/types/token_spec.rb

@@ -0,0 +1,14 @@
+describe Axiom::Types::Token do
+  class TestConfiguration < CC::Service::Config
+    attribute :token_attribute, Token
+    attribute :str_attribute, String
+  end
+
+  it "token type inference" do
+    expect(Axiom::Types::Token).to eq(TestConfiguration.attribute_set[:token_attribute].type)
+  end
+
+  it "string type inference" do
+    expect(Axiom::Types::String).to eq(TestConfiguration.attribute_set[:str_attribute].type)
+  end
+end

data/spec/cc/presenters/pull_requests_presenter_spec.rb

@@ -3,12 +3,12 @@ require "cc/presenters/pull_requests_presenter"
 describe CC::Service::PullRequestsPresenter, type: :service do
   it "message singular" do
     expect(build_presenter("fixed" => 1, "new" => 1).success_message).
-      to eq("1 new issue (1 fixed)")
+      to eq("1 issue to fix")
   end
 
   it "message plural" do
     expect(build_presenter("fixed" => 1, "new" => 2).success_message).
-      to eq("2 new issues (1 fixed)")
+      to eq("2 issues to fix")
   end
 
   it "message only fixed" do
@@ -18,24 +18,32 @@ describe CC::Service::PullRequestsPresenter, type: :service do
 
   it "message only new" do
     expect(build_presenter("fixed" => 0, "new" => 3).success_message).
-      to eq("3 new issues")
+      to eq("3 issues to fix")
   end
 
   it "message no new or fixed" do
     expect(build_presenter("fixed" => 0, "new" => 0).success_message).
-      to eq("no new or fixed issues")
+      to eq("All good!")
   end
 
   it "message coverage same" do
     expect("85%").to eq(build_presenter({}, "covered_percent" => 85, "covered_percent_delta" => 0).coverage_message)
   end
 
+  it "message coverage without delta" do
+    expect("85%").to eq(build_presenter({}, "covered_percent" => 85, "covered_percent_delta" => nil).coverage_message)
+  end
+
+  it "message coverage the same when rounded" do
+    expect("85%").to eq(build_presenter({}, "covered_percent" => 85, "covered_percent_delta" => 0.0005).coverage_message)
+  end
+
   it "message coverage up" do
     expect("85.5% (+2.46%)").to eq(build_presenter({}, "covered_percent" => 85.5, "covered_percent_delta" => 2.4567).coverage_message)
   end
 
   it "message coverage down" do
-    expect("85.35% (-3%)").to eq( build_presenter({}, "covered_percent" => 85.348, "covered_percent_delta" => -3.0).coverage_message)
+    expect("85.35% (-3%)").to eq(build_presenter({}, "covered_percent" => 85.348, "covered_percent_delta" => -3.0).coverage_message)
   end
 
   it "message approved" do
@@ -45,7 +53,7 @@ describe CC::Service::PullRequestsPresenter, type: :service do
 
   it "message approved is empty string" do
     expect(build_presenter({"fixed" => 1, "new" => 1}, { "approved_by" => ""}).success_message).
-      to eq("1 new issue (1 fixed)")
+      to eq("1 issue to fix")
   end
 
   private

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" => "2 new issues (1 fixed)")
+      "description" => "2 issues to fix")
 
     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" => "2 new issues (1 fixed)")
+      "description" => "2 issues to fix")
 
     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" => /2 new issues \(1 fixed\)/)
+      "description" => "2 issues to fix")
 
     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" => "2 new issues (1 fixed)",
+      "description" => "2 issues to fix",
     )
 
     receive_merge_request(
@@ -36,7 +36,7 @@ describe CC::Service::GitlabMergeRequests, type: :service do
       "hal/hal9000",
       "abc123",
       "state" => "failed",
-      "description" => "2 new issues (1 fixed)",
+      "description" => "2 issues to fix",
     )
 
     receive_merge_request(
@@ -116,13 +116,13 @@ describe CC::Service::GitlabMergeRequests, type: :service do
   end
 
   it "merge request status test success" do
-    http_stubs.post("api/v3/projects/hal%2Fhal9000/statuses/#{"0" * 40}") { |_env| [404, {}, ""] }
+    http_stubs.post("api/v4/projects/hal%2Fhal9000/statuses/#{"0" * 40}") { |_env| [404, {}, ""] }
 
     expect(receive_test({}, git_url: "ssh://git@gitlab.com/hal/hal9000.git")[:ok]).to eq(true)
   end
 
   it "merge request status test failure" do
-    http_stubs.post("api/v3/projects/hal%2Fhal9000/statuses/#{"0" * 40}") { |_env| [401, {}, ""] }
+    http_stubs.post("api/v4/projects/hal%2Fhal9000/statuses/#{"0" * 40}") { |_env| [401, {}, ""] }
 
     expect { receive_test({}, git_url: "ssh://git@gitlab.com/hal/hal9000.git") }.to raise_error(CC::Service::HTTPError)
   end
@@ -134,8 +134,8 @@ describe CC::Service::GitlabMergeRequests, type: :service do
   end
 
   it "different base url" do
-    http_stubs.post("api/v3/projects/hal%2Fhal9000/statuses/#{"0" * 40}") do |env|
-      expect(env[:url].to_s).to eq("https://gitlab.hal.org/api/v3/projects/hal%2Fhal9000/statuses/#{"0" * 40}")
+    http_stubs.post("api/v4/projects/hal%2Fhal9000/statuses/#{"0" * 40}") do |env|
+      expect(env[:url].to_s).to eq("https://gitlab.hal.org/api/v4/projects/hal%2Fhal9000/statuses/#{"0" * 40}")
       [404, {}, ""]
     end
 
@@ -145,8 +145,8 @@ describe CC::Service::GitlabMergeRequests, type: :service do
   private
 
   def expect_status_update(repo, commit_sha, params)
-    http_stubs.post "api/v3/projects/#{CGI.escape(repo)}/statuses/#{commit_sha}" do |env|
-      expect(env[:request_headers]["PRIVATE-TOKEN"]).to eq("123")
+    http_stubs.post "api/v4/projects/#{CGI.escape(repo)}/statuses/#{commit_sha}" do |env|
+      expect(env[:request_headers]["Private-Token"]).to eq("123")
 
       body = JSON.parse(env[:body])
 

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" => "2 new issues (1 fixed)")
+      "description" => "2 issues to fix")
 
     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" => "2 new issues (1 fixed)")
+      "description" => "2 issues to fix")
 
     receive_pull_request(
       commit_sha: "abc123",

data/spec/cc/service_spec.rb

@@ -75,4 +75,53 @@ describe CC::Service, type: :service do
 
     expect(services.include?(CC::PullRequests)).not_to eq(true)
   end
+
+  context "with proxy details" do
+    before do
+      @old_no_proxy = ENV["no_proxy"]
+      @old_http_proxy = ENV["http_proxy"]
+      ENV["no_proxy"] = "github.com"
+      ENV["http_proxy"] = "http://127.0.0.2:42"
+    end
+
+    after do
+      ENV["no_proxy"] = @old_no_proxy
+      ENV["http_proxy"] = @old_http_proxy
+    end
+
+    it "uses the proxy when it should" do
+      stub_http("http://proxied.test/my/test/url") do |env|
+        expect(env.request.proxy).to be_instance_of(Faraday::ProxyOptions)
+        expect(env.request.proxy.uri).to eq(URI.parse("http://127.0.0.2:42"))
+        [200, {}, '{"ok": true, "thing": "123"}']
+      end
+
+      response = service_post("http://proxied.test/my/test/url", { token: "1234" }.to_json, {}) do |inner_response|
+        body = JSON.parse(inner_response.body)
+        { thing: body["thing"] }
+      end
+
+      expect(response[:ok]).to eq(true)
+      expect(response[:params]).to eq('{"token":"1234"}')
+      expect(response[:endpoint_url]).to eq("http://proxied.test/my/test/url")
+      expect(response[:status]).to eq(200)
+    end
+
+    it "respects proxy exclusions" do
+      stub_http("http://github.com/my/test/url") do |env|
+        expect(env.request.proxy).to be_nil
+        [200, {}, '{"ok": true, "thing": "123"}']
+      end
+
+      response = service_post("http://github.com/my/test/url", { token: "1234" }.to_json, {}) do |inner_response|
+        body = JSON.parse(inner_response.body)
+        { thing: body["thing"] }
+      end
+
+      expect(response[:ok]).to eq(true)
+      expect(response[:params]).to eq('{"token":"1234"}')
+      expect(response[:endpoint_url]).to eq("http://github.com/my/test/url")
+      expect(response[:status]).to eq(200)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codeclimate-services
 version: !ruby/object:Gem::Version
-  version: 1.9.7
+  version: 1.11.1
 platform: ruby
 authors:
 - Bryan Helmkamp
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-05-03 00:00:00.000000000 Z
+date: 2021-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -129,6 +129,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".codeclimate.yml"
 - ".gitignore"
 - ".rspec"
@@ -144,11 +145,11 @@ files:
 - bin/nokogiri
 - bin/pry
 - bin/rake
-- circle.yml
 - codeclimate-services.gemspec
 - config/cacert.pem
 - config/load.rb
 - lib/axiom/types/password.rb
+- lib/axiom/types/token.rb
 - lib/cc/formatters/linked_formatter.rb
 - lib/cc/formatters/plain_formatter.rb
 - lib/cc/formatters/snapshot_formatter.rb
@@ -190,6 +191,7 @@ files:
 - pull_request_test.rb
 - service_test.rb
 - spec/axiom/types/password_spec.rb
+- spec/axiom/types/token_spec.rb
 - spec/cc/formatters/snapshot_formatter_spec.rb
 - spec/cc/presenters/pull_requests_presenter_spec.rb
 - spec/cc/resolve_spec.rb
@@ -216,11 +218,11 @@ files:
 - spec/support/fake_logger.rb
 - spec/support/resolv_helpers.rb
 - spec/support/service_context.rb
-homepage: ''
+homepage: https://codeclimate.com/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -235,13 +237,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Service classes for Code Climate
 test_files:
 - spec/axiom/types/password_spec.rb
+- spec/axiom/types/token_spec.rb
 - spec/cc/formatters/snapshot_formatter_spec.rb
 - spec/cc/presenters/pull_requests_presenter_spec.rb
 - spec/cc/resolve_spec.rb

data/circle.yml

@@ -1,3 +0,0 @@
-test:
-  override:
-    - bundle exec rake && bundle exec codeclimate-test-reporter