mr_bump 0.2.1 → 0.2.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NThjNjNjNzI3OWZjNmNkMjIxOGI3NzAzY2NmZjNkYzU0NWRkYWY2Nw==
+    MGZhYWYxMDg5ZWExMWU2ZDMyY2RkODBlMDhjMmI1ZGMxYTFmMjlmYg==
   data.tar.gz: !binary |-
-    YzA2OTc1NjMxZWE1MmFmYjQ4MzIzMDg1NjBkMzc3ZDA3NThmOWYzZg==
+    ODNmZjg2Y2JmM2QxNGU1MTBmOWU4ZTE3YjYyMjY5OWQzMjg3YzA0Zg==
 SHA512:
   metadata.gz: !binary |-
-    MWRhNjU0YmVjY2JjNDA1YzVjMzZkMmQwYzhlMDhlMmU4YmI2ZGY0M2NkYmIz
-    MzRhZDMyNTU3OTkwODk3M2Y2OTgzZDZhMTVkNDYwODExZjQyNTQ5N2NmZDYz
-    ZDA5Y2M5MTY4MWMyNjI4M2RkZmY0MWI0NGQ3YTg1Mzc3MTZhZTM=
+    MDE2YmI0ODMyYTc0YWFmYTFkNGE4NjMwYjUwMjMwMTlhODk0M2YzYjg5OWI1
+    ZmJlYjc2MDliYzliYzUzNDcwMWM4MDkyZjE1NTZlNDM3OThjZmU5YjkyMDI5
+    MTk0NzA1ZWVjZDcxN2RkNWY2YzJiMjcxNzNlY2NlYjYyM2U0ODU=
   data.tar.gz: !binary |-
-    NTQ3MGU3MmI2N2Q0YmYxYTUyZWUwNjY3MDM4NjMxMGMxNDIxODY1NjcxOWQ4
-    ZjhiMGEyZDNhZjJiZWE1MjE0OTMyYTkwODYwMWFmZDIyZDk0YzQwYWNiMDdl
-    M2ZjN2E3YjdhMGMxZjU5MmQ0YjVkZTA0OGJiNjE0NTEzYzAwODg=
+    M2Y3MWM4NTZmOWVlMzMzNmJlNDI5YjIxYjNmZWJmNjdhOTYxZWZmNTZjOGJm
+    YzE0MzIzMTY2ZTY2NDAzOWVlZjVhODJiMTU2Y2E2NDcwMGIxMjZmMmFkNmNi
+    ZWFiZGVjNTY0MDA5OGE4YzJiZWY3ODQ3MTNhN2I1NjJjYTAzOTk=

data/bin/mr_bump

@@ -9,10 +9,11 @@ require 'optparse'
 require 'mr_bump'
 require 'mr_bump/git_api'
 
-def menu(text, valid_options)
+def menu(text)
+  valid_options = text.scan(/\[(\w)\]/).flatten.uniq
   loop do
     print text + ': '
-    choice = gets.chomp.upcase
+    choice = STDIN.gets.chomp.upcase
     if valid_options.include? choice
       yield(choice)
       break
@@ -22,18 +23,40 @@ def menu(text, valid_options)
   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
+def options
+  @options ||= begin
+    dict = { dryrun: false }
+    OptionParser.new do |parser|
+      parser.on('-n', '--dry-run',
+                'Make no changes to git state, and change some fatal errors to warnings') do
+        dict[:dryrun] = true
+      end
+    end.parse!
+    dict.freeze
+  end
+end
+
+def run(cmd)
+  if options[:dryrun]
+    puts "dry-run: `#{cmd}`"
+    return true
+  else
+    system(cmd)
   end
-end.parse!
+end
+
+head_tag = MrBump.all_tags.detect { |tag| tag.casecmp('HEAD').zero? }
+if head_tag
+  puts 'You have a tag called "HEAD". This interferes with both mr_bump and git.'
+  puts 'Would you like to remove it?'
+  menu '[F]ix and continue / [E]xit mr_bump' do |choice|
+    if choice == 'F'
+      run("git tag -d #{head_tag}")
+    else
+      exit 1
+    end
+  end
+end
 
 release = MrBump.on_release_branch?
 master = MrBump.on_master_branch?
@@ -62,7 +85,7 @@ 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|
+menu '[Y]es / [N]o' 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)
@@ -79,18 +102,14 @@ menu '[Y]es / [N]o', %w(Y N) do |choice|
   end
 end
 
-unless system('git remote update > /dev/null 2>&1')
+unless options[:dryrun] || 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}`
-  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
+  puts 'Not up to date with origin! Please run git pull'
+  exit 1 unless options[:dryrun]
 end
 
 unless MrBump.all_tagged_versions.include? MrBump.current_uat_major
@@ -99,10 +118,10 @@ unless MrBump.all_tagged_versions.include? MrBump.current_uat_major
   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|
+  menu '[Y]es / [N]o' do |choice|
     exit 1 if choice == 'N'
   end
-  `git tag #{MrBump.current_uat_major} #{base_sha}`
+  run("git tag #{MrBump.current_uat_major} #{base_sha}")
 end
 
 unless File.file?(changelog)
@@ -112,28 +131,30 @@ end
 
 if release
   last_release = MrBump.current_uat
-  changes = MrBump.change_log_items_for_range(last_release, MrBump.uat_branch)
+  changes = MrBump.change_log_items_for_range(last_release, MrBump.uat_branch).map(&:to_md)
 else
   last_release = MrBump.current_master
   unless last_release
     puts "Couldn't detect the version of the master branch. " \
-         "At least one tagged version with version less than the current release version " \
+         'At least one tagged version with version less than the current release version ' \
          "(#{MrBump.current_uat_major}) needs to exist"
     exit 1
   end
-  changes = MrBump.change_log_items_for_range(last_release, 'master')
+  changes = MrBump.change_log_items_for_range(last_release, 'master').map(&:to_md)
 end
 
 new_release = last_release.bump_patch
 changes = changes.join("\n")
 md_changes = "# #{new_release}\n#{changes}\n\n"
 
+puts "You are bumping from version '#{last_release}' to '#{new_release}'"
+puts ''
 puts 'Changelog additions'
 puts '----------'
 puts md_changes
 puts '----------'
 
-menu '[A]ccept these changes / Manually [E]dit / [C]ancel Release', %w(A E C) do |choice|
+menu '[A]ccept these changes / Manually [E]dit / [C]ancel Release' do |choice|
   if choice == 'C'
     exit 1
   elsif choice == 'E'
@@ -148,7 +169,7 @@ menu '[A]ccept these changes / Manually [E]dit / [C]ancel Release', %w(A E C) do
     puts md_changes
     puts '----------'
 
-    menu '[A]ccept modified changes / [C]ancel Release', %w(A C) do |cancel|
+    menu '[A]ccept modified changes / [C]ancel Release' do |cancel|
       exit 1 if cancel == 'C'
     end
   end
@@ -156,30 +177,22 @@ menu '[A]ccept these changes / Manually [E]dit / [C]ancel Release', %w(A E C) do
   MrBump.file_prepend(changelog, md_changes) unless options[:dryrun]
 end
 
-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
-  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
+if run("git commit -m 'Bump version to #{new_release}' -- #{changelog}") &&
+   run("git tag #{new_release}") &&
+   run('git push && git push --tags')
+  MrBump.slack_notifier(new_release, changes) unless options[:dryrun]
+
+  config_file = MrBump.config_file()
+  branch_type = release ? 'release' : 'master'
+  bump_cmd = config_file.fetch('post_bump', {}).fetch(branch_type, '')
+  unless bump_cmd.empty?
+    puts 'Would you like to execute the following post bump commands?'
+    puts "  #{bump_cmd}"
+    menu '[Y]es execute / [N]o Im done' do |choice|
+      run(bump_cmd) if choice == 'Y'
     end
   end
+else
+  puts "Bump Failed :'("
+  exit 1
 end

data/lib/mr_bump/change.rb

@@ -7,9 +7,10 @@ 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
+    attr_reader :pr_number, :branch_type, :dev_id, :config, :comment_lines, :branch_name
 
-    BRANCH_FMT = '((?<branch_type>bugfix|feature|hotfix)/)?(?<dev_id>\w+[-_]?\d+)?[\\w\\-_]+'.freeze
+    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
@@ -20,6 +21,7 @@ module MrBump
                            "'#{commit_msg}'" unless matches
       @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'] || ''
       @comment_lines = Array(comment_lines)

data/lib/mr_bump.rb

@@ -89,14 +89,22 @@ module MrBump
   end
 
   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 unless ignored_branch.match(change.branch_name)
+    end
+
     chunked_log = merge_logs(rev, head).chunk { |change| change[/^Merge/].nil? }
     chunked_log.each_slice(2).map do |merge_str, comment|
       begin
-        MrBump::Change.new(config_file, merge_str[1][0], comment[1]).to_md
+        no_comment_changes = merge_str[1][0..-2].map(&make_change)
+        commented_changes = make_change.call(merge_str[1][-1], comment[1])
+        no_comment_changes.push(commented_changes)
       rescue ArgumentError => e
         puts e
       end
-    end.compact
+    end.flatten.compact
   end
 
   def self.file_prepend(file, str)

data/spec/change_spec.rb

@@ -2,6 +2,7 @@
 # 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_relative 'spec_helper.rb'
 require 'mr_bump/change'
 
 describe MrBump::Change do

data/spec/config_spec.rb

@@ -2,6 +2,7 @@
 # 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_relative 'spec_helper.rb'
 require 'mr_bump/config'
 
 describe MrBump::Config do