danger 5.3.2 → 5.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 994bbccdd6aade507bf921c29ae4b2ceb87790d0
-  data.tar.gz: 737d2c1b9dd070fab88f3d88ebe9db0926699ac4
+  metadata.gz: 3c4f4e43ea259c3203e6be2c3990d24e64b1eb87
+  data.tar.gz: 8a78dfd71a3b65200988fe21e7fab9ee2a6da163
 SHA512:
-  metadata.gz: 6e7a14375164b48ccd6a4c2352a6ce906111a24ef1e0b0e5a59399fa5b20e96791a3b544b3761cc6b9ac2ba45ff7b3e4b1d3f6195c69fcef0d0edbc963ae470a
-  data.tar.gz: a5597d14580dc5124dd4b235130d2eb01b8de2b741db0e8a89e56982dd9467aa7415c404e563fafa363c6dbf8c54a379e0b61eee25b1937b7a2d9f19fe11e62e
+  metadata.gz: 611c401f519dec25f89a8ea35cb5b21cb48c618690c8595b2788b91b00e1b2c8d5585a191a2cc2551a8c43992116af841767b009c590963926fb4b2edc930fcf
+  data.tar.gz: 4b8e80af258bd44d48f1cfed63559a0405d1fdda0d0ad5d35eb6e73fe1e46c77d5dee0be3c887276dad1cab498e1660f48a01906800ea6f56299d3822be9611f

data/README.md

@@ -10,8 +10,9 @@ Formalize your Pull Request etiquette.
 
 <p align="center">
     <a href="#what-is-danger">What is Danger?</a> &bull;
+    <a href="VISION.md">Vision</a> &bull;
     <a href="#im-here-to-help-out">Helping Out</a> &bull;
-    <a href="#tell-me-of-these-plugins">Plugin Development</a>
+    <a href="http://danger.systems/guides/creating_your_first_plugin.html">Plugin Development</a>
 </p>
 
 -------
