mr_bump 0.0.10 → 0.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDljMWFkOGIzNmMxZDViNWNmODNiZTdmMjYxNzg2OWJjYmE0NGNiNw==
+    YjZmNTY4ODM4MjMyNzFiNmE4MDY2MWVlOWJmN2YwODhlYzcwYmQwYg==
   data.tar.gz: !binary |-
-    ZGFiZTIwNzI4Njk2YjFhMzA3OTkwNzY4YzI2ZmRlMjdjMjM4NjZlYw==
+    ZDZiNWQwYmJiNmJkMzMzZDYzNjZiMmQyNDJhZmQwZmM5Y2Q0ODRhMg==
 SHA512:
   metadata.gz: !binary |-
-    ZjM5NjZjZjRjODcyNjRkMjg4ZGYxN2E3MDgyOTk0YTM0YTQxNmY2ZWU1MTc0
-    MjZmM2RiNWU1ZDdkMDllYWQyM2UxZjg3ZGJmM2UyYTg0ZTMxOTU2N2FlOGM5
-    ZTJhNTY1OTg0MzFmYmJmMTJkMGE5MjViNTBhOTQ5MDhlZjkxMWY=
+    NGIzNTUwNDc2OTAzOTFhNWY4OGI5MWIyODczMTdkODliYTg2MmUxMWEwNzgx
+    YWE0Mzk1OTA3OWZhMDY5ZWEyZmI3MzIyYTYzMWVkZjdhYjc1NTMxMTE5ZjY3
+    NWU4M2U2ODY0OTMwNjExODRiOTFiZmIwYzkzNTRiNWM0YTJlYjA=
   data.tar.gz: !binary |-
-    ODUxNjNlN2UyMmYzMjAzZjgyMjk0ZThhNDEyYzk3ZjI1ZTUwZWE1NDU0ZTIy
-    MzY3ZGUzZGJiNmViYzQ5ZGZjOGE3NzllYmM3ZjM1NmQ1MjBkMDEwNDBjNzJm
-    NGMyYjViYmViNjQ1NWYwNWE2ZDQ0ZGM2ZDZkOWQyMTQ0NDlmZTA=
+    ODg4MzE1MzZmZGQzYjJiYTk0Y2IyMWJhNDVjODFkNWQyZmMzMDA2Zjg2MzFl
+    ZTlkZjczY2Y2M2JjMmUyYTgzOGFmOWQ3YTdkNjI5OTI2MTMwMDY4ZWI3OWIw
+    MTg5MWVlNWFkYzAyMjEzZmRmNDBiZGZmZWViZTQ3ZGZjMWM0ZTE=

data/bin/mr_bump

@@ -1,10 +1,45 @@
 #!/usr/bin/env ruby
-# Small script to tag releases and update changelogs
+# 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/.
+
+# Script to tag releases and update changelogs
+require 'optparse'
+
 require 'mr_bump'
+require 'mr_bump/git_api'
+
+def menu(text, valid_options, &block)
+  loop do
+    print text + ': '
+    choice = gets.chomp.upcase
+    if valid_options.include? choice
+      block.call(choice)
+      break
+    else
+      puts "I'm sorry Dave; I'm afraid I can't do that."
+    end
+  end
+end
+
+options = {
+  dryrun: false
+}
+OptionParser.new do |parser|
+  parser.on(
+    '-n', '--dry-run',
+    'Make no changes to git state (except to update remotes), and change some fatal errors to ' \
+    'warnings'
+  ) do
+    options[:dryrun] = true
+  end
+end.parse!
 
 release = !MrBump.current_branch[/^release/].nil?
 master = !MrBump.current_branch[/^master$/].nil?
 
+changelog = "#{`git rev-parse --show-toplevel`.strip}/CHANGELOG.md"
+
 unless release || master
   puts 'Need to be on either release or master branch'
   exit 1
@@ -16,102 +51,130 @@ unless master || MrBump.current_branch.to_s == "release/#{MrBump.current_uat_maj
   exit 1
 end
 
+unless MrBump.config_file['github_api_token']
+  puts "Couldn't find a github API token in configuration files"
+  puts "Please obtain a github token by following the guide at\n" \
+       "  https://help.github.com/articles/creating-an-access-token-for-command-line-use/\n" \
+       "and add it with the 'github_api_token:' option"
+  exit 1
+end
+
+puts 'Have you already closed your PR?'
+
+github_client = MrBump::GitApi.new(MrBump.config_file['github_api_token'])
+menu '[Y]es / [N]o', %w(Y N) do |choice|
+  if choice == 'N'
+    puts 'Here are the 10 most recent PRs in your repo:'
+    puts github_client.sorted_prs(MrBump.git_config.path)
+    loop do
+      print 'Enter the PR number to merge : '
+      pr_id = gets.chomp
+      if options[:dryrun]
+        puts "dryrun: Would merge ##{pr_id}"
+      else
+        github_client.merge_pr(MrBump.git_config.path, pr_id)
+      end
+      break
+    end
+  end
+end
+
 unless system('git remote update > /dev/null 2>&1')
   puts 'Failed to update remotes. (Connectivity problems?)'
   exit 1
 end
 
 unless `git rev-parse @` == `git rev-parse @{u}`
-  puts 'Not up to date with origin! Please run git pull'
-  exit 1
+  if options[:dryrun]
+    puts 'WARNING! Not up to date with origin! Please run git pull'
+  else
+    puts 'Not up to date with origin! Please run git pull'
+    exit 1
+  end
+end
+
+unless MrBump.all_tagged_versions.include? MrBump.current_uat_major
+  base_sha = `git merge_base release/#{MrBump.current_uat_major} develop`
+
+  puts "Missing tag for version #{MrBump.current_uat_major}. Suggesting commit #{base_sha[0...8]}"
+  puts "\t#{`git log --format="(%ci) %cn - %s" -n 1 #{base_sha}`}"
+  puts 'Would you like to tag this commit?'
+  menu '[Y]es / [N]o', %w(Y N) do |choice|
+    exit 1 if choice == 'N'
+  end
+  `git tag #{MrBump.current_uat_major} #{base_sha}`
 end
 
-unless File.file?('CHANGELOG.md')
-  puts "Couldn't find CHANGELOG.md. ensure you are in the root of the git checkout"
+unless File.file?(changelog)
+  puts "Couldn't find CHANGELOG.md at '#{changelog}'."
   exit 1
 end
 
 if release
   last_release = MrBump.current_uat
-  current_uat_major = MrBump.current_uat_major
-  changes = MrBump.change_log_items_for_range(last_release, "release/#{current_uat_major}")
+  uat_major = MrBump.current_uat_major
+  changes = MrBump.change_log_items_for_range(last_release, "release/#{uat_major}")
 else
   last_release = MrBump.current_master
   changes = MrBump.change_log_items_for_range(last_release, 'master')
 end
 
 new_release = last_release.bump_patch
-changes = changes.join('')
-md_changes = "# #{new_release}#{changes}\n\n"
+changes = changes.join("\n")
+md_changes = "# #{new_release}\n#{changes}\n\n"
 
 puts 'Changelog additions'
 puts '----------'
 puts md_changes
 puts '----------'
 
-loop do
-  print '[A]ccept these changes / Manually [E]dit / [C]ancel Release : '
-  choice = gets.chomp.upcase
-
-  case choice
-  when 'A'
-    MrBump.file_prepend('CHANGELOG.md', md_changes)
-    break
-  when 'E'
-    MrBump.file_prepend('CHANGELOG.md', md_changes)
-    system 'nano CHANGELOG.md'
-    loop do
-      log = File.open('CHANGELOG.md', 'r').read
-      changes = log.split("\n\n").first.strip.split("\n").drop(1)
-      changes = changes.join("\n")
-      md_changes = "# #{new_release}\n#{changes}\n\n"
-      puts 'Modified Changelog additions'
-      puts '----------'
-      puts md_changes
-      puts '----------'
-      print '[A]ccept modified changes / [C]ancel Release : '
-      choice2 = gets.chomp.upcase
-      if choice2 == 'C'
-        exit 1
-      elsif choice2 == 'A'
-        break
-      else
-        puts "I'm sorry Dave; I'm afraid I can't do that."
-      end
-    end
-    break
-  when 'C'
+menu '[A]ccept these changes / Manually [E]dit / [C]ancel Release', %w(A E C) do |choice|
+  if choice == 'C'
     exit 1
-  else
-    puts "I'm sorry Dave; I'm afraid I can't do that."
+  elsif choice == 'E'
+    tempfile = Tempfile.new('CHANGELOG')
+    tempfile.write(changes)
+    tempfile.close
+    system "nano #{tempfile.path}"
+    changes = File.open(tempfile.path, 'r').read.rstrip
+    md_changes = "# #{new_release}\n#{changes}\n\n"
+    puts 'Modified Changelog additions'
+    puts '----------'
+    puts md_changes
+    puts '----------'
+
+    menu '[A]ccept modified changes / [C]ancel Release', %w(A C) do |cancel|
+      exit 1 if cancel == 'C'
+    end
   end
-end
 
-`git commit -m 'Bump version to #{new_release}' CHANGELOG.md`
-`git tag #{new_release}`
-`git push && git push --tags`
+  MrBump.file_prepend(changelog, md_changes) unless options[:dryrun]
+end
 
-MrBump.slack_notifier(new_release, changes)
+if options[:dryrun]
+  puts "dry-run: `git commit -m 'Bump version to #{new_release}' -- #{changelog}`"
+  puts "dry-run: `git tag #{new_release}`"
+  puts 'dry-run: git push && git push --tags`'
+else
+  `git commit -m 'Bump version to #{new_release}' -- #{changelog}`
+  `git tag #{new_release}`
+  `git push && git push --tags`
+  MrBump.slack_notifier(new_release, changes)
+end
 
 config_file = MrBump.config_file()
 branch_type = release ? "release" : 'master'
 bump_cmd_exists = config_file.key?('post_bump') &&
                   config_file['post_bump'].key?(branch_type)
 if bump_cmd_exists
-  loop do
-    puts 'Would you like to execute post bump commands? '
-    print '[Y]es execute / [N]o Im done : '
-    choice = gets.chomp.upcase
-
-    case choice
-    when 'Y'
-      post_command = config_file['post_bump'][branch_type]
-      system post_command
-      break
-    when 'N'
-      break
-    else
-      puts "I'm sorry Dave; I'm afraid I can't do that."
+  puts 'Would you like to execute post bump commands? '
+  menu '[Y]es execute / [N]o Im done', %w(Y N) do |choice|
+    if choice == 'Y'
+      if options[:dryrun]
+        puts "dry-run: `#{config_file['post_bump'][branch_type]}`"
+      else
+        system(config_file['post_bump'][branch_type])
+      end
     end
   end
 end

data/defaults.yml

@@ -0,0 +1,27 @@
+# Slack integration
+
+# Mr Bump can be configured to post a message to slack while bumping.
+# To do so, a slack web hook is needed, as well as an icon and user name
+# format for this configuration is below
+#slack:
+#  webhook_url: "https://hooks.slack.com/services/some_custom_webhook"
+#  username: "Mr Bump"
+#  icon: "https://path_to_image.png"
+
+# Post bump hooks
+
+# Mr Bump can also run custom deploy or other commands after a bumping
+#post_bump:
+#  release: "echo 'There has been a release on the release branch'"
+#  master: "echo 'There has been a release on the master branch'"
+
+
+# Changelog template
+# Your changelog can be customized by using a template. The template is in
+# mustache format. The allowed parameters are
+#   - branch_type: Bugfix / Feature / Hotfix
+#   - dev_id: The development ID for this feature
+#   - 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}}"

data/lib/mr_bump.rb

@@ -1,8 +1,12 @@
+# 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/.
+
 require 'mr_bump/version'
 require 'mr_bump/slack'
 require 'mr_bump/config'
 require 'mr_bump/git_config'
-
+require 'mr_bump/change'
 
 module MrBump
   def self.current_branch
@@ -10,45 +14,42 @@ module MrBump
     @current_branch.strip
   end
 
+  def self.latest_release_from_list(branches)
+    prefix = 'origin/release[-/]'
+    regex = Regexp.new("^#{prefix}(\\d+\\.\\d+)\\.\\d+$")
+    branches.map do |branch|
+      matches = regex.match(branch)
+      MrBump::Version.new(matches[1]) if matches
+    end.compact.max
+  end
+
   def self.current_uat_major
-    prefix = 'origin/release/'
-    vers = `git branch -r`
-    regex = Regexp.new("^#{prefix}(\\d+\\.\\d+\\.0)$")
-    vers = vers.each_line.map do |branch|
-      branch = branch.strip
-      MrBump::Version.new(branch.gsub(regex, '\1')) if branch[regex]
+    branches = `git branch -r`.each_line.map(&:strip)
+    latest_release_from_list(branches)
+  end
+
+  def self.all_tags
+    `git tag -l`.each_line.map(&:strip)
+  end
+
+  def self.all_tagged_versions
+    all_tags.map do |tag|
+      begin
+        MrBump::Version.new(tag)
+      rescue
+        nil
+      end
     end.compact
