danger 0.6.0 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bf96232696dca35c69a7d338d10bf16af6917a2
-  data.tar.gz: e5e7f69f74d8419ce1c0f2c0df2725aa8b1874bf
+  metadata.gz: 583874b396b59f83aa7e2150e2a11072d7a05b1b
+  data.tar.gz: a5391cce92d93f75753a903cbe1d395b337af929
 SHA512:
-  metadata.gz: c69c8d1096130a36a0749c55a6f1e7e90d2df55ee0048bfdd13d13f83760071e66c7a65ad188b3c12a4d71613f75d982698e3e7776438bc1dc3ec227a94fd445
-  data.tar.gz: 16a07e94b369b7da16ab0bab5c4d9935c40442a3284c43985254811f92da77439d81dc8c19dbb6f4a9893f1ea89fcac6155736f9dd07f9b000b1457c1d2d31ad
+  metadata.gz: 4b6fc6777fcd152333dbf0cdbe4c48c23f243aa4711c51b0fc149cf2d4de20ea1dd1c8bf7f4f3864a3dd55b0e4818f4e06e9963bb079e1d3642b26804f82c727
+  data.tar.gz: 946a75817a7d7fd2c1966c4177cd64cf229e017c228b63dbdbab324f4f2747e1610510cfabde9e498ecfb879eca5029a85433533654c05df94cdc5d1fa266ae8

data/README.md

@@ -38,7 +38,7 @@ bundle exec danger init
 bundle exec danger
 ```
 
-This will look at your `Dangerfile` and update the pull request accordingly. While you are setting up Danger, you may want to use: `--verbose` for more debug information. 
+This will look at your `Dangerfile` and update the pull request accordingly. While you are setting up Danger, you may want to use: `--verbose` for more debug information.
 
 ## What happens?
 
@@ -49,9 +49,9 @@ Danger runs at the end of a CI build, she will execute a `Dangerfile`. This file
    |   | Danger :no_entry_sign:
 -------------: | ------------- | ----
 :sparkles: | `lines_of_code` | The total amount of lines of code in the diff
-:pencil2:  | `files_modified` |  The list of files modified
-:ship: | `files_added` | The list of files added
-:recycle: | `files_removed` | The list of files removed
+:pencil2:  | `modified_files` |  The list of modified files
+:ship: | `added_files` | The list of added files
+:recycle: | `deleted_files` | The list of removed files
 :abc:  | `pr_title` | The title of the PR
 :book:  | `pr_body` | The body of the PR
 :busts_in_silhouette:  | `pr_author` | The author who submitted the PR
@@ -74,11 +74,11 @@ warn("PR is classed as Work in Progress") if pr_title.include? "[WIP]"
 
 ``` 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")
+fail("Developer Specific file shouldn't be changed") if modified_files.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")
+made_analytics_changes = modified_files.include?("/Artsy/App/ARAppDelegate+Analytics.m")
+made_analytics_specs_changes = modified_files.include?("/Artsy_Tests/Analytics_Tests/ARAppAnalyticsSpec.m")
 if made_analytics_changes
   fail("Analytics changes should have reflected specs changes") if !made_analytics_specs_changes
 
@@ -91,7 +91,7 @@ end
 #### Pinging people when a specific file has changed
 
 ```ruby
-message("@orta something changed in elan!") if files_modified.include? "/components/lib/variables/colors.json"
+message("@orta something changed in elan!") if modified_files.include? "/components/lib/variables/colors.json"
 ```
 
 #### Exposing aspects of CI logs into the PR discussion

data/lib/danger/available_values.rb

@@ -8,9 +8,9 @@ module Danger
     def self.scm
       [
         :lines_of_code,
-        :files_modified,
-        :files_deleted,
-        :files_added,
+        :modified_files,
+        :deleted_files,
+        :added_files,
         :deletions,
         :insertions
       ]

data/lib/danger/ci_source/local_git_repo.rb

@@ -1,6 +1,6 @@
 # For more info see: https://github.com/schacon/ruby-git
 
-require 'grit'
+require 'git'
 require 'uri'
 
 module Danger
