danger 2.1.4 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36950c7276cc765b1f5994828da871b8752468d0
-  data.tar.gz: ddf1f42d8808342587f4aad220b1dede2166deec
+  metadata.gz: f2e2226e12824fc11ac62cf2a5db48a4add6ec31
+  data.tar.gz: 2a763da22a526ab15228e3bdb7b57702c3ac94e2
 SHA512:
-  metadata.gz: cd56f33b2e8477a1e3fb7eba37b60397b6863fa53b2d8cecd9dd700688ead5a409095b57a97266dc20682b575806b700fb835da48e266bceeea2bc2ffc00a040
-  data.tar.gz: 70dc44e76ee01815baaaa241417e65fecbf33863d97240c6cafe1eb299af66925db266a96aacbebbc205ce3b7f693b6a7f3e50e6a7fa09a43e0869f2a311c79a
+  metadata.gz: 21209a7ef5de1d76336cd132793d334b25ab2cd16ee9946241cc56ff61f954c77a40b75f3af6d46ae40de0c4550e4dc1710bb5341e4c658c9ca955c4fc59f994
+  data.tar.gz: 99b9dbe5cc93c644168525024913453ce958af27c5a0735ba4b41fc94bead9fa689fb46571236cd31737c81281c464b06f936577aeffcb22318a1c62776392ea

data/lib/danger/ci_source/circle.rb

@@ -22,7 +22,18 @@ module Danger
   #
   # There is no difference here for OSS vs Closed, add your `DANGER_GITHUB_API_TOKEN` to the Environment variable settings page.
   #
+  # ### I still want to run commit builds
+  #
+  # OK, alright. So, if you add a `DANGER_CIRCLE_CI_API_TOKEN` then Danger will use the Circle API to look up
+  # the status of whether a commit is inside a PR or not. You can generate a token from inside the project set_trace_func
+  # then go to Permissions > "API Permissions" and generate a token with access to Status. Take that token and add
+  # it to Build Settings > "Environment Variables".
+  #
   class CircleCI < CI
+    # Side note: CircleCI is complicated. The env vars for PRs are not guaranteed to exist
+    # if the build was triggered from a commit, to look at examples of the different types
+    # of CI states, see this repo: https://github.com/orta/show_circle_env
+
     def self.validates_as_ci?(env)
       env.key? "CIRCLE_BUILD_NUM"
     end
@@ -32,53 +43,42 @@ module Danger
       return true unless env["CI_PULL_REQUEST"].empty?
 
       # Real-world talk, it should be worrying if none of these are in the environment
-      return false unless ["CIRCLE_CI_API_TOKEN", "CIRCLE_PROJECT_USERNAME", "CIRCLE_PROJECT_REPONAME", "CIRCLE_BUILD_NUM"].all? { |x| env[x] }
+      return false unless ["CIRCLE_CI_API_TOKEN", "CIRCLE_PROJECT_USERNAME", "CIRCLE_PROJECT_REPONAME", "CIRCLE_BUILD_NUM"].all? { |x| env[x] && !env[x].empty? }
 
-      # Uses the Circle API to determine if it's a PR otherwose
-      @circle_token = env["CIRCLE_CI_API_TOKEN"]
-      !pull_request_url(env).nil?
+      # Uses the Circle API to determine if it's a PR otherwise
+      api = CircleAPI.new
+      api.pull_request?(env)
     end
 
     def supported_request_sources
       @supported_request_sources ||= [Danger::RequestSources::GitHub]
     end
 
-    def pull_request_url(env)
-      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"])
-      end
-
-      url
-    end
-
-    def client
-      @client ||= CircleAPI.new(@circle_token)
-    end
-
-    def fetch_pull_request_url(repo_slug, build_number)
-      build_json = client.fetch_build(repo_slug, build_number)
-      build_json[:pull_request_urls].first
-    end
-
     def initialize(env)
-      self.repo_url = GitRepo.new.origins # CircleCI doesn't provide a repo url env variable :/
-
+      self.repo_url = env["CIRCLE_REPOSITORY_URL"]
       pr_url = env["CI_PULL_REQUEST"]
 
       # If it's not a real URL, use the Circle API
       unless pr_url && URI.parse(pr_url).kind_of?(URI::HTTP)
-        @circle_token = env["CIRCLE_CI_API_TOKEN"]
-        pr_url = pull_request_url(env)
+        api = CircleAPI.new
+        pr_url = api.pull_request_url(env)
       end
 
+      # We should either have got it via the API, or
+      # an ENV var.
       pr_path = URI.parse(pr_url).path.split("/")
       if pr_path.count == 5
         # The first one is an extra slash, ignore it
         self.repo_slug = pr_path[1] + "/" + pr_path[2]
         self.pull_request_id = pr_path[4]
+
+      else
+        message = "Danger::Circle.rb considers this a PR, " \
+                  "but did not get enough information to get a repo slug" \
+                  "and PR id.\n\n" \
+                  "PR path: #{pr_url}\n" \
+                  "Keys: #{env.keys}"
+        raise message.red
       end
     end
   end

data/lib/danger/ci_source/circle_api.rb

@@ -2,19 +2,40 @@ require "faraday"
 
 module Danger
   class CircleAPI
-    attr_accessor :circle_token
+    # Determine if there's a PR attached to this commit,
+    # and return a bool
+    def pull_request?(env)
+      url = pull_request_url(env)
+      return !url.nil?
+    end
+
+    # Determine if there's a PR attached to this commit,
+    # and return the url if so
+    def pull_request_url(env)
+      url = env["CI_PULL_REQUEST"]
 
-    def initialize(circle_token = nil)
-      self.circle_token = circle_token
+      if url.nil? && !env["CIRCLE_PROJECT_USERNAME"].nil? && !env["CIRCLE_PROJECT_REPONAME"].nil?
+        repo_slug = env["CIRCLE_PROJECT_USERNAME"] + "/" + env["CIRCLE_PROJECT_REPONAME"]
+        token = env["DANGER_CIRCLE_CI_API_TOKEN"] || env["CIRCLE_CI_API_TOKEN"]
+        url = fetch_pull_request_url(repo_slug, env["CIRCLE_BUILD_NUM"], token)
+      end
+      url
     end
 
     def client
       @client ||= Faraday.new(url: "https://circleci.com/api/v1")
     end
 
-    def fetch_build(repo_slug, build_number)
+    # Ask the API if the commit is inside a PR
+    def fetch_pull_request_url(repo_slug, build_number, token)
+      build_json = fetch_build(repo_slug, build_number, token)
+      build_json[:pull_request_urls].first
+    end
+
+    # Make the API call, and parse the JSON
+    def fetch_build(repo_slug, build_number, token)
       url = "project/#{repo_slug}/#{build_number}"
-      params = { "circle-token" => circle_token }
+      params = { "circle-token" => token }
       response = client.get url, params, accept: "application/json"
       json = JSON.parse(response.body, symbolize_names: true)
       json

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "2.1.4".freeze
+  VERSION = "2.1.5".freeze
   DESCRIPTION = "Automate your PR etiquette.".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-17 00:00:00.000000000 Z
+date: 2016-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -398,9 +398,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Automate your PR etiquette.
 test_files: []
-has_rdoc: