mr_bump 0.2.2 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGZhYWYxMDg5ZWExMWU2ZDMyY2RkODBlMDhjMmI1ZGMxYTFmMjlmYg==
+    Mjc5ZWMwMzgzODBkNWFmOTJjYmM3MDdkZTA4N2YyOWNjMjYwMjQ3OA==
   data.tar.gz: !binary |-
-    ODNmZjg2Y2JmM2QxNGU1MTBmOWU4ZTE3YjYyMjY5OWQzMjg3YzA0Zg==
+    MDQwYmQzMDQ5NmQ0ODcxNTlhNGM0OGJmZjFhNGVjMThjMTlmNTYxMg==
 SHA512:
   metadata.gz: !binary |-
-    MDE2YmI0ODMyYTc0YWFmYTFkNGE4NjMwYjUwMjMwMTlhODk0M2YzYjg5OWI1
-    ZmJlYjc2MDliYzliYzUzNDcwMWM4MDkyZjE1NTZlNDM3OThjZmU5YjkyMDI5
-    MTk0NzA1ZWVjZDcxN2RkNWY2YzJiMjcxNzNlY2NlYjYyM2U0ODU=
+    MmRkYTUxZjBiOWU4OThhYzM0Njg0M2YyZjA4ZjJhM2FkOTRiNzY4ZDRjMTNm
+    ODhjYjNjNDBkNGI5YzE5NzU0Njc4ODM1ZmNmYTNhNGI4YzcyZjc0ZGUzNjdl
+    MTMxMThhZTY3MzIyNmJmMzkzOTYxZGFlNjQ1MGQ5MDYyODc2YjM=
   data.tar.gz: !binary |-
-    M2Y3MWM4NTZmOWVlMzMzNmJlNDI5YjIxYjNmZWJmNjdhOTYxZWZmNTZjOGJm
-    YzE0MzIzMTY2ZTY2NDAzOWVlZjVhODJiMTU2Y2E2NDcwMGIxMjZmMmFkNmNi
-    ZWFiZGVjNTY0MDA5OGE4YzJiZWY3ODQ3MTNhN2I1NjJjYTAzOTk=
+    MzYwYzUyZWUzYTFlZmJkNWY4MTIxOThhMjg2OWNmNzc4NzI2OGFhODEzODFh
+    MWE0NDMzYTFjNWYzMmUxYWEzMDQ4MzliYTNjOGNkNzE1NDVjMjZmODNmZGE4
+    MmJjZjk5YWNjMWMxODJlNzk1ZDliZTE3MGRkZDYwZDRiY2Y1M2U=

data/bin/mr_bump

@@ -60,15 +60,16 @@ end
 
 release = MrBump.on_release_branch?
 master = MrBump.on_master_branch?
+develop = MrBump.on_develop_branch?
 
 changelog = "#{`git rev-parse --show-toplevel`.strip}/CHANGELOG.md"
 
-unless release || master
+unless release || master || develop
   puts 'Need to be on either release or master branch'
   exit 1
 end
 
-unless master || MrBump.current_branch.to_s == MrBump.uat_branch
+unless master || develop || MrBump.current_branch.to_s == MrBump.uat_branch
   puts "On release branch '#{MrBump.current_branch}'. " \
        "Expected release branch '#{MrBump.uat_branch}'"
   exit 1
@@ -82,22 +83,24 @@ unless MrBump.config_file['github_api_token']
   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' 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)
+unless develop
+  puts 'Have you already closed your PR?'
+
+  github_client = MrBump::GitApi.new(MrBump.config_file['github_api_token'])
+  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)
+      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
-      break
     end
   end
 end
@@ -129,21 +132,40 @@ unless File.file?(changelog)
   exit 1
 end
 
-if release
-  last_release = MrBump.current_uat
-  changes = MrBump.change_log_items_for_range(last_release, MrBump.uat_branch).map(&:to_md)
-else
-  last_release = MrBump.current_master
-  unless last_release
+if MrBump.release_stale?
+  if release
+    puts 'Error: Master branch contains commits from the release branch.'
+    puts 'This means the release branch has been merged, and a new release branch needs to be made.'
+    puts 'Unable to continue on old release branch.'
+    exit 1
+  elsif master
+    puts 'WARNING: Master branch contains commits from the release branch.'
+  end
+end
+
+last_release = MrBump.last_release
+unless last_release
+  if master
     puts "Couldn't detect the version of the master branch. " \
          'At least one tagged version with version less than the current release version ' \
          "(#{MrBump.current_uat_major}) needs to exist"
-    exit 1
+  else
+    puts "Couldn't detect the version of this branch. "
   end
-  changes = MrBump.change_log_items_for_range(last_release, 'master').map(&:to_md)
+  exit 1
 end
 
-new_release = last_release.bump_patch
+new_release = MrBump.next_release
+if develop
+  new_branch = MrBump.release_branch_for_version(new_release)
+  print "You are about to cut a release branch. If you are sure you want to do this type: \n" \
+        "      #{new_branch}\n" \
+        'Here: '
+  user_inp = STDIN.readline
+  exit 1 unless user_inp.strip == new_branch
+end
+
+changes = MrBump.change_log_items_for_range(last_release, MrBump.current_branch).map(&:to_md)
 changes = changes.join("\n")
 md_changes = "# #{new_release}\n#{changes}\n\n"
 
@@ -179,17 +201,22 @@ end
 
 if run("git commit -m 'Bump version to #{new_release}' -- #{changelog}") &&
    run("git tag #{new_release}") &&
-   run('git push && git push --tags')
+   run('git push && git push --tags') &&
+   (!develop || run("git checkout -b #{new_branch} && git push origin #{new_branch}"))
   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?
+  branch_type = master ? 'master' : 'release'
+  post_bump = MrBump.config_file.fetch('post_bump', {})
+  bump_cmds = [
+    develop ? post_bump['develop'] : nil,
+    post_bump[branch_type]
+  ].compact
+
+  unless bump_cmds.empty?
     puts 'Would you like to execute the following post bump commands?'
-    puts "  #{bump_cmd}"
+    bump_cmds.each.each { |cmd| puts "  #{cmd}" }
     menu '[Y]es execute / [N]o Im done' do |choice|
-      run(bump_cmd) if choice == 'Y'
+      bump_cmds.each { |cmd| run(cmd) } if choice == 'Y'
     end
   end
 else

data/lib/mr_bump.rb

@@ -11,8 +11,7 @@ require 'mr_bump/change'
 # Add helper functions to the MrBump namespace
 module MrBump
   def self.current_branch
-    @current_branch ||= `git rev-parse --abbrev-ref HEAD`
-    @current_branch.strip
+    @current_branch ||= `git rev-parse --abbrev-ref HEAD`.strip.freeze
   end
 
   def self.release_branch_regex
@@ -21,6 +20,12 @@ module MrBump
     "#{prefix}(\\d+\\.\\d+)(\\.\\d+)?#{suffix}"
   end
 
+  def self.release_branch_for_version(ver)
+    prefix = config_file['release_prefix']
+    suffix = config_file['release_suffix']
+    "#{prefix}#{ver.major}.#{ver.minor}.0#{suffix}"
+  end
+
   def self.on_release_branch?
     regex = Regexp.new("^#{release_branch_regex}$")
     !MrBump.current_branch[regex].nil?
@@ -30,6 +35,33 @@ module MrBump
     !MrBump.current_branch[/^master$/].nil?
   end
 
+  def self.on_develop_branch?
+    !MrBump.current_branch[/^develop$/].nil?
+  end
+
+  def self.release_stale?
+    !`git branch master --contains #{MrBump.current_uat_major}`.strip.empty?
+  end
+
+  def self.last_release
+    if on_release_branch? || (on_master_branch? && release_stale?)
+      MrBump.current_uat
+    elsif on_master_branch?
+      MrBump.current_master
+    elsif on_develop_branch?
+      MrBump.current_uat_major
+    end
+  end
+
+  def self.next_release
+    return nil unless last_release
+    if on_release_branch? || on_master_branch?
+      last_release.bump_patch
+    elsif on_develop_branch?
+      last_release.bump_minor
+    end
+  end
+
   def self.latest_release_from_list(branches)
     regex = Regexp.new("^origin/#{release_branch_regex}$")
     branches.map do |branch|
@@ -44,8 +76,7 @@ module MrBump
   end
 
   def self.uat_branch
-    config = MrBump.config_file
-    "#{config['release_prefix']}#{current_uat_major}#{config['release_suffix']}"
+    release_branch_for_version(current_uat_major)
   end
 
   def self.all_tags
@@ -79,15 +110,6 @@ module MrBump
     log.each_line.map(&:strip).select { |str| !(str.nil? || str == '' || str[0] == '#') }
   end
 
-  def self.ignored_merges_regex
-    @ignored_merges_regex ||= begin
-      ignored_branch = '(release|master|develop)'
-      regex_pr = "^Merge pull request #\\d+ from Intellection/#{ignored_branch}"
-      regex_manual = "^Merge branch '?#{ignored_branch}"
-      Regexp.new("#{regex_pr}|#{regex_manual}")
-    end
-  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 = []|

data/spec/mr_bump_spec.rb

@@ -317,6 +317,58 @@ describe MrBump do
         expect(MrBump.on_master_branch?).to eq(false)
       end
     end
+
+    context 'when on a branch called develop' do
+      let(:current_branch) { 'develop' }
+
+      it 'returns false' do
+        expect(MrBump.on_master_branch?).to eq(false)
+      end
+    end
+  end
+
+  describe '#on_develop_branch?' do
+    before(:each) { allow(MrBump).to receive(:current_branch).and_return(current_branch) }
+
+    context 'when on a branch called develop' do
+      let(:current_branch) { 'develop' }
+
+      it 'returns true' do
+        expect(MrBump.on_develop_branch?).to eq(true)
+      end
+    end
+
+    context 'when on a branch called develop$' do
+      let(:current_branch) { 'develop$' }
+
+      it 'returns false' do
+        expect(MrBump.on_develop_branch?).to eq(false)
+      end
+    end
+
+    context 'when on a branch called ^develop' do
+      let(:current_branch) { '^develop' }
+
+      it 'returns false' do
+        expect(MrBump.on_develop_branch?).to eq(false)
+      end
+    end
+
+    context 'when on a branch called release' do
+      let(:current_branch) { 'release' }
+
+      it 'returns false' do
+        expect(MrBump.on_develop_branch?).to eq(false)
+      end
+    end
+
+    context 'when on a branch called master' do
+      let(:current_branch) { 'master' }
+
+      it 'returns false' do
+        expect(MrBump.on_develop_branch?).to eq(false)
+      end
+    end
   end
 
   describe '#on_release_branch?' do
@@ -361,6 +413,14 @@ describe MrBump do
           expect(MrBump.on_release_branch?).to eq(true)
         end
       end
+
+      context 'when on a branch called develop' do
+        let(:current_branch) { 'develop' }
+
+        it 'returns false' do
+          expect(MrBump.on_master_branch?).to eq(false)
+        end
+      end
     end
 
     context 'with altered config' do
@@ -430,7 +490,7 @@ describe MrBump do
     end
   end
 
-  describe '#' do
+  describe '#change_log_items_for_range' do
     let(:log) do
       [
         'Merge pull request #4 from mr_bump/hotfix/DEV-1261',
@@ -461,4 +521,143 @@ describe MrBump do
       end
     end
   end
+
+  describe '#last_release' do
+    before do
+      allow(MrBump).to receive(:current_uat).and_return(MrBump::Version.new('0.1.3'))
+      allow(MrBump).to receive(:current_uat_major).and_return(MrBump::Version.new('0.1.0'))
+      allow(MrBump).to receive(:current_master).and_return(MrBump::Version.new('0.0.1'))
+    end
+
+    context 'when on master branch' do
+      before do
+        allow(MrBump).to receive(:on_master_branch?).and_return(true)
+        allow(MrBump).to receive(:on_release_branch?).and_return(false)
+        allow(MrBump).to receive(:on_develop_branch?).and_return(false)
+        allow(MrBump).to receive(:release_stale?).and_return(false)
+      end
+
+      it 'returns the master version' do
+        expect(MrBump.last_release).to eq(MrBump::Version.new('0.0.1'))
+      end
+    end
+
+    context 'when on master with stale release branch' do
+      before do
+        allow(MrBump).to receive(:on_master_branch?).and_return(true)
+        allow(MrBump).to receive(:on_release_branch?).and_return(false)
+        allow(MrBump).to receive(:on_develop_branch?).and_return(false)
+        allow(MrBump).to receive(:release_stale?).and_return(true)
+      end
+
+      it 'returns the master version' do
+        expect(MrBump.last_release).to eq(MrBump::Version.new('0.1.3'))
+      end
+    end
+
+    context 'when on release branch' do
+      before do
+        allow(MrBump).to receive(:on_master_branch?).and_return(false)
+        allow(MrBump).to receive(:on_release_branch?).and_return(true)
+        allow(MrBump).to receive(:on_develop_branch?).and_return(false)
+        allow(MrBump).to receive(:release_stale?).and_return(false)
+      end
+
+      it 'returns the release version' do
+        expect(MrBump.last_release).to eq(MrBump::Version.new('0.1.3'))
+      end
+    end
+
+
+    context 'when on develop branch' do
+      before do
+        allow(MrBump).to receive(:on_master_branch?).and_return(false)
+        allow(MrBump).to receive(:on_release_branch?).and_return(false)
+        allow(MrBump).to receive(:on_develop_branch?).and_return(true)
+        allow(MrBump).to receive(:release_stale?).and_return(false)
+      end
+
+      it 'returns the last release version' do
+        expect(MrBump.last_release).to eq(MrBump::Version.new('0.1.0'))
+      end
+    end
+  end
+
+  describe '#next_release' do
+    before do
+      allow(MrBump).to receive(:current_uat).and_return(MrBump::Version.new('0.1.3'))
+      allow(MrBump).to receive(:current_uat_major).and_return(MrBump::Version.new('0.1.0'))
+      allow(MrBump).to receive(:current_master).and_return(MrBump::Version.new('0.0.1'))
+    end
+
+    context 'when on master branch' do
+      before do
+        allow(MrBump).to receive(:on_master_branch?).and_return(true)
+        allow(MrBump).to receive(:on_release_branch?).and_return(false)
+        allow(MrBump).to receive(:on_develop_branch?).and_return(false)
+        allow(MrBump).to receive(:release_stale?).and_return(false)
+      end
+
+      it 'returns the master version + a patch' do
+        expect(MrBump.next_release).to eq(MrBump::Version.new('0.0.2'))
+      end
+    end
+
+    context 'when on master with stale release branch' do
+      before do
+        allow(MrBump).to receive(:on_master_branch?).and_return(true)
+        allow(MrBump).to receive(:on_release_branch?).and_return(false)
+        allow(MrBump).to receive(:on_develop_branch?).and_return(false)
+        allow(MrBump).to receive(:release_stale?).and_return(true)
+      end
+
+      it 'returns the release version' do
+        expect(MrBump.next_release).to eq(MrBump::Version.new('0.1.4'))
+      end
+    end
+
+    context 'when on release branch' do
+      before do
+        allow(MrBump).to receive(:on_master_branch?).and_return(false)
+        allow(MrBump).to receive(:on_release_branch?).and_return(true)
+        allow(MrBump).to receive(:on_develop_branch?).and_return(false)
+        allow(MrBump).to receive(:release_stale?).and_return(false)
+      end
+
+      it 'returns the release version' do
+        expect(MrBump.next_release).to eq(MrBump::Version.new('0.1.4'))
+      end
+    end
+
+    context 'when on develop branch' do
+      before do
+        allow(MrBump).to receive(:on_master_branch?).and_return(false)
+        allow(MrBump).to receive(:on_release_branch?).and_return(false)
+        allow(MrBump).to receive(:on_develop_branch?).and_return(true)
+        allow(MrBump).to receive(:release_stale?).and_return(false)
+      end
+
+      it 'returns the release version plus a minor' do
+        expect(MrBump.next_release).to eq(MrBump::Version.new('0.2.0'))
+      end
+    end
+  end
+
+  describe '#file_prepend' do
+    it 'prepends to files' do
+      file = 'filename.md'
+      before = 'String before'
+      prepend_str = 'Sting to prepend. '
+      after = prepend_str + before
+
+      read_buffer = StringIO.new before
+      write_buffer = StringIO.new
+
+      allow(File).to receive(:open).with(file, 'r').and_yield(read_buffer)
+      allow(File).to receive(:open).with(file, 'w').and_yield(write_buffer)
+
+      MrBump.file_prepend(file, prepend_str)
+      expect(write_buffer.string).to eq(after)
+    end
+  end
 end