danger 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00d92eed49b5e7fc0093a196fead65e3e9f6eaa8
-  data.tar.gz: bd6ed16e33d9127c511018c3b55d4cf68db67524
+  metadata.gz: b830d9fd6b6ce7b6a2141b4cb7e5b801f44ae202
+  data.tar.gz: 9769485c2b763df4caa907614622913f70042921
 SHA512:
-  metadata.gz: d10ab63bf1fd7f244187c854b2ae092b8dbb20f73ba61d8041375476dfd2b5d8cf80c5a778fe9d20b41a8b8539c62c2b83a2400eb79f5cebb1042d6cb1aab358
-  data.tar.gz: 3a94d29282e62e9396508fd8ad9563202c160d3e81cdc201d45567f40af465c07d6a774c0812ee899fde63ddf79f9d55408449685a84ffbcaff0884a9ab1d678
+  metadata.gz: 8948ed48eb28381972bec1dd6832281aae83ae2e87f57a43f8df5ba003d002424b1d472013d58637cf73041a362a2b7fc8499763cc7bc7fb225ec65fcb6ec3bb
+  data.tar.gz: afcd5b7b1e16111a4ec5760ade4987c6e540c191fbfa409225bfb3d9379c32f1123dbd58d00db00a4ea3a6cba06f0f5dabcb1e1c8b8b34446185ac765c4f1f45

data/README.md

@@ -5,9 +5,8 @@
 
 Formalize your Pull Request etiquette.
 
-*Note:* Not ready for public usage yet - unless you're willing to look inside the codebase. This is a Work in progress, though it is active use on [Artsy/Eigen](https://github.com/artsy/eigen/) and [fastlane/fastlane-core](https://github.com/fastlane/fastlane_core).
-
 -------
+
 <p align="center">
     <a href="#installation">Installation</a> &bull;
     <a href="#usage">Usage</a> &bull;
@@ -19,7 +18,7 @@ Formalize your Pull Request etiquette.
 
 -------
 
-## Installation
+## Getting Started
 
 Add this line to your application's [Gemfile](https://guides.cocoapods.org/using/a-gemfile.html):
 
@@ -27,15 +26,15 @@ Add this line to your application's [Gemfile](https://guides.cocoapods.org/using
 gem 'danger'
 ```
 
-and then run the following to set up `danger` for your repository
+and then run the following, which will help walk you through getting set up: `bundle exec danger init`.
 
-```
-danger init
-```
+## Usage on CI
+
+In CI run `bundle exec danger`. This will look at your `Dangerfile` and provide feedback. While you are setting up, you may want to use: `--verbose`.
 
-## Usage
+## What happens?
 
-In CI run `bundle exec danger`.  This will look at your `Dangerfile` and provide some feedback based on that.
+Danger runs at the end of a CI build, she will execute a `Dangerfile`. This file is given some special variables based on the git diff and the Pull Request being running. You can use these variables in Ruby to provide messages, warnings and failures for your build. You set up Danger with a GitHub user account and she will post updates via comments on the Pull Request, and can fail your build too.
 
 ## DSL
 
@@ -50,28 +49,50 @@ In CI run `bundle exec danger`.  This will look at your `Dangerfile` and provide
 :busts_in_silhouette:  | `pr_author` | The author who submitted the PR
 :bookmark: | `pr_labels` | The labels added to the PR
 
-You can then create a `Dangerfile` like the following:
+The `Dangerfile` is a ruby file, so really, you can do anything. However, at this stage you might need selling on the idea a bit more, so lets take some real examples:
+
+#### Dealing with WIP pull requests
 
 ``` ruby
-# Easy checks
+# Sometimes its a README fix, or something like that - which isn't relevant for
+# including in a CHANGELOG for example
+declared_trivial = pr_title.include? "#trivial"
+
+# Just to let people know
 warn("PR is classed as Work in Progress") if pr_title.include? "[WIP]"
+```
 
-if lines_of_code > 50 && files_modified.include?("CHANGELOG.yml") == false
-  fail("No CHANGELOG changes made")
-end
+#### Being cautious around specific files
 
-# Stop skipping some manual testing
-if lines_of_code > 50 && pr_title.include?("📱") == false
-   fail("Needs testing on a Phone if change is non-trivial")
+``` ruby
+# Devs shouldn't ship changes to this file
+fail("Developer Specific file shouldn't be changed") if files_modified.include?("Artsy/View_Controllers/App_Navigation/ARTopMenuViewController+DeveloperExtras.m")
+
+# Did you make analytics changes? Well you should also include a change to our analytics spec
+made_analytics_changes = files_modified.include?("/Artsy/App/ARAppDelegate+Analytics.m")
+made_analytics_specs_changes = files_modified.include?("/Artsy_Tests/Analytics_Tests/ARAppAnalyticsSpec.m")
+if made_analytics_changes
+    fail("Analytics changes should have reflected specs changes") if !made_analytics_specs_changes
+
+    # And pay extra attention anyway
+    message('Analytics dict changed, double check for ?: `@""` on new entries')
+    message('Also, double check the [Analytics Eigen schema](https://docs.google.com/spreadsheets/u/1/d/1bLbeOgVFaWzLSjxLOBDNOKs757-zBGoLSM1lIz3OPiI/edit#gid=497747862) if the changes are non-trivial.')
 end
