Sha256: cbb246396de69c1e00634865a2ea1e3bd867a70a3c0541c7e197fcadcfdfe5c1
Contents?: true
Size: 1.86 KB
Versions: 70
Compression:
Stored size: 1.86 KB
Contents
# frozen_string_literal: true require 'eac_ruby_base0/core_ext' module Avm module Tools class Runner class AppSrc class Ruby class Bundler class GemfileLock module Git private def git_continue return unless check_capability(__method__, :git_repo, :continue) infom "Adding \"#{gemfile_lock}\"..." instance.git_repo.command('add', gemfile_lock).execute! if rebase_conflict? git_continue_run('rebase') elsif cherry_conflict? git_continue_run('cherry-pick') else raise 'Unknown how to continue' end end def git_continue_run(command) infom "\"#{command}\" --continue..." cmd = instance.git_repo.command(command, '--continue') .envvar('GIT_EDITOR', 'true') return unless !cmd.system && !conflict? fatal_error "\"#{cmd}\" failed and there is no conflict" end def git_reset_checkout return unless check_capability(__method__, :git_repo, nil) git_reset_gemfile_lock git_checkout_gemfile_lock end def git_checkout_gemfile_lock infom 'Checkouting...' instance.git_repo.command('checkout', '--', gemfile_lock).system! end def git_reset_gemfile_lock infom 'Reseting...' instance.git_repo.command('reset', gemfile_lock).system! if ::File.exist?(gemfile_lock) end end end end end end end end end
Version data entries
70 entries across 70 versions & 2 rubygems