-    vers.max
   end
 
   def self.current_uat
     uat = current_uat_major
-    vers = `git tag -l`
-    vers = vers.each_line.map do |branch|
-      MrBump::Version.new(branch) rescue nil
-    end.compact
-    vers.select { |ver| ver.major == uat.major && ver.minor == uat.minor }.max
+    all_tagged_versions.select { |ver| ver.major == uat.major && ver.minor == uat.minor }.max
   end
 
   def self.current_master
     uat = current_uat_major
-    vers = `git tag -l`
-    vers = vers.each_line.map do |branch|
-      MrBump::Version.new(branch) rescue nil
-    end.compact
-    vers.select { |ver| ver < uat }.max
-  end
-
-  def self.story_information(merge_str)
-    branch_fmt = '(?<fix_type>bugfix|feature|hotfix)/(?<dev_id>\w+[-_]?\d+)?'
-    merge_pr_fmt = "^Merge pull request #(?<pr_number>\\d+) from \\w+/#{branch_fmt}"
-    merge_manual_fmt = "^Merge branch '#{branch_fmt}'"
-    matches = Regexp.new(merge_pr_fmt + '|' + merge_manual_fmt).match(merge_str)
-    if matches
-      type = matches['fix_type'].capitalize
-      dev_id = (matches['dev_id'].nil? ? 'UNKNOWN' : matches['dev_id'])
-      "#{type} - #{dev_id} - "
-    end
+    all_tagged_versions.select { |ver| ver < uat }.max
   end
 
   def self.merge_logs(rev, head)
@@ -69,9 +70,10 @@ module MrBump
   def self.change_log_items_for_range(rev, head)
     chunked_log = merge_logs(rev, head).chunk { |change| change[/^Merge/].nil? }
     chunked_log.each_slice(2).map do |merge_str, comment|
-      merge_str = merge_str[1][0]
-      unless merge_str[ignored_merges_regex]
-        "\n* #{story_information(merge_str)}" + comment[1].join("\n  ")
+      begin
+        MrBump::Change.new(config_file, merge_str[1][0], comment[1]).to_md
+      rescue ArgumentError => e
+        puts e
       end
     end.compact
   end
@@ -85,16 +87,19 @@ module MrBump
     File.open(file, 'w') do |fd|
       fd.write(new_contents)
     end
+  end
 
-    def self.config_file
-      MrBump::Config.new().config
-    end
+  def self.config_file
+    @config_file ||= MrBump::Config.new.config
+  end
 
-    def self.slack_notifier(version, changelog)
-      if config_file.key? 'slack'
-        MrBump::Slack.new(MrBump::GitConfig.from_current_path, config_file["slack"]).bump(version, changelog)
-      end
+  def self.slack_notifier(version, changelog)
+    if config_file.key? 'slack'
+      MrBump::Slack.new(git_config, config_file['slack']).bump(version, changelog)
     end
+  end
 
+  def self.git_config
+    @git_config ||= MrBump::GitConfig.from_current_path
   end
 end

data/lib/mr_bump/change.rb

@@ -0,0 +1,40 @@
+# 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/.
+
+require 'mustache'
+
+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_FMT = '((?<branch_type>bugfix|feature|hotfix)/)?(?<dev_id>\w+[-_]?\d+)?[\\w\\-_]+'.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
+
+    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
+      @config = config
+      @branch_type = (matches['branch_type'] || 'Task').capitalize
+      @dev_id = matches['dev_id'] || 'UNKNOWN'
+      @pr_number = matches['pr_number'] || ''
+      @comment_lines = Array(comment_lines)
+    end
+
+    def first_comment_line
+      comment_lines.first
+    end
+
+    def comment_body
+      comment_lines[1..-1] if comment_lines.size > 1
+    end
+
+    def to_md
+      Mustache.render(config['markdown_template'], self)
+    end
+  end
+end

data/lib/mr_bump/config.rb

@@ -1,3 +1,7 @@
+# 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/.
+
 require 'yaml'
 
 module MrBump
@@ -6,20 +10,40 @@ module MrBump
     attr_reader :config_file
 
     def initialize(config_file = nil)
-      @config_file = config_file || default_file
+      @config_file = config_file || default_project_filename
     end
 
