codeclimate-services 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be1d804a70349ad1e1b265055f2e2a72b5f9bc4b
-  data.tar.gz: 9a0c1811f8a1518d268fd25fdc6b703bbde5c552
+  metadata.gz: d6eec64efaec80eeb0b6c5b285b240567a8ea9b0
+  data.tar.gz: db56869b1abd78be91b81f4d241a42b232ff6e89
 SHA512:
-  metadata.gz: 3aada36fb17278ee7093c5fc1e982150addf951d919539ed35a92332dda6888188f09e9e472331a6fb31914fa7cd0f9e0dce97b67393ae64346423cc61d455a9
-  data.tar.gz: f0ddd57b0da12d644aff62c076e9cf4ac0375589d4e8015b3bf2a031264697938bd160d520d8780b1b1ede11ab2684f53c786cdc87766958a26731b7ced701de
+  metadata.gz: 6802d6c6dd3c157aff5d73dc2b71d5d9254c6c638044669ce03690261fdddf4bcf724008f406d61eea1a0741e84fae2749c0bde1284f076fcc212ca2078dd3c7
+  data.tar.gz: 97a9f8f65e9c7ace31ecc2f0585fba61cd1de29e071e3afbaf84f943126e2b3331006a2c7bdfe73f3b2c669af38b56c7f80e214288a64a7748a77ebe34a68fa8

data/lib/cc/services/github_issues.rb

@@ -9,6 +9,10 @@ class CC::Service::GitHubIssues < CC::Service
     attribute :labels, String,
       label: "Labels (comma separated)",
       description: "Comma separated list of labels to apply to the issue"
+    attribute :base_url, String,
+      label: "Github API Base URL",
+      description: "Base URL for the Github API",
+      default: "https://api.github.com"
 
     validates :oauth_token, presence: true
   end
@@ -17,8 +21,6 @@ class CC::Service::GitHubIssues < CC::Service
   self.description = "Open issues on GitHub"
   self.issue_tracker = true
 
-  BASE_URL = "https://api.github.com"
-
   def receive_test
     result = create_issue("Test ticket from Code Climate", "")
     result.merge(
@@ -66,7 +68,7 @@ private
     http.headers["Authorization"] = "token #{config.oauth_token}"
     http.headers["User-Agent"] = "Code Climate"
 
-    url = "#{BASE_URL}/repos/#{config.project}/issues"
+    url = "#{config.base_url}/repos/#{config.project}/issues"
     service_post(url, params.to_json) do |response|
       body = JSON.parse(response.body)
       {

data/lib/cc/services/github_pull_requests.rb

@@ -11,6 +11,10 @@ class CC::Service::GitHubPullRequests < CC::Service
     attribute :add_comment, Boolean,
       label: "Add a comment?",
       description: "Comment on the pull request after analyzing?"
+    attribute :base_url, String,
+      label: "Github API Base URL",
+      description: "Base URL for the Github API",
+      default: "https://api.github.com"
 
     validates :oauth_token, presence: true
   end
@@ -18,7 +22,6 @@ class CC::Service::GitHubPullRequests < CC::Service
   self.title = "GitHub Pull Requests"
   self.description = "Update pull requests on GitHub"
 
-  BASE_URL = "https://api.github.com"
   BODY_REGEX = %r{<b>Code Climate</b> has <a href=".*">analyzed this pull request</a>}
   COMMENT_BODY = '<img src="https://codeclimate.com/favicon.png" width="20" height="20" />&nbsp;<b>Code Climate</b> has <a href="%s">analyzed this pull request</a>.'
   MESSAGES = [
@@ -180,15 +183,15 @@ private
   end
 
   def base_status_url(commit_sha)
-    "#{BASE_URL}/repos/#{github_slug}/statuses/#{commit_sha}"
+    "#{config.base_url}/repos/#{github_slug}/statuses/#{commit_sha}"
   end
 
   def comments_url
-    "#{BASE_URL}/repos/#{github_slug}/issues/#{number}/comments"
+    "#{config.base_url}/repos/#{github_slug}/issues/#{number}/comments"
   end
 
   def user_url
-    "#{BASE_URL}/user"
+    "#{config.base_url}/user"
   end
 
   def github_slug

data/lib/cc/services/version.rb

@@ -1,5 +1,5 @@
 module CC
   module Services
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

data/test/github_issues_test.rb

@@ -60,6 +60,17 @@ class TestGitHubIssues < CC::Service::TestCase
     assert_equal "Issue <a href='http://foo.bar'>#2</a> created.", response[:message]
   end
 
+  def test_different_base_url
+    @stubs.post request_url do |env|
+      assert env[:url].to_s == "http://example.com/#{request_url}"
+      [200, {}, '{"number": 2, "html_url": "http://foo.bar"}']
+    end
+
+    response = receive_event({ name: "test" }, base_url: "http://example.com")
+
+    assert_equal "Issue <a href='http://foo.bar'>#2</a> created.", response[:message]
+  end
+
   private
 
   def project
@@ -86,10 +97,10 @@ class TestGitHubIssues < CC::Service::TestCase
     receive_event(event_data)
   end
 
-  def receive_event(event_data = nil)
+  def receive_event(event_data = nil, config = {})
     receive(
       CC::Service::GitHubIssues,
-      { oauth_token: "123", project: project },
+      { oauth_token: "123", project: project }.merge(config),
       event_data || event(:quality, from: "D", to: "C")
     )
   end

data/test/github_pull_requests_test.rb

@@ -244,6 +244,15 @@ class TestGitHubPullRequests < CC::Service::TestCase
     assert_equal({ ok: false, message: "Nothing happened" }, response)
   end
 
+  def test_different_base_url
+    @stubs.get("/user") do |env|
+      assert env[:url].to_s == "http://example.com/user"
+      [200, { "x-oauth-scopes" => "gist, user, repo" }, ""]
+    end
+
+    assert receive_test({ add_comment: true, base_url: "http://example.com" })[:ok], "Expected test of pull request to be true"
+  end
+
 private
 
   def expect_status_update(repo, commit_sha, params)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codeclimate-services
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Bryan Helmkamp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-25 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday