brightpearl-cli 1.1.0 → 1.2.0

data/lib/routes/git_merge.rb

@@ -18,8 +18,12 @@ module BrightpearlCommand
 
         def opts_validate
 
+            if @opts[:from_file] && @opts[:open_file]
+                Brightpearl::Terminal::error('Too many flags', "You cannot pass the #{Brightpearl::Terminal::format_flag('o', false)} and #{Brightpearl::Terminal::format_flag('f', false)} flags at the same time.", true)
+            end
+
             unless @args.any?
-                unless @opts[:from_file]
+                unless @opts[:from_file] || @opts[:open_file]
                     system('bp g m -h')
                     exit
                 end
@@ -31,10 +35,12 @@ module BrightpearlCommand
 
             if @opts[:from_file]
                 unless @args[1].nil?
-                    Brightpearl::Terminal::error('Too many parameters', ["When using the #{Brightpearl::Terminal::format_flag('f')}\x1B[38;5;240m, system only expects one #{Brightpearl::Terminal::format_action('optional')}\x1B[38;5;240m parameter \xe2\x80\x94 the target branch.", "The amount of parameters you tried to pass is: #{@args.length}"], true)
+                    Brightpearl::Terminal::error('Too many parameters', ["When using the #{Brightpearl::Terminal::format_flag('f')}\x1B[38;5;240m the system only expects one #{Brightpearl::Terminal::format_action('optional')}\x1B[38;5;240m parameter \xe2\x80\x94 the target branch.", "The amount of parameters you passed were: #{Brightpearl::Terminal::format_highlight(@args.length)}"], true)
                 end
-                unless File.file?(@opts[:from_file])
-                    Brightpearl::Terminal::error('File not found', "The file: #{Brightpearl::Terminal::format_directory(@opts[:from_file])}\x1B[38;5;240m doesn't exist.", true)
+                if @opts[:from_file] != '' && File.file?(Brightpearl::Enum::GIT_MERGE_DEFAULT_FILE) == false
+                    Brightpearl::Terminal::error("File not found: #{Brightpearl::Terminal::format_directory(Brightpearl::Enum::GIT_MERGE_DEFAULT_FILE)}", [
+                        "To specify multiple #{Brightpearl::Terminal::format_branch('source-branches')} try running #{Brightpearl::Terminal::format_command('bp g m -o')} first."
+                    ], true)
                 end
             end
 
@@ -42,6 +48,11 @@ module BrightpearlCommand
 
         def opts_routing
 
+            if @opts[:open_file]
+                system("#{Brightpearl::Config.param(Brightpearl::Config::PREFERRED_TEXT_EDITOR)} #{Brightpearl::Enum::GIT_MERGE_DEFAULT_FILE}")
+                exit
+            end
+
             retrieve_source_branches
             retrieve_target_branches
 
@@ -51,9 +62,32 @@ module BrightpearlCommand
 
         def merge
 
-            puts "\x1B[38;5;40m@TODO \xe2\x80\x94 If no source branches, must throw error.\x1B[0m"
+            @git.check_for_uncommitted_files(false, 'Aborting the merge!')
+
+            # If no 'source branches' are found, select current branch (if both repos on same branch) or throw Error.
+            unless @source_branches.any?
+                code_sb = @git.current_branch_for_repo(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE))
+                db_sb = @git.current_branch_for_repo(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB))
+                if code_sb != db_sb
+                    Brightpearl::Terminal::error('Cannot reliably determine source branch', ["You're repos are on two different branches:", nil, "Code \xe2\x86\x92 #{Brightpearl::Terminal::format_branch(code_sb)}", "  DB \xe2\x86\x92 #{Brightpearl::Terminal::format_branch(db_sb)}", nil, 'In this particular scenario, you must explicitly specify a source branch in order to merge.'], true)
+                end
+                @source_branches << code_sb
+            end
+
+            # Check MASTER isn't one of the 'source branches'
+            @source_branches.each do |branch|
+                if branch == Brightpearl::Git::MASTER
+                    Brightpearl::Terminal::error("#{Brightpearl::Terminal::format_branch(Brightpearl::Git::MASTER)} has been recognized as a #{Brightpearl::Terminal::format_highlight('source branch')}", ["If your intention is to merge #{Brightpearl::Terminal::format_branch(Brightpearl::Git::MASTER)} into #{Brightpearl::Terminal::format_branch(@target_branch)}, use #{Brightpearl::Terminal::format_command('bp g u')} instead."], true)
+                end
+            end
 
