danger 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14a93dd351e70737bc4c56de0db56d790c223c5b
-  data.tar.gz: 2902696f31772f74976816570b4fa5051db637f6
+  metadata.gz: 8bf96232696dca35c69a7d338d10bf16af6917a2
+  data.tar.gz: e5e7f69f74d8419ce1c0f2c0df2725aa8b1874bf
 SHA512:
-  metadata.gz: e0a87671ee98117c019ff2d374830112d4c94c356d66315ab69553e125546d98c54a209b9a7f0bb4cf03830bdb84ddbec3e763656ced085768731f1c00641d29
-  data.tar.gz: 0b2fcf219ff87f2c959295f0f5884fc444820ae8831daa6452b622171331dafd049bfb08e7f749b66c4d937878eb1935d5c138311c2497f96f3374352237467b
+  metadata.gz: c69c8d1096130a36a0749c55a6f1e7e90d2df55ee0048bfdd13d13f83760071e66c7a65ad188b3c12a4d71613f75d982698e3e7776438bc1dc3ec227a94fd445
+  data.tar.gz: 16a07e94b369b7da16ab0bab5c4d9935c40442a3284c43985254811f92da77439d81dc8c19dbb6f4a9893f1ea89fcac6155736f9dd07f9b000b1457c1d2d31ad

data/README.md

@@ -124,6 +124,14 @@ open to turning useful bits into the official API.
 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.
 
+## Suppress Violations
+
+You can tell Danger to ignore a specific warning or error by commenting on the PR body:
+
+```
+> Danger: Ignore "Developer Specific file shouldn't be changed"
+```
+
 ## Useful bits of knowledge
 
 * You can set the base branch in the command line arguments see: `bundle exec danger --help`, if you commonly merge into non-master branches.

data/lib/danger/ci_source/local_git_repo.rb

@@ -25,14 +25,9 @@ module Danger
         # 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", '')
-
-          # deal with SSH origin
-          elsif url.start_with? "git@github.com:"
-            self.repo_slug = url.gsub("git@github.com:", "").gsub(".git", '')
+          remote_url_matches = remote.first.chomp.match(%r{github\.com(:|/)(?<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."
           end

data/lib/danger/circle_api.rb

@@ -14,7 +14,7 @@ module Danger
 
     def fetch_build(repo_slug, build_number)
       url = "project/#{repo_slug}/#{build_number}"
-      params = { :'circle-token' => circle_token }
+      params = { 'circle-token' => circle_token }
       response = client.get url, params, accept: 'application/json'
       json = JSON.parse(response.body, symbolize_names: true)
       json

data/lib/danger/commands/init.rb

@@ -75,7 +75,7 @@ module Danger
       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.say "press return when you're ready to move on..."
       ui.wait_for_return
     end
 
@@ -96,7 +96,7 @@ module Danger
       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.say "\nCool, please press return when you have your account ready (and you've verified the email...)"
       ui.wait_for_return
     end
 
@@ -111,7 +111,7 @@ module Danger
 
       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.say "This means only providing access to " + "public_repo".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 quite easily be extracted from the environment via pull requests."
@@ -122,10 +122,10 @@ module Danger
         ui.say "This means only providing access to " + "repo".yellow + ", and its 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."
-        ui.say "Make a new one for those repos with just " + "public_info".yellow + "."
+        ui.say "Make a new one for those repos with just " + "public_repo".yellow + "."
       end
 
-      ui.say "\n👍, please press return when you have your token set up…"
+      ui.say "\n👍, please press return when you have your token set up..."
       ui.wait_for_return
     end
 
@@ -145,7 +145,7 @@ module Danger
       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.say "\nOK, I'll give you a moment to do this..."
       ui.wait_for_return
 
       ui.say "Final step: exposing the GitHub token as an environment build variable."
@@ -161,7 +161,7 @@ module Danger
       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.say "This is the last step, I can give you a second..."
       ui.wait_for_return
     end
 
@@ -179,7 +179,7 @@ module Danger
     end
 
     def uses_circle
-      danger = "bundle exec danger".yellow
+      danger = "- bundle exec danger".yellow
       config = YAML.load(File.read("circle.yml"))
 
       if config["test"]
@@ -192,7 +192,7 @@ module Danger
         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
+        ui.say "    #{danger}".green
       end
     end
 
@@ -221,13 +221,13 @@ module Danger
         ui.say "the ramifications of 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.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.say "I'll hold..."
         ui.wait_for_return
       end
 
@@ -249,7 +249,7 @@ module Danger
       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 its variables to the console via the " + "--verbose".yellow + "option."
+      ui.say "- You can have Danger output all of its 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

data/lib/danger/commands/local.rb

@@ -27,7 +27,7 @@ module Danger
         exit 0
       end
 
-      puts "Running your Dangerfile against this PR - https://github.com/#{source.repo_slug}/pulls/#{source.pull_request_id}"
+      puts "Running your Dangerfile against this PR - https://github.com/#{source.repo_slug}/pull/#{source.pull_request_id}"
 
       if verbose != true
         puts "Turning on --verbose"

data/lib/danger/dangerfile_dsl.rb

@@ -13,6 +13,17 @@ module Danger
         self.warnings = []
         self.errors = []
         self.messages = []
+        load_plugins
+      end
+
+      def load_plugins
+        Dir['./lib/danger/plugins/*.rb'].each do |file|
+          require file
+        end
+      end
+
+      def should_ignore_violation(message)
+        env.request_source.ignored_violations.include? message
       end
 
       # Declares a CI blocking error
@@ -20,6 +31,7 @@ module Danger
       # @param    [String] message
       #           The message to present to the user
       def fail(message)
+        return if should_ignore_violation(message)
         self.errors << message
         puts "Raising error '#{message}'"
       end
@@ -29,6 +41,7 @@ module Danger
       # @param    [String] message
       #           The message to present to the user
       def warn(message)
+        return if should_ignore_violation(message)
         self.warnings << message
         puts "Printing warning '#{message}'"
       end
@@ -46,10 +59,6 @@ module Danger
       # that either the `scm` or the `request_source` can handle.
       # This opens us up to letting those object extend themselves naturally.
       def method_missing(method_sym, *_arguments, &_block)
-        unless AvailableValues.all.include?(method_sym)
-          raise "Unknown method '#{method_sym}', please check out the documentation for available variables".red
-        end
-
         if AvailableValues.scm.include?(method_sym)
           # SCM Source
           return env.scm.send(method_sym)
@@ -59,6 +68,8 @@ module Danger
           # Request Source
           return env.request_source.send(method_sym)
         end
+
+        raise "Unknown method '#{method_sym}', please check out the documentation for available variables".red
       end
     end
   end

data/lib/danger/plugins/protect_files.rb

@@ -0,0 +1,23 @@
+module Danger
+  class Dangerfile
+    module DSL
+      # Protect a file from being changed. This can
+      # be used in combination with some kind of
+      # permission check if a user is inside the org
+      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)
+        end
+
+        return unless broken_rule
+
+        if fail_build
+          self.errors << message
+        else
+          self.messages << message
+        end
+      end
+    end
+  end
+end

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
+    attr_accessor :ci_source, :pr_json, :issue_json, :environment, :base_commit, :head_commit, :support_tokenless_auth, :ignored_violations
 
     def initialize(ci_source, environment)
       self.ci_source = ci_source
@@ -30,6 +30,13 @@ module Danger
     def fetch_details
       self.pr_json = client.pull_request(ci_source.repo_slug, ci_source.pull_request_id)
       fetch_issue_details(self.pr_json)
+      self.ignored_violations = ignored_violations_from_pr(self.pr_json)
+    end
+
+    def ignored_violations_from_pr(pr_json)
+      pr_body = pr_json[:body]
+      return [] if pr_body.nil?
+      pr_body.chomp.scan(/>\s*danger\s*:\s*ignore\s*"(.*)"/i).flatten
     end
 
     def fetch_issue_details(pr_json)
@@ -46,15 +53,15 @@ module Danger
     end
 
     def pr_title
-      self.pr_json[:title]
+      self.pr_json[:title].to_s
     end
 
     def pr_body
-      self.pr_json[:body]
+      self.pr_json[:body].to_s
     end
 
     def pr_author
-      self.pr_json[:user][:login]
+      self.pr_json[:user][:login].to_s
     end
 
     def pr_labels

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "0.5.2"
+  VERSION = "0.6.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.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -224,6 +224,7 @@ files:
 - lib/danger/dangerfile.rb
 - lib/danger/dangerfile_dsl.rb
 - lib/danger/environment_manager.rb
+- lib/danger/plugins/protect_files.rb
 - lib/danger/request_sources/github.rb
 - lib/danger/scm_source/git_repo.rb
 - lib/danger/standard_error.rb