@@ -13,35 +13,35 @@ module Danger
       end
 
       def git
-        @git ||= Grit::Git.new(".")
+        @git ||= GitRepo.new
       end
 
       def run_git(command)
-        binary = Grit::Git.git_binary
-        git.sh "#{binary} #{command}"
+        git.exec command
       end
 
-      def initialize(*)
+      def initialize(env = {})
+        github_host = env["DANGER_GITHUB_HOST"] || "github.com"
+
         # get the remote URL
         remote = run_git "remote show origin -n | grep \"Fetch URL\" | cut -d ':' -f 2-"
         if remote
-          remote_url_matches = remote.first.chomp.match(%r{github\.com(:|/)(?<repo_slug>.+/.+?)(?:\.git)?$})
+          remote_url_matches = remote.match(%r{#{Regexp.escape github_host}(:|/)(?<repo_slug>.+/.+?)(?:\.git)?$})
           if !remote_url_matches.nil? and remote_url_matches["repo_slug"]
             self.repo_slug = remote_url_matches["repo_slug"]
           else
-            puts "Danger local requires a repository hosted on github."
+            puts "Danger local requires a repository hosted on GitHub.com or GitHub Enterprise."
           end
         end
 
         # 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
+        pr_merge = run_git "log --since='2 weeks ago' --merges --oneline | grep \"Merge pull request\" | head -n 1".strip
         if pr_merge
-          self.pull_request_id = pr_merge.match("#[0-9]*")[0].delete("#")
+          self.pull_request_id = pr_merge.match("#([0-9]+)")[1]
           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]
+          parents = run_git("rev-list --parents -n 1 #{sha}").strip.split(" ")
+          self.base_commit = parents[0]
+          self.head_commit = parents[1]
         end
       end
     end

data/lib/danger/commands/local.rb

@@ -22,12 +22,14 @@ module Danger
       dm.env = EnvironmentManager.new(ENV)
 
       source = dm.env.ci_source
-      unless source.repo_slug
-        puts "danger local".red " failed because it only works with GitHub projects at the moment. Sorry."
+      if source.nil? or source.repo_slug.empty?
+        puts "danger local failed because it only works with GitHub projects at the moment. Sorry.".red
         exit 0
       end
 
-      puts "Running your Dangerfile against this PR - https://github.com/#{source.repo_slug}/pull/#{source.pull_request_id}"
+      gh = dm.env.request_source
+
+      puts "Running your Dangerfile against this PR - https://#{gh.github_host}/#{source.repo_slug}/pull/#{source.pull_request_id}"
 
       if verbose != true
         puts "Turning on --verbose"
@@ -36,7 +38,6 @@ module Danger
 
       puts ""
 
-      gh = GitHub.new(dm.env.ci_source, ENV)
       # We can use tokenless here, as it's running on someone's computer
       # and is IP locked, as opposed  to on the CI.
       gh.support_tokenless_auth = true

data/lib/danger/commands/runner.rb

@@ -33,17 +33,20 @@ module Danger
       dm.verbose = verbose
       dm.env = EnvironmentManager.new(ENV)
       return unless dm.env.ci_source # if it's not a PR
-      dm.env.fill_environment_vars
 
-      gh = dm.env.request_source
-      ci_base = @base || gh.base_commit
-      ci_head = @head || gh.head_commit
+      dm.env.fill_environment_vars
+      dm.env.ensure_danger_branches_are_setup
 
+      # Offer the chance for a user to specify a branch through the command line
+      ci_base = @base || dm.env.danger_head_branch
+      ci_head = @head || dm.env.danger_base_branch
       dm.env.scm.diff_for_folder(".", from: ci_base, to: ci_head)
 
       dm.parse Pathname.new(@dangerfile_path)
 
       post_results(dm)
+
+      dm.env.clean_up
     end
 
     def post_results(dm)

data/lib/danger/dangerfile.rb

@@ -26,8 +26,8 @@ module Danger
       rows = []
 
       AvailableValues.all.each do |key|
-        next if key == :pr_body
         value = self.send(key)
+        value = value.scan(/.{,80}/).to_a.each(&:strip!).join("\n") if key == :pr_body
 
         # So that we either have one value per row
         # or we have [] for an empty array
@@ -40,8 +40,8 @@ module Danger
       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]
