danger 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e22a3c405d78751b1e8ddc02872e1ee3d19de32
-  data.tar.gz: 24c42b47f0ec7965498a899bb48577c828c4cecb
+  metadata.gz: 8f0959f195af33185bbbdb41f1056e67a7c9babf
+  data.tar.gz: 61223153953f39a208c7c9edfa9103b1748d8124
 SHA512:
-  metadata.gz: d5b263ba25eac823b04822bc74a8b7b1f0e721fe41559fd2195883ff76aef813f4f9be0753de117003c1461550fa5e6c788b54e2f483944a61ee7ee56f33d7c1
-  data.tar.gz: 1591ad1a26e5f69bae95cdaa3cb288f5b82333c1f67cf1da2af4a104c6d798f1cbb8c6f5baf75a820ecf9700d62bed0c5a3d4de1b239f5d233c27f34f7d1569a
+  metadata.gz: abf51e8a4378186c34e869654f0216ff18501ebdc79d304c7a9c8b271c22219226d334fe9e466a4c1d41f476e32385f26c9764de5a6e23bf96b0de9d83ed8aba
+  data.tar.gz: 8a6bc14ef8e75a917d43a8b65f7366610d784775a54abb411f87ca1146b83b4599161ef96f7f503cdc4c3bfd9fcaa70ac9fe53d5b2003356a7ca47055c411a8e

data/lib/danger/ci_source/circle.rb

@@ -28,8 +28,12 @@ module Danger
     end
 
     def self.validates_as_pr?(env)
+      # This will get used if it's available, instead of the API faffing.
       return true if env["CI_PULL_REQUEST"]
 
+      # 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] }
+
       # Uses the Circle API to determine if it's a PR otherwose
       @circle_token = env["CIRCLE_CI_API_TOKEN"]
       !pull_request_url(env).nil?
@@ -39,15 +43,6 @@ module Danger
       @supported_request_sources ||= [Danger::RequestSources::GitHub]
     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 pull_request_url(env)
       url = env["CI_PULL_REQUEST"]
 
@@ -59,17 +54,31 @@ module Danger
       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 :/
 
-      @circle_token = env["CIRCLE_CI_API_TOKEN"]
-      url = pull_request_url(env)
+      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)
+      end
 
-      if URI.parse(url).path.split("/").count == 5
-        paths = URI.parse(url).path.split("/")
+      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 = paths[1] + "/" + paths[2]
-        self.pull_request_id = paths[4]
+        self.repo_slug = pr_path[1] + "/" + pr_path[2]
+        self.pull_request_id = pr_path[4]
       end
     end
   end

data/lib/danger/commands/init.rb

@@ -90,6 +90,15 @@ module Danger
       ui.say "Here are great resources for creative commons images of robots:"
       ui.link "https://www.flickr.com/search/?text=robot&license=2%2C3%2C4%2C5%2C6%2C9"
       ui.link "https://www.google.com/search?q=robot&tbs=sur:fmc&tbm=isch&tbo=u&source=univ&sa=X&ved=0ahUKEwjgy8-f95jLAhWI7hoKHV_UD00QsAQIMQ&biw=1265&bih=1359"
+      ui.pause ""
+
+      if considered_an_oss_repo?
+        ui.say "#{@bot_name} does not need privilidged access to your repo or org. This is because Danger will only"
+        ui.say "be writing comments, and you do not need special access for that."
+      else
+        ui.say "#{@bot_name} will need access to your repo. Simply because the code is not available for the public"
+        ui.say "to read and comment on."
+      end
 
       ui.say ""
       note_about_clicking_links
@@ -113,7 +122,6 @@ module Danger
         ui.pause 1
         ui.say "This token limits Danger's abilities to just writing comments on OSS projects. I recommend"
         ui.say "this because the token can quite easily be extracted from the environment via pull requests."
-        ui.say "#{@bot_name} does not need admin access to your repo. So its ability to cause chaos is minimalized.\n"
 
         ui.say "\nIt is important that you do not store this token in your repository, as GitHub will automatically revoke it when pushed.\n"
       elsif @is_open_source == "closed"
@@ -170,10 +178,10 @@ module Danger
     def uses_travis
       danger = "bundle exec danger".yellow
       config = YAML.load(File.read(".travis.yml"))
-      if config["script"]
+      if config.kind_of?(Hash) && config["script"]
         ui.say "Add " + "- ".yellow + danger + " as a new step in the " + "script".yellow + " section of your .travis.yml file."
       else
-        ui.say "I'd recommend adding " + "script: ".yellow + danger + " to the script section of your .travis.yml file."
+        ui.say "I'd recommend adding " + "before_script: ".yellow + danger + " to the script section of your .travis.yml file."
       end
 
       ui.pause 1
@@ -184,7 +192,7 @@ module Danger
       danger = "- bundle exec danger".yellow
       config = YAML.load(File.read("circle.yml"))
 
-      if config["test"]
+      if config.kind_of?(Hash) && config["test"]
         if config["test"]["post"]
           ui.say "Add " + danger + " as a new step in the " + "test:post:".yellow + " section of your circle.yml file."
         else
@@ -241,6 +249,8 @@ module Danger
     def unsure_token
       ui.say "You need to expose a token called " + "DANGER_GITHUB_API_TOKEN".yellow + " and the value is the GitHub Personal Acess Token."
       ui.say "Depending on the CI system, this may need to be done on the machine ( in the " + "~/.bashprofile".yellow + ") or in a web UI somewhere."
+      ui.say "We have a guide for all supported CI systems on danger.systems:"
+      ui.link "http://danger.systems/guides/getting_started.html#setting-up-danger-to-run-on-your-ci"
     end
 
     def note_about_clicking_links

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "2.1.1".freeze
+  VERSION = "2.1.2".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.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-31 00:00:00.000000000 Z
+date: 2016-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide