danger 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d97659425a77d1d4f21f22f7ba9fd43afd47d974
-  data.tar.gz: 4d3eb4ce159a4deb8326bebb05073e81cc91e233
+  metadata.gz: fcdcdc1039905ce7ed910c8e951042b5f2fd994c
+  data.tar.gz: 96f2dd059e8d700ca3965e36339183e027a2c080
 SHA512:
-  metadata.gz: 6ba7e1f9b4fb554dc663d81bf58b260a51914625c245ef9a30b6265f67155e1a1ba164df8c7db9a4c6895897b0761301df2bbe1f7a896bbf61dd5f6f7e70b002
-  data.tar.gz: bd2495aa7cc47436669f8c4d9d190a501bf7273cb53997b97f93abb1541c2eabf17e8b8906d9b2b7f8ee4f580225680243804e58776a59b642ba2c08ae0ef84f
+  metadata.gz: b7e6ad0524f308e7ecfdab0b80759dc123024f2a6bde3c141bdc6c9317f63ea36b95dd4964b12be97487247b24ca12f886b1effd52352735ea307b15eefd5d60
+  data.tar.gz: a1fc5b70bfbd76637b683b2944942109732650f400d0415726e9d803f0ebd4b45001444f2c202ff873ecddcaf445acd77454d19d17e3a0f20f634f1c2060253c

data/README.md

@@ -40,6 +40,20 @@ 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.
 
+**Supported CIs**: Travis CI, CircleCI, Jenkins, Xcode Server and Buildkite.
+
+### Making your own
+If the CI server you're using isn't available yet, you can build it yourself:
+
+Take a look at some of the [already existing integrations](https://github.com/danger/danger/tree/master/lib/danger/ci_source). The class has 2 mandatory methods:
+
+- `self.validates?` which should detect if the CI is active (detecting via ENV variables, mostly)
+- `initialize` which should set 2 variables:
+  - `self.repo_slug` the repo slug, in `org/repo` or `user/repo` format.
+  - `self.pull_request_id` the number of the pull request that the CI is testing (often available in ENV variables)
+
+We'd love to see pull requests for new integrations!
+
 ## What happens?
 
 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.
@@ -134,7 +148,7 @@ To create a new plugin run
 danger new_plugin
 ```
 
-This will generate a new Ruby file which you can modify to fit your needs. 
+This will generate a new Ruby file which you can modify to fit your needs.
 
 ## Support
 
@@ -155,8 +169,11 @@ open to turning useful bits into the official API.
 
 ## Test locally with `danger local`
 
-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.
+You can use `danger local` to run Danger in an environment similar to how it will be ran on CI. By default Danger will look
+at the most recently merged PR, then run your `Dangerfile` against that Pull Request. This is really useful when making changes.
+
+If you have a specific PR in mind that you'd like to work against, make sure you have it merged in your current git
+history, then append `--use-merged-pr=[id]` to the command.
 
 ## Suppress Violations
 

data/lib/danger/available_values.rb

@@ -12,7 +12,8 @@ module Danger
         :deleted_files,
         :added_files,
         :deletions,
-        :insertions
+        :insertions,
+        :commits
       ]
     end
 

data/lib/danger/ci_source/local_git_repo.rb

@@ -34,10 +34,19 @@ module Danger
           end
         end
 
+        specific_pr = env["LOCAL_GIT_PR_ID"]
+        pr_ref = specific_pr ? "##{specific_pr}" : ''
+        pr_command = "log --merges --oneline | grep \"Merge pull request #{pr_ref}\" | head -n 1"
+
         # get the most recent PR merge
-        pr_merge = run_git "log --since='2 weeks ago' --merges --oneline | grep \"Merge pull request\" | head -n 1".strip
+        pr_merge = run_git pr_command.strip
+
         if pr_merge.to_s.empty?
-          raise "No recent pull requests found for this repo, danger requires at least one PR for the local mode"
+          if specific_pr
+            raise "Could not find the pull request (#{specific_pr}) inside the git history for this repo."
+          else
+            raise "No recent pull requests found for this repo, danger requires at least one PR for the local mode."
+          end
         end
 
         self.pull_request_id = pr_merge.match("#([0-9]+)")[1]

data/lib/danger/commands/local.rb

@@ -5,9 +5,16 @@ module Danger
 
     def initialize(argv)
       @dangerfile_path = "Dangerfile" if File.exist? "Dangerfile"
+      @pr_num = argv.option('use-merged-pr')
       super
     end
 
+    def self.options
+      [
+        ['--use-merged-pr=[#id]', 'The ID of an alreadty merged PR inside your history to use as a reference for the local run.']
+      ].concat(super)
+    end
+
     def validate!
       super
       unless @dangerfile_path
@@ -17,6 +24,7 @@ module Danger
 
     def run
       ENV["DANGER_USE_LOCAL_GIT"] = "YES"
+      ENV["LOCAL_GIT_PR_ID"] = @pr_num if @pr_num
 
       dm = Dangerfile.new
       dm.env = EnvironmentManager.new(ENV)
@@ -47,6 +55,7 @@ module Danger
 
       dm.env.scm = GitRepo.new
 
+      dm.env.ensure_danger_branches_are_setup
       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))
       dm.print_results

data/lib/danger/commands/new_plugin.rb

@@ -3,14 +3,6 @@ module Danger
     self.summary = 'Generate a new danger plugin.'
     self.command = 'new_plugin'
 
-    def initialize(argv)
-      super
-    end
-
-    def validate!
-      super
-    end
-
     def run
       require 'fileutils'
 

data/lib/danger/commands/runner.rb

@@ -7,6 +7,8 @@ module Danger
     self.summary = 'Run the Dangerfile.'
     self.command = 'danger'
 
+    self.plugin_prefixes = %w(claide danger)
+
     def initialize(argv)
       @dangerfile_path = "Dangerfile" if File.exist? "Dangerfile"
       @base = argv.option('base')

data/lib/danger/environment_manager.rb

@@ -38,17 +38,17 @@ module Danger
       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
+      # Next, we want to ensure that we have a version of the current branch at a known 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. )
+      # the head of the PR ( 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}"
+        scm.exec "branch -D #{branch}"
       end
     end
 

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "0.7.3".freeze
+  VERSION = "0.7.4".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: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -256,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Automate your PR etiquette.