+```
 
-message("This pull request adds #{lines_of_code} new lines")
-warn("Author @#{pr_author} is not a contributor") unless ["KrauseFx", "orta"].include?(pr_author)
+#### Pinging people when a specific file has changed
+
+``` ruby
+message("@orta something changed in elan!") if files_modified.include? "/components/lib/variables/colors.json"
 ```
 
-## Constraints
+#### Exposing aspects of CI logs into the PR discussion
 
-* **GitHub** - Built with same-repo PRs in mind
+``` ruby
+build_log = File.read( File.join(ENV["CIRCLE_ARTIFACTS"], "xcode_test_raw.log") )
+snapshots_url = build_log.match(%r{https://eigen-ci.s3.amazonaws.com/\d+/index.html})
+fail("There were [snapshot errors](#{snapshots_url})") if snapshots_url
+```
 
 ## Advanced
 
@@ -80,7 +101,7 @@ You can access more detailed information by accessing the following variables
 &nbsp; | Danger :no_entry_sign:
 ------------- | ----
 `env.request_source.pr_json` | The full JSON for the pull request
-`env.scm.diff` | The full [GitDiff](https://github.com/schacon/ruby-git/blob/master/lib/git/diff.rb) file for the diff.
+`env.scm.diff` | The full [Diff](https://github.com/mojombo/grit/blob/master/lib/grit/diff.rb) file for the diff.
 `env.ci_source` | To get information like the repo slug or pull request ID
 
 ## Test locally with `danger local`
@@ -88,10 +109,15 @@ You can access more detailed information by accessing the following variables
 Using `danger local` will look for the last merged pull request in your git history, and apply your current
 `Dangerfile` against that Pull Request. Useful when editing.
 
-## Useful bits of knowledge ATM
+## Useful bits of knowledge
 
-* You can set the base branch in the command line arguments see: `bundle exec danger --help`.
+* You can set the base branch in the command line arguments see: `bundle exec danger --help`, if you commonly merge into non-master branches.
+* Appending `--verbose` to `bundle exec danger` will expose all of the variables that Danger provides, and their values in the shell.
 
-## License
+## License, Contributor's Guidelines and Code of Conduct
 
 > This project is open source under the MIT license, which means you have full access to the source code and can modify it to fit your own needs.
+
+> This project subscribes to the [Moya Contributors Guidelines](https://github.com/Moya/contributors) which TLDR: means we give out push access easily and often.
+
+> Contributors subscribe to the [Contributor Code of Conduct](http://contributor-covenant.org/version/1/3/0/) based on the [Contributor Covenant](http://contributor-covenant.org) version 1.3.0.

data/lib/assets/DangerfileTemplate

@@ -1,15 +1,13 @@
-puts "OK"
-puts "Lines"
-puts lines_of_code
-puts "Added"
-puts files_added
-puts "modified"
-puts files_modified
+# Sometimes it's a README fix, or something like that - which isn't relevant for
+# including in a project's CHANGELOG for example
+declared_trivial = pr_title.include? "#trivial"
 
-puts ""
-puts pr_body
-puts ""
-puts pr_title
+# Make it more obvious that a PR is a work in progress and shouldn't be merged yet
+warn("PR is classed as Work in Progress") if pr_title.include? "[WIP]"
 
-warn("Some random warning")
-fail("Orta is not really orta")
+# Warn when there is a big PR
+warn("Big PR") if lines_of_code > 500
+
+# Don't let testing shortcuts get into master by accident
+fail("fdescribe left in tests") if `grep -r fdescribe specs/`.length > 1
+fail("fit left in tests") if `grep -r "fit specs/ `.length > 1

data/lib/danger.rb

@@ -7,6 +7,7 @@ require "danger/available_values"
 require "claide"
 require "colored"
 require "pathname"
+require "terminal-table"
 
 # Import all the Sources (CI, Request and SCM)
 Dir[File.expand_path('danger/*source/*.rb', File.dirname(__FILE__))].each do |file|

data/lib/danger/available_values.rb

@@ -9,7 +9,7 @@ module Danger
       [
         :lines_of_code,
         :files_modified,
-        :files_removed,
+        :files_deleted,
         :files_added,
         :deletions,
         :insertions

data/lib/danger/ci_source/jenkins.rb

@@ -0,0 +1,25 @@
+# https://wiki.jenkins-ci.org/display/JENKINS/Building+a+software+project#Buildingasoftwareproject-JenkinsSetEnvironmentVariables
+# https://wiki.jenkins-ci.org/display/JENKINS/GitHub+pull+request+builder+plugin
+
+module Danger
+  module CISource
+    class Jenkins < CI
+      def self.validates?(env)
+        return !env["ghprbPullId"].nil? && !env["GIT_URL"].nil?
+      end
+
+      def initialize(env)
+        repo = env["GIT_URL"]
+        unless repo.nil?
+          repo_matches = repo.match(%r{([\/:])([^\/]+\/[^\/.]+)(?:.git)?$})
+          self.repo_slug = repo_matches[2] unless repo_matches.nil?
+        end
+
+        # from https://docs.travis-ci.com/user/pull-requests, as otherwise it's "false"
+        if env["ghprbPullId"].to_i > 0
+          self.pull_request_id = env["ghprbPullId"]
+        end
+      end
+    end
+  end
+end

data/lib/danger/ci_source/local_git_repo.rb

@@ -1,6 +1,6 @@
 # For more info see: https://github.com/schacon/ruby-git
 
-require 'git'
+require 'grit'
 require 'uri'
 
 module Danger
@@ -12,10 +12,20 @@ module Danger
         return !env["DANGER_USE_LOCAL_GIT"].nil?
       end
 
+      def git
+        @git ||= Grit::Git.new(".")
+      end
+
+      def run_git(command)
+        binary = Grit::Git.git_binary
+        git.sh "#{binary} #{command}"
+      end
+
       def initialize(*)
-        git = Git.open(".")
-        if git.remote("origin")
-          url = git.remote("origin").url
+        # get the remote URL
+        remote = run_git "remote show origin -n | grep \"Fetch URL\" | cut -d ':' -f 2-"
+        if remote
+          url = remote[0].strip
           # deal with https://
           if url.start_with? "https://github.com/"
             self.repo_slug = url.gsub("https://github.com/", "").gsub(".git", '')
@@ -23,18 +33,20 @@ module Danger
           # deal with SSH origin
           elsif url.start_with? "git@github.com:"
             self.repo_slug = url.gsub("git@github.com:", "").gsub(".git", '')
+          else
+            puts "Danger local requires a repository hosted on github."
           end
         end
 
-        logs = git.log.since('2 weeks ago')
-        # Look for something like
-        # "Merge pull request #38 from KrauseFx/funky_circles\n\nAdd support for GitHub compare URLs that don't conform
-        pr_merge = logs.detect { |log| (/Merge pull request #[0-9]* from/ =~ log.message) == 0 }
+        # get the most recent PR merge
+        logs = run_git "log --since='2 weeks ago' --merges --oneline | grep \"Merge pull request\" | head -n 1"
+        pr_merge = logs[0].strip
         if pr_merge
-          # then pull out the 38, to_i
-          self.pull_request_id = pr_merge.message.gsub("Merge pull request #", "").to_i
-          self.base_commit = pr_merge.parents[0].sha
-          self.head_commit = pr_merge.parents[1].sha
+          self.pull_request_id = pr_merge.match("#[0-9]*")[0].delete("#")
+          sha = pr_merge.split(" ")[0]
+          parents = run_git "rev-list --parents -n 1 #{sha}"
+          self.base_commit = parents[0].strip.split(" ")[0]
+          self.head_commit = parents[0].strip.split(" ")[1]
         end
       end
     end

data/lib/danger/commands/init.rb

@@ -1,25 +1,269 @@
+require 'danger/commands/init_helpers/interviewer'
+require 'danger/ci_source/local_git_repo'
+require 'yaml'
+
 module Danger
   class Init < Runner
-    self.description = 'Creates a Dangerfile.'
+    self.summary = 'Helps you set up Danger.'
     self.command = 'init'
 
+    def self.options
+      [
+        ['--impatient', "'I've not got all day here. Don't add any thematic delays please.'"],
+        ['--mousey', "'Don't make me press return to continue the adventure.'"]
+      ].concat(super)
+    end
+
     def initialize(argv)
-      @dangerfile_path = "Dangerfile" if File.exist? "Dangerfile"
+      ui.no_delay = argv.flag?('impatient', false)
+      ui.no_waiting = argv.flag?('mousey', false)
+      @bot_name = File.basename(Dir.getwd).split(".").first.capitalize + "Bot"
       super
     end
 
-    def validate!
-      if @dangerfile_path
-        help! "Found an existing Dangerfile."
-      end
+    def run
+      ui = Interviewer.new
+      ui.say "\nOK, thanks #{ENV['LOGNAME']}, grab a seat and we'll get you started.\n".yellow
+      ui.pause 1
+
+      show_todo_state
+      ui.pause 1.4
+
+      setup_dangerfile
+      setup_github_account
+      setup_access_token
+      setup_danger_ci
+
+      info
+      thanks
     end
 
-    def run
-      dir = Danger.gem_path
+    def ui
+      @ui ||= Interviewer.new
+    end
 
+    def show_todo_state
+      ui.say "We need to do the following steps:\n"
+      ui.pause 0.6
+      ui.say " - [ ] Create a Dangerfile and add a few simple rules."
+      ui.pause 0.6
+      ui.say " - [#{@account_created ? 'x' : ' '}] Create a GitHub account for Danger use for messaging."
+      ui.pause 0.6
+      ui.say " - [ ] Set up an access token for Danger."
+      ui.pause 0.6
+      ui.say " - [ ] Set up Danger to run on your CI.\n\n"
+    end
+
+    def setup_dangerfile
+      dir = Danger.gem_path
       content = File.read(File.join(dir, "lib", "assets", "DangerfileTemplate"))
       File.write("Dangerfile", content)
-      puts "Successfully created 'Dangerfile'"
+
+      ui.header 'Step 1: Creating a starter Dangerfile'
+      ui.say "I've set up an example Dangerfile for you in this folder.\n"
+      ui.pause 1
+
+      ui.say "cat #{Dir.pwd}/Dangerfile\n".blue
+      content.lines.each do |l|
+        ui.say "  " + l.chomp.green
+      end
+      ui.say ""
+      ui.pause 2
+
+      ui.say "There's a collection of small, simple ideas in here, but Danger is about being able to easily"
+      ui.say "iterate. The power comes from you have the ability to codify fixes to some of the problems"
+      ui.say "that come up in day to day programming. It can be difficult to try and see those from day 1."
+
+      ui.say "\nIf you'd like to investigate the file, and make some changes - I'll wait here,"
+      ui.say "press return when you're ready to move on…"
+      ui.wait_for_return
+    end
+
+    def setup_github_account
+      ui.header 'Step 2: Creating a GitHub account'
+
+      ui.say "In order to get the most out of Danger, I'd recommend given her the ability to post in"
+      ui.say "the code-review comment section.\n\n"
+      ui.pause 1
+
+      ui.say "IMO, it's best do this by using the private mode of your browser. Create an account like"
+      ui.say "#{@bot_name}, and don't forget a cool robot avatar.\n\n"
+      ui.pause 1
+      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.say ""
+      note_about_clicking_links
+      ui.pause 1
+      ui.say "\nCool, please press return when you have your account ready (and you've verified the email…)"
+      ui.wait_for_return
+    end
+
+    def setup_access_token
+      ui.header 'Step 3: Configuring a GitHub Personal Access Token'
+
+      ui.say "Here's the link, you should open this in your private session with the new GitHub account"
+      ui.link "https://github.com/settings/tokens/new"
+      ui.pause 1
+
+      @is_open_source = ui.ask_with_answers("For token access rights, I need to know if this is for an Open Source or Closed Source project\n", ["Open", "Closed"])
+
+      if considered_an_oss_repo?
+        ui.say "For Open Source projects, I'd recommend giving the token the smallest scope possible."
+        ui.say "This means only providing access to " + "public_info".yellow + " in the token.\n\n"
+        ui.pause 1
+        ui.say "This token limits Danger's abilities to just to writing comments on OSS projects. I recommend"
+        ui.say "this because the token can be quite easily be extracted from the environment via pull requests."
+        ui.say "#{@bot_name} does not need admin access to your repo. So it's ability to cause chaos is minimalized.\n"
+
+      elsif @is_open_source == "closed"
+        ui.say "For Closed Source projects, I'd recommend giving the token access to the whole repo scope."
+        ui.say "This means only providing access to " + "repo".yellow + ", and it's children in the token.\n\n"
+        ui.pause 1
+        ui.say "It's worth noting that you " + "should not".bold.white + " re-use this token for OSS repos. Make a new one for those repos with just " + "public_info".yellow + "."
+      end
+
+      ui.say "\n👍, please press return when you have your token set up…"
+      ui.wait_for_return
+    end
+
+    def considered_an_oss_repo?
+      @is_open_source == "open"
+    end
+
+    def current_repo_slug
+      @repo ||= Danger::CISource::LocalGitRepo.new
+      @repo.repo_slug || "[Your/Repo]"
+    end
+
+    def setup_danger_ci
+      ui.header 'Step 4: Add Danger for your CI'
+
+      uses_travis if File.exist? ".travis.yml"
+      uses_circle if File.exist? "circle.yml"
+      unsure_ci unless File.exist?(".travis.yml") || File.exist?(".circle.yml")
+
+      ui.say "\nOK, I'll give you a moment to do this…"
+      ui.wait_for_return
+
+      ui.say "Final step: exposing the GitHub token as a environment build variable."
+      ui.pause 0.4
+      if considered_an_oss_repo?
+        ui.say "As you have an Open Source repo, this token should be considered public, otherwise you cannot"
+        ui.say "run Danger on pull requests from forks, limiting it's use.\n"
+        ui.pause 1
+      end
+
+      travis_token if File.exist? ".travis.yml"
+      circle_token if File.exist? "circle.yml"
+      unsure_token unless File.exist?(".travis.yml") || File.exist?(".circle.yml")
+
+      ui.pause 0.6
+      ui.say "This is the last step, I can give you a second…"
+      ui.wait_for_return
+    end
+
+    def uses_travis
+      danger = "bundle exec danger".yellow
+      config = YAML.load(File.read(".travis.yml"))
+      if 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."
+      end
+
+      ui.pause 1
+      ui.say "You shouldn't use " + "after_success, after_failure, after_script".red + " as they cannot fail your builds."
+    end
+
+    def uses_circle
+      danger = "bundle exec danger".yellow
+      config = YAML.load(File.read("circle.yml"))
+
+      if 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
+          ui.say "Add " + danger + " as a new step in the " + "test:override:".yellow + " section of your circle.yml file."
+        end
+      else
+        ui.say "Add this to the bottom of your circle.yml file:"
+        ui.say "test:".green
+        ui.say "  post:".green
+        ui.say "    - bundle exec danger".green
+      end
+    end
+
+    def unsure_ci
+      danger = "bundle exec danger".yellow
+      ui.say "As I'm not sure what CI you want to run Danger on base on the files in your repo, I'll just offer some generic"
+      ui.say "advice. You want to run " + danger + " after your tests have finished running, it should be during the testing"
+      ui.say "process so the build can fail."
+    end
+
+    def travis_token
+      # https://travis-ci.org/artsy/eigen/settings
+      ui.say "In order to add an environment variable, go to:"
+      ui.link "https://travis-ci.org/#{current_repo_slug}/settings"
+      ui.say "\nThe name is " + "DANGER_GITHUB_API_TOKEN".yellow + " and the value is the GitHub Personal Acess Token."
+      if @is_open_source
+        ui.say "Make sure to have \"Display value in build log\" enabled."
+      end
+    end
+
+    def circle_token
+      # https://circleci.com/gh/artsy/eigen/edit#env-vars
+      if considered_an_oss_repo?
+        ui.say "Before we start, it's important to be up-front. Circle CI only really has one option to support running Danger"
+        ui.say "for forks on OSS repos. It is quite a drastic option, and I want to let you know the best place to understand"
+        ui.say "the ramnifications for turning on a setting I'm about to advise.\n"
+        ui.link "https://circleci.com/docs/fork-pr-builds"
+        ui.say "TLDR: If you have anything other than Danger config settings in CircleCI, then you should not turn on the setting."
+        ui.say "I'll give you a minute to read it…"
+        ui.wait_for_return
+
+        ui.say "On Danger/Danger we turn on " + "Permissive building of fork pull requests".yellow + " this exposes the token to Danger"
+        ui.say "You can find this setting at:"
+        ui.link "https://circleci.com/gh/#{current_repo_slug}/edit#experimental\n"
+        ui.say "I'll hold…"
+        ui.wait_for_return
+      end
+
+      ui.say "In order to expose an environment variable, go to:"
+      ui.link "https://circleci.com/gh/#{repo_slug}/edit#env-vars"
+      ui.say "The name is " + "DANGER_GITHUB_API_TOKEN".yellow + " and the value is the GitHub Personal Acess 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 "Depending on the CI system, this may need to be done on the machine ( in the " + "~/.bashprofile".yellow + ") or in a web UI somewhere."
+    end
+
+    def note_about_clicking_links
+      ui.say "Note: Holding cmd ( ⌘ ) and #{ENV['ITERM_SESSION_ID'] ? '' : 'double '}clicking a link will open it in your browser."
+    end
+
+    def info
+      ui.header "Useful info"
+      ui.say "- One of the best ways to test out new rules locally is via " + "bundle exec danger local".yellow + "."
+      ui.pause 0.6
+      ui.say "- You can have Danger output all of it's variables to the console via the " + "--verbose".yellow + "option."
+      ui.pause 0.6
+      ui.say "- You can look at the following Dangerfiles to get some more ideas:"
+      ui.pause 0.6
+      ui.link "https://github.com/danger/danger/blob/master/Dangerfile"
+      ui.link "https://github.com/artsy/eigen/blob/master/Dangerfile"
+      ui.pause 1
+    end
+
+    def thanks
+      ui.say "\n\n🎉"
+      ui.pause 0.6
+
+      ui.say "And you're set. Danger is a collaboration between Orta Therox, Gem 'Danger' McShane and Felix Krause."
+      ui.say "If you like it, let others know. If you want to know more, follow " + "@orta".yellow + " and " + "@krausefx".yellow + " on twitter."
+      ui.say "If you don't like it, help us improve it! xxx"
     end
   end
 end

data/lib/danger/commands/init_helpers/interviewer.rb

@@ -0,0 +1,103 @@
+module Danger
+  class Interviewer
+    attr_accessor :no_delay, :no_waiting
+
+    def show_prompt
+      print "> ".bold.green
+    end
+
+    def yellow_bang
+      "! ".yellow
+    end
+
+    def green_bang
+      "! ".green
+    end
+
+    def red_bang
+      "! ".red
+    end
+
+    def say(output)
+      puts output
+    end
+
+    def header(title)
+      say title.yellow
+      say ''
+      pause 0.6
+    end
+
+    def link(url)
+      say " -> " + url.underline + "\n"
+    end
+
+    def pause(time)
+      sleep(time) unless @no_waiting
+    end
+
+    def wait_for_return
+      STDOUT.flush
+      STDIN.gets unless @no_delay
+      puts ""
+    end
+
+    def run_command(command, output_command = nil)
+      output_command ||= command
+      puts "  " + output_command.magenta
+      system command
+    end
+
+    def ask(question)
+      answer = ""
+      loop do
+        puts "\n#{question}?"
+
+        show_prompt
+        answer = STDIN.gets.chomp
+
+        break if answer.length > 0
+
+        print "\nYou need to provide an answer."
+      end
+      answer
+    end
+
+    def ask_with_answers(question, possible_answers)
+      print "\n#{question}? ["
+
+      print_info = proc do
+        possible_answers.each_with_index do |answer, i|
+          the_answer = (i == 0) ? answer.underline : answer
+          print " " + the_answer
+          print(" /") if i != possible_answers.length - 1
+        end
+        print " ]\n"
+      end
+      print_info.call
+
+      answer = ""
+
+      loop do
+        show_prompt
+        answer = @no_waiting ? possible_answers[0].downcase : STDIN.gets.downcase.chomp
+
+        answer = "yes" if answer == "y"
+        answer = "no" if answer == "n"
+
+        # default to first answer
+        if answer == ""
+          answer = possible_answers[0].downcase
+          puts "Using: " + answer.yellow
+        end
+
+        break if possible_answers.map(&:downcase).include? answer
+
+        print "\nPossible answers are ["
+        print_info.call
+      end
+
+      answer
+    end
+  end
+end

data/lib/danger/commands/local.rb

@@ -1,6 +1,6 @@
 module Danger
   class Local < Runner
-    self.description = 'Run the Dangerfile locally.'
+    self.summary = 'Run the Dangerfile locally.'
     self.command = 'local'
 
     def initialize(argv)
@@ -45,7 +45,8 @@ module Danger
       dm.env.request_source = gh
 
       dm.env.scm = GitRepo.new
-      dm.env.scm.diff_for_folder(".", dm.env.ci_source.base_commit, dm.env.ci_source.head_commit)
+
+      dm.env.scm.diff_for_folder(".", from: dm.env.ci_source.base_commit, to: dm.env.ci_source.head_commit)
       dm.parse Pathname.new(@dangerfile_path)
     end
   end

data/lib/danger/commands/runner.rb

@@ -3,7 +3,7 @@ module Danger
     require 'danger/commands/init'
     require 'danger/commands/local'
 
-    self.description = 'Run the Dangerfile.'
+    self.summary = 'Run the Dangerfile.'
     self.command = 'danger'
 
     def initialize(argv)
@@ -39,7 +39,8 @@ module Danger
       ci_base = @base || gh.base_commit
       ci_head = @head || gh.head_commit
 
-      dm.env.scm.diff_for_folder(".", ci_base, ci_head)
+      dm.env.scm.diff_for_folder(".", from: ci_base, to: ci_head)
+
       dm.parse Pathname.new(@dangerfile_path)
 
       post_results(dm)

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

@@ -1,14 +1,24 @@
 <% @tables.each do |table| %>
   <% if table[:content].any? %>
-    &nbsp; | <%= table[:content].count %> <%= table[:name] %><%= "s" unless table[:content].count == 1 %>
-    ------------- | ------------
+<table>
+  <thead>
+    <tr>
+      <th width="50"></th>
+      <th width="100%"><%= table[:content].count %> <%= table[:name] %><%= "s" unless table[:content].count == 1 %></th>
+     </tr>
+  </thead>
+  <tbody>
     <% table[:content].each do |message| -%>
-    :<%= table[:emoji] %>: | <%= message %>
+    <tr>
+      <td>:<%= table[:emoji] %>:</td>
+      <td><%= message %></td>
+    </tr>
     <% end %>
-
+  </tbody>
+</table>
   <% end %>
 <% end %>
 
 <p align="right" data-meta="generated_by_danger" data-base-commit="<%= @base_commit %>" data-head-commit="<%= @head_commit %>" >
-  Generated by :no_entry_sign: <a href="https://github.com/KrauseFx/danger/">danger</a>
+  Generated by :no_entry_sign: <a href="https://github.com/danger/danger/">danger</a>
 </p>

data/lib/danger/dangerfile.rb

@@ -23,24 +23,35 @@ module Danger
 
     # Iterates through the DSL's attributes, and table's the output
     def print_known_info
-      puts "Danger v#{Danger::VERSION}"
-      width = AvailableValues.all.map(&:to_s).map(&:length).max
-      puts "DSL Attributes:"
-      puts "-" * (width + 4)
-      AvailableValues.all.each do |value|
-        spaces = (width - value.to_s.length)
-        puts "| #{value.to_s.blue}#{' ' * spaces} | #{self.send(value)}"
+      rows = []
+
+      AvailableValues.all.each do |key|
+        next if key == :pr_body
+        value = self.send(key)
+
+        # So that we either have one value per row
+        # or we have [] for an empty array
+        value = value.join("\n") if value.kind_of?(Array) && value.count > 0
+
+        rows << [key.to_s, value]
       end
-      puts "-" * (width + 4)
-
-      puts "Metadata:"
-      puts "#{'SCM'.blue}      : #{env.scm.class}"
-      puts "#{'Source'.blue}   : #{env.ci_source.class}"
-      puts "#{'Requests'.blue} : #{env.request_source.class}"
-      puts "           #{'Base commit'.blue} : #{env.request_source.base_commit}"
-      puts "           #{'HEAD commit'.blue} : #{env.request_source.head_commit}"
-      puts "           git diff  #{env.request_source.base_commit} #{env.request_source.head_commit}".yellow
-      puts "\n\n"
+
+      rows << ["---", "---"]
+      rows << ["SCM", env.scm.class]
+      rows << ["Source", env.ci_source.class]
+      rows << ["Requests", env.request_source.class]
+      rows << ["Base Commit", env.request_source.base_commit]
+      rows << ["Head Commit", env.request_source.head_commit]
+
+      params = {}
+      params[:rows] = rows.each { |current| current[0] = current[0].yellow }
+      params[:title] = "Danger v#{Danger::VERSION}\nDSL Attributes".green
+
+      puts ""
+      puts Terminal::Table.new(params)
+      puts "PR Body:"
+      puts self.pr_body.cyan
+      puts ""
     end
 
     # Parses the file at a path, optionally takes the content of the file for DI

data/lib/danger/request_sources/github.rb

@@ -1,8 +1,6 @@
 # coding: utf-8
-require 'rest'
-require 'json'
-require 'base64'
 require 'octokit'
+require 'redcarpet'
 
 module Danger
   class GitHub
@@ -25,6 +23,10 @@ module Danger
       )
     end
 
+    def markdown_parser
+      @markdown_parser ||= Redcarpet::Markdown.new(Redcarpet::Render::HTML)
+    end
+
     def fetch_details
       self.pr_json = client.pull_request(ci_source.repo_slug, ci_source.pull_request_id)
       fetch_issue_details(self.pr_json)
@@ -138,11 +140,18 @@ module Danger
       # 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 }
+        { name: "Error", emoji: "no_entry_sign", content: errors.map { |s| process_markdown(s) } },
+        { name: "Warning", emoji: "warning", content: warnings.map { |s| process_markdown(s) } },
+        { name: "Message", emoji: "book", content: messages.map { |s| process_markdown(s) } }
       ]
       return ERB.new(File.read(md_template), 0, "-").result(binding)
     end
+
+    def process_markdown(string)
+      html = markdown_parser.render(string)
+      match = html.match(%r{^<p>(.*)</p>$})
+      return match.captures.first unless match.nil?
+      html
+    end
   end
 end

data/lib/danger/scm_source/git_repo.rb

@@ -1,38 +1,38 @@
 # For more info see: https://github.com/schacon/ruby-git
 
-require 'git'
+require 'grit'
 
 module Danger
   class GitRepo
     attr_accessor :diff
 
-    def diff_for_folder(folder, from = "master", to = 'HEAD')
-      g = Git.open(folder)
-      self.diff = g.diff(from, to)
+    def diff_for_folder(folder, from: "master", to: 'HEAD')
+      repo = Grit::Repo.new folder
+      self.diff = repo.diff(from, to)
     end
 
-    def files_modified
-      @diff.to_a.map(&:path)
+    def files_added
+      @diff.select(&:new_file).map(&:b_path)
     end
 
-    def files_removed
-      @diff.to_a.select { |d| d.type == "deleted" }.map(&:path)
+    def files_deleted
+      @diff.select(&:deleted_file).map(&:a_path)
     end
 
-    def files_added
-      @diff.to_a.select { |d| d.type == "new" }.map(&:path)
+    def files_modified
+      @diff.reject(&:deleted_file).reject(&:new_file).map(&:a_path)
     end
 
     def lines_of_code
-      @diff.lines
+      @diff.map(&:diff).map(&:lines).flatten.count { |l| l.start_with?("+") || l.start_with?("-") }
     end
 
     def deletions
-      @diff.deletions
+      @diff.map(&:diff).map(&:lines).flatten.count { |l| l.start_with?("-") }
     end
 
     def insertions
-      @diff.insertions
+      @diff.map(&:diff).map(&:lines).flatten.count { |l| l.start_with?("+") }
     end
   end
 end

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "0.3.0"
+  VERSION = "0.5.0"
   DESCRIPTION = "Automate your PR etiquette."
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-12 00:00:00.000000000 Z
+date: 2016-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -26,35 +26,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: git
+  name: grit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.9
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.9
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: nap
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -71,16 +71,44 @@ dependencies:
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -184,10 +212,12 @@ files:
 - lib/danger/ci_source/buildkite.rb
 - lib/danger/ci_source/ci_source.rb
 - lib/danger/ci_source/circle.rb
+- lib/danger/ci_source/jenkins.rb
 - lib/danger/ci_source/local_git_repo.rb
 - lib/danger/ci_source/travis.rb
 - lib/danger/circle_api.rb
 - lib/danger/commands/init.rb
+- lib/danger/commands/init_helpers/interviewer.rb
 - lib/danger/commands/local.rb
 - lib/danger/commands/runner.rb
 - lib/danger/comment_generators/github.md.erb
@@ -198,7 +228,7 @@ files:
 - lib/danger/scm_source/git_repo.rb
 - lib/danger/standard_error.rb
 - lib/danger/version.rb
-homepage: http://github.com/orta/danger
+homepage: http://github.com/danger/danger
 licenses:
 - MIT
 metadata: {}