lib/danger/ci_source/circle.rb in danger-0.8.4 vs lib/danger/ci_source/circle.rb in danger-0.8.5

- old
+ new

@@ -4,13 +4,13 @@ module Danger module CISource class CircleCI < CI def self.validates?(env) - return false unless env["CIRCLE_BUILD_NUM"] - return false unless env["CIRCLE_PROJECT_USERNAME"] - return false unless env["CIRCLE_PROJECT_REPONAME"] + return false unless env['CIRCLE_BUILD_NUM'] + return false unless env['CIRCLE_PROJECT_USERNAME'] + return false unless env['CIRCLE_PROJECT_REPONAME'] return true end def supported_request_sources @@ -25,29 +25,29 @@ build_json = client.fetch_build(repo_slug, build_number) build_json[:pull_request_urls].first end def pull_request_url(env) - url = env["CI_PULL_REQUEST"] + url = env['CI_PULL_REQUEST'] - if url.nil? && !env["CIRCLE_PROJECT_USERNAME"].nil? && !env["CIRCLE_PROJECT_REPONAME"].nil? - repo_slug = env["CIRCLE_PROJECT_USERNAME"] + "/" + env["CIRCLE_PROJECT_REPONAME"] - url = fetch_pull_request_url(repo_slug, env["CIRCLE_BUILD_NUM"]) + if url.nil? && !env['CIRCLE_PROJECT_USERNAME'].nil? && !env['CIRCLE_PROJECT_REPONAME'].nil? + repo_slug = env['CIRCLE_PROJECT_USERNAME'] + '/' + env['CIRCLE_PROJECT_REPONAME'] + url = fetch_pull_request_url(repo_slug, env['CIRCLE_BUILD_NUM']) end url end def initialize(env) self.repo_url = GitRepo.new.origins # CircleCI doesn't provide a repo url env variable :/ - @circle_token = env["CIRCLE_CI_API_TOKEN"] + @circle_token = env['CIRCLE_CI_API_TOKEN'] url = pull_request_url(env) - if URI.parse(url).path.split("/").count == 5 - paths = URI.parse(url).path.split("/") + if URI.parse(url).path.split('/').count == 5 + paths = URI.parse(url).path.split('/') # The first one is an extra slash, ignore it - self.repo_slug = paths[1] + "/" + paths[2] + self.repo_slug = paths[1] + '/' + paths[2] self.pull_request_id = paths[4] end end end end