danger 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52836eb7928792ec1e8ec0ffb78076c0e1d6cae0
-  data.tar.gz: 9d550c596cfe8e25764a0662965fc4e4768ddf54
+  metadata.gz: 6408840e4167a8092819c1b40d3c409b61df856b
+  data.tar.gz: 036b9a85309a45403d2649949f7f63b2722d5a50
 SHA512:
-  metadata.gz: 7103cf673b79e9827e1eef36a08c8001540fff0e0f5f535d2d4ce01a4b3d836546ea4cf083e736c5bf4ce0f3a3e9f3f93829713313672fa2d6f10f7c06ab591a
-  data.tar.gz: 2af2f1aebc31d5c3b573e2af054a46975160c9b200b3d06511036d0b7a05862b36869273a8d99083724725f11edf97632664200e752b5b63aba3f26695cf6a0b
+  metadata.gz: decc456c54fc15961a5f73c92b8cf131a784bffb01842d05f97dff361f36ece7a0dbc1443e9d74fde21acd40a3c83fa070e0cc17dfc33745788f7a68441d1ead
+  data.tar.gz: 56c7fe3cf50c9d0b8d7fb91f2e70f195970f10c7ec1f813768c357626eac43212edde7697ccf4e6ee1b2225f76b0d3628cfaa803893dc228c5cd6eba1458909d

data/lib/danger.rb

@@ -18,13 +18,14 @@ Dir[File.expand_path("danger/*source/*.rb", File.dirname(__FILE__))].each do |fi
 end
 
 module Danger
+  GEM_NAME = "danger".freeze
+
   # @return [String] The path to the local gem directory
   def self.gem_path
-    gem_name = "danger"
-    unless Gem::Specification.find_all_by_name(gem_name).any?
+    if Gem::Specification.find_all_by_name(GEM_NAME).empty?
       raise "Couldn't find gem directory for 'danger'"
     end
-    return Gem::Specification.find_by_name(gem_name).gem_dir
+    return Gem::Specification.find_by_name(GEM_NAME).gem_dir
   end
 
   # @return [String] Latest version of Danger on https://rubygems.org

data/lib/danger/danger_core/dangerfile.rb

@@ -123,12 +123,9 @@ module Danger
           when :pr_json
             value = "[Skipped]"
 
-          when :pr_body
-            value = plugin.send(method)
-            value = value.scan(/.{,80}/).to_a.each(&:strip!).join("\n")
-
           else
             value = plugin.send(method)
+            value = value.scan(/.{,80}/).to_a.each(&:strip!).join("\n") if value.kind_of?(String)
             # 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
@@ -158,7 +155,9 @@ module Danger
 
       ui.section("Info:") do
         ui.puts
-        ui.puts Terminal::Table.new(params)
+        table = Terminal::Table.new(params)
+        table.align_column(0, :right)
+        ui.puts table
         ui.puts
       end
     end

data/lib/danger/danger_core/messages/markdown.rb

@@ -17,6 +17,10 @@ module Danger
         other.line == line
     end
 
+    def inline?
+      return (file.nil? && line.nil?) == false
+    end
+
     def to_s
       extra = []
       extra << "file: #{file}" unless file.nil?

data/lib/danger/danger_core/plugins/dangerfile_bitbucket_server_plugin.rb

@@ -17,12 +17,6 @@ module Danger
   #
   #          fail "Please add labels to this PR" if bitbucket_server.pr_labels.empty?
   #
-  # @example Check if a user is in a specific bitbucket_server org, and message them if so
-  #
-  #          unless bitbucket_server.api.organization_member?('danger', bitbucket_server.pr_author)
-  #            message "@#{bitbucket_server.pr_author} is not a contributor yet, would you like to join the Danger org?"
-  #          end
-  #
   # @example Ensure there is a summary for a PR
   #
   #          fail "Please provide a summary in the Pull Request description" if bitbucket_server.pr_body.length < 5

data/lib/danger/danger_core/plugins/dangerfile_danger_plugin.rb

@@ -1,11 +1,8 @@
 require "danger/plugin_support/plugin"
 
 module Danger
-  # One way to support internal plugins is via `plugin.import` this gives you
-  # the chance to quickly iterate without the need for building rubygems. As such,
-  # it does not have the stringent rules around documentation expected of a public plugin.
-  # It's worth noting, that you can also have plugins inside `./danger_plugins` and they
-  # will be automatically imported into your Dangerfile at launch.
+  # A way to interact with Danger herself. Offering APIs to import plugins,
+  # and Dangerfiles from muliple sources.
   #
   # @example Import a plugin available over HTTP
   #
@@ -20,6 +17,18 @@ module Danger
   #
   #          danger.import_plugin("danger/plugins/*.rb")
   #
+  # @example Run a Dangerfile from inside a sub-folder
+  #
+  #          danger.import_dangerfile(file: "danger/Dangerfile.private")
+  #
+  # @example Run a Dangerfile from inside a gem
+  #
+  #          danger.import_dangerfile(gem: "ruby-grape-danger")
+  #
+  # @example Run a Dangerfile from inside a repo
+  #
+  #          danger.import_dangerfile(gitlab: "ruby-grape/danger")
+  #
   # @see  danger/danger
   # @tags core, plugins
 