-            unless Brightpearl::Terminal::prompt_yes_no("You're about to #{Brightpearl::Terminal::format_action('merge')} the following branch(es):", generate_source_target_text, "Would you like to #{Brightpearl::Terminal::format_action('CONTINUE')}\x1B[38;5;89m")
+            # Check a RELEASE-BRANCH isn't one of the 'target branches'
+            if @target_branch =~ Brightpearl::Git::RELEASE_BRANCH_REGEX
+                Brightpearl::Terminal::error("#{Brightpearl::Terminal::format_branch(@target_branch)} has been recognized as a #{Brightpearl::Terminal::format_highlight('target branch')}", ["You #{Brightpearl::Terminal::format_invalid('cannot use this script', true)} to merge to a release branch.", "It's usually best to do this manually."], true)
+            end
+
+            # Initial confirmation
+            unless Brightpearl::Terminal::prompt_yes_no("You're about to #{Brightpearl::Terminal::format_action('initiate a merge')} between the following branch(es):", generate_source_target_text, "Would you like to #{Brightpearl::Terminal::format_action('CONTINUE')}\x1B[38;5;89m")
                 Brightpearl::Terminal::abort(nil, nil, true, false)
             end
 
@@ -67,25 +101,27 @@ module BrightpearlCommand
             non_existent_branches_db = []
             branches_with_stashes_cd = []
             branches_with_stashes_db = []
-            changed_files = []
-
-            # # SANITY CHECK SCRIPT
-            # @source_branches.each do |x|
-            #     grep_string = x.split('-')
-            #     grep_string = "BP-#{grep_string[grep_string.count - 1]}"
-            #     puts "\x1B[38;5;39m#{x}\x1B[0m \xe2\x80\x94 (#{grep_string})"
-            #     system("cd #{Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE)} && git log | grep '#{grep_string}' --color=auto")
-            #     system("cd #{Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB)} && git log | grep '#{grep_string}' --color=auto")
-            # end
-            # puts
-            # exit
+            changed_files_code = {}
+            changed_files_db = {}
 
             # UPDATE MASTER & CHECKOUT BRANCH TO MERGE TO
             Brightpearl::Terminal::output("Updating #{Brightpearl::Terminal::format_branch(@target_branch)}")
             target_branch_data = @git.branch_data(@target_branch, nil, false)
-            if target_branch_data[0][:"#{Brightpearl::Git::BRANCH_EXISTS}"] == false || target_branch_data[1][:"#{Brightpearl::Git::BRANCH_EXISTS}"] == false
+            if target_branch_data[0][:"#{Brightpearl::Git::BRANCH_EXISTS}"] == false && target_branch_data[1][:"#{Brightpearl::Git::BRANCH_EXISTS}"] == false
                 Brightpearl::Terminal::error("Target branch #{Brightpearl::Terminal::format_branch(@target_branch)} doesn't exist", 'Please check your spelling and try again.', true)
             end