+      rows << ["Base Commit", env.meta_info_for_base]
+      rows << ["Head Commit", env.meta_info_for_head]
 
       params = {}
       params[:rows] = rows.each { |current| current[0] = current[0].yellow }
@@ -49,8 +49,6 @@ module Danger
 
       puts ""
       puts Terminal::Table.new(params)
-      puts "PR Body:"
-      puts self.pr_body.cyan
       puts ""
     end
 

data/lib/danger/environment_manager.rb

@@ -32,5 +32,40 @@ module Danger
 
       self.scm = GitRepo.new # For now
     end
+
+    def ensure_danger_branches_are_setup
+      # As this currently just works with GitHub, we can use a github specific feature here:
+      pull_id = ci_source.pull_request_id
+      test_branch = request_source.base_commit
+
+      # Next, we want to ensure that we have a version of the current branch that at a know location
+      scm.exec "branch #{danger_base_branch} #{test_branch}"
+
+      # OK, so we want to ensure that we have a known head branch, this will always represent
+      # the head ( e.g. the most recent commit that will be merged. )
+      scm.exec "fetch origin +refs/pull/#{pull_id}/merge:#{danger_head_branch}"
+    end
+
+    def clean_up
+      [danger_base_branch, danger_base_branch].each do |branch|
+        scm.exec "branch -d #{branch}"
+      end
+    end
+
+    def meta_info_for_base
+      scm.exec("--no-pager log #{danger_base_branch} -n1")
+    end
+
+    def meta_info_for_head
+      scm.exec("--no-pager log #{danger_head_branch} -n1")
+    end
+
+    def danger_head_branch
+      "danger_head"
+    end
+
+    def danger_base_branch
+      "danger_base"
+    end
   end
 end

data/lib/danger/plugins/protect_files.rb

@@ -7,7 +7,7 @@ module Danger
       def protect_files(path: nil, message: nil, fail_build: true)
         broken_rule = false
         Dir.glob(path) do |current|
-          broken_rule = true if self.env.scm.files_modified.include?(current)
+          broken_rule = true if self.env.scm.modified_files.include?(current)
         end
 
         return unless broken_rule

data/lib/danger/request_sources/github.rb

@@ -4,7 +4,7 @@ require 'redcarpet'
 
 module Danger
   class GitHub
-    attr_accessor :ci_source, :pr_json, :issue_json, :environment, :base_commit, :head_commit, :support_tokenless_auth, :ignored_violations
+    attr_accessor :ci_source, :pr_json, :issue_json, :environment, :base_commit, :head_commit, :support_tokenless_auth, :ignored_violations, :github_host
 
     def initialize(ci_source, environment)
       self.ci_source = ci_source
@@ -12,14 +12,18 @@ module Danger
       self.support_tokenless_auth = false
 
       Octokit.auto_paginate = true
+      @token = @environment["DANGER_GITHUB_API_TOKEN"]
+      self.github_host = @environment["DANGER_GITHUB_HOST"] || "github.com"
+      if @environment["DANGER_GITHUB_API_HOST"]
+        Octokit.api_endpoint = @environment["DANGER_GITHUB_API_HOST"]
+      end
     end
 
     def client
-      token = @environment["DANGER_GITHUB_API_TOKEN"]
-      raise "No API given, please provide one using `DANGER_GITHUB_API_TOKEN`" if !token && !support_tokenless_auth
+      raise "No API given, please provide one using `DANGER_GITHUB_API_TOKEN`" if !@token && !support_tokenless_auth
 
       @client ||= Octokit::Client.new(
-        access_token: token
+        access_token: @token
       )
     end
 
@@ -52,6 +56,10 @@ module Danger
       self.pr_json[:head][:sha]
     end
 
+    def branch_for_merge
+      self.pr_json[:base][:ref]
+    end
+
     def pr_title
       self.pr_json[:title].to_s
     end

data/lib/danger/scm_source/git_repo.rb

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

data/lib/danger/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.5
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -26,19 +26,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: grit
+  name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement