Class: FlashFlow::Merge::Master

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

Defined Under Namespace

Classes: GitPushFailure, NothingToMergeError, PendingReleaseError

Instance Method Summary collapse

Methods inherited from Base

#check_repo, #check_version, #git_merge, #is_working_branch, #logger, #merge_branches

Constructor Details

#initialize(opts = {}) ⇒ Master

Returns a new instance of Master.



11
12
13
14
15
16
17
 
# File 'lib/flash_flow/merge/master.rb', line 11

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

  @release_branches = parse_branches(opts[:release_branches])

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

Instance Method Details

#branch_data ⇒ Object 



90
91
92
 
# File 'lib/flash_flow/merge/master.rb', line 90

def branch_data

end

#check_branches ⇒ Object

Raises:



100
101
102
103
104
105
 
# File 'lib/flash_flow/merge/master.rb', line 100

def check_branches
  raise NothingToMergeError.new("Nothing to merge") if @release_branches.empty?

  requested_not_ready_branches = (@release_branches.map(&:ref) - shippable_branch_names)
  raise RuntimeError.new("The following branches are not ready to ship:\n#{requested_not_ready_branches.join("\n")}") unless requested_not_ready_branches.empty?
end

#commit_message ⇒ Object 



116
117
118
119
120
121
122
 
# File 'lib/flash_flow/merge/master.rb', line 116

def commit_message
  message ="Flash Flow merged these branches:\n\#{@release_branches.map(&:ref).join(\"\\n\")}\n  EOS\n  message.gsub(/'/, '')\nend\n"

#parse_branches(user_branches) ⇒ Object 



94
95
96
97
98
 
# File 'lib/flash_flow/merge/master.rb', line 94

def parse_branches(user_branches)
  branch_list = user_branches == ['ready'] ? shippable_branch_names : [user_branches].flatten.compact

  branch_list.map { |b| Data::Branch.new('origin', @git.remotes_hash['origin'], b) }
end

#run ⇒ Object 



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
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
 
# File 'lib/flash_flow/merge/master.rb', line 19

def run
  begin
    check_version
    check_branches
    puts "Merging these branches into #{@git.release_branch}:\n  #{@release_branches.map(&:ref).join("\n  ")}"
    logger.info "\n\n### Beginning #{@local_git.merge_branch} merge ###\n\n"

    mergers, errors = [], []

    @lock.with_lock do
      release = @data.releases.detect { |r| r['status'] == 'Pending' }
      if release
        raise PendingReleaseError.new("There is already a pending release: #{release}")
      elsif @git.branch_exists?("#{@git.merge_remote}/#{@git.release_branch}") &&
          !@git.branch_contains?(@git.master_branch, @git.get_sha("#{@git.merge_remote}/#{@git.release_branch}"))
        raise PendingReleaseError.new("The release branch '#{@git.release_branch}' has commits that are not in master")
      end

      @git.fetch(@git.merge_remote)
      @git.in_original_merge_branch do
        @git.initialize_rerere
      end

      @git.reset_temp_merge_branch
      @git.in_temp_merge_branch do
        merge_branches(@release_branches) do |branch, merger|
          mergers << [branch, merger]
        end
      end

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

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

        release_sha = @git.get_sha(@git.temp_merge_branch)

        @data.releases.unshift({ created_at: Time.now, sha: release_sha, status: 'Pending' })

        @git.in_temp_merge_branch do
          @git.run("reset --hard #{@git.merge_remote}/#{@git.merge_branch}")
        end
        @git.in_merge_branch do
          @git.run("reset --hard #{@git.merge_remote}/#{@git.merge_branch}")
        end

        @data.save!

        @git.copy_temp_to_branch(@git.merge_branch, 'Release data updated [ci skip]')
        @git.delete_temp_merge_branch
        @git.push(@git.merge_branch, false)
      end
    end

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

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

#shippable_branch_names ⇒ Object 



107
108
109
110
111
112
113
114
 
# File 'lib/flash_flow/merge/master.rb', line 107

def shippable_branch_names
  @shippable_branch_names ||= begin
    status = Merge::Status.new(Config.configuration.issue_tracker, Config.configuration.branches, Config.configuration.branch_info_file, Config.configuration.git, logger: logger)

    all_branches = status.branches
    all_branches.values.select { |b| b[:shippable?] }.map { |b| b[:name] }
  end
end