@@ -53,7 +62,8 @@ module Danger
     # Import a Dangerfile.
     #
     # @param    [Hash] opts
-    # @option opts [String] :github Github path
+    # @option opts [String] :github GitHub repo
+    # @option opts [String] :gitlab GitLab repo
     # @option opts [String] :gem Gem name
     # @option opts [String] :path Path to Dangerfile
     # @return   [void]
@@ -62,8 +72,8 @@ module Danger
         warn "Use `import_dangerfile(github: '#{opts}')` instead of `import_dangerfile '#{opts}'`."
         import_dangerfile_from_github(opts)
       elsif opts.kind_of?(Hash)
-        if opts.key?(:github)
-          import_dangerfile_from_github(opts[:github])
+        if opts.key?(:github) || opts.key?(:gitlab)
+          import_dangerfile_from_github(opts[:github] || opts[:gitlab])
         elsif opts.key?(:path)
           import_dangerfile_from_path(opts[:path])
         elsif opts.key?(:gem)
@@ -76,6 +86,24 @@ module Danger
       end
     end
 
+    # @!group Danger
+    # Returns the name of the current SCM Provider being used.
+    # @return [Symbol] The name of the SCM Provider used for the active repository.
+    def scm_provider
+      return :unknown unless env.request_source
+
+      case env.request_source
+      when Danger::RequestSources::GitHub
+        :github
+      when Danger::RequestSources::GitLab
+        :gitlab
+      when Danger::RequestSources::BitbucketServer
+        :bitbucket_server
+      else
+        :unknown
+      end
+    end
+
     private
 
     # @!group Danger

data/lib/danger/danger_core/plugins/dangerfile_gitlab_plugin.rb

@@ -4,52 +4,52 @@ module Danger
   # Handles interacting with GitLab inside a Dangerfile. Provides a few functions which wrap `mr_json` and also
   # through a few standard functions to simplify your code.
   #
-  # @example Warn when an MR is classed as work in progress
+  # @example Warn when an MR is classed as work in progress.
   #
   #          warn "MR is classed as Work in Progress" if gitlab.mr_title.include? "[WIP]"
   #
-  # @example Declare a MR to be simple to avoid specific Danger rules
+  # @example Declare a MR to be simple to avoid specific Danger rules.
   #
   #          declared_trivial = (gitlab.mr_title + gitlab.mr_body).include?("#trivial")
   #
-  # @example Ensure that labels have been applied to the MR
+  # @example Ensure that labels have been applied to the MR.
   #
   #          fail "Please add labels to this MR" if gitlab.mr_labels.empty?
   #
-  # @example Ensure that all MRs have an assignee
+  # @example Ensure that all MRs have an assignee.
   #
   #          warn "This MR does not have any assignees yet." unless gitlab.mr_json["assignee"]
   #
-  # @example Ensure there is a summary for a MR
+  # @example Ensure there is a summary for a MR.
   #
-  #          fail "Please provide a summary in the Pull Request description" if gitlab.mr_body.length < 5
+  #          fail "Please provide a summary in the Merge Request description" if gitlab.mr_body.length < 5
   #
-  # @example Only accept MRs to the develop branch
+  # @example Only accept MRs to the develop branch.
   #
   #          fail "Please re-submit this MR to develop, we may have already fixed your issue." if gitlab.branch_for_merge != "develop"
   #
-  # @example Note when MRs don't reference a milestone, which goes away when it does
+  # @example Note when MRs don't reference a milestone, which goes away when it does.
   #
   #          has_milestone = gitlab.mr_json["milestone"] != nil
   #          warn("This MR does not refer to an existing milestone", sticky: false) unless has_milestone
   #
-  # @example Note when a MR cannot be manually merged, which goes away when you can
+  # @example Note when a MR cannot be manually merged, which goes away when you can.
   #
   #          can_merge = gitlab.mr_json["mergeable"]
   #          warn("This MR cannot be merged yet.", sticky: false) unless can_merge
   #
-  # @example Highlight when a celebrity makes a pull request
+  # @example Highlight when a celebrity makes a merge request.
   #
   #          message "Welcome, Danger." if gitlab.mr_author == "dangermcshane"
   #
-  # @example Send a message with links to a collection of specific files
+  # @example Send a message with links to a collection of specific files.
   #
   #          if git.modified_files.include? "config/*.js"
   #            config_files = git.modified_files.select { |path| path.include? "config/" }
   #            message "This MR changes #{ gitlab.html_link(config_files) }"
   #          end
   #
-  # @example Highlight with a clickable link if a Package.json is changed
+  # @example Highlight with a clickable link if a Package.json is changed.
   #
   #         warn "#{gitlab.html_link("Package.json")} was edited." if git.modified_files.include? "Package.json"
   #
@@ -110,7 +110,7 @@ module Danger
     end
 
     # @!group MR Content
