mr_bump 0.3.5 → 0.3.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2IwZTVlYTM1MWZmMTNiYzFiYzUzMjczODFiMjMwNjU1ZTEyMGQxOA==
+    NjQ1YzdhMzBhYTY0YTkyMmYwMDM2YzBjNzY5OWZmN2UzZmE1MTU0Yg==
   data.tar.gz: !binary |-
-    Zjk1NDg5MDkxZmZlYjk2MzI4YzA2ZWY1MWQ2ZWEzYjY5MDEzMTdiMg==
+    NjAzZTRkNGNmOWY0MTg1MTQxZWVjMWI3OTk2NjdmYTZhYzhhOGMzYg==
 SHA512:
   metadata.gz: !binary |-
-    MTY5NjlkMDE0MmI0NDdhMDM1MTJkYzU3YzMwYThjNmJjOTNmYzBiNzEzZDRi
-    YjQ5OTZjYmRmZTI5ZmM5ODgyNmVjOWUxZmUzNzFjODBmYjNkMTZkOWIyMjA1
-    ODliYzA3ODdiOTBlNWFiZWFmNmJhMGY1MzA5NGE4OTkzMWMwOGE=
+    M2Y3ZDVlM2FlMDk4OTQ4NjEwZjk0OTZiMjhjMzlhN2JkZjIzMGI1NGY1YWM2
+    MjdkODhjZDVkMGY3NmU2OWU4N2ZiYTVjZTJkYzczODBmZDgzMTg2N2VjYTI1
+    ODZmMWJiZDk0OWI3NTliN2Q3NWZhN2ZlMDg3ZjM1ZTRmN2MxNWM=
   data.tar.gz: !binary |-
-    M2NjY2EzMWU0ZDU1YWJjYTU3N2I5ODJkYmMzODc5ODQ0ZjI5OTdlNGU1NDFj
-    ZmIwNDhiMzFkMWIxNGVlYTA0N2M0MzkxM2JlZTg1OTlmMmFkZDU5NmVkYTM5
-    ZDIyNjg2ZDEzYmUwMGMxMWRkZTUwMWJjN2VkMjcwMGQ1YTVkZmM=
+    OTg2NmNjNDU4ZDM0MmIwMjk5OWUwZDk4OGNjNjNjMDAzZTY1YTllYjY0NDBh
+    OGYyMGNmNzlkZTI0YmJhYzE4M2FiMzYwZTdjZDY2OGFlYzFmNDYzOTk3Nzlj
+    NjE4NjMwMjQ3YTRjMTNlNjhmMTI2YzZlNTJiNDFiMDE1ODQ1OGY=

data/bin/mr_bump

@@ -99,7 +99,7 @@ unless develop
       puts github_client.sorted_prs(MrBump.git_config.path)
       loop do
         print 'Enter the PR number to merge : '
-        pr_id = gets.chomp
+        pr_id = STDIN.gets.chomp
         if options[:dryrun]
           puts "dryrun: Would merge ##{pr_id}"
         else
@@ -205,10 +205,13 @@ menu '[A]ccept these changes / Manually [E]dit / [C]ancel Release' do |choice|
   MrBump.file_prepend(changelog, md_changes) unless options[:dryrun]
 end
 
-if run("git commit -m 'Bump version to #{new_release}' -- #{changelog}") &&
+push_branch_cmd = develop ? "git push --set-upstream origin #{new_branch}" : 'git push'
+
+if (!develop || run("git checkout -b #{new_branch}")) &&
+   run("git commit -m 'Bump version to #{new_release}' -- #{changelog}") &&
    run("git tag #{new_release}") &&
-   run('git push && git push --tags') &&
-   (!develop || run("git checkout -b #{new_branch} && git push --set-upstream origin #{new_branch}"))
+   run(push_branch_cmd) &&
+   run("git push origin refs/tags/#{new_release}")
   MrBump.slack_notifier(new_release, changes) unless options[:dryrun]
 
   branch_type = master ? 'master' : 'release'

data/defaults.yml

@@ -24,7 +24,7 @@
 #   - comment_lines: Array of all lines in commit comment
 #   - first_commit_line: The first line of the commit comment
 #   - comment_body: The rest of the lines in the comment
-markdown_template: " * {{branch_type}} - {{dev_id}} - {{first_comment_line}}{{#comment_body}}\n   {{.}}{{/comment_body}}"
+markdown_template: " * {{branch_type}} - {{#dev_id}}{{.}} - {{/dev_id}}{{first_comment_line}}{{#comment_body}}\n   {{.}}{{/comment_body}}"
 
 # Prefix for release branches, this allows arbitrary text to be added before the version number on a release branch
 release_prefix: release/

data/lib/mr_bump.rb

@@ -113,7 +113,7 @@ module MrBump
   def self.change_log_items_for_range(rev, head)
     ignored_branch = Regexp.new("^(#{release_branch_regex}|master|develop)$")
     make_change = lambda do |title, comment = []|
-      change = MrBump::Change.new(config_file, title, comment)
+      change = MrBump::Change.from_gitlog(config_file, title, comment)
       change unless ignored_branch.match(change.branch_name)
     end
 
@@ -146,7 +146,7 @@ module MrBump
 
   def self.slack_notifier(version, changelog)
     if config_file.key? 'slack'
-      MrBump::Slack.new(git_config, config_file['slack']).bump(version, changelog)
+      MrBump::Slack.new(git_config, config_file).bump(version, changelog)
     end
   end
 

data/lib/mr_bump/change.rb

@@ -3,29 +3,36 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 require 'mustache'
+require 'mr_bump/regex_template'
 
 module MrBump
   # This class acts parses merge information from a commit message string
   class Change
     attr_reader :pr_number, :branch_type, :dev_id, :config, :comment_lines, :branch_name
 
-    BRANCH_NAME_FMT = '(?<branch_name>(?<dev_id>\w+[-_]?\d+)?([\w\d\-_/\.])*)'.freeze
-    BRANCH_FMT = "((?<branch_type>bugfix|feature|hotfix)/)?#{BRANCH_NAME_FMT}".freeze
-    MERGE_PR_FMT = "^Merge pull request #(?<pr_number>\\d+) from [\\w\\-_]+/#{BRANCH_FMT}".freeze
-    MERGE_MANUAL_FMT = "^Merge branch '#{BRANCH_FMT}'".freeze
-    MERGE_REGEX = Regexp.new(MERGE_PR_FMT + '|' + MERGE_MANUAL_FMT).freeze
+    BRANCH_TYPES = %w(Bugfix Feature Hotfix Task).freeze
 
-    def initialize(config, commit_msg, comment_lines)
-      matches = MERGE_REGEX.match(commit_msg)
-      raise ArgumentError, "Couldn't extract merge information from commit message " \
-                           "'#{commit_msg}'" unless matches
+    FORMATS = {
+      dev_id: '\w+[-_]?\d+',
+      branch_type: "#{BRANCH_TYPES.join('|')}",
+      pr_number: '\d+',
+      first_comment_line: '(?=\w)[^\n]*',
+      comment_body: '(?=\w)[^\n]*'
+    }.freeze
+
+    BRANCH_FMT = "((?<branch_type>#{FORMATS[:branch_type]})/)?(?<branch_name>(?<dev_id>#{FORMATS[:dev_id]})?([\\w\\d\\-_/\\.])*)".freeze
+    MERGE_PR_FMT = "^Merge pull request #(?<pr_number>#{FORMATS[:pr_number]}) from [\\w\\-_]+/#{BRANCH_FMT}/?".freeze
+    MERGE_MANUAL_FMT = "^Merge branch '(#{BRANCH_FMT}/?)'".freeze
+    MERGE_REGEX = Regexp.new(MERGE_PR_FMT + '|' + MERGE_MANUAL_FMT, 'i').freeze
+
+    def initialize(config, branch_type = nil, branch_name = nil, dev_id = nil, pr_number = nil, comment_lines = nil)
       @config = config
-      @branch_type = (matches['branch_type'] || 'Task').capitalize
-      @branch_name = matches['branch_name']
-      @dev_id = matches['dev_id'] || 'UNKNOWN'
-      @pr_number = matches['pr_number'] || ''
+      @branch_type = (branch_type || 'Task')
+      @branch_name = branch_name
+      @dev_id = dev_id
+      @pr_number = pr_number || ''
       @comment_lines = Array(comment_lines)
