danger-jira 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 349f7574894426c9a762617ccdbd993a48e03158
-  data.tar.gz: bea55cf6f864564a26502f4ef8416005c35810ab
+  metadata.gz: 80a48c0714244892fd4a261ccc9e488f4cf5111f
+  data.tar.gz: bed4700e427eda5556c26dd69631ee1e0c8f2492
 SHA512:
-  metadata.gz: 85fcb10b043ba8bd3411092c207ca83547f81d41335c61b8248f6ffceb0005c21f840ced3c1f10bb3cc29bdc17856cb2161005191f0ab45f148031ea54507563
-  data.tar.gz: 4e8f2b814fcf5a52b76dde8066e94225f3315ad9c35a2e2dd2c8e23a9d2c5523e296e637efef526e40547cf8ced22c402cdb8b55ce444da65c3877020f071c7d
+  metadata.gz: 52f36a30ef82ea8b9445944e2bb308020e60d58b1139b329693eceec99b2687e3276daadb867881fabd38e5872659b8fb4740719f3da01dc1f0b06ad66b9888b
+  data.tar.gz: e15f44b307f2060e1f4830544b31013559f831d93ac23513cb05c35f051da7ae6bd7e0f158b761de5601687187a9e470249258b5c1d48e24a27e9693ab0cd74e

data/README.md

@@ -20,7 +20,10 @@ gem 'danger-jira'
 jira.check(
   key: ["KEY", "PM"],
   url: "https://myjira.atlassian.net/browse",
-  fail_on_warning: true
+  search_title: true, 
+  search_commits: false, 
+  fail_on_warning: false, 
+  report_missing: true
 )
 ```
 
@@ -42,7 +45,7 @@ With "KEY-123" in the PR title or PR body, Danger will comment with:
 
 
 <p align="right">
-  Generated by :no_entry_sign: <a href="http://github.com/danger/danger-js/">dangerJS</a>
+  Generated by :no_entry_sign: <a href="http://github.com/danger/danger/">Danger</a>
 </p>
 
 ## License

data/lib/jira/gem_version.rb

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

data/lib/jira/plugin.rb

@@ -38,6 +38,28 @@ module Danger
       throw Error("'key' missing - must supply JIRA issue key") if key.nil?
       throw Error("'url' missing - must supply JIRA installation URL") if url.nil?
 
+      jira_issues = find_jira_issues(
+        key: key,
+        search_title: search_title,
+        search_commits: search_commits
+      )
+
+      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}")
+      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
+          warn(msg)
+        end
+      end
+    end
+
+    private
+
+    def find_jira_issues(key: nil, search_title: true, search_commits: false)
       # Support multiple JIRA projects
       keys = key.kind_of?(Array) ? key.join("|") : key
       jira_key_regex_string = "((?:#{keys})-[0-9]+)"
@@ -46,35 +68,27 @@ module Danger
       jira_issues = []
 
       if search_title
-        jira_issues << github.pr_title.scan(regexp)
+        github.pr_title.gsub(regexp) do |match|
+          jira_issues << match
+        end
       end
+
       if search_commits
-        jira_issues << git.commits.map { |commit| commit.message.scan(regexp) }.compact
+        git.commits.map do |commit|
+          commit.message.gsub(regexp) do |match|
+            jira_issues << match
+          end
+        end
       end
 
-      jira_issues.flatten.uniq
-
       if jira_issues.empty?
         github.pr_body.gsub(regexp) do |match|
           jira_issues << match
         end
       end
-
-      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}")
-      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
-          warn(msg)
-        end
-      end
+      return jira_issues
     end
 
-    private
-
     def ensure_url_ends_with_slash(url)
       return "#{url}/" unless url.end_with?("/")
       return url

data/spec/jira_spec.rb

@@ -11,10 +11,41 @@ module Danger
     #
     describe "with Dangerfile" do
       before do
+        @jira = testing_dangerfile.jira
+        DangerJira.send(:public, *DangerJira.private_instance_methods)
+        github = Danger::RequestSources::GitHub.new({}, testing_env)
       end
 
-      # Some examples for writing tests
-      # You should replace these with your own.
+      it "can find jira issues via title" do
+        allow(@jira).to receive_message_chain("github.pr_title").and_return("Ticket [WEB-123] and WEB-124")
+        issues = @jira.find_jira_issues(key: "WEB")
+        expect((issues <=> ["WEB-123", "WEB-124"]) == 0)
+      end
+
+      it "can find jira issues in commits" do
+        single_commit = Object.new
+        def single_commit.message
+          "WIP [WEB-125]"
+        end
+        commits = [single_commit]
+        allow(@jira).to receive_message_chain("git.commits").and_return(commits)
+        issues = @jira.find_jira_issues(
+          key: "WEB",
+          search_title: false,
+          search_commits: true
+        )
+        expect((issues <=> ["WEB-125"]) == 0)
+      end
+
+      it "can find jira issues in pr body" do
+        allow(@jira).to receive_message_chain("github.pr_body").and_return("[WEB-126]")
+        issues = @jira.find_jira_issues(
+          key: "WEB",
+          search_title: false,
+          search_commits: false
+        )
+        expect((issues <=> ["WEB-126"]) == 0)
+      end
     end
   end
 end

metadata

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