@@ -45,8 +46,6 @@ We keep all of the end-user documentation at [http://danger.systems](http://dang
 
 Some quick links: [Guides Index](http://danger.systems/guides.html), [DSL Reference](http://danger.systems/reference.html), [Getting Started](http://danger.systems/guides/getting_started.html) and [What does Danger Do?](http://danger.systems/guides/what_does_danger_do.html).
 
-Sidenote: There is a [pure JS version](https://github.com/danger/danger-js) in the works, it's at the point where it can fail your build but that's about it for now, would love help there if it interests you.
-
 ## I'm here to help out!
 
 Brilliant. So, let's get you set up.
@@ -83,11 +82,6 @@ require 'pry'
 binding.pry
 ```
 
-## Tell me of these Plugins
-
-* Follow the [Creating your first plugin](http://danger.systems/guides/creating_your_first_plugin.html) guide
-* (Talk through the tech specs here.)
-
 ## License, Contributor's Guidelines and Code of Conduct
 
 We try to keep as much discussion as possible in GitHub issues, but also have a pretty inactive Slack --- if you'd like an invite, ping [@Orta](https://twitter.com/orta/) a DM on Twitter with your email. It's mostly interesting if you want to stay on top of Danger without all the emails from GitHub.

data/lib/danger/ci_source/teamcity.rb

@@ -17,7 +17,16 @@ module Danger
   # is to pass in the token as a prefix to the command `DANGER_GITHUB_API_TOKEN="123" bundle exec danger`.
   #
   # However, you will need to find a way to add the environment vars: `GITHUB_REPO_SLUG`, `GITHUB_PULL_REQUEST_ID` and
-  # `GITHUB_REPO_URL`. These are not added by default. You could do this via the GitHub API potentially.
+  # `GITHUB_REPO_URL`. These are not added by default. You can manually add `GITHUB_REPO_SLUG` and `GITHUB_REPO_URL`
+  #  as build parameters or by exporting them inside your Simple Command Runner.
+  #
+  # As for `GITHUB_PULL_REQUEST_ID`, TeamCity provides the `%teamcity.build.branch%` variable which is in the format
+  # `PR_NUMBER/merge`. You can slice the Pull Request ID out by doing the following:
+  #
+  # ```sh
+  # branch="%teamcity.build.branch%"
+  # export GITHUB_PULL_REQUEST_ID=(${branch//\// })
+  # ```
   #
   # #### GitLab
   #

data/lib/danger/commands/init.rb

@@ -182,7 +182,7 @@ module Danger
 
     def uses_travis
       danger = "bundle exec danger".yellow
-      config = YAML.load(File.read(".travis.yml")) # rubocop:disable Security/YAMLLoad
+      config = YAML.load(File.read(".travis.yml"))
       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
@@ -195,7 +195,7 @@ module Danger
 
     def uses_circle
       danger = "- bundle exec danger".yellow
-      config = YAML.load(File.read("circle.yml")) # rubocop:disable Security/YAMLLoad
+      config = YAML.load(File.read("circle.yml"))
 
       if config.kind_of?(Hash) && config["test"]
         if config["test"]["post"]
@@ -248,11 +248,11 @@ module Danger
 
       ui.say "In order to expose an environment variable, go to:"
       ui.link "https://circleci.com/gh/#{current_repo_slug}/edit#env-vars"
-      ui.say "The name is " + "DANGER_GITHUB_API_TOKEN".yellow + " and the value is the GitHub Personal Acess Token."
+      ui.say "The name is " + "DANGER_GITHUB_API_TOKEN".yellow + " and the value is the GitHub Personal Access Token."
     end
 
     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 "You need to expose a token called " + "DANGER_GITHUB_API_TOKEN".yellow + " and the value is the GitHub Personal Access 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"

data/lib/danger/request_sources/github/github.rb

@@ -7,7 +7,6 @@ require "danger/helpers/comments_helper"
 require "danger/helpers/comment"
 require "danger/request_sources/github/github_review"
 require "danger/request_sources/github/github_review_unsupported"
-require "danger/request_sources/github/octokit_pr_review"
 require "danger/request_sources/support/get_ignored_violation"
 
 module Danger
@@ -329,8 +328,17 @@ module Danger
           end
 
           if matching_comments.empty?
-            client.create_pull_request_comment(ci_source.repo_slug, ci_source.pull_request_id,
-                                               body, head_ref, m.file, position)
+            begin
+              client.create_pull_request_comment(ci_source.repo_slug, ci_source.pull_request_id,
+                                                 body, head_ref, m.file, position)
+            rescue Octokit::UnprocessableEntity => e
+              # Show more detail for UnprocessableEntity error
+              message = [e, "body: #{body}", "head_ref: #{head_ref}", "filename: #{m.file}", "position: #{position}"].join("\n")
+              puts message
+
+              # Not reject because this comment has not completed
+              next false
+            end
           else
             # Remove the surviving comment so we don't strike it out
             danger_comments.reject! { |c| matching_comments.include? c }

data/lib/danger/request_sources/github/github_review.rb

@@ -2,7 +2,6 @@
 
 require "octokit"
 require "danger/ci_source/ci_source"
-require "danger/request_sources/github/octokit_pr_review"
 require "danger/request_sources/github/github_review_resolver"
 require "danger/danger_core/messages/violation"
 require "danger/danger_core/messages/markdown"
@@ -65,7 +64,7 @@ module Danger
           # If the review resolver says that there is nothing to submit we skip submission
           return unless ReviewResolver.should_submit?(self, submission_body)
 
-          @review_json = @client.create_pull_request_review(@ci_source.repo_slug, @ci_source.pull_request_id, generate_event(general_violations), submission_body)
+          @review_json = @client.create_pull_request_review(@ci_source.repo_slug, @ci_source.pull_request_id, event: generate_event(general_violations), body: submission_body)
         end
 
         def generated_by_danger?(danger_id = "danger")

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "5.3.2".freeze
+  VERSION = "5.3.3".freeze
   DESCRIPTION = "Like Unit Tests, but for your Team Culture.".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger
 version: !ruby/object:Gem::Version
-  version: 5.3.2
+  version: 5.3.3
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-23 00:00:00.000000000 Z
+date: 2017-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -101,14 +101,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.7'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
@@ -442,7 +442,6 @@ files:
 - lib/danger/request_sources/github/github_review.rb
 - lib/danger/request_sources/github/github_review_resolver.rb
 - lib/danger/request_sources/github/github_review_unsupported.rb
-- lib/danger/request_sources/github/octokit_pr_review.rb
 - lib/danger/request_sources/gitlab.rb
 - lib/danger/request_sources/request_source.rb
 - lib/danger/request_sources/support/get_ignored_violation.rb

data/lib/danger/request_sources/github/octokit_pr_review.rb

@@ -1,84 +0,0 @@
-# coding: utf-8
-
-require "octokit"
-
-module Octokit
-  class Client
-    # The Pull Request Review API is currently available for developers to preview.
-    # During the preview period, the API may change without advance notice.
-    # please see the blog post for full details.
-    # To access the API during the preview period, you must provide
-    # a custom media type in the Accept header:
-    CUSTOM_ACCEPT_HEADER = "application/vnd.github.black-cat-preview+json".freeze
-
-    # Approve pull request event
-    PULL_REQUEST_REVIEW_EVENT_APPROVE = "APPROVE".freeze
-
-    # Request changes on the pull request event
-    PULL_REQUEST_REVIEW_EVENT_REQUEST_CHANGES = "REQUEST_CHANGES".freeze
-
-    # Left a gemeneral comment on the pull request event
-    PULL_REQUEST_REVIEW_EVENT_COMMENT = "COMMENT".freeze
-
-    # List pull request reviews for a pull request
-    #
-    # @see https://developer.github.com/v3/pulls/reviews/#list-reviews-on-a-pull-request
-    # @param repo [Integer, String, Hash, Repository] A GitHub repository
-    # @param pull_request_number [Integer] Number of the pull request to fetch reviews for
-    # @return [Array<Sawyer::Resource>] Array of reviews
-    # @example
-    #   Octokit.pull_request_reviews('rails/rails', :state => 'closed')
-    def pull_request_reviews(repo, pull_request_number, options = {})
-      accept = {
-        accept: CUSTOM_ACCEPT_HEADER
-      }
-      paginate "#{Repository.path repo}/pulls/#{pull_request_number}/reviews", options.merge(accept)
-    end
-
-    # Create a pull request review
-    #
-    # @see https://developer.github.com/v3/pulls/reviews/#create-a-pull-request-review
-    # @param repo [Integer, String, Hash, Repository] A GitHub repository
-    # @param pull_request_number [Integer] Number of the pull request to create review for
-    # @param event [String] The review action (event) to perform. Can be one of
-    #                       PULL_REQUEST_REVIEW_EVENT_APPROVE
-    #                       PULL_REQUEST_REVIEW_EVENT_REQUEST_CHANGES
-    #                       PULL_REQUEST_REVIEW_EVENT_COMMENT
-    # @param body [String] The body for the pull request review (optional). Supports GFM.
-    # @return [Sawyer::Resource] The newly created pull request
-    # @example
-    #   @client.create_pull_request_review("octokit/octokit.rb", "APPROVE", "Thanks for your contribution")
-    def create_pull_request_review(repo, pull_request_number, event, body = nil, options = {})
-      review = {
-        event: event,
-        accept: CUSTOM_ACCEPT_HEADER
-      }
-      review[:body] = body unless body.nil?
-      post "#{Repository.path repo}/pulls/#{pull_request_number}/reviews", options.merge(review)
-    end
-
-    # Submit a pull request review
-    #
-    # @see https://developer.github.com/v3/pulls/reviews/#create-a-pull-request-review
-    # @param repo [Integer, String, Hash, Repository] A GitHub repository
-    # @param pull_request_number [Integer] Number of the pull request to create review for
-    # @param review_id [Integer] ID of the pull request review to submit
-    # @param event [String] The review action (event) to perform. Can be one of
-    #                       PULL_REQUEST_REVIEW_EVENT_APPROVE
-    #                       PULL_REQUEST_REVIEW_EVENT_REQUEST_CHANGES
-    #                       PULL_REQUEST_REVIEW_EVENT_COMMENT
-    # @param body [String] The body for the pull request review (optional). Supports GFM.
-    # @return [Sawyer::Resource] The newly created pull request
-    # @example
-    #   @client.submit_pull_request_review("octokit/octokit.rb", "REQUEST_CHANGES",
-    #                                      "Nice changes, but please make couple of imrovements")
-    def submit_pull_request_review(repo, pull_request_number, review_id, event, body = nil, options = {})
-      review = {
-        event: event,
-        accept: CUSTOM_ACCEPT_HEADER
-      }
-      review[:body] = body unless body.nil?
-      post "#{Repository.path repo}/pulls/#{pull_request_number}/reviews/#{review_id}/events", options.merge(review)
-    end
-  end
-end