+
+            # CREATE TARGET BRANCH (CODE OR DB) IF ONE OR THE OTHER DOESN'T EXIST
+            if target_branch_data[0][:"#{Brightpearl::Git::BRANCH_EXISTS}"] == false
+                Brightpearl::Terminal::warning("Target #{Brightpearl::Terminal::format_highlight('CODE')} branch doesn't exist")
+                Brightpearl::Terminal::output("Creating branch #{Brightpearl::Terminal::format_branch(@target_branch)} in #{Brightpearl::Terminal::format_directory(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE))}")
+                Brightpearl::Terminal::error('Not yet implemented', ["The code which should create branch #{Brightpearl::Terminal::format_branch(@target_branch)} on #{Brightpearl::Terminal::format_directory(@git.get_repo_shorthand(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE))} hasn't been programmed yet.", "Please speak to #{Brightpearl::Terminal::format_highlight('Albert')}."], true)
+            elsif target_branch_data[1][:"#{Brightpearl::Git::BRANCH_EXISTS}"] == false
+                Brightpearl::Terminal::warning("Target #{Brightpearl::Terminal::format_highlight('DB')} branch doesn't exist")
+                Brightpearl::Terminal::output("Creating branch #{Brightpearl::Terminal::format_branch(@target_branch)} in #{Brightpearl::Terminal::format_directory(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB))}")
+                Brightpearl::Terminal::error('Not yet implemented', ["The code which should create branch #{Brightpearl::Terminal::format_branch(@target_branch)} on #{Brightpearl::Terminal::format_directory(@git.get_repo_shorthand(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB))} hasn't been programmed yet.", "Please speak to #{Brightpearl::Terminal::format_highlight('Albert')}."], true)
+            end
+
             commands = [
                 "git checkout #{Brightpearl::Git::MASTER}",
                 'git pull',
@@ -103,7 +139,7 @@ module BrightpearlCommand
                 branches_data << @git.branch_data(branch_name, nil, false)
             end
 
-            # RUN CHECKS
+            # RUN CHECKS (AND CHECKOUT BRANCHES WHICH DON'T EXIST LOCALLY)
             branches_data.each do |branch_data|
                 if branch_data[0][:"#{Brightpearl::Git::BRANCH_EXISTS}"] || branch_data[1][:"#{Brightpearl::Git::BRANCH_EXISTS}"]
                     atleast_one_branch_found = true
@@ -140,96 +176,128 @@ module BrightpearlCommand
 
             puts # DO NOT REMOVE.
 
-            # STOP HERE IF THERE ARE FAILURES
+            if non_existent_branches_cd.any? || branches_with_stashes_cd.any?
+                puts "\n  #{Brightpearl::Terminal::format_directory(@git.get_repo_shorthand(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE)))}\n\n"
+            end
             if non_existent_branches_cd.any?
-                Brightpearl::Terminal::warning("The following branches could not be found in: #{Brightpearl::Terminal::format_directory(@git.get_repo_shorthand(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE)))}", non_existent_branches_cd, false)
+                Brightpearl::Terminal::warning("The following branches #{Brightpearl::Terminal::format_invalid('could not be found', true)} \xe2\x80\x94 #{Brightpearl::Terminal::format_directory(@git.get_repo_shorthand(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE)))}", non_existent_branches_cd, false)
                 atleast_one_error = true
             end
-            if non_existent_branches_db.any?
-                Brightpearl::Terminal::warning("The following branches could not be found in: #{Brightpearl::Terminal::format_directory(@git.get_repo_shorthand(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB)))}", non_existent_branches_db, false)
+            if branches_with_stashes_cd.any?
+                Brightpearl::Terminal::warning("The following branches #{Brightpearl::Terminal::format_invalid('have stashes', true)} \xe2\x80\x94 #{Brightpearl::Terminal::format_directory(@git.get_repo_shorthand(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE)))}", branches_with_stashes_cd, false)
                 atleast_one_error = true
             end
-            if branches_with_stashes_cd.any?
-                Brightpearl::Terminal::error("The following branches have stashes (#{@git.get_repo_shorthand(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE))})", branches_with_stashes_cd, false)
+            if non_existent_branches_db.any? || branches_with_stashes_db.any?
+                puts "\n  #{Brightpearl::Terminal::format_directory(@git.get_repo_shorthand(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB)))}\n\n"
+            end
+            if non_existent_branches_db.any?
+                Brightpearl::Terminal::warning("The following branches #{Brightpearl::Terminal::format_invalid('could not be found', true)} \xe2\x80\x94 #{Brightpearl::Terminal::format_directory(@git.get_repo_shorthand(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB)))}", non_existent_branches_db, false)
                 atleast_one_error = true
             end
             if branches_with_stashes_db.any?
-                Brightpearl::Terminal::error("The following branches have stashes (#{@git.get_repo_shorthand(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB))})", branches_with_stashes_db, false)
+                Brightpearl::Terminal::warning("The following branches #{Brightpearl::Terminal::format_invalid('have stashes', true)} \xe2\x80\x94 #{Brightpearl::Terminal::format_directory(@git.get_repo_shorthand(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB)))}", branches_with_stashes_db, false)
                 atleast_one_error = true
             end
             if atleast_one_branch_found == false
-                Brightpearl::Terminal::error('All the branches you specified cannot be found.', 'Nothing to merge. Aborting script.', true)
+                Brightpearl::Terminal::error('Source branches not found', 'Nothing to merge. Aborting script.', true)
             end
 
-            source_target_text = generate_source_target_text
+            non_existent_branches_cd_dup = non_existent_branches_cd.dup
+            non_existent_branches_db_dup = non_existent_branches_db.dup
+
+            source_target_text = generate_source_target_text(non_existent_branches_cd_dup.concat(non_existent_branches_db_dup).uniq!)
             source_target_text.unshift('')
             if atleast_one_error
                 source_target_text.unshift('Although issues were detected, the script determined that these are non-fatal and can continue with the merge.')
             end
             source_target_text.unshift("This is officially the \x1B[38;5;196mPOINT OF NO RETURN\x1B[38;5;240m. Please make sure everything is OK before continuing.")
 
-            unless Brightpearl::Terminal::prompt_yes_no("You're about to #{Brightpearl::Terminal::format_action('merge')} the following branch(es):", source_target_text, "Are you absolutely sure you would like to #{Brightpearl::Terminal::format_action('CONTINUE')}\x1B[38;5;89m with the merge?")
+            unless Brightpearl::Terminal::prompt_yes_no("You're about to #{Brightpearl::Terminal::format_action('merge')} between following branch(es):", source_target_text, "Are you absolutely sure you would like to #{Brightpearl::Terminal::format_action('CONTINUE')}\x1B[38;5;89m with the merge?")
                 Brightpearl::Terminal::abort(nil, nil, true, false)
             end
 
-            # DO THE MERGE
+            # MERGE STARTS HERE !!
             branches_data.each do |branch_data|
 
                 branch_name = branch_data[0][:"#{Brightpearl::Git::BRANCH_NAME}"]
-                commands1 = []
-                commands1 << "git checkout #{branch_name}"
-                commands1 << 'git pull'
-                commands2 = ["git merge #{Brightpearl::Git::MASTER}"]
-                commands3 = [
+                commands_1 = [
+                    "git checkout #{branch_name}"
+                ]
+                commands_2 = [
+                    "git merge #{Brightpearl::Git::MASTER}"
+                ]
+                commands_3 = [
+                    "git diff --name-only #{Brightpearl::Git::MASTER}"
+                ]
+                commands_4 = [
                     'git push',
                     "git checkout #{@target_branch}"
                 ]
-                commands4 = ["git merge #{branch_name}"]
+                commands_5 = [
+                    "git merge #{branch_name}",
+                ]
+                commands_6 = []
+                if @target_branch != Brightpearl::Git::MASTER
+                    commands_6 << 'git push'
+                end
 
                 # CODE BRANCHES
                 unless non_existent_branches_cd.include?(branch_name)
-                    Brightpearl::Terminal::command(commands1, cd_repo)
-                    merge_master_result = Brightpearl::Terminal::command(commands2, cd_repo)
+                    Brightpearl::Terminal::command(commands_1, cd_repo)
+                    Brightpearl::Terminal::command('git pull', cd_repo) if branch_data[0][:"#{Brightpearl::Git::BRANCH_HAS_UPSTREAM}"]
+                    merge_master_result = Brightpearl::Terminal::command(commands_2, cd_repo)
                     if merge_master_result[0] == false
-                        Brightpearl::Terminal::error('Merge conflict occurred', "Unable to successfully merge #{Brightpearl::Terminal::format_branch(Brightpearl::Git::MASTER)} \xe2\x86\x92 #{Brightpearl::Terminal::format_branch(branch_name)} \xe2\x80\x94 (#{@git.get_repo_shorthand(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE))})", true)
+                        Brightpearl::Terminal::error('Merge conflict occurred', "Unable to successfully merge #{Brightpearl::Terminal::format_branch(Brightpearl::Git::MASTER)} \xe2\x86\x92 #{Brightpearl::Terminal::format_branch(branch_name)} \xe2\x80\x94 (#{Brightpearl::Terminal::format_directory(@git.get_repo_shorthand(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE)))})", true)
+                    end
+                    changed_files_code["#{branch_name}"] = Brightpearl::Terminal::command_capture(commands_3, cd_repo)
+                    Brightpearl::Terminal::command(commands_4, cd_repo)
+                    merge_to_target = Brightpearl::Terminal::command(commands_5, cd_repo)
+                    if merge_to_target[0] == false
+                        Brightpearl::Terminal::error('Merge conflict occurred', ["Unable to successfully merge #{Brightpearl::Terminal::format_branch(branch_name)} \xe2\x86\x92 #{Brightpearl::Terminal::format_branch(@target_branch)} \xe2\x80\x94 (#{Brightpearl::Terminal::format_directory(@git.get_repo_shorthand(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE)))})", "Please #{Brightpearl::Terminal::format_action('open an IDE')} and resolve your conflicts before continuing."], true)
                     end
-                    Brightpearl::Terminal::command(commands3, cd_repo)
-                    merge_to_target = Brightpearl::Terminal::command(commands4, cd_repo)
-                    if merge_to_target == false
-                        Brightpearl::Terminal::error('Merge conflict occurred', "Unable to successfully merge #{Brightpearl::Terminal::format_branch(branch_name)} \xe2\x86\x92 #{Brightpearl::Terminal::format_branch(@target_branch)} \xe2\x80\x94 (#{@git.get_repo_shorthand(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE))})", true)
+                    if commands_6.any?
+                        Brightpearl::Terminal::command(commands_6, cd_repo)
                     end
                 end
 
                 # DB BRANCHES
-                if non_existent_branches_db.include?(branch_name)
-                    # Brightpearl::Terminal::warning("Skipping #{Brightpearl::Terminal::format_branch(branch_name)} \xe2\x80\x94 (#{@git.get_repo_shorthand(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB))})", 'Branch not found.')
-                else
-                    Brightpearl::Terminal::command(commands1, db_repo)
-                    merge_master_result = Brightpearl::Terminal::command(commands2, db_repo)
+                unless non_existent_branches_db.include?(branch_name)
+                    Brightpearl::Terminal::command(commands_1, db_repo)
+                    Brightpearl::Terminal::command('git pull', db_repo) if branch_data[1][:"#{Brightpearl::Git::BRANCH_HAS_UPSTREAM}"]
+                    merge_master_result = Brightpearl::Terminal::command(commands_2, db_repo)
                     if merge_master_result[0] == false
-                        Brightpearl::Terminal::error('Merge conflict occurred', "Unable to successfully merge #{Brightpearl::Terminal::format_branch(Brightpearl::Git::MASTER)} \xe2\x86\x92 #{Brightpearl::Terminal::format_branch(branch_name)} \xe2\x80\x94 (#{@git.get_repo_shorthand(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB))})", true)
+                        Brightpearl::Terminal::error('Merge conflict occurred', ["Unable to successfully merge #{Brightpearl::Terminal::format_branch(Brightpearl::Git::MASTER)} \xe2\x86\x92 #{Brightpearl::Terminal::format_branch(branch_name)} \xe2\x80\x94 (#{Brightpearl::Terminal::format_directory(@git.get_repo_shorthand(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB)))})", "Please #{Brightpearl::Terminal::format_action('open an IDE')} and resolve your conflicts before continuing."], true)
+                    end
+                    changed_files_db["#{branch_name}"] = Brightpearl::Terminal::command_capture(commands_3, db_repo)
+                    Brightpearl::Terminal::command(commands_4, db_repo, false)
+                    merge_to_target = Brightpearl::Terminal::command(commands_5, db_repo)
+                    if merge_to_target[0] == false
+                        Brightpearl::Terminal::error('Merge conflict occurred', ["Unable to successfully merge #{Brightpearl::Terminal::format_branch(branch_name)} \xe2\x86\x92 #{Brightpearl::Terminal::format_branch(@target_branch)} \xe2\x80\x94 (#{Brightpearl::Terminal::format_directory(@git.get_repo_shorthand(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB)))})", "Please #{Brightpearl::Terminal::format_action('open an IDE')} and resolve your conflicts before continuing."], true)
                     end
-                    Brightpearl::Terminal::command(commands3, db_repo, false)
-                    merge_to_target = Brightpearl::Terminal::command(commands4, db_repo)
-                    if merge_to_target == false
-                        Brightpearl::Terminal::error('Merge conflict occurred', "Unable to successfully merge #{Brightpearl::Terminal::format_branch(branch_name)} \xe2\x86\x92 #{Brightpearl::Terminal::format_branch(@target_branch)} \xe2\x80\x94 (#{@git.get_repo_shorthand(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB))})", true)
+                    if commands_6.any?
+                        Brightpearl::Terminal::command(commands_6, db_repo)
                     end
                 end
 
             end
 
             Brightpearl::Terminal::success('It seems as if everything ran smoothly', "#{@source_branches.count} #{(@source_branches.count) == 1 ? 'branch has' : 'branches have'} been successfully merged to #{Brightpearl::Terminal::format_branch(@target_branch)}")
-            if Brightpearl::Terminal::prompt_yes_no('Just to be safe, would you like to run a sanity check?', ["This will execute #{Brightpearl::Terminal::format_command('git log')}\x1B[38;5;240m on #{Brightpearl::Terminal::format_branch(@target_branch)}\x1B[38;5;240m and #{Brightpearl::Terminal::format_command('grep')}\x1B[38;5;240m for Jira numbers relating to", 'to all the branches you have just merged. This way we can double-check they have', 'actually been merged', nil, "Please note this process may not be \x1B[38;5;250m100%\x1B[38;5;240m reliable"])
-
-                # SANITY CHECK SCRIPT
-                @source_branches.each do |x|
-                    grep_string = x.split('-')
-                    grep_string = "BP-#{grep_string[grep_string.count - 1]}"
-                    puts "\x1B[38;5;39m#{x}\x1B[0m \xe2\x80\x94 (#{grep_string})"
-                    system("cd #{Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE)} && git log | grep '#{grep_string}' --color=auto")
-                    system("cd #{Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB)} && git log | grep '#{grep_string}' --color=auto")
+
+            if Brightpearl::Config.param(Brightpearl::Config::BETA)
+
+                if Brightpearl::Terminal::prompt_yes_no('Just to be safe, would you like to run a sanity check?', ["This will execute #{Brightpearl::Terminal::format_command('git log')}\x1B[38;5;240m on #{Brightpearl::Terminal::format_branch(@target_branch)}\x1B[38;5;240m and #{Brightpearl::Terminal::format_command('grep')}\x1B[38;5;240m for Jira numbers relating all the branches you have just merged. This way we can double-check they have actually been merged.", nil, "Please note this process may not be \x1B[38;5;250m100%\x1B[38;5;240m reliable."])
+
+                    # SANITY CHECK SCRIPT
+                    @source_branches.each do |x|
+                        grep_string = x.split('-')
+                        grep_string = "BP-#{grep_string[grep_string.count - 1]}"
+                        puts "\x1B[38;5;39m#{x}\x1B[0m \xe2\x80\x94 (#{grep_string})"
+                        system("cd #{Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE)} && git log | grep '#{grep_string}' --color=auto")
+                        system("cd #{Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB)} && git log | grep '#{grep_string}' --color=auto")
+                    end
+                    puts
+
                 end
-                puts
 
             end
 
@@ -239,7 +307,7 @@ module BrightpearlCommand
 
         def retrieve_source_branches
             if @opts[:from_file]
-                File.open(@opts[:from_file]).each do |line|
+                File.open(Brightpearl::Enum::GIT_MERGE_DEFAULT_FILE).each do |line|
                     line_trimmed = line.gsub(/\s+/, '')
                     if line_trimmed != ''
                         line_split = line_trimmed.split(',')
@@ -252,30 +320,40 @@ module BrightpearlCommand
             end
             @source_branches.sort_by! { |m| m.downcase }
             @source_branches.uniq!
+            unless @source_branches.any?
+                error_text = nil
+                if @opts[:from_file]
+                    error_text = "No source branches found in: #{Brightpearl::Terminal::format_directory(Brightpearl::Enum::GIT_MERGE_DEFAULT_FILE)}"
+                end
+                Brightpearl::Terminal::error('Cannot determine source branch(es)', error_text, true)
+            end
         end
 
         def retrieve_target_branches
             if @opts[:from_file]
                 if @args[0].nil?
-                    @target_branch = Brightpearl::Git::MASTER
+                    @target_branch = @git.current_branch_for_repo(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE))
                 else
                     @target_branch = @args[0]
                 end
             else
                 if @args[1].nil?
-                    @target_branch = Brightpearl::Git::MASTER
+                    @target_branch = @git.current_branch_for_repo(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE))
                 else
                     @target_branch = @args[1]
                 end
             end
         end
 
-        def generate_source_target_text
+        def generate_source_target_text(branches_with_issues = nil)
+            branches_with_issues = [] if branches_with_issues.nil?
             source_branches_dup = @source_branches.dup
-            source_branch_text = ["Source branch(es): \x1B[38;5;117m#{source_branches_dup.shift}"]
+            first_branch_color = (branches_with_issues.include?(source_branches_dup[0])) ? '240' : '117'
+            source_branch_text = ["Source branch(es): \x1B[38;5;#{first_branch_color}m#{source_branches_dup.shift}"]
             unless source_branches_dup.empty?
                 source_branches_dup.each do |sb|
-                    source_branch_text << "                   \x1B[38;5;117m#{sb}"
+                    branch_color = (branches_with_issues.include?(sb)) ? '240' : '117'
+                    source_branch_text << "                   \x1B[38;5;#{branch_color}m#{sb}"
                 end
                 source_branch_text << ''
             end

data/lib/routes/git_pull.rb

@@ -4,10 +4,46 @@ module BrightpearlCommand
 
         def execute
 
-            Convoy::Logger.output.puts "Command: #{command_name}"
-            Convoy::Logger.output.puts "Options: #{options}"
-            Convoy::Logger.output.puts "Command options: #{command_options}"
-            Convoy::Logger.output.puts "Arguments: #{arguments}"
+            @opts = command_options
+            @args = arguments
+            @git = Brightpearl::Git.new
+
+            opts_validate
+            opts_routing
+
+        end
+
+        def opts_validate
+
+            if @args[0].nil?
+                @args[0] = @git.current_branch_for_repo(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE))
+            end
+
+        end
+
+        def opts_routing
+
+            git_pull
+
+        end
+
+        def git_pull
+
+            @git.check_for_same_branch(Brightpearl::Git::SAME_BRANCH_WARNING)
+            branch_code = @git.current_branch_for_repo(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE))
+            branch_db = @git.current_branch_for_repo(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB))
+            if Brightpearl::Terminal::prompt_yes_no("#{Brightpearl::Terminal::format_action('pull')} the following repos:", [
+                "#{Brightpearl::Terminal::format_directory(@git.get_repo_shorthand(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE)))} will pull #{Brightpearl::Terminal::format_branch(branch_code)} \xe2\x86\x92 #{Brightpearl::Terminal::format_branch("origin/#{branch_code}")}",
+                "#{Brightpearl::Terminal::format_directory(@git.get_repo_shorthand(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB)))}   will pull #{Brightpearl::Terminal::format_branch(branch_db)} \xe2\x86\x92 #{Brightpearl::Terminal::format_branch("origin/#{branch_db}")}"
+            ])
+                @git.check_for_uncommitted_files(true)
+                @git.repo_loop.each do |repo_dir|
+                    unless Brightpearl::Terminal::command_capture("git pull origin #{@git.current_branch_for_repo(repo_dir)}", repo_dir)
+                        Brightpearl::Terminal::warning('Something went wrong', "Not sure what the reason was, but doing a #{Brightpearl::Terminal::format_command('git pull')} on #{Brightpearl::Terminal::format_directory(@git.get_repo_shorthand(repo_dir))} was unsuccessful.")
+                    end
+                end
+                @git.check_for_stash(true)
+            end
 
         end
 

data/lib/routes/git_push.rb

@@ -4,10 +4,46 @@ module BrightpearlCommand
 
         def execute
 
-            Convoy::Logger.output.puts "Command: #{command_name}"
-            Convoy::Logger.output.puts "Options: #{options}"
-            Convoy::Logger.output.puts "Command options: #{command_options}"
-            Convoy::Logger.output.puts "Arguments: #{arguments}"
+            @opts = command_options
+            @args = arguments
+            @git = Brightpearl::Git.new
+
+            opts_validate
+            opts_routing
+
+        end
+
+        def opts_validate
+
+            if @args[0].nil?
+                @args[0] = @git.current_branch_for_repo(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE))
+            end
+
+        end
+
+        def opts_routing
+
+            git_push
+
+        end
+
+        def git_push
+
+            @git.check_for_same_branch(Brightpearl::Git::SAME_BRANCH_WARNING)
+            branch_code = @git.current_branch_for_repo(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE))
+            branch_db = @git.current_branch_for_repo(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB))
+            if Brightpearl::Terminal::prompt_yes_no("#{Brightpearl::Terminal::format_action('push')} the following repos:", [
+                "#{Brightpearl::Terminal::format_directory(@git.get_repo_shorthand(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE)))} will push #{Brightpearl::Terminal::format_branch(branch_code)} \xe2\x86\x92 #{Brightpearl::Terminal::format_branch("origin/#{branch_code}")}",
+                "#{Brightpearl::Terminal::format_directory(@git.get_repo_shorthand(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB)))}   will push #{Brightpearl::Terminal::format_branch(branch_db)} \xe2\x86\x92 #{Brightpearl::Terminal::format_branch("origin/#{branch_db}")}"
+            ])
+                @git.check_for_uncommitted_files(true)
+                @git.repo_loop.each do |repo_dir|
+                    unless Brightpearl::Terminal::command_capture("git push origin #{@git.current_branch_for_repo(repo_dir)}", repo_dir)
+                        Brightpearl::Terminal::warning('Something went wrong', "Not sure what the reason was, but doing a #{Brightpearl::Terminal::format_command('git push')} on #{Brightpearl::Terminal::format_directory(@git.get_repo_shorthand(repo_dir))} was unsuccessful.")
+                    end
+                end
+                @git.check_for_stash(true)
+            end
 
         end
 