-      unless @comment_lines.empty? || @dev_id == 'UNKNOWN'
+      unless @comment_lines.empty? || @dev_id.nil?
         id = Regexp.escape(@dev_id)
         prefix_regex = /^(\[#{id}\]|\(#{id}\)|#{id})\s*([:\-]\s*)?/
         @comment_lines[0] = @comment_lines[0].sub(prefix_regex, '')
@@ -43,5 +50,44 @@ module MrBump
     def to_md
       Mustache.render(config['markdown_template'], self)
     end
+
+    def self.from_gitlog(config, commit_msg, comment_lines)
+      matches = MERGE_REGEX.match(commit_msg)
+      raise ArgumentError, "Couldn't extract merge information from commit message " \
+                           "'#{commit_msg}'" unless matches
+      Change.new(
+        config,
+        (matches['branch_type'] || 'task').capitalize,
+        matches['branch_name'],
+        matches['dev_id'],
+        matches['pr_number'],
+        comment_lines
+      )
+    end
+
+    def self.from_md(config, md)
+      regex = RegexTemplate.render(config['markdown_template'], FORMATS, 'i')
+      matches = regex.match md
+      raise ArgumentError, "Couldn't extract merge information from markdown " \
+                           "'#{md}'" unless matches
+      # Convert whole string matches into smaller individual matches
+      match_hash = FORMATS.map do |key, reg|
+        key = key.to_s
+        find = matches.names.include?(key) ? matches[key] : ''
+        [key.to_s, find.scan(Regexp.new(reg)).reject(&:empty?)]
+      end
+      match_hash = Hash[match_hash]
+
+      comment_lines = match_hash['first_comment_line'] + match_hash['comment_body']
+
+      Change.new(
+        config,
+        (match_hash['branch_type'].first || 'task').capitalize,
+        nil,
+        match_hash['dev_id'].first,
+        match_hash['pr_number'].first,
+        comment_lines
+      )
+    end
   end
 end

data/lib/mr_bump/regex_template.rb

@@ -0,0 +1,57 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+module MrBump
+  class RegexTemplate < Mustache
+    def render(data = template, ctx = {}, opts = '')
+      Regexp.new(super(data, ctx), opts)
+    end
+
+    class Template < Mustache::Template
+      def compile(src = @source)
+        Generator.new.compile(tokens(src))
+      end
+    end
+
+    def self.templateify(obj, _options = {})
+      obj.is_a?(Template) ? obj : Template.new(obj)
+    end
+
+    class Generator < Mustache::Generator
+      def str(s)
+        Regexp.escape(super)
+      end
+
+      def ev(s)
+        "' + (#{s}) + '"
+      end
+      def compile(exp)
+        "'#{compile!(exp)}'"
+      end
+
+      def make_group(names, regex)
+        return regex if names.empty?
+        "(?<#{names.join('.')}>#{regex})"
+      end
+
+      def on_etag(name, _offset)
+        make_group(name[2], ev(compile!(name).to_s))
+      end
+
+      def on_utag(name, _offset)
+        make_group(name[2], ev(compile!(name).to_s))
+      end
+
+      def on_section(name, _offset, content, _raw, _delims)
+        one_repeat = ev("v = #{compile!(name)}; ctx.push(v); r = '#{compile!(content)}'; ctx.pop; r;")
+        make_group(name[2], "(#{one_repeat})*")
+      end
+
+      def on_inverted_section(name, _offset, content, _raw, _delims)
+        one_repeat = ev("v = #{compile!(name)}; ctx.push(v); r = '#{compile!(content)}'; ctx.pop; r;")
+        make_group( name[2], "(#{one_repeat})?")
+      end
+    end
+  end
+end

data/lib/mr_bump/slack.rb

@@ -8,12 +8,14 @@ module MrBump
   class Slack
     attr_accessor :webhook, :username, :jira_url, :icon, :git
 
-    def initialize(git_config, opts)
+    def initialize(git_config, config)
+      opts = config['slack'] || {}
       raise ArgumentError, 'No Slack webhook found.' unless opts['webhook_url']
       @webhook = opts['webhook_url']
       @username = opts['username'] || 'Mr Bump'
       @jira_url = opts['jira_url']
       @icon = Array(opts['icon']).sample
+      @config = config
       @git = git_config
     end
 
@@ -29,7 +31,13 @@ module MrBump
     end
 
     def jira_ids(changes)
-      changes.split('* ').map { |i| i.split(' - ', 3)[1] }.compact
+      changes.split(/$\n?(?=\s*\*)/).map do |i|
+        begin
+          MrBump::Change.from_md(@config, i).dev_id
+        rescue ArgumentError
+          nil
+        end
+      end.compact
     end
 
     def jira_urls(changes)

data/spec/change_spec.rb

@@ -8,275 +8,537 @@ require 'mr_bump/change'
 describe MrBump::Change do
   let(:config) do
     {
-      'markdown_template' => ' * {{branch_type}} - {{dev_id}} - {{first_comment_line}}' \
-                             "{{#comment_body}}\n  {{.}}{{/comment_body}}"
+      'markdown_template' => ' * {{branch_type}} - {{#dev_id}}{{.}} - {{/dev_id}}' \
+                             "{{first_comment_line}}{{#comment_body}}\n  {{.}}{{/comment_body}}"
     }
   end
 
-  let(:change) { described_class.new(config, merge_str, ['Line 1', 'Line 2']) }
+  context 'when loading from git log message' do
+    let(:change) { described_class.from_gitlog(config, merge_str, ['Line 1', 'Line 2']) }
 
-  context 'when given a merge string in the default PR format for a feature' do
-    let(:merge_str) { 'Merge pull request #555 from AGithubUsername/feature/DEV-1_Stuff' }
+    context 'when given a merge string in the default PR format for a feature' do
+      let(:merge_str) { 'Merge pull request #555 from AGithubUsername/feature/DEV-1_Stuff' }
 
-    it 'extracts the correct PR Number' do
-      expect(change.pr_number).to eq('555')
-    end
+      it 'extracts the correct PR Number' do
+        expect(change.pr_number).to eq('555')
+      end
 
-    it 'extracts the correct branch type' do
-      expect(change.branch_type).to eq('Feature')
-    end
+      it 'extracts the correct branch type' do
+        expect(change.branch_type).to eq('Feature')
+      end
 
-    it 'extracts the correct dev ID' do
-      expect(change.dev_id).to eq('DEV-1')
-    end
+      it 'extracts the correct dev ID' do
+        expect(change.dev_id).to eq('DEV-1')
+      end
 
-    it 'renders to markdown correctly' do
-      expect(change.to_md).to eq(" * Feature - DEV-1 - Line 1\n  Line 2")
+      it 'renders to markdown correctly' do
+        expect(change.to_md).to eq(" * Feature - DEV-1 - Line 1\n  Line 2")
+      end
     end
-  end
 
-  context 'when given a merge string in the default PR format for a feature' do
-    let(:merge_str) { 'Merge pull request #555 from AGithubUsername/feature/Stuff' }
+    context 'when given a merge string in the default PR format for a feature' do
+      let(:merge_str) { 'Merge pull request #555 from AGithubUsername/feature/Stuff' }
 
-    it 'extracts the correct PR Number' do
-      expect(change.pr_number).to eq('555')
-    end
+      it 'extracts the correct PR Number' do
+        expect(change.pr_number).to eq('555')
+      end
 
-    it 'extracts the correct branch type' do
-      expect(change.branch_type).to eq('Feature')
-    end
+      it 'extracts the correct branch type' do
+        expect(change.branch_type).to eq('Feature')
+      end
 
-    it 'defaults the dev ID to UNKNOWN' do
-      expect(change.dev_id).to eq('UNKNOWN')
-    end
+      it 'fails to extract dev ID' do
+        expect(change.dev_id).to be_nil
+      end
 
-    it 'renders to markdown correctly' do
-      expect(change.to_md).to eq(" * Feature - UNKNOWN - Line 1\n  Line 2")
+      it 'renders to markdown correctly' do
+        expect(change.to_md).to eq(" * Feature - Line 1\n  Line 2")
+      end
     end
-  end
 
-  context 'when given a merge string in the default PR format for a bugfix' do
-    let(:merge_str) { 'Merge pull request #555 from AGithubUsername/bugfix/DEV-1_Stuff' }
+    context 'when given a merge string in the default PR format for a bugfix' do
+      let(:merge_str) { 'Merge pull request #555 from AGithubUsername/bugfix/DEV-1_Stuff' }
 
-    it 'extracts the correct PR Number' do
-      expect(change.pr_number).to eq('555')
-    end
+      it 'extracts the correct PR Number' do
+        expect(change.pr_number).to eq('555')
+      end
 
-    it 'extracts the correct branch type' do
-      expect(change.branch_type).to eq('Bugfix')
-    end
+      it 'extracts the correct branch type' do
+        expect(change.branch_type).to eq('Bugfix')
+      end
 
-    it 'extracts the correct dev ID' do
-      expect(change.dev_id).to eq('DEV-1')
-    end
+      it 'extracts the correct dev ID' do
+        expect(change.dev_id).to eq('DEV-1')
+      end
 
-    it 'renders to markdown correctly' do
-      expect(change.to_md).to eq(" * Bugfix - DEV-1 - Line 1\n  Line 2")
+      it 'renders to markdown correctly' do
+        expect(change.to_md).to eq(" * Bugfix - DEV-1 - Line 1\n  Line 2")
+      end
     end
-  end
 
-  context 'when given a merge string in the default PR format for a bugfix' do
-    let(:merge_str) { 'Merge pull request #555 from AGithubUsername/bugfix/Stuff' }
+    context 'when given a merge string in the default PR format for a bugfix' do
+      let(:merge_str) { 'Merge pull request #555 from AGithubUsername/bugfix/Stuff' }
 
-    it 'extracts the correct PR Number' do
-      expect(change.pr_number).to eq('555')
-    end
+      it 'extracts the correct PR Number' do
+        expect(change.pr_number).to eq('555')
+      end
 
-    it 'extracts the correct branch type' do
-      expect(change.branch_type).to eq('Bugfix')
-    end
+      it 'extracts the correct branch type' do
+        expect(change.branch_type).to eq('Bugfix')
+      end
 
-    it 'defaults the dev ID to UNKNOWN' do
-      expect(change.dev_id).to eq('UNKNOWN')
-    end
+      it 'fails to extract dev ID' do
+        expect(change.dev_id).to be_nil
+      end
 
-    it 'renders to markdown correctly' do
-      expect(change.to_md).to eq(" * Bugfix - UNKNOWN - Line 1\n  Line 2")
+      it 'renders to markdown correctly' do
+        expect(change.to_md).to eq(" * Bugfix - Line 1\n  Line 2")
+      end
     end
-  end
 
-  context 'when given a merge string in the default PR format for a hotfix' do
-    let(:merge_str) { 'Merge pull request #555 from AGithubUsername/hotfix/DEV-1_Stuff' }
+    context 'when given a merge string in the default PR format for a hotfix' do
+      let(:merge_str) { 'Merge pull request #555 from AGithubUsername/hotfix/DEV-1_Stuff' }
 
-    it 'extracts the correct PR Number' do
-      expect(change.pr_number).to eq('555')
-    end
+      it 'extracts the correct PR Number' do
+        expect(change.pr_number).to eq('555')
+      end
 
-    it 'extracts the correct branch type' do
-      expect(change.branch_type).to eq('Hotfix')
-    end
+      it 'extracts the correct branch type' do
+        expect(change.branch_type).to eq('Hotfix')
+      end
 
-    it 'extracts the correct dev ID' do
-      expect(change.dev_id).to eq('DEV-1')
-    end
+      it 'extracts the correct dev ID' do
+        expect(change.dev_id).to eq('DEV-1')
+      end
 
-    it 'renders to markdown correctly' do
-      expect(change.to_md).to eq(" * Hotfix - DEV-1 - Line 1\n  Line 2")
+      it 'renders to markdown correctly' do
+        expect(change.to_md).to eq(" * Hotfix - DEV-1 - Line 1\n  Line 2")
+      end
     end
-  end
 
-  context 'when given a merge string in the default PR format for a hotfix' do
-    let(:merge_str) { 'Merge pull request #555 from AGithubUsername/hotfix/Stuff' }
+    context 'when given a merge string in the default PR format for a hotfix' do
+      let(:merge_str) { 'Merge pull request #555 from AGithubUsername/hotfix/Stuff' }
 
-    it 'extracts the correct PR Number' do
-      expect(change.pr_number).to eq('555')
-    end
+      it 'extracts the correct PR Number' do
+        expect(change.pr_number).to eq('555')
+      end
 
-    it 'extracts the correct branch type' do
-      expect(change.branch_type).to eq('Hotfix')
-    end
+      it 'extracts the correct branch type' do
+        expect(change.branch_type).to eq('Hotfix')
+      end
 
-    it 'defaults the dev ID to UNKNOWN' do
-      expect(change.dev_id).to eq('UNKNOWN')
-    end
+      it 'fails to extract dev ID' do
+        expect(change.dev_id).to be_nil
+      end
 
-    it 'renders to markdown correctly' do
-      expect(change.to_md).to eq(" * Hotfix - UNKNOWN - Line 1\n  Line 2")
+      it 'renders to markdown correctly' do
+        expect(change.to_md).to eq(" * Hotfix - Line 1\n  Line 2")
+      end
     end
-  end
 
-  context 'when given a merge string in the default manual format for a feature' do
-    let(:merge_str) { "Merge branch 'feature/DEV-1_Stuff'" }
+    context 'when given a merge string in the default manual format for a feature' do
+      let(:merge_str) { "Merge branch 'feature/DEV-1_Stuff'" }
 
-    it 'defaults PR Number to a blank string' do
-      expect(change.pr_number).to eq('')
-    end
+      it 'defaults PR Number to a blank string' do
+        expect(change.pr_number).to eq('')
+      end
 
-    it 'extracts the correct branch type' do
-      expect(change.branch_type).to eq('Feature')
-    end
+      it 'extracts the correct branch type' do
+        expect(change.branch_type).to eq('Feature')
+      end
 
-    it 'extracts the correct dev ID' do
-      expect(change.dev_id).to eq('DEV-1')
-    end
+      it 'extracts the correct dev ID' do
+        expect(change.dev_id).to eq('DEV-1')
+      end
 
-    it 'renders to markdown correctly' do
-      expect(change.to_md).to eq(" * Feature - DEV-1 - Line 1\n  Line 2")
+      it 'renders to markdown correctly' do
+        expect(change.to_md).to eq(" * Feature - DEV-1 - Line 1\n  Line 2")
+      end
     end
-  end
 
-  context 'when given a merge string in the default PR format for a feature' do
-    let(:merge_str) { "Merge branch 'feature/Stuff'" }
+    context 'when given a merge string in the default PR format for a feature' do
+      let(:merge_str) { "Merge branch 'feature/Stuff'" }
 
-    it 'defaults PR Number to a blank string' do
-      expect(change.pr_number).to eq('')
-    end
+      it 'defaults PR Number to a blank string' do
+        expect(change.pr_number).to eq('')
+      end
 
-    it 'extracts the correct branch type' do
-      expect(change.branch_type).to eq('Feature')
-    end
+      it 'extracts the correct branch type' do
+        expect(change.branch_type).to eq('Feature')
+      end
+
+      it 'fails to extract dev ID' do
+        expect(change.dev_id).to be_nil
+      end
 
-    it 'defaults the dev ID to UNKNOWN' do
-      expect(change.dev_id).to eq('UNKNOWN')
+      it 'renders to markdown correctly' do
+        expect(change.to_md).to eq(" * Feature - Line 1\n  Line 2")
+      end
     end
 
-    it 'renders to markdown correctly' do
-      expect(change.to_md).to eq(" * Feature - UNKNOWN - Line 1\n  Line 2")
+    context 'when given a merge string in the default manual format for a bugfix' do
+      let(:merge_str) { "Merge branch 'bugfix/DEV-1_Stuff'" }
+
+      it 'defaults PR Number to a blank string' do
+        expect(change.pr_number).to eq('')
+      end
+
+      it 'extracts the correct branch type' do
+        expect(change.branch_type).to eq('Bugfix')
+      end
+
+      it 'extracts the correct dev ID' do
+        expect(change.dev_id).to eq('DEV-1')
+      end
+
+      it 'renders to markdown correctly' do
+        expect(change.to_md).to eq(" * Bugfix - DEV-1 - Line 1\n  Line 2")
+      end
     end
-  end
 
-  context 'when given a merge string in the default manual format for a bugfix' do
-    let(:merge_str) { "Merge branch 'bugfix/DEV-1_Stuff'" }
+    context 'when given a merge string in the default PR format for a bugfix' do
+      let(:merge_str) { "Merge branch 'bugfix/Stuff'" }
+
+      it 'defaults PR Number to a blank string' do
+        expect(change.pr_number).to eq('')
+      end
+
+      it 'extracts the correct branch type' do
+        expect(change.branch_type).to eq('Bugfix')
+      end
+
+      it 'fails to extract dev ID' do
+        expect(change.dev_id).to be_nil
+      end
 
-    it 'defaults PR Number to a blank string' do
-      expect(change.pr_number).to eq('')
+      it 'renders to markdown correctly' do
+        expect(change.to_md).to eq(" * Bugfix - Line 1\n  Line 2")
+      end
     end
 
-    it 'extracts the correct branch type' do
-      expect(change.branch_type).to eq('Bugfix')
+    context 'when given a merge string in the default manual format for a hotfix' do
+      let(:merge_str) { "Merge branch 'hotfix/DEV-1_Stuff'" }
+
+      it 'defaults PR Number to a blank string' do
+        expect(change.pr_number).to eq('')
+      end
+
+      it 'extracts the correct branch type' do
+        expect(change.branch_type).to eq('Hotfix')
+      end
+
+      it 'extracts the correct dev ID' do
+        expect(change.dev_id).to eq('DEV-1')
+      end
+
+      it 'renders to markdown correctly' do
+        expect(change.to_md).to eq(" * Hotfix - DEV-1 - Line 1\n  Line 2")
+      end
     end
 
-    it 'extracts the correct dev ID' do
-      expect(change.dev_id).to eq('DEV-1')
+    context 'when given a merge string in the default PR format for a hotfix' do
+      let(:merge_str) { "Merge branch 'hotfix/Stuff'" }
+
+      it 'defaults PR Number to a blank string' do
+        expect(change.pr_number).to eq('')
+      end
+
+      it 'extracts the correct branch type' do
+        expect(change.branch_type).to eq('Hotfix')
+      end
+
+      it 'fails to extract dev ID' do
+        expect(change.dev_id).to be_nil
+      end
+
+      it 'renders to markdown correctly' do
+        expect(change.to_md).to eq(" * Hotfix - Line 1\n  Line 2")
+      end
     end
 
-    it 'renders to markdown correctly' do
-      expect(change.to_md).to eq(" * Bugfix - DEV-1 - Line 1\n  Line 2")
+    context 'when no merge type given' do
+      let(:merge_str) { 'Merge pull request #1224 from Xulaus/gem_bump' }
+      it 'extracts the correct PR Number' do
+        expect(change.pr_number).to eq('1224')
+      end
+
+      it 'defaults the branch type to "Task"' do
+        expect(change.branch_type).to eq('Task')
+      end
+
+      it 'fails to extract dev ID' do
+        expect(change.dev_id).to be_nil
+      end
+
+      it 'renders to markdown correctly' do
+        expect(change.to_md).to eq(" * Task - Line 1\n  Line 2")
+      end
     end
   end
 
-  context 'when given a merge string in the default PR format for a bugfix' do
-    let(:merge_str) { "Merge branch 'bugfix/Stuff'" }
+  context 'when loading from markdown' do
+    let(:change) { described_class.from_md(config, md_str) }
+
+    context 'with bugfix and no DevID given' do
+      let(:md_str) { " * Bugfix - Line 1\n  Line 2\n  Line 3" }
+
+      it 'extracts the correct branch type' do
+        expect(change.branch_type).to eq('Bugfix')
+      end
 
-    it 'defaults PR Number to a blank string' do
-      expect(change.pr_number).to eq('')
+      it 'fails to extract dev ID' do
+        expect(change.dev_id).to be_nil
+      end
+
+      it 'renders to markdown correctly' do
+        expect(change.to_md).to eq(md_str)
+      end
     end
 
-    it 'extracts the correct branch type' do
-      expect(change.branch_type).to eq('Bugfix')
+    context 'with feature and no DevID given' do
+      let(:md_str) { " * Feature - Line 1\n  Line 2\n  Line 3" }
+
+      it 'extracts the correct branch type' do
+        expect(change.branch_type).to eq('Feature')
+      end
+
+      it 'fails to extract dev ID' do
+        expect(change.dev_id).to be_nil
+      end
+
+      it 'renders to markdown correctly' do
+        expect(change.to_md).to eq(md_str)
+      end
     end
 
-    it 'defaults the dev ID to UNKNOWN' do
-      expect(change.dev_id).to eq('UNKNOWN')
+    context 'with hotfix and no DevID given' do
+      let(:md_str) { " * Hotfix - Line 1\n  Line 2\n  Line 3" }
+
+      it 'extracts the correct branch type' do
+        expect(change.branch_type).to eq('Hotfix')
+      end
+
+      it 'fails to extract dev ID' do
+        expect(change.dev_id).to be_nil
+      end
+
+      it 'renders to markdown correctly' do
+        expect(change.to_md).to eq(md_str)
+      end
     end
 
-    it 'renders to markdown correctly' do
-      expect(change.to_md).to eq(" * Bugfix - UNKNOWN - Line 1\n  Line 2")
+    context 'with task and no DevID given' do
+      let(:md_str) { " * Task - Line 1\n  Line 2\n  Line 3" }
+
+      it 'defaults the branch type to "Task"' do
+        expect(change.branch_type).to eq('Task')
+      end
+
+      it 'fails to extract dev ID' do
+        expect(change.dev_id).to be_nil
+      end
+
+      it 'renders to markdown correctly' do
+        expect(change.to_md).to eq(md_str)
+      end
     end
-  end
 
-  context 'when given a merge string in the default manual format for a hotfix' do
-    let(:merge_str) { "Merge branch 'hotfix/DEV-1_Stuff'" }
+    context 'with bugfix and no DevID given, and no second line' do
+      let(:md_str) { " * Bugfix - Line 1" }
+
+      it 'extracts the correct branch type' do
+        expect(change.branch_type).to eq('Bugfix')
+      end
+
+      it 'fails to extract dev ID' do
+        expect(change.dev_id).to be_nil
+      end
 
-    it 'defaults PR Number to a blank string' do
-      expect(change.pr_number).to eq('')
+      it 'renders to markdown correctly' do
+        expect(change.to_md).to eq(md_str)
+      end
     end
 
-    it 'extracts the correct branch type' do
-      expect(change.branch_type).to eq('Hotfix')
+    context 'with feature and no DevID given, and no second line' do
+      let(:md_str) { " * Feature - Line 1" }
+
+      it 'extracts the correct branch type' do
+        expect(change.branch_type).to eq('Feature')
+      end
+
+      it 'fails to extract dev ID' do
+        expect(change.dev_id).to be_nil
+      end
+
+      it 'renders to markdown correctly' do
+        expect(change.to_md).to eq(md_str)
+      end
     end
 
-    it 'extracts the correct dev ID' do
-      expect(change.dev_id).to eq('DEV-1')
+    context 'with hotfix and no DevID given, and no second line' do
+      let(:md_str) { " * Hotfix - Line 1" }
+
+      it 'extracts the correct branch type' do
+        expect(change.branch_type).to eq('Hotfix')
+      end
+
+      it 'fails to extract dev ID' do
+        expect(change.dev_id).to be_nil
+      end
+
+      it 'renders to markdown correctly' do
+        expect(change.to_md).to eq(md_str)
+      end
     end
 
-    it 'renders to markdown correctly' do
-      expect(change.to_md).to eq(" * Hotfix - DEV-1 - Line 1\n  Line 2")
+    context 'with task and no DevID given, and no second line' do
+      let(:md_str) { " * Task - Line 1" }
+
+      it 'defaults the branch type to "Task"' do
+        expect(change.branch_type).to eq('Task')
+      end
+
+      it 'fails to extract dev ID' do
+        expect(change.dev_id).to be_nil
+      end
+
+      it 'renders to markdown correctly' do
+        expect(change.to_md).to eq(md_str)
+      end
     end
-  end
 
-  context 'when given a merge string in the default PR format for a hotfix' do
-    let(:merge_str) { "Merge branch 'hotfix/Stuff'" }
+    context 'with bugfix and no DevID given' do
+      let(:md_str) { " * Bugfix - ASDASD-123123 - Line 1\n  Line 2\n  Line 3" }
+
+      it 'extracts the correct branch type' do
+        expect(change.branch_type).to eq('Bugfix')
+      end
+
+      it 'extracts the correct dev ID' do
+        expect(change.dev_id).to eq('ASDASD-123123')
+      end
 
-    it 'defaults PR Number to a blank string' do
-      expect(change.pr_number).to eq('')
+      it 'renders to markdown correctly' do
+        expect(change.to_md).to eq(md_str)
+      end
     end
 
-    it 'extracts the correct branch type' do
-      expect(change.branch_type).to eq('Hotfix')
+    context 'with feature and no DevID given' do
+      let(:md_str) { " * Feature - WHUT00 - Line 1\n  Line 2\n  Line 3" }
+
+      it 'extracts the correct branch type' do
+        expect(change.branch_type).to eq('Feature')
+      end
+
+      it 'extracts the correct dev ID' do
+        expect(change.dev_id).to eq('WHUT00')
+      end
+
+      it 'renders to markdown correctly' do
+        expect(change.to_md).to eq(md_str)
+      end
     end
 
-    it 'defaults the dev ID to UNKNOWN' do
-      expect(change.dev_id).to eq('UNKNOWN')
+    context 'with hotfix and no DevID given' do
+      let(:md_str) { " * Hotfix - WJNASD-123 - Line 1\n  Line 2\n  Line 3" }
+
+      it 'extracts the correct branch type' do
+        expect(change.branch_type).to eq('Hotfix')
+      end
+
+      it 'extracts the correct dev ID' do
+        expect(change.dev_id).to eq('WJNASD-123')
+      end
+
+      it 'renders to markdown correctly' do
+        expect(change.to_md).to eq(md_str)
+      end
     end
 
-    it 'renders to markdown correctly' do
-      expect(change.to_md).to eq(" * Hotfix - UNKNOWN - Line 1\n  Line 2")
+    context 'with task and no DevID given' do
+      let(:md_str) { " * Task - lqiwhuweh213 - Line 1\n  Line 2\n  Line 3" }
+
+      it 'defaults the branch type to "Task"' do
+        expect(change.branch_type).to eq('Task')
+      end
+
+      it 'extracts the correct dev ID' do
+        expect(change.dev_id).to eq('lqiwhuweh213')
+      end
+
+      it 'renders to markdown correctly' do
+        expect(change.to_md).to eq(md_str)
+      end
     end
-  end
 
-  context 'when no merge type given' do
-    let(:merge_str) { 'Merge pull request #1224 from Xulaus/gem_bump' }
-    it 'extracts the correct PR Number' do
-      expect(change.pr_number).to eq('1224')
+    context 'with bugfix and no DevID given, and no second line' do
+      let(:md_str) { " * Bugfix - DEV-123 - Line 1" }
+
+      it 'extracts the correct branch type' do
+        expect(change.branch_type).to eq('Bugfix')
+      end
+
+      it 'extracts the correct dev ID' do
+        expect(change.dev_id).to eq('DEV-123')
+      end
+
+      it 'renders to markdown correctly' do
+        expect(change.to_md).to eq(md_str)
+      end
     end
 
-    it 'defaults the branch type to "Task"' do
-      expect(change.branch_type).to eq('Task')
+    context 'with feature and no DevID given, and no second line' do
+      let(:md_str) { " * Feature - SAMBA-123 - Line 1" }
+
+      it 'extracts the correct branch type' do
+        expect(change.branch_type).to eq('Feature')
+      end
+
+      it 'extracts the correct dev ID' do
+        expect(change.dev_id).to eq('SAMBA-123')
+      end
+
+      it 'renders to markdown correctly' do
+        expect(change.to_md).to eq(md_str)
+      end
     end
 
-    it 'defaults the dev ID to UNKNOWN' do
-      expect(change.dev_id).to eq('UNKNOWN')
+    context 'with hotfix and no DevID given, and no second line' do
+      let(:md_str) { " * Hotfix - asf1 - Line 1" }
+
+      it 'extracts the correct branch type' do
+        expect(change.branch_type).to eq('Hotfix')
+      end
+
+      it 'extracts the correct dev ID' do
+        expect(change.dev_id).to eq('asf1')
+      end
+
+      it 'renders to markdown correctly' do
+        expect(change.to_md).to eq(md_str)
+      end
     end
 
-    it 'renders to markdown correctly' do
-      expect(change.to_md).to eq(" * Task - UNKNOWN - Line 1\n  Line 2")
+    context 'with task and no DevID given, and no second line' do
+      let(:md_str) { " * Task - JBAJSDB0123 - Line 1" }
+
+      it 'defaults the branch type to "Task"' do
+        expect(change.branch_type).to eq('Task')
+      end
+
+      it 'extracts the correct dev ID' do
+        expect(change.dev_id).to eq('JBAJSDB0123')
+      end
+
+      it 'renders to markdown correctly' do
+        expect(change.to_md).to eq(md_str)
+      end
     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']) }
+    let(:change) { described_class.from_gitlog(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")
@@ -285,7 +547,7 @@ describe MrBump::Change do
 
   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']) }
+    let(:change) { described_class.from_gitlog(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")
@@ -294,7 +556,7 @@ describe MrBump::Change do
 
   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']) }
+    let(:change) { described_class.from_gitlog(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")
@@ -303,7 +565,7 @@ describe MrBump::Change do
 
   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']) }
+    let(:change) { described_class.from_gitlog(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")
@@ -312,7 +574,7 @@ describe MrBump::Change do
 
   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']) }
+    let(:change) { described_class.from_gitlog(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")
@@ -321,7 +583,7 @@ describe MrBump::Change do
 
   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']) }
+    let(:change) { described_class.from_gitlog(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")
@@ -330,7 +592,7 @@ describe MrBump::Change do
 
   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']) }
+    let(:change) { described_class.from_gitlog(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")
@@ -339,7 +601,7 @@ describe MrBump::Change do
 
   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, []) }
+    let(:change) { described_class.from_gitlog(config, merge_str, []) }
 
     it 'renders to markdown correctly' do
       expect(change.to_md).to eq(" * Hotfix - DEV-1 - ")

data/spec/slack_spec.rb

@@ -8,9 +8,11 @@ require 'mr_bump/slack'
 describe MrBump::Slack do
   let(:config) do
     {
-      'webhook_url' => webhook_url,
-      'username' => username,
-      'icon' => icons
+      'slack' => {
+        'webhook_url' => webhook_url,
+        'username' => username,
+        'icon' => icons
+      }
     }
   end
   let(:git_config) { {} }
@@ -94,4 +96,51 @@ describe MrBump::Slack do
       end
     end
   end
+
+  describe '#jira_ids' do
+    let(:result) do
+      described_class.new(
+        {},
+        'slack' => { 'webhook_url' => 'dummy' },
+        'markdown_template' => ' * {{branch_type}} - {{dev_id}} - {{first_comment_line}}' \
+                               "{{#comment_body}}\n  {{.}}{{/comment_body}}"
+      ).jira_ids(changes)
+    end
+
+    context 'when fed mixed changes in the default format' do
+      let(:changes) do
+        <<-CHANGES
+ * Task - HSDA-123 - jsldafbaksjdblkab
+ * Feature - QUAD-213 - asdbasn
+ * Bugfix - UKNO-17 - akssnjlsand;kajnsd
+   asmdhakjsdhgkaadsdasdsaafssdfgadfa
+ * Hotfix - Yo-421 - kjfnjdns
+CHANGES
+      end
+      let(:devids) { ['HSDA-123', 'QUAD-213', 'UKNO-17', 'Yo-421'] }
+
+      it "extracts the DevID's where possible" do
+        expect(result).to eq(devids)
+      end
+    end
+
+    context "when fed mixed changes without DevID's" do
+      let(:changes) do
+        <<-CHANGES
+ * Task - HSDA-123 - jsldafbaksjdblkab
+ * Feature - asd213
+ * Bugfix - UKNO-17 - akssnjlsand;kajnsd
+   asmdhakjsdhgkaadsdasdsaafssdfgadfa
+ * Bugfix - akssnjlsand;kajnsd
+   asmdhakjsdhgkaadsdasdsaafssdfgadfa
+ * Hotfix - Yo-421 - kjfnjdns
+CHANGES
+      end
+      let(:devids) { ['HSDA-123', 'UKNO-17', 'Yo-421'] }
+
+      it "extracts the DevID's where possible" do
+        expect(result).to eq(devids)
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mr_bump
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Richard Fitzgerald
@@ -29,30 +29,42 @@ dependencies:
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - <=
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - <=
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.99.3
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.99.3
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: OptionParser
   requirement: !ruby/object:Gem::Requirement
@@ -95,6 +107,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-readline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -179,6 +205,7 @@ files:
 - lib/mr_bump/config.rb
 - lib/mr_bump/git_api.rb
 - lib/mr_bump/git_config.rb
+- lib/mr_bump/regex_template.rb
 - lib/mr_bump/slack.rb
 - lib/mr_bump/version.rb
 - spec/change_spec.rb