auto_release_note 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 419bea71c490e3b6cbe05cb8ddec9e7e6a2e3e8b7ab354353dfef5fdaf0b8ad9
-  data.tar.gz: 16c0cde829cf726426ed26274545f8a7d106e6848c64382ccdc35695d5792b5c
+  metadata.gz: 72bf788152d668252ebfdb99ad38637f1e73130668b93b28df91898d0aaa56cf
+  data.tar.gz: 79e6f4426ba4e5b4660ab150986106b37a95d1a62083959361158dcd47c56c3a
 SHA512:
-  metadata.gz: 681837bae3dc9586d7bfe61e587323ac05d6593b21a0acc2b4ad94afc4a8ab99bf5f0883dfc78ab611c6d83c353ab74e94c0f5a3756609b46b536644984dd3ee
-  data.tar.gz: 683b83212494c8a9793e7a69246f80af480ccdd2b9691b6ed8d3736a9cb8de8856cb51d83d9df8dafff426f43cac637b40b46398d57cf851dc10fe09053b41cb
+  metadata.gz: 32bf795a11947c46ebd05734a584eaae4093a7c966136a887df3edfeae0fd865c8d96ab96797c8afa3629d255d40d80d387e3e34d20331b04308548e328859d2
+  data.tar.gz: 627431a4fd603127b80a5c2c890d407e699b38f25c9a9d9ff65296c9423e36007b3ed7700c1e2cb6cb0ab6aac1d5bca9126d83a0a497f2c0cedc217d1cf79af6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    auto_release_note (0.1.4)
+    auto_release_note (0.1.5)
       git
       thor
 

data/lib/auto_release_note/git_log.rb

@@ -22,12 +22,15 @@ module AutoReleaseNote
 
     private
     def get_merge_log(tag_query)
-      merge_log ||= @git.log.between(tag_query.split("..")[0], tag_query.split("..")[1]) # `git log --merges --oneline #{tag_query} | grep 'Merge pull request #'`
+      # `git log --merges --oneline #{tag_query} | grep 'Merge pull request #'`
+      @git.log.between(tag_query.split("..")[0], tag_query.split("..")[1]).select do |commit|
+        commit.message.match(/Merge pull request #/)
+      end
     end
 
     def parse_merge_log(merge_log)
-      merge_log.each_line do |line|
-        logs << { pull_req_id: get_pull_req_id(line), branch: get_branch_name(line), issue: nil }
+      merge_log.each do |log|
+        logs << { pull_req_id: get_pull_req_id(log.message), branch: get_branch_name(log.message), issue: nil }
       end
       logs.compact!
     end

data/lib/auto_release_note/version.rb

@@ -1,3 +1,3 @@
 module AutoReleaseNote
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: auto_release_note
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - iaia