data/lib/routes/git_stash.rb

@@ -6,6 +6,7 @@ module BrightpearlCommand
 
             @opts = command_options
             @args = arguments
+            @git = Brightpearl::Git.new
             opts_validate
             opts_routing
 
@@ -17,8 +18,24 @@ module BrightpearlCommand
 
         def opts_routing
 
-            # SHOW WHAT FILES HAVE CHANGED IN A STASH
-            system('git stash show --name-only stash@{0}')
+            show_all_stashes
+
+        end
+
+        def show_all_stashes
+
+            @git.repo_loop.each do |repo_dir|
+                stashes = `cd #{repo_dir} && git stash list`
+                stashes = stashes.split("\n")
+                # Skip if no stashes.
+                next unless stashes.any?
+                Brightpearl::Terminal::info("Showing stashes for: #{Brightpearl::Terminal::format_directory(@git.get_repo_shorthand(repo_dir))}")
+                stashes.each do |stash|
+                    stash_name = stash.split(/:/).first
+                    output = Brightpearl::Terminal::command_capture("git stash show --name-only #{stash_name}", repo_dir, false)
+                    Brightpearl::Terminal::info("#{stash}", output[0], false)
+                end
+            end
 
         end
 

data/lib/routes/git_update.rb

@@ -28,8 +28,7 @@ module BrightpearlCommand
         # Updates the current branch.
         # @return void
         def update_branch_single
