danger 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2df0507da13cc40eb7f1d93256d1c5da4363ee0
-  data.tar.gz: 89be5c58b12e017286d8d0dedafcd5adc80f05bf
+  metadata.gz: 9a534e4b3084cff5f94432c123204a9fac9a4859
+  data.tar.gz: dc850675fbd49a0059842c2c5af8fff5c3dbb110
 SHA512:
-  metadata.gz: 44a07b2b9aca7eac7d487576fc1efb3332e3e978120c49046428ae623e8b76c5ed965ec44b5482bb3b5024206301490933118537275723ba1acdc8d14fdc6690
-  data.tar.gz: 10c85b4daeb7feff0c22d8c3b39746aaa14963bba02788b9a83d310334670c857eb4a5d651801e74803b68c4d9c7a92b373fcaa8747d5844a4fcd7653ef259aa
+  metadata.gz: 29f4abd20107421d94ff5b0159aceedd2aeb35b940ec11c2deab97c255b5bab22e80c42e1c01954cab01bd8a36ecb3492a5c79c101af10b0f46733fad2a2ccd4
+  data.tar.gz: c2840f76f6961a600a9a2b98b7603ee3fa0fbfaf83f43dbee57f0f7c5fa20f603849429d34a9a12baa9f9ad593765f7793651fc6febcb4754609156cca8ec328

data/README.md

@@ -55,12 +55,12 @@ You can then create a `Dangerfile` like the following:
 # Easy checks
 warn("PR is classed as Work in Progress") if pr_title.include? "[WIP]"
 
-if lines_of_code > 50 && files_modified.include? "CHANGELOG.yml" == false
+if lines_of_code > 50 && files_modified.include?("CHANGELOG.yml") == false
   fail("No CHANGELOG changes made")
 end
 
 # Stop skipping some manual testing
-if lines_of_code > 50 && pr_title.include? "📱" == false
+if lines_of_code > 50 && pr_title.include?("📱") == false
    fail("Needs testing on a Phone if change is non-trivial")
 end
 

data/lib/danger/ci_source/circle.rb

@@ -5,12 +5,14 @@ module Danger
   module CISource
     class CircleCI < CI
       def self.validates?(env)
-        return !env["CIRCLE_BUILD_NUM"].nil? && !env["CI_PULL_REQUEST"].nil?
+        return !env["CIRCLE_BUILD_NUM"].nil? &&
+          !env["CI_PULL_REQUEST"].nil? &&
+          URI.parse(env["CI_PULL_REQUEST"]).path.split("/").count == 5
       end
 
       def initialize(env)
         paths = URI.parse(env["CI_PULL_REQUEST"]).path.split("/")
-        # the first one is an extra slash, ignore it
+        # The first one is an extra slash, ignore it
         self.repo_slug = paths[1] + "/" + paths[2]
         self.pull_request_id = paths[4]
       end

data/lib/danger/comment_generators/github.md.erb

@@ -1,32 +1,14 @@
-<% if @errors.count > 0 %>
-  &nbsp; | <%= @errors.count %> Error<%= "s" unless @errors.count == 1 %>
-  ------------- | ------------ <% @errors.each do |error| %>
-    :no_entry_sign: | <%= error %><% end %>
-<% else %>
-  :white_check_mark: | No errors found
-  ------------- | ------------ 
+<% @tables.each do |table| %>
+  <% if table[:content].any? %>
+    &nbsp; | <%= table[:content].count %> <%= table[:name] %><%= "s" unless table[:content].count == 1 %>
+    ------------- | ------------
+    <% table[:content].each do |message| -%>
+    :<%= table[:emoji] %>: | <%= message %>
+    <% end %>
+
+  <% end %>
 <% end %>
 
-<% if @warnings.count > 0 %>
-  &nbsp; | <%= @warnings.count %> Warning<%= "s" unless @warnings.count == 1 %>
-  ------------- | ------------ <% @warnings.each do |warning| %>
-    :warning: | <%= warning %><% end %>
-<% else %>
-  :white_check_mark: | No warnings found
-  ------------- | ------------ 
-<% end %>
-
-<% if @messages.count > 0 %>
-  &nbsp; | <%= @messages.count %> Message<%= "s" unless @messages.count == 1 %>
-  ------------- | ------------ <% @messages.each do |message| %>
-    :book: | <%= message %><% end %>
-<% end %>
-
-<p align="right">
-  Generated by 
-    <a href="https://github.com/KrauseFx/danger">danger</a>
-  on 
-  <i><%= Time.now.strftime("%Y-%m-%d") %></i>
+<p align="right" meta="generated_by_danger">
+  Generated by :no_entry_sign: <a href="https://github.com/KrauseFx/danger/">danger</a>
 </p>
-
-<% "" # the reason why we have the each in the same line is because we don't want a new line in the markdown file %>

data/lib/danger/environment_manager.rb

@@ -23,7 +23,8 @@ module Danger
 
       raise "Could not find a CI source".red unless self.ci_source
 
-      self.request_source = GitHub.new(self.ci_source) # for now
+      # only GitHub for now, open for PRs adding more!
+      self.request_source = GitHub.new(self.ci_source, ENV)
     end
 
     def fill_environment_vars

data/lib/danger/request_sources/github.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 require 'rest'
 require 'json'
 require 'base64'
@@ -5,14 +6,15 @@ require 'octokit'
 
 module Danger
   class GitHub
-    attr_accessor :ci_source, :pr_json
+    attr_accessor :ci_source, :pr_json, :environment
 
-    def initialize(ci_source)
+    def initialize(ci_source, environment)
       self.ci_source = ci_source
+      self.environment = environment
     end
 
     def client
-      token = ENV["DANGER_GITHUB_API_TOKEN"]
+      token = @environment["DANGER_GITHUB_API_TOKEN"]
       raise "No API given, please provide one using `DANGER_GITHUB_API_TOKEN`" unless token
 
       @client ||= Octokit::Client.new(
@@ -42,56 +44,81 @@ module Danger
 
     # Sending data to GitHub
     def update_pull_request!(warnings: nil, errors: nil, messages: nil)
-      # First, add a comment
-      body = generate_comment(warnings: warnings, errors: errors, messages: messages)
-      result = client.add_comment(ci_source.repo_slug, ci_source.pull_request_id, body)
-      delete_old_comment!(except: result[:id])
+      comment_result = {}
 
-      # Now, set the pull request status
+      if (warnings + errors + messages).empty?
+        # Just remove the comment, if there's nothing to say.
+        delete_old_comments!
+      else
+        body = generate_comment(warnings: warnings, errors: errors, messages: messages)
+        comment_result = client.add_comment(ci_source.repo_slug, ci_source.pull_request_id, body)
+        delete_old_comments!(except: comment_result[:id])
+      end
+
+      # Now, set the pull request status.
+      # Note: this can terminate the entire process.
       submit_pull_request_status!(warnings: warnings,
                                     errors: errors,
-                               details_url: result['html_url'])
+                               details_url: comment_result['html_url'])
     end
 
     def submit_pull_request_status!(warnings: nil, errors: nil, details_url: nil)
       status = (errors.count == 0 ? 'success' : 'failure')
+      message = generate_github_description(warnings: warnings, errors: errors)
       client.create_status(ci_source.repo_slug, latest_pr_commit_ref, status, {
-        description: generate_github_description(warnings: warnings, errors: errors),
+        description: message,
         context: "KrauseFx/danger",
         target_url: details_url
       })
+    rescue
+      # This usually means the user has no commit access to this repo
+      # That's always the case for open source projects where you can only
+      # use a read-only GitHub account
+      if errors.count > 0
+        # We need to fail the actual build here
+        abort("\nDanger has failed this build. \nFound #{errors.count} error(s) and I don't have write access to the PR set a PR status.")
+      else
+        puts message
+      end
     end
 
     # Get rid of the previously posted comment, to only have the latest one
-    def delete_old_comment!(except: nil)
+    def delete_old_comments!(except: nil)
       issues = client.issue_comments(ci_source.repo_slug, ci_source.pull_request_id)
       issues.each do |issue|
-        next unless issue[:body].gsub(/\s+/, "").include?("Generatedby<ahref=")
+        next unless issue[:body].include?("generated_by_danger")
         next if issue[:id] == except
         client.delete_comment(ci_source.repo_slug, issue[:id])
       end
     end
 
     def generate_github_description(warnings: nil, errors: nil)
-      if errors.count > 0
-        "danger found errors"
-      elsif warnings.count > 0
-        "⚠️ danger found warnings, merge with caution"
+      if errors.empty? && warnings.empty?
+        compliment = ["Well done.", "Congrats.", "Woo!",
+                      "Yay.", "Jolly good show.", "Good on 'ya.", "Nice work."]
+        return "All green. #{compliment.sample}"
       else
-        "danger was successful"
+        message = "⚠ "
+        message += "#{errors.count} Error#{errors.count == 1 ? '' : 's'}. " unless errors.empty?
+        message += "#{warnings.count} Warning#{warnings.count == 1 ? '' : 's'}. " unless warnings.empty?
+        message += "Don't worry, everything is fixable."
+        return message
       end
     end
 
     def generate_comment(warnings: nil, errors: nil, messages: nil)
       require 'erb'
 
-      @warnings = warnings
-      @errors = errors
-      @messages = messages
-
       md_template = File.join(Danger.gem_path, "lib/danger/comment_generators/github.md.erb")
-      comment = ERB.new(File.read(md_template)).result(binding) # http://www.rrn.dk/rubys-erb-templating-system
-      return comment
+
+      # erb: http://www.rrn.dk/rubys-erb-templating-system
+      # for the extra args: http://stackoverflow.com/questions/4632879/erb-template-removing-the-trailing-line
+      @tables = [
+        { name: "Error", emoji: "no_entry_sign", content: errors },
+        { name: "Warning", emoji: "warning", content: warnings },
+        { name: "Message", emoji: "book", content: messages }
+      ]
+      return ERB.new(File.read(md_template), 0, "-").result(binding)
     end
   end
 end

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
   DESCRIPTION = "Ensure your pull request is up to standard with a nice DSL"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-07 00:00:00.000000000 Z
+date: 2016-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -215,8 +215,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.0
 signing_key: 
 specification_version: 4
 summary: Ensure your pull request is up to standard with a nice DSL
 test_files: []
+has_rdoc: