Class: FlashFlow::Merge::Release

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

Defined Under Namespace

Classes: GitPushFailure, PendingReleaseError

Instance Method Summary collapse

Methods inherited from Base

#check_git_version, #check_repo, #check_version, #git_merge, #is_working_branch, #logger, #merge_branches, #pending_release, #ready_to_merge_release, #release_ahead_of_master?, #write_data

Constructor Details

#initialize(opts = {}) ⇒ Release

Returns a new instance of Release.



10
11
12
13
14
15
16
17
18
19
 
# File 'lib/flash_flow/merge/release.rb', line 10

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

  @force = opts[:force]
  @release_branches = parse_branches(opts[:release_branches])

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

  @release_branches.each {|b| b.merge_order = @data.collection.get(b.ref).merge_order }
end

Instance Method Details

#check_branches ⇒ Object

Raises:



86
87
88
89
90
91
92
93
 
# File 'lib/flash_flow/merge/release.rb', line 86

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

  unless @force
    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
end

#commit_message ⇒ Object 



104
105
106
107
108
109
110
 
# File 'lib/flash_flow/merge/release.rb', line 104

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

#parse_branches(user_branches) ⇒ Object 



80
81
82
83
84
 
# File 'lib/flash_flow/merge/release.rb', line 80

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

  branch_list.map { |b| Data::Branch.new(b) }
end

#run ⇒ Object 



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
 
# File 'lib/flash_flow/merge/release.rb', line 21

def run
  begin
    check_version
    check_git_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 = pending_release
      if release
        raise PendingReleaseError.new("There is already a pending release: #{release}")
      elsif release_ahead_of_master?
        raise PendingReleaseError.new("The release branch '#{@git.release_branch}' has commits that are not in master")
      end

      @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' })

        write_data('Release branch created [ci skip]')
      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 



95
96
97
98
99
100
101
102
 
# File 'lib/flash_flow/merge/release.rb', line 95

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