-    # The unified diff produced by GitLab for this PR
+    # The unified diff produced by GitLab for this MR
     # see [Unified diff](https://en.wikipedia.org/wiki/Diff_utility#Unified_format)
     # @return [String]
     #
@@ -120,12 +120,29 @@ module Danger
 
     # @!group MR Commit Metadata
     # The branch to which the MR is going to be merged into
+    # @deprecated Please use {#branch_for_base} instead
     # @return [String]
     #
     def branch_for_merge
+      branch_for_base
+    end
+
+    # @!group MR Commit Metadata
+    # The branch to which the MR is going to be merged into.
+    # @return [String]
+    #
+    def branch_for_base
       @gitlab.mr_json.target_branch
     end
 
+    # @!group MR Commit Metadata
+    # The branch to which the MR is going to be merged from.
+    # @return [String]
+    #
+    def branch_for_head
+      @gitlab.mr_json.source_branch
+    end
+
     # @!group MR Commit Metadata
     # The base commit to which the MR is going to be merged as a parent
     # @return [String]
@@ -153,8 +170,11 @@ module Danger
 
     # @!group GitLab Misc
     # Provides access to the GitLab API client used inside Danger. Making
-    # it easy to use the GitLab API inside a Dangerfile.
+    # it easy to use the GitLab API inside a Dangerfile. See the gitlab
+    # gem's [documentation](http://www.rubydoc.info/gems/gitlab/Gitlab/Client)
+    # for accessible methods.
     # @return [GitLab::Client]
+    #
     def api
       @gitlab.client
     end
@@ -168,6 +188,7 @@ module Danger
     #           Shows the full path as the link's text, defaults to `true`.
     #
     # @return [String]
+    #
     def html_link(paths, full_path: true)
       paths = [paths] unless paths.kind_of?(Array)
       commit = head_commit

data/lib/danger/request_source/bitbucket_server_api.rb

@@ -13,6 +13,16 @@ module Danger
         self.pr_api_endpoint = "https://#{host}/rest/api/1.0/projects/#{project}/repos/#{slug}/pull-requests/#{pull_request_id}"
       end
 
+      def inspect
+        inspected = super
+
+        if @password
+          inspected = inspected.sub! @password, "********".freeze
+        end
+
+        inspected
+      end
+
       def credentials_given?
         @username && !@username.empty? && @password && !@password.empty?
       end

data/lib/danger/request_source/request_source.rb

@@ -18,9 +18,9 @@ module Danger
         raise "Subclass and overwrite initialize"
       end
 
-      # What does this do?
+      # @return [Boolean] whether scm.origins is a valid git repository or not
       def validates_as_ci?
-        !!self.scm.origins.match(%r{#{Regexp.escape self.host}(:|/)(?<repo_slug>.+/.+?)(?:\.git)?$})
+        !!self.scm.origins.match(%r{#{Regexp.escape self.host}(:|/)(.+/.+?)(?:\.git)?$})
       end
 
       def validates_as_api_source?

data/lib/danger/scm_source/git_repo.rb

@@ -4,20 +4,27 @@ require "git"
 
 module Danger
   class GitRepo
-    attr_accessor :diff, :log
+    attr_accessor :diff, :log, :folder
 
     def diff_for_folder(folder, from: "master", to: "HEAD")
-      repo = Git.open folder
+      self.folder = folder
+      repo = Git.open self.folder
 
+      ensure_commitish_exists!(from)
+      ensure_commitish_exists!(to)
       merge_base = repo.merge_base(from, to)
+
+      ensure_commitish_exists!(merge_base)
       self.diff = repo.diff(merge_base.to_s, to)
       self.log = repo.log.between(from, to)
     end
 
     def exec(string)
       require "open3"
-      Open3.popen2(default_env, "git #{string}") do |_stdin, stdout, _wait_thr|
-        stdout.read.rstrip
+      Dir.chdir(self.folder || ".") do
+        Open3.popen2(default_env, "git #{string}") do |_stdin, stdout, _wait_thr|
+          stdout.read.rstrip
+        end
       end
     end
 
@@ -34,6 +41,10 @@ module Danger
     def default_env
       { "LANG" => "en_US.UTF-8" }
     end
+
+    def ensure_commitish_exists!(commitish)
+      exec "fetch" if exec("--no-pager show #{commitish}").empty?
+    end
   end
 end
 

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "3.2.0".freeze
+  VERSION = "3.2.1".freeze
   DESCRIPTION = "Like Unit Tests, but for your Team Culture.".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-03 00:00:00.000000000 Z
+date: 2016-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -419,7 +419,7 @@ files:
 - lib/danger/request_source/request_source.rb
 - lib/danger/scm_source/git_repo.rb
 - lib/danger/version.rb
-homepage: http://github.com/danger/danger
+homepage: https://github.com/danger/danger
 licenses:
 - MIT
 metadata: {}
@@ -439,9 +439,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Like Unit Tests, but for your Team Culture.
 test_files: []
-has_rdoc: