mr_bump 0.3.3 → 0.3.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmM5YzE4NTA2NzYzNjZiM2IxZmQ5NGMxMjY2NjgzZDYwOTRiNjc4YQ==
+    ZWE5YzJmNjc4YjgwNjRlZTQyNDg4M2Q2ZWMyMDFmYzM2NDdkZDliNA==
   data.tar.gz: !binary |-
-    MzJhOTI3ZTgwODgwZThjZDM4MTczYWQxMWIwYWIwMmQ2NDk1OTE1Mg==
+    NWJmZWNhMWRmYjA3MGU0YWNkZGViNjVmZThkNDU3NWJmMDdlMGY3Zg==
 SHA512:
   metadata.gz: !binary |-
-    MWY5MDMxMDBiYzM5YWI2ZDJmN2NkZmI5Nzk0YjJjYTAxNmU4MDUxOTk4YjFl
-    ZDhlZWZkYzliNTc3MjJiNmRjM2U1YmQ2NWJhYjA1ZGI0MTliNTZhNDc4MTZh
-    NjVkOGYwN2UyZDk1NjU5YzFkMmI3ZDBjNjljZTczOTk1MGY0YmI=
+    YzAyNzM0MTMzYjQ0MThlY2ZjNGFlYTVhNmRkOGQ5MTE0NGE0MGQyZTJmMGM5
+    ZjM1MmEyNTlmMGQ4MTg3MjA3MjY0YWIxYTM2NTE4M2I5YzRlYjE5OWIzMzM4
+    YzVhMGNmZGJmY2Q3ZTI1YzcwM2QzYjkwN2QxYjJkYTQwYTJmZjU=
   data.tar.gz: !binary |-
-    MzVlOWZjODRlY2UxZmUxZjk5OGQzOTBhODRhYmZiYTgwMDBhZjkyODdlMTBi
-    ZWI4NGE1MmZiZjJiMTE0MWEyZTdkYjU5NmMwMGY4YzNmYjBhYmE1MjAzNDJj
-    OGZhYTljNzhlZDNkZjVkYTg1NWFkYjU5MzQ2NjE0MzIxMjQyMzk=
+    ZTVlYjQ3YWQ5ZmU3MDNlZTk4YmVhODhiZTU2MDFhMmZlOWUwNWNmZWNmZmVm
+    NDdkMmNjMjBmMmRiNzk2ODg5MGJjMzliYzEzZTA4N2U1YjQzNmU2MzNjMDFm
+    ZTQxZjlhZmYxYjMwMmRlMjc5NDViNDZjMzIzMTg5YTY5ZTc4ZjQ=

data/lib/mr_bump/change.rb

@@ -25,6 +25,11 @@ module MrBump
       @dev_id = matches['dev_id'] || 'UNKNOWN'
       @pr_number = matches['pr_number'] || ''
       @comment_lines = Array(comment_lines)
+      unless @comment_lines.empty? || @dev_id == 'UNKNOWN'
+        id = Regexp.escape(@dev_id)
+        prefix_regex = /^(\[#{id}\]|\(#{id}\)|#{id})\s*([:\-]\s*)?/
+        @comment_lines[0] = @comment_lines[0].sub(prefix_regex, '')
+      end
     end
 
     def first_comment_line

data/spec/change_spec.rb

@@ -273,4 +273,76 @@ describe MrBump::Change do
       expect(change.to_md).to eq(" * Task - UNKNOWN - Line 1\n  Line 2")
     end
   end
+
+  context 'when given a change prefixed with a DevID seperated with a colon' do
+    let(:merge_str) { "Merge branch 'hotfix/DEV-1_Stuff'" }
+    let(:change) { described_class.new(config, merge_str, ['DEV-1: Line 1', 'Line 2']) }
+
+    it 'removes the DevID and renders to markdown correctly' do
+      expect(change.to_md).to eq(" * Hotfix - DEV-1 - Line 1\n  Line 2")
+    end
+  end
+
+  context 'when given a change prefixed with a DevID seperated with a dash' do
+    let(:merge_str) { "Merge branch 'hotfix/DEV-1_Stuff'" }
+    let(:change) { described_class.new(config, merge_str, ['DEV-1 - Line 1', 'Line 2']) }
+
+    it 'removes the DevID and renders to markdown correctly' do
+      expect(change.to_md).to eq(" * Hotfix - DEV-1 - Line 1\n  Line 2")
+    end
+  end
+
+  context 'when given a change prefixed with a DevID seperated with a dash, and in square braces' do
+    let(:merge_str) { "Merge branch 'hotfix/DEV-1_Stuff'" }
+    let(:change) { described_class.new(config, merge_str, ['[DEV-1] - Line 1', 'Line 2']) }
+
+    it 'removes the DevID and renders to markdown correctly' do
+      expect(change.to_md).to eq(" * Hotfix - DEV-1 - Line 1\n  Line 2")
+    end
+  end
+
+  context 'when given a change prefixed with a DevID in square braces' do
+    let(:merge_str) { "Merge branch 'hotfix/DEV-1_Stuff'" }
+    let(:change) { described_class.new(config, merge_str, ['[DEV-1] Line 1', 'Line 2']) }
+
+    it 'removes the DevID and renders to markdown correctly' do
+      expect(change.to_md).to eq(" * Hotfix - DEV-1 - Line 1\n  Line 2")
+    end
+  end
+
+  context 'when given a change prefixed with a DevID in round braces' do
+    let(:merge_str) { "Merge branch 'hotfix/DEV-1_Stuff'" }
+    let(:change) { described_class.new(config, merge_str, ['(DEV-1) Line 1', 'Line 2']) }
+
+    it 'removes the DevID and renders to markdown correctly' do
+      expect(change.to_md).to eq(" * Hotfix - DEV-1 - Line 1\n  Line 2")
+    end
+  end
+
+  context 'when given a change prefixed with a DevID seperated by space only' do
+    let(:merge_str) { "Merge branch 'hotfix/DEV-1_Stuff'" }
+    let(:change) { described_class.new(config, merge_str, ['DEV-1 Line 1', 'Line 2']) }
+
+    it 'leaves the DevID and renders to markdown correctly' do
+      expect(change.to_md).to eq(" * Hotfix - DEV-1 - Line 1\n  Line 2")
+    end
+  end
+
+  context 'when given a change postfixed with a DevID in round braces' do
+    let(:merge_str) { "Merge branch 'hotfix/DEV-1_Stuff'" }
+    let(:change) { described_class.new(config, merge_str, ['Line 1 (DEV-1)', 'Line 2']) }
+
+    it 'leaves the DevID and renders to markdown correctly' do
+      expect(change.to_md).to eq(" * Hotfix - DEV-1 - Line 1 (DEV-1)\n  Line 2")
+    end
+  end
+
+  context 'when given a change with no description' do
+    let(:merge_str) { "Merge branch 'hotfix/DEV-1_Stuff'" }
+    let(:change) { described_class.new(config, merge_str, []) }
+
+    it 'renders to markdown correctly' do
+      expect(change.to_md).to eq(" * Hotfix - DEV-1 - ")
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mr_bump
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Richard Fitzgerald