danger-jira 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3dc20f8a0e781427f8fed365b29cb5788e99db7a
-  data.tar.gz: eb959c279530a8aa476ec29dbc4f4d0be8163869
+  metadata.gz: 349f7574894426c9a762617ccdbd993a48e03158
+  data.tar.gz: bea55cf6f864564a26502f4ef8416005c35810ab
 SHA512:
-  metadata.gz: f2a2e4e4b63b1eb459e10778e7b8ba2d4cd3db9c5840b6fa858ac6b54fca635d883c9d4c84e04d0b5e0a020747cd1abaefa268bfd37b9c4e67ed709de48740cf
-  data.tar.gz: 965f18edd6800ee1ccc0723d00cd6909641f75ba9368ec3671a0b7ce0ae185a45163cb1ad96894c481d3524bb0e702d1643dbc7d47bb930ae4186e1698c34015
+  metadata.gz: 85fcb10b043ba8bd3411092c207ca83547f81d41335c61b8248f6ffceb0005c21f840ced3c1f10bb3cc29bdc17856cb2161005191f0ab45f148031ea54507563
+  data.tar.gz: 4e8f2b814fcf5a52b76dde8066e94225f3315ad9c35a2e2dd2c8e23a9d2c5523e296e637efef526e40547cf8ced22c402cdb8b55ce444da65c3877020f071c7d

data/README.md

@@ -19,12 +19,12 @@ gem 'danger-jira'
 // Dangerfile
 jira.check(
   key: ["KEY", "PM"],
-  url: "https://myjira.atlassian.net/browse"
+  url: "https://myjira.atlassian.net/browse",
   fail_on_warning: true
 )
 ```
 
-With "KEY-123" in the PR title, Danger will comment with:
+With "KEY-123" in the PR title or PR body, Danger will comment with:
 
 <table>
   <thead>

data/lib/jira/gem_version.rb

@@ -1,3 +1,3 @@
 module Jira
-  VERSION = "0.3.0".freeze
+  VERSION = "0.4.0".freeze
 end

data/lib/jira/plugin.rb

@@ -20,25 +20,40 @@ module Danger
     # @param [String] emoji
     #         The emoji you want to display in the message.
     #
+    # @param [Boolean] search_title
+    #         Option to search JIRA issues from PR title
+    #
+    # @param [Boolean] search_commits
+    #         Option to search JIRA issues from commit messages
+    #
     # @param [Boolean] fail_on_warning
-    #         Option to fail danger if no JIRA issue found in PR title
+    #         Option to fail danger if no JIRA issue found
+    #
+    # @param [Boolean] report_missing
+    #         Option to report if no JIRA issue was found
     #
     # @return [void]
     #
-    def check(key: nil, url: nil, emoji: ":link:", fail_on_warning: false)
+    def check(key: nil, url: nil, emoji: ":link:", search_title: true, search_commits: false, fail_on_warning: false, report_missing: true)
       throw Error("'key' missing - must supply JIRA issue key") if key.nil?
       throw Error("'url' missing - must supply JIRA installation URL") if url.nil?
 
       # Support multiple JIRA projects
       keys = key.kind_of?(Array) ? key.join("|") : key
-      jira_key_regex_string = "((#{keys})-[0-9]+)"
+      jira_key_regex_string = "((?:#{keys})-[0-9]+)"
       regexp = Regexp.new(/#{jira_key_regex_string}/)
 
       jira_issues = []
-      github.pr_title.gsub(regexp) do |match|
-        jira_issues << match
+
+      if search_title
+        jira_issues << github.pr_title.scan(regexp)
+      end
+      if search_commits
+        jira_issues << git.commits.map { |commit| commit.message.scan(regexp) }.compact
       end
 
+      jira_issues.flatten.uniq
+
       if jira_issues.empty?
         github.pr_body.gsub(regexp) do |match|
           jira_issues << match
@@ -48,8 +63,8 @@ module Danger
       if !jira_issues.empty?
         jira_urls = jira_issues.map { |issue| link(href: ensure_url_ends_with_slash(url), issue: issue) }.join(", ")
         message("#{emoji} #{jira_urls}")
-      else
-        msg = "This PR does not contain a JIRA issue key in the PR title (e.g. KEY-123)"
+      elsif report_missing
+        msg = "This PR does not contain any JIRA issue keys in the PR title or commit messages (e.g. KEY-123)"
         if fail_on_warning
           fail(msg)
         else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danger-jira
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - RestlessThinker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-13 00:00:00.000000000 Z
+date: 2018-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger-plugin-api