-    def config
-      @config ||= if File.exist?(@config_file)
-        YAML.load_file(@config_file) || {}
-      else
-        {}
+    def user_config_file
+      File.join(Dir.home, '.mr_bump.yml')
+    end
+
+    def default_project_filename
+      File.join('.mr_bump')
+    end
+
+    def default_config
+      @default_config = begin
+        defaults_yml = File.join(File.dirname(__FILE__), '..', '..', 'defaults.yml')
+        YAML.load_file(defaults_yml)
       end
     end
 
-    def default_file
-      File.join(".mr_bump")
+    def user_config
+      @user_config = begin
+        loaded = YAML.load_file(user_config_file) if File.exist?(user_config_file)
+        loaded || {}
+      end
+    end
+
+    def project_config
+      @project_config ||= begin
+        loaded = YAML.load_file(@config_file) if File.exist?(@config_file)
+        loaded || {}
+      end
     end
 
+    def config
+      @config ||= default_config.merge(user_config).merge(project_config)
+    end
   end
 end

data/lib/mr_bump/git_api.rb

@@ -0,0 +1,25 @@
+# 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/.
+
+require 'octokit'
+module MrBump
+  # This class makes calls to the github API
+  class GitApi
+    def initialize(token)
+      @client = Octokit::Client.new(access_token: token)
+    end
+
+    def prs(repo_url)
+      @prs ||= client.pull_requests(repo_url, state: 'open')
+    end
+
+    def sorted_prs(repo_url)
+      prs(repo_url).map { |x| '#' + x[:number].to_s + ' - ' + x[:title].to_s + "\n" }.first(10).join
+    end
+
+    def merge_pr(repo_url, pr_id)
+      client.merge_pull_request(repo_url, pr_id)
+    end
+  end
+end

data/lib/mr_bump/git_config.rb

@@ -1,16 +1,22 @@
+# 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
   # This class gathers configuration infromation from git
   class GitConfig
-    attr_reader :user, :username, :repo_url, :repo_name, :orgin
+    attr_reader :user, :username, :repo_url, :host, :path, :repo_name, :orgin
     GITHUB_URL_REGEX = Regexp.new(
       '(https?://((?<user>[\w_\-\d]+)@)?|git@)(?<domain>github.com)[:/](?<path>[\w_\-\d]+)/' \
       '(?<repo_name>[\w_\-\d\.]+?)(\.git)?$'
     ).freeze
 
-    def initialize(origin, repo_name, repo_url, username, user)
+    def initialize(origin, repo_name, repo_host, repo_path, username, user)
       @origin = origin
       @repo_name = repo_name
-      @repo_url = repo_url
+      @repo_url = repo_host + '/' + repo_path + '/'
+      @host = repo_host
+      @path = repo_path
       @username = username
       @user = user || `git config user.name`
     end
@@ -22,7 +28,8 @@ module MrBump
       GitConfig.new(
         origin,
         match['repo_name'],
-        "https://#{match['domain']}/#{match['path']}/#{match['repo_name']}/",
+        "https://#{match['domain']}",
+        "#{match['path']}/#{match['repo_name']}",
         match['user'],
         user
       )

data/lib/mr_bump/slack.rb

@@ -1,3 +1,7 @@
+# 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/.
+
 require 'slack-notifier'
 module MrBump
   # This class uses a slack webhook to push notifications to slack

data/lib/mr_bump/version.rb

@@ -1,3 +1,7 @@
+# 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
   # This class enables comparison and bumping of sementic versions and
   # conversion to and from strings

data/spec/change_spec.rb