-            ran_smoothly = true
-            @git.stash_staged_changes
+            @git.check_for_uncommitted_files(true)
             @git.repo_loop.each do |repo_dir|
                 current_branch = @git.current_branch_for_repo(repo_dir)
                 commands = Array.new
@@ -43,83 +42,24 @@ module BrightpearlCommand
                     commands << 'git merge master'
                 end
                 results = Brightpearl::Terminal::command(commands, repo_dir)
-                if results[4] == false
-                    Brightpearl::Terminal::error('Merge conflict occurred', ["Unable to successfully merge #{Brightpearl::Terminal::format_branch(Brightpearl::Git::MASTER)} \xe2\x86\x92 #{Brightpearl::Terminal::format_branch(current_branch)} \xe2\x80\x94 (#{@git.get_repo_shorthand(repo_dir)})", "Please #{Brightpearl::Terminal::format_action('open an IDE')}\x1B[38;5;240m and resolve your conflicts as soon as this script has finished executing."], false)
-                    ran_smoothly = false
-                    next
+                if current_branch != Brightpearl::Git::MASTER
+                    if results[3] == false
+                        @git.ask_to_setup_remote_tracking(current_branch, repo_dir)
+                    end
+                    if results[4] == false
+                        Brightpearl::Terminal::error('Merge conflict occurred', ["Unable to successfully merge #{Brightpearl::Terminal::format_branch(Brightpearl::Git::MASTER)} into #{Brightpearl::Terminal::format_branch(current_branch)} on #{Brightpearl::Terminal::format_directory(@git.get_repo_shorthand(repo_dir))}", "Please #{Brightpearl::Terminal::format_action('open an IDE')}\x1B[38;5;240m and resolve your conflicts as soon as this script has finished executing."])
+                    end
                 end
