Class: FlashFlow::Merge::Master

Inherits:
Base
  • Object
show all
Defined in:
lib/flash_flow/merge/master.rb

Defined Under Namespace

Classes: GitPushFailure

Instance Method Summary collapse

Methods inherited from Base

#check_repo, #check_version, #git_merge, #is_working_branch, #logger, #merge_branches, #pending_release, #release_ahead_of_master, #write_data

Constructor Details

#initialize(opts = {}) ⇒ Master

Returns a new instance of Master.



9
10
11
12
13
 
# File 'lib/flash_flow/merge/master.rb', line 9

def initialize(opts={})
  super(opts)

  @data = Data::Base.new({}, Config.configuration.branch_info_file, @git, logger: logger)
end

Instance Method Details

#run ⇒ Object 



15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
 
# File 'lib/flash_flow/merge/master.rb', line 15

def run
  begin
    check_version
    puts "Merging #{@git.release_branch} into #{@git.master_branch}"
    logger.info "\n\n### Beginning merge of #{@git.release_branch} into #{@git.master_branch} ###\n\n"

    mergers, errors = [], []

    @lock.with_lock do
      release = pending_release
      if !release
        raise NothingToMergeError.new("There is no pending release.")
      elsif !release_ahead_of_master
        raise NothingToMergeError.new("The release branch '#{@git.release_branch}' has no commits that are not in master")
      end

      @git.in_original_merge_branch do
        @git.initialize_rerere
      end

      @git.in_branch(@git.master_branch) do
        @git.run("reset --hard origin/master")
        merge_branches([Data::Branch.new(@git.release_branch)]) do |branch, merger|
          mergers << [branch, merger]
        end
      end

      errors = mergers.select { |m| m.last.result != :success }

      if errors.empty?
        unless @git.push("#{@git.master_branch}:#{@git.master_branch}", true)
          raise GitPushFailure.new("Unable to push to #{@git.master_branch}. See log for details.")
        end

        released_sha = @git.get_sha(@git.master_branch)

        release['status'] = 'Success'
        release['released_sha'] = released_sha

        write_data('Release merged [ci skip]')
      end
    end

    if errors.empty?
      puts 'Success!'
    else
      raise UnmergeableBranch.new("#{@git.release_branch} didn't merge successfully to #{@git.master_branch}:\n  #{errors.map { |e| e.first.ref }.join("\n  ")}")
    end

    logger.info "### Finished merge of #{@git.release_branch} into #{@git.master_branch} ###"
  rescue Lock::Error, OutOfSyncWithRemote, UnmergeableBranch, GitPushFailure, NothingToMergeError, VersionError => e
    puts 'Failure!'
    puts e.message
  ensure
    @local_git.run("checkout #{@local_git.working_branch}")
  end
end