@@ -0,0 +1,275 @@
+# 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/.
+
+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}}"
+    }
+  end
+
+  let(:change) { described_class.new(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' }
+
+    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 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")
+    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' }
+
+    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 'defaults the dev ID to UNKNOWN' do
+      expect(change.dev_id).to eq('UNKNOWN')
+    end
+
+    it 'renders to markdown correctly' do
+      expect(change.to_md).to eq(" * Feature - UNKNOWN - Line 1\n  Line 2")
+    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' }
+
+    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 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
+
+  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 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 'renders to markdown correctly' do
+      expect(change.to_md).to eq(" * Bugfix - UNKNOWN - Line 1\n  Line 2")
+    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' }
+
+    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 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
+
+  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 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 'renders to markdown correctly' do
+      expect(change.to_md).to eq(" * Hotfix - UNKNOWN - Line 1\n  Line 2")
+    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'" }
+
+    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 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")
+    end
+  end
+
+  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 '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 'renders to markdown correctly' do
+      expect(change.to_md).to eq(" * Feature - UNKNOWN - Line 1\n  Line 2")
+    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'" }
+
+    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
+
+  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 'defaults the dev ID to UNKNOWN' do
+      expect(change.dev_id).to eq('UNKNOWN')
+    end
+
+    it 'renders to markdown correctly' do
+      expect(change.to_md).to eq(" * Bugfix - UNKNOWN - Line 1\n  Line 2")
+    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'" }
+
+    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
+
+  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 'defaults the dev ID to UNKNOWN' do
+      expect(change.dev_id).to eq('UNKNOWN')
+    end
+
+    it 'renders to markdown correctly' do
+      expect(change.to_md).to eq(" * Hotfix - UNKNOWN - Line 1\n  Line 2")
+    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')
+    end
+
+    it 'defaults the branch type to "Task"' do
+      expect(change.branch_type).to eq('Task')
+    end
+
+    it 'defaults the dev ID to UNKNOWN' do
+      expect(change.dev_id).to eq('UNKNOWN')
+    end
+
+    it 'renders to markdown correctly' do
+      expect(change.to_md).to eq(" * Task - UNKNOWN - Line 1\n  Line 2")
+    end
+  end
+end

data/spec/config_spec.rb

@@ -0,0 +1,24 @@
+# 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/.
+
+require 'mr_bump/config'
+
+describe MrBump::Config do
+  context 'when given default, user and project level configuration' do
+    let(:default) { { 'a' => 'a', 'b' => 'a', 'c' => 'a' } }
+    let(:user_level) { { 'c' => 'b', 'b' => 'b' } }
+    let(:project_level) { { 'c' => 'c' } }
+    let(:expected_result) { { 'a' => 'a', 'b' => 'b', 'c' => 'c' } }
+    let(:config) do
+      config = described_class.new
+      allow(config).to receive(:default_config).and_return(default)
+      allow(config).to receive(:user_config).and_return(user_level)
+      allow(config).to receive(:project_config).and_return(project_level)
+      config.config
+    end
+    it 'correctly prefers more specific configuration' do
+      expect(config).to eq(expected_result)
+    end
+  end
+end

data/spec/git_config_spec.rb

@@ -0,0 +1,76 @@
+# 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/.
+
+require 'mr_bump/git_config'
+
+describe MrBump::GitConfig do
+  let(:config) { described_class.from_origin(origin, 'Someone') }
+
+  context 'Given https origin with no username' do
+    let(:origin) { 'https://github.com/xulaus/mr_bump' }
+    it 'correctly extracts the repository name' do
+      expect(config.repo_name).to eq('mr_bump')
+    end
+
+    it 'correctly constructs github url' do
+      expect(config.repo_url).to eq('https://github.com/xulaus/mr_bump/')
+    end
+
+    it "doesn't extract a username" do
+      expect(config.username.nil?)
+    end
+
+    it "extracts correct host" do
+      expect(config.host).to eq('https://github.com')
+    end
+
+    it "extracts the correct path" do
+      expect(config.path).to eq('xulaus/mr_bump')
+    end
+  end
+
+  context 'Given https origin with username' do
+    let(:origin) { 'https://xulaus@github.com/xulaus/mr_bump.git' }
+    it 'correctly extracts the repository name' do
+      expect(config.repo_name).to eq('mr_bump')
+    end
+    it 'correctly constructs github url' do
+      expect(config.repo_url).to eq('https://github.com/xulaus/mr_bump/')
+    end
+
+    it 'correctly extracts the username' do
+      expect(config.username).to eq('xulaus')
+    end
+
+    it "extracts correct host" do
+      expect(config.host).to eq('https://github.com')
+    end
+
+    it "extracts the correct path" do
+      expect(config.path).to eq('xulaus/mr_bump')
+    end
+  end
+
+  context 'Given git origin' do
+    let(:origin) { 'git@github.com:xulaus/mr_bump.git' }
+    it 'correctly extracts the repository name' do
+      expect(config.repo_name).to eq('mr_bump')
+    end
+    it 'correctly constructs github url' do
+      expect(config.repo_url).to eq('https://github.com/xulaus/mr_bump/')
+    end
+
+    it "doesn't extract a username" do
+      expect(config.username.nil?)
+    end
+
+    it "extracts correct host" do
+      expect(config.host).to eq('https://github.com')
+    end
+
+    it "extracts the correct path" do
+      expect(config.path).to eq('xulaus/mr_bump')
+    end
+  end
+end

data/spec/mr_bump_spec.rb

@@ -0,0 +1,238 @@
+# 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/.
+
+require 'mr_bump/version'
+require 'mr_bump'
+
+describe MrBump do
+  describe '#all_tagged_versions' do
+    before(:each) { allow(MrBump).to receive(:all_tags).and_return(tag_list) }
+
+    context 'when given a mixed list of tags' do
+      let(:tag_list) do
+        [
+          'safbdhasgbd',
+          '',
+          '9.1.32',
+          '21.1',
+          '132',
+          'Not.A Version'
+        ]
+      end
+      it 'parses into versions where possible' do
+        expect(MrBump.all_tagged_versions).to match_array(
+          [
+            MrBump::Version.new('9.1.32'),
+            MrBump::Version.new('21.1'),
+            MrBump::Version.new('132')
+          ]
+        )
+      end
+    end
+  end
+
+  describe '#current_uat' do
+    before(:each) do
+      allow(MrBump).to receive(:all_tags).and_return(tag_list)
+      allow(MrBump).to receive(:current_uat_major).and_return(MrBump::Version.new(next_version))
+    end
+
+    context 'when the next release is a minor bump' do
+      let(:next_version) { '1.2.0' }
+      let(:tag_list) do
+        [
+          'safbdhasgbd',
+          '',
+          'Not.A Version',
+          '1.2.3',
+          '1.2.2',
+          '1.1.1',
+          '1.1.9'
+        ]
+      end
+      it 'returns the maximum tagged version with the same major and minor numbers' do
+        expect(MrBump.current_uat).to eq(MrBump::Version.new('1.2.3'))
+      end
+    end
+
+    context 'when the next release is a major bump' do
+      let(:next_version) { '2.0.0' }
+      let(:tag_list) do
+        [
+          'safbdhasgbd',
+          '',
+          'Not.A Version',
+          '1.2.3',
+          '1.2.2',
+          '1.1.1',
+          '1.0.9',
+          '2.0.0',
+          '2.0.1',
+          '2.0.9'
+        ]
+      end
+      it 'returns the maximum tagged version with the same major and minor numbers' do
+        expect(MrBump.current_uat).to eq(MrBump::Version.new('2.0.9'))
+      end
+    end
+  end
+
+  describe '#current_master' do
+    before(:each) do
+      allow(MrBump).to receive(:all_tags).and_return(tag_list)
+      allow(MrBump).to receive(:current_uat_major).and_return(MrBump::Version.new(next_version))
+    end
+
+    context 'when the next release is a minor bump' do
+      let(:next_version) { '1.2.0' }
+      let(:tag_list) do
+        [
+          'safbdhasgbd',
+          '',
+          'Not.A Version',
+          '1.2.3',
+          '1.2.2',
+          '1.1.1',
+          '1.1.9'
+        ]
+      end
+      it 'returns the maximum tagged version below the UAT version' do
+        expect(MrBump.current_master).to eq(MrBump::Version.new('1.1.9'))
+      end
+    end
+
+    context 'when the next release is a major bump' do
+      let(:next_version) { '2.0.0' }
+      let(:tag_list) do
+        [
+          'safbdhasgbd',
+          '',
+          'Not.A Version',
+          '1.2.3',
+          '1.2.2',
+          '1.1.1',
+          '1.0.9',
+          '2.0.0',
+          '2.0.1',
+          '2.0.9'
+        ]
+      end
+      it 'returns the maximum tagged version below the UAT version' do
+        expect(MrBump.current_master).to eq(MrBump::Version.new('1.2.3'))
+      end
+    end
+  end
+
+  describe '#latest_release_from_list' do
+    context 'With many release branches and using slash separator' do
+      it 'extracts the highest version' do
+        branch_list = [
+          'origin/release/10.16.0',
+          'origin/release/10.15.9',
+          'origin/release/10.1.0',
+          'origin/release/10.15.0',
+          'origin/rse/10.16.0',
+          'origin/master',
+          ''
+        ]
+        expect(MrBump.latest_release_from_list(branch_list)).to eq(MrBump::Version.new('10.16.0'))
+      end
+    end
+
+    context 'With a single release branch and using slash separator' do
+      it 'extracts the version' do
+        branch_list = [
+          'origin/release/10.16.9',
+          'origin/rse/1.2.0',
+          'origin/master',
+          ''
+        ]
+        expect(MrBump.latest_release_from_list(branch_list)).to eq(MrBump::Version.new('10.16.0'))
+      end
+    end
+
+    context 'With many release branches and minor versions and using slash separator' do
+      it 'extracts the highest version with patch version set to 0' do
+        branch_list = [
+          'origin/release/10.16.0',
+          'origin/release/10.15.9',
+          'origin/release/10.1.0',
+          'origin/release/10.15.0',
+          'origin/release/10.16.9',
+          'origin/rse/10.16.0',
+          'origin/master',
+          ''
+        ]
+        expect(MrBump.latest_release_from_list(branch_list)).to eq(MrBump::Version.new('10.16.0'))
+      end
+    end
+
+    context 'With a single release branch with a patch number and using slash separator' do
+      it 'extracts the version with patch version set to 0' do
+        branch_list = [
+          'origin/release/10.16.9',
+          'origin/rse/1.2.0',
+          'origin/master',
+          ''
+        ]
+        expect(MrBump.latest_release_from_list(branch_list)).to eq(MrBump::Version.new('10.16.0'))
+      end
+    end
+
+    context 'With many release branches and using dash separator' do
+      it 'extracts the highest version' do
+        branch_list = [
+          'origin/release-10.16.0',
+          'origin/release-10.15.9',
+          'origin/release-10.1.0',
+          'origin/release-10.15.0',
+          'origin/rse-10.16.0',
+          'origin/master',
+          ''
+        ]
+        expect(MrBump.latest_release_from_list(branch_list)).to eq(MrBump::Version.new('10.16.0'))
+      end
+    end
+
+    context 'With a single release branch and using dash separator' do
+      it 'extracts the version' do
+        branch_list = [
+          'origin/release-10.16.9',
+          'origin/rse-1.2.0',
+          'origin/master',
+          ''
+        ]
+        expect(MrBump.latest_release_from_list(branch_list)).to eq(MrBump::Version.new('10.16.0'))
+      end
+    end
+
+    context 'With many release branches and minor versions and using dash separator' do
+      it 'extracts the highest version with patch version set to 0' do
+        branch_list = [
+          'origin/release-10.16.0',
+          'origin/release-10.15.9',
+          'origin/release-10.1.0',
+          'origin/release-10.15.0',
+          'origin/release-10.16.9',
+          'origin/rse-10.16.0',
+          'origin/master',
+          ''
+        ]
+        expect(MrBump.latest_release_from_list(branch_list)).to eq(MrBump::Version.new('10.16.0'))
+      end
+    end
+
+    context 'With a single release branch with a patch number and using dash separator' do
+      it 'extracts the version with patch version set to 0' do
+        branch_list = [
+          'origin/release-10.16.9',
+          'origin/rse-1.2.0',
+          'origin/master',
+          ''
+        ]
+        expect(MrBump.latest_release_from_list(branch_list)).to eq(MrBump::Version.new('10.16.0'))
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,8 @@
+# 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/.
+
+require 'bundler/setup'
+Bundler.setup
+
+require 'mr_bump'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mr_bump
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.1.0
 platform: ruby
 authors:
 - Richard Fitzgerald
@@ -25,6 +25,76 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: octokit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: mustache
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.99.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.99.3
+- !ruby/object:Gem::Dependency
+  name: OptionParser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  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: pry
+  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'
 description: Bump versions
 email: richard.fitzgerald36@gmail.com
 executables:
@@ -33,13 +103,22 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/mr_bump
+- defaults.yml
 - lib/mr_bump.rb
+- lib/mr_bump/change.rb
 - lib/mr_bump/config.rb
+- lib/mr_bump/git_api.rb
 - lib/mr_bump/git_config.rb
 - lib/mr_bump/slack.rb
 - lib/mr_bump/version.rb
+- spec/change_spec.rb
+- spec/config_spec.rb
+- spec/git_config_spec.rb
+- spec/mr_bump_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/xulaus/mr_bump
-licenses: []
+licenses:
+- MPL 2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -61,4 +140,9 @@ rubygems_version: 2.4.8
 signing_key: 
 specification_version: 3
 summary: BUMP!
-test_files: []
+test_files:
+- spec/change_spec.rb
+- spec/config_spec.rb
+- spec/git_config_spec.rb
+- spec/mr_bump_spec.rb
+- spec/spec_helper.rb