-                if @opts[:push] && (current_branch != Brightpearl::Git::MASTER)
-                    Brightpearl::Terminal::command('git push', repo_dir)
+                if @opts[:push] && current_branch != Brightpearl::Git::MASTER
+                    Brightpearl::Terminal::command("git push origin #{current_branch}", repo_dir)
+                elsif @opts[:push] && current_branch == Brightpearl::Git::MASTER
+                    Brightpearl::Terminal::warning("#{Brightpearl::Terminal::format_action('push')} to #{Brightpearl::Terminal::format_branch(Brightpearl::Git::MASTER)} not allowed!", ["Your #{Brightpearl::Terminal::format_directory(@git.get_repo_shorthand(repo_dir))} repo is currently on #{Brightpearl::Terminal::format_branch(Brightpearl::Git::MASTER)}","The script will not perform a #{Brightpearl::Terminal::format_action('push')} as requested for safety reasons."])
                 end
 
             end
-            if ran_smoothly
-                @git.check_for_stash
-            end
+            @git.check_for_stash(true)
         end
 
-        # Updates ALL local branches.
-        # @return void
-        # def update_branch_all
-        #     Brightpearl::Tools::verify_internet_access
-        #     repos = []
-        #     brightpearl_code, brightpearl_db = @git.get_branches_as_array(Brightpearl::Git::SORT_REFNAME, Brightpearl::Git::LOCAL)
-        #     Array[brightpearl_code, brightpearl_db].each do |repo_data|
-        #         branches = []
-        #         repo_data.each do |branch_name|
-        #             if branch_name[0..6] != Brightpearl::Git::MERGED_PREFIX
-        #                 branches << branch_name
-        #             end
-        #         end
-        #         repos << branches
-        #     end
-        #     message = [
-        #         "You are about to merge master into ALL of the following branches:\n\n",
-        #         "\x1B[33mbrightpearl-code \xe2\x86\x92 \x1B[0m\x1B[32m#{repos[0].join(', ')}\x1B[0m",
-        #         "\x1B[33mbrightpearl-db   \xe2\x86\x92 \x1B[0m\x1B[32m#{repos[1].join(', ')}\x1B[0m\n\n",
-        #         'This script will pull from master, merge master into ALL of your branches & then push your branches back up to /origin.'
-        #     ]
-        #     branch_count = repos[0].length + repos[1].length
-        #     if (branch_count) > 9
-        #         message << "\n\x1B[41m WARNING \x1B[0m You're about to update \x1B[32m#{branch_count}\x1B[0m branches. This could take a while.."
-        #     end
-        #     Brightpearl::Terminal::prompt_enter(message)
-        #
-        #     # Update master on both repos.
-        #     @git.repo_loop.each do |repo_dir|
-        #         current_branch = @git.current_branch_for_repo(repo_dir)
-        #         commands = Array.new
-        #         if current_branch != Brightpearl::Git::MASTER
-        #             commands << 'git checkout master'
-        #         end
-        #         commands << 'git pull'
-        #         Brightpearl::Terminal::command(commands, repo_dir)
-        #     end
-        #
-        #     # Update ALL the branches, one-by-one.
-        #     repos[0].each do |branch|
-        #         update_branch(branch, Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE))
-        #     end
-        #     repos[1].each do |branch|
-        #         update_branch(branch, Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB))
-        #     end
-        #
-        # end
-
-        # Updates a single branch.
-        # @return void
-        # def update_branch(branch_name, repo_dir)
-        #     if branch_name != Brightpearl::Git::MASTER
-        #         puts "\x1B[45m Check-out \x1B[0m \x1B[32m\xe2\x86\x92\x1B[0m \x1B[35m#{branch_name}\x1B[0m"
-        #         commands = Array.new
-        #         commands << "git checkout #{branch_name}"
-        #         # commands << 'git pull'
-        #         commands << 'git merge --no-commit --no-ff master | grep CONFLICT'
-        #         # commands << 'git push'
-        #         Brightpearl::Terminal::command(commands, repo_dir)
-        #     end
-        # end
-
     end
 
 end

data/lib/routes/jira.rb

@@ -7,6 +7,7 @@ module BrightpearlCommand
             @opts = command_options
             @args = arguments
             @jira = Brightpearl::Jira.new
+
             opts_validate
             opts_routing