brightpearl-cli 1.1.0

data/lib/core/git.rb

@@ -0,0 +1,771 @@
+require 'columnist'
+require 'date'
+require 'highline'
+
+module Brightpearl
+
+    class Git
+
+        include Columnist
+
+        DELIMITER = '*|*'
+
+        SORT_DATE = 'date'
+        SORT_REFNAME = 'refname'
+
+        LOCAL = 'local'
+        REMOTE = 'remote'
+        CODE = 'code'
+        DB = 'db'
+
+        MERGED_PREFIX = 'MERGED-'
+        MDASH = '━'
+
+        MASTER = 'master'
+        REFNAME = 'refname'
+        OBJECT_TYPE = 'objecttype'
+        OBJECT_SIZE = 'objectsize'
+        OBJECT_NAME = 'objectname'
+        TREE = 'tree'
+        NUM_PARENT = 'numparent'
+        COMMITTER_NAME = 'committername'
+        COMMITTER_EMAIL = 'committeremail'
+        COMMITTER_DATE = 'committerdate'
+        SUBJECT = 'subject'
+        UPSTREAM = 'upstream'
+
+        BRANCH_NAME = 'branch_name'
+        BRANCH_LOCATION = 'branch_location'
+        BRANCH_EXISTS = 'branch_exists'
+        BRANCH_EXISTS_LOCALLY = 'branch_exists_locally'
+        BRANCH_IS_CURRENT = 'branch_is_current'
+        BRANCH_IS_UP_TO_DATE = 'branch_is_up_to_date'
+        BRANCH_HAS_STASH = 'branch_has_stash'
+        BRANCH_HAS_UPSTREAM = 'branch_has_upstream'
+
+        def initialize
+
+            @origin_updated_code = false
+            @origin_updated_db = false
+            @branch_upstream_data = false
+            @branches_as_array = {
+                :local_code => nil,
+                :local_db => nil,
+                :local_both => nil,
+                :remote_code => nil,
+                :remote_db => nil,
+                :remote_both => nil
+            }
+            @branches_as_array_all = false
+
+        end
+
+        # Gets detailed info about local branches as Array.
+        # @return Array
+        def get_local_branches(sort = SORT_REFNAME, repo_dir = nil)
+            repos = []
+            repos_to_return = []
+            validate_sort(sort)
+            if repo_dir.nil?
+                repo_loop.each do |repo_dir_inner|
+                    repos << repo_dir_inner
+                end
+            else
+                validate_repo_dir(repo_dir)
+                repos << repo_dir
+            end
+            repos.each do |repo_dir_inner|
+                unless File.directory?(repo_dir_inner)
+                    Brightpearl::Terminal::error('Directory not found', "Directory doesn't exist: #{Brightpearl::Terminal::format_directory(repo_dir_inner)}", true)
+                end
+                raw_terminal_output = `
+                    cd #{repo_dir_inner} &&
+                    git for-each-ref refs/heads/ --format='%(#{REFNAME})#{DELIMITER}%(#{OBJECT_TYPE})#{DELIMITER}%(#{OBJECT_SIZE})#{DELIMITER}%(#{OBJECT_NAME})#{DELIMITER}%(tree)#{DELIMITER}%(#{NUM_PARENT})#{DELIMITER}%(#{COMMITTER_NAME})#{DELIMITER}%(#{COMMITTER_EMAIL})#{DELIMITER}%(#{COMMITTER_DATE})#{DELIMITER}%(#{SUBJECT})#{DELIMITER}%(#{UPSTREAM})#{DELIMITER}' | sed 's/refs\\/heads\\///g'
+                `
+                branches = {}
+                branch_count = 0
+                raw_terminal_output.split("\n").each do |line|
+                    line_split = line.split(DELIMITER)
+                    data = {}
+                    data[:"#{REFNAME}"] = line_split[0]
+                    data[:"#{OBJECT_TYPE}"] = line_split[1]
+                    data[:"#{OBJECT_SIZE}"] = line_split[2]
+                    data[:"#{OBJECT_NAME}"] = line_split[3]
+                    data[:"#{TREE}"] = line_split[4]
+                    data[:"#{NUM_PARENT}"] = line_split[5]
+                    data[:"#{COMMITTER_NAME}"] = line_split[6]
+                    data[:"#{COMMITTER_EMAIL}"] = line_split[7][1..-2]
+                    data[:"#{COMMITTER_DATE}"] = DateTime.parse(line_split[8])
+                    data[:"#{SUBJECT}"] = line_split[9]
+                    data[:"#{UPSTREAM}"] = line_split[10]
+                    case sort
+                        when SORT_REFNAME
+                            branches[data[:"#{REFNAME}"]] = data
+                        when SORT_DATE
+                            branches["#{data[:"#{COMMITTER_DATE}"].strftime('%Y-%m-%d-%H-%I-%S')}-#{branch_count}"] = data
+                            branch_count = branch_count + 1
+                        else
+                            Brightpearl::Terminal::error('Sort not supported', "The following sorting option is not yet supported: #{sort}", true)
+                    end
+                end
+                branch_keys = branches.keys
+                case sort
+                    when SORT_REFNAME
+                        branch_keys.sort_by!(&:downcase)
+                    when SORT_DATE
+                        branch_keys.sort_by! { |value| value }
+                        branch_keys = branch_keys.reverse
+                    else
+                        Brightpearl::Terminal::error('Sort not supported', "The following sorting option is not yet supported: #{sort}", true)
+                end
+                branch_data = []
+                branch_keys.each do |key|
+                    branch_data << branches["#{key}"]
+                end
+                repos_to_return << branch_data
+            end
+            if repo_dir.nil?
+                return repos_to_return[0], repos_to_return[1]
+            else
+                repos_to_return[0]
+            end
+        end
+
+        # Gets detailed info about remote branches as Array.
+        # @return Array
+        def get_remote_branches(sort = SORT_REFNAME, repo_dir = nil)
+            repos = []
+            repos_to_return = []
+            validate_sort(sort)
+            if repo_dir.nil?
+                repo_loop.each do |repo_dir_inner|
+                    repos << repo_dir_inner
+                end
+            else
+                validate_repo_dir(repo_dir)
+                repos << repo_dir
+            end
+            repos.each do |repo_dir_inner|
+                unless File.directory?(repo_dir_inner)
+                    Brightpearl::Terminal::error('Directory not found', "Directory doesn't exist: #{Brightpearl::Terminal::format_directory(repo_dir)}", true)
+                end
+                update_origin(repo_dir_inner)
+                raw_terminal_output = `
+                    cd #{repo_dir_inner} &&
+                    for branch in \`git branch -r | grep -v HEAD\`; do echo \`git show --format="%cn#{DELIMITER}%ce#{DELIMITER}%cd#{DELIMITER}%s#{DELIMITER}" $branch | head -n 1\` $branch; done | sort -r | sed 's/origin\\///g'
+                `
+                branches = {}
+                branch_count = 0
+                raw_terminal_output.split("\n").each do |line|
+                    line_split = line.split(DELIMITER)
+                    data = {}
+                    data[:"#{COMMITTER_NAME}"] = line_split[0]
+                    data[:"#{COMMITTER_EMAIL}"] = line_split[1]
+                    data[:"#{COMMITTER_DATE}"] = DateTime.parse(line_split[2])
+                    data[:"#{SUBJECT}"] = line_split[3]
+                    data[:"#{REFNAME}"] = line_split[4].to_s.strip
+                    case sort
+                        when SORT_REFNAME
+                            branches[data[:"#{REFNAME}"]] = data
+                        when SORT_DATE
+                            branches["#{data[:"#{COMMITTER_DATE}"].strftime('%Y-%m-%d-%H-%I-%S')}-#{branch_count}"] = data
+                            branch_count = branch_count + 1
+                        else
+                            Brightpearl::Terminal::error('Sort not supported', "The following sorting option is not yet supported: #{sort}", true)
+                    end
+                end
+                branch_keys = branches.keys
+                case sort
+                    when SORT_REFNAME
+                        branch_keys.sort_by!(&:downcase)
+                    when SORT_DATE
+                        branch_keys.sort_by! { |value| value }
+                        branch_keys = branch_keys.reverse
+                    else
+                        Brightpearl::Terminal::error('Sort not supported', "The following sorting option is not yet supported: #{sort}", true)
+                end
+                branch_data = []
+                branch_keys.each do |key|
+                    branch_data << branches["#{key}"]
+                end
+                repos_to_return << branch_data
+            end
+            if repo_dir.nil?
+                return repos_to_return[0], repos_to_return[1]
+            else
+                repos_to_return[0]
+            end
+        end
+
+        # Gets branch names as array.
+        # @return Array
+        def get_branches_as_array(local_remote = LOCAL, repo_dir = nil)
+            validate_local_remote(local_remote)
+
+            # Check if result is already cached.
+            if repo_dir.nil?
+                if local_remote == LOCAL
+                    return @branches_as_array[:local_both] if @branches_as_array[:local_both] != nil
+                else
+                    return @branches_as_array[:remote_both] if @branches_as_array[:remote_both] != nil
+                end
+            else
+                if repo_dir == Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE)
+                    if local_remote == LOCAL
+                        return @branches_as_array[:local_code] if @branches_as_array[:local_code] != nil
+                    else
+                        return @branches_as_array[:remote_code] if @branches_as_array[:remote_code] != nil
+                    end
+                else
+                    if local_remote == LOCAL
+                        return @branches_as_array[:local_db] if @branches_as_array[:local_db] != nil
+                    else
+                        return @branches_as_array[:remote_db] if @branches_as_array[:remote_db] != nil
+                    end
+                end
+            end
+
+            case local_remote
+                when LOCAL
+                    if repo_dir.nil?
+                        brightpearl_code, brightpearl_db = get_local_branches
+                        repos_branches = [brightpearl_code, brightpearl_db]
+                    else
+                        branches = get_local_branches(SORT_REFNAME, repo_dir)
+                        repos_branches = [branches]
+                    end
+                else
+                    if repo_dir.nil?
+                        brightpearl_code, brightpearl_db = get_remote_branches
+                        repos_branches = [brightpearl_code, brightpearl_db]
+                    else
+                        branches = get_remote_branches(SORT_REFNAME, repo_dir)
+                        repos_branches = [branches]
+                    end
+            end
+            repos_to_return = []
+            repos_branches.each do |repo_data|
+                branch_names = []
+                repo_data.each do |branch_data|
+                    branch_names << branch_data[:"#{REFNAME}"]
+                end
+                repos_to_return << branch_names
+            end
+            if repo_dir.nil?
+                if local_remote == LOCAL
+                    return @branches_as_array[:local_both] = repos_to_return[0], repos_to_return[1]
+                else
+                    return @branches_as_array[:remote_both] = repos_to_return[0], repos_to_return[1]
+                end
+            else
+                if repo_dir == Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE)
+                    if local_remote == LOCAL
+                        return @branches_as_array[:local_code] = repos_to_return[0]
+                    else
+                        return @branches_as_array[:remote_code] = repos_to_return[0]
+                    end
+                else
+                    if local_remote == LOCAL
+                        return @branches_as_array[:local_db] = repos_to_return[0]
+                    else
+                        return @branches_as_array[:remote_db] = repos_to_return[0]
+                    end
+                end
+            end
+        end
+
+        # Gets EVERY SINGLE BRANCH that exists -- local & remote, code & db -- and puts them in a single, unique, array.
+        # @return Array
+        def get_all_branches_as_array
+            unless @branches_as_array_all
+                local_branches = get_branches_as_array(Brightpearl::Git::LOCAL)
+                remote_branches = get_branches_as_array(Brightpearl::Git::REMOTE)
+                @branches_as_array_all = local_branches[0].concat(local_branches[1]).concat(remote_branches[0]).concat(remote_branches[1])
+                @branches_as_array_all.uniq!
+                @branches_as_array_all.sort_by! { |m| m.downcase }
+            end
+            @branches_as_array_all
+        end
+
+        # Outputs list of branches to terminal.
+        # @return void
+        def show_branches(sort = SORT_REFNAME, local_remote = LOCAL)
+            # todo
+            puts
+            puts "\x1B[31mTODO!\x1B[0m Must do something with 'terminal_width' parameter."
+            puts
+            validate_sort(sort)
+            validate_local_remote(local_remote)
+            # terminal_width = HighLine::SystemExtensions.terminal_size
+            # terminal_width = terminal_width[0]
+            case local_remote
+                when LOCAL
+                    brightpearl_code, brightpearl_db = get_local_branches(sort)
+                else
+                    brightpearl_code, brightpearl_db = get_remote_branches(sort)
+            end
+            current_code_branch = current_branch_for_repo(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE))
+            current_db_branch = current_branch_for_repo(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB))
+            column_width = [2, 20, 23, 15, 34, 1, 34, 15, 23, 20, 1]
+            Brightpearl::Tools::validate_report_width(column_width)
+            puts "\n"
+            table(:border => false) do
+                row do
+                    column('', :align => 'right', :bold => 'true', :width => column_width[0])
+                    column('Last Activity', :align => 'right', :bold => 'true', :width => column_width[1])
+                    column('Developer', :align => 'right', :bold => 'true', :width => column_width[2])
+                    column('Last Commit', :align => 'right', :bold => 'true', :width => column_width[3])
+                    column('BRIGHTPEARL-CODE', :align => 'right', :bold => 'true', :width => column_width[4], :color => 32)
+                    column('|', :align => 'center', :bold => 'true', :width => column_width[5])
+                    column('BRIGHTPEARL-DB', :align => 'left', :bold => 'true', :width => column_width[6], :color => 160)
+                    column('Last Commit', :align => 'left', :bold => 'true', :width => column_width[7])
+                    column('Developer', :align => 'left', :bold => 'true', :width => column_width[8])
+                    column('Last Activity', :align => 'left', :bold => 'true', :width => column_width[9])
+                    column('', :align => 'left', :bold => 'true', :width => column_width[10])
+                end
+                show_branches_divider(column_width)
+                db_branches_shown = []
+                brightpearl_code.each do |code_branch|
+                    db_branch = show_branches_get_db_branch(brightpearl_db, code_branch)
+                    if db_branch[:"#{REFNAME}"] != MDASH
+                        db_branches_shown << db_branch[:"#{REFNAME}"]
+                        # branch_data = branch_data(code_branch[:"#{REFNAME}"])
+                    else
+                        # branch_data = branch_data(code_branch[:"#{REFNAME}"], CODE)
+                    end
+                    code_time_adjusted = code_branch[:"#{COMMITTER_DATE}"] - (1 / 24.0)
+                    row do
+                        code_accent, code_color, code_star, db_accent, db_color, db_star = show_branches_get_colors(code_branch, current_code_branch, current_db_branch, db_branch)
+                        column("#{code_star}", :color => code_color)
+                        column(Brightpearl::Tools::time_passed_since(code_time_adjusted), :color => code_color)
+                        column(code_branch[:"#{COMMITTER_NAME}"], :color => code_color)
+                        column(code_branch[:"#{COMMITTER_DATE}"].strftime('%d %^b %H:%M'), :color => code_color)
+                        column(code_branch[:"#{REFNAME}"], :color => code_accent)
+                        column('|')
+                        column(db_branch[:"#{REFNAME}"], :color => db_accent)
+                        column((db_branch[:"#{COMMITTER_DATE}"] == nil) ? MDASH : db_branch[:"#{COMMITTER_DATE}"].strftime('%d %^b %H:%M'), :color => db_color)
+                        column(db_branch[:"#{COMMITTER_NAME}"], :color => db_color)
+                        column((db_branch[:"#{COMMITTER_DATE}"] == nil) ? MDASH : Brightpearl::Tools::time_passed_since(db_branch[:"#{COMMITTER_DATE}"] - (1 / 24.0)), :color => db_color)
+                        column("#{db_star}", :color => db_color)
+                    end
+                end
+                brightpearl_db.each do |db_branch|
+                    unless db_branches_shown.include? db_branch[:"#{REFNAME}"]
+                        row do
+                            code_accent, code_color, code_star, db_accent, db_color, db_star = show_branches_get_colors(nil, current_code_branch, current_db_branch, db_branch)
+                            column('', :color => code_color)
+                            column(MDASH, :color => code_color)
+                            column(MDASH, :color => code_color)
+                            column(MDASH, :color => code_color)
+                            column(MDASH, :color => code_accent)
+                            column('|')
+                            column(db_branch[:"#{REFNAME}"], :color => db_accent)
+                            column((db_branch[:"#{COMMITTER_DATE}"] == nil) ? MDASH : db_branch[:"#{COMMITTER_DATE}"].strftime('%d %^b %H:%M'), :color => db_color)
+                            column(db_branch[:"#{COMMITTER_NAME}"], :color => db_color)
+                            column((db_branch[:"#{COMMITTER_DATE}"] == nil) ? MDASH : Brightpearl::Tools::time_passed_since(db_branch[:"#{COMMITTER_DATE}"]), :color => db_color)
+                            column('')
+                        end
+                    end
+                end
+                show_branches_divider(column_width)
+            end
+            puts "\n"
+        end
+
+        # Sub-method for 'show_branches'. Don't call independently.
+        # @return String(s)
+        def show_branches_get_colors(code_branch, current_code_branch, current_db_branch, db_branch)
+            code_star = nil
+            code_color = 240
+            code_accent = nil
+            db_star = nil
+            db_color = 240
+            db_accent = nil
+            current_branch_color = 46
+            unless code_branch.nil?
+                if current_code_branch == code_branch[:"#{REFNAME}"]
+                    code_star = "\xe2\x98\x85"
+                    code_color = current_branch_color
+                    code_accent = current_branch_color
+                end
+            end
+            unless db_branch.nil?
+                if current_db_branch == db_branch[:"#{REFNAME}"]
+                    db_star = "\xe2\x98\x85"
+                    db_color = current_branch_color
+                    db_accent = current_branch_color
+                end
+            end
+            return code_accent, code_color, code_star, db_accent, db_color, db_star
+        end
+
+        # Sub-method for 'show_branches'. Don't call independently.
+        # @return void
+        def show_branches_get_db_branch(brightpearl_db, code_branch)
+            brightpearl_db.each do |db_branch|
+                if db_branch[:"#{REFNAME}"] == code_branch[:"#{REFNAME}"]
+                    return db_branch
+                end
+            end
+            db_branch = {}
+            db_branch[:"#{REFNAME}"] = MDASH
+            db_branch[:"#{COMMITTER_NAME}"] = MDASH
+            db_branch[:"#{COMMITTER_DATE}"] = nil
+            db_branch
+        end
+
+        # Sub-method for 'show_branches'. Don't call independently.
+        # @return void
+        def show_branches_divider(column_width, color = 'white')
+            row do
+                column(Brightpearl::Terminal::fill(column_width[0], MDASH), :color => color)
+                column(Brightpearl::Terminal::fill(column_width[1], MDASH), :color => color)
+                column(Brightpearl::Terminal::fill(column_width[2], MDASH), :color => color)
+                column(Brightpearl::Terminal::fill(column_width[3], MDASH), :color => color)
+                column(Brightpearl::Terminal::fill(column_width[4], MDASH), :color => color)
+                column(Brightpearl::Terminal::fill(column_width[5], MDASH), :color => color)
+                column(Brightpearl::Terminal::fill(column_width[6], MDASH), :color => color)
+                column(Brightpearl::Terminal::fill(column_width[7], MDASH), :color => color)
+                column(Brightpearl::Terminal::fill(column_width[8], MDASH), :color => color)
+                column(Brightpearl::Terminal::fill(column_width[9], MDASH), :color => color)
+                column(Brightpearl::Terminal::fill(column_width[10], MDASH), :color => color)
+            end
+        end
+
+        # Get current branch for repo.
+        # @return String
+        def current_branch_for_repo(repo_dir)
+            validate_repo_dir(repo_dir)
+            `cd #{repo_dir} && git symbolic-ref --short -q HEAD`.strip
+        end
+
+        # Updates origin (IE: remote branches)
+        # @return void
+        def update_origin(repo_dir = nil)
+            validate_repo_dir(repo_dir)
+            if @origin_updated_code && repo_dir == Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE) ||
+                @origin_updated_db && repo_dir == Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB) ||
+                @origin_updated_code && @origin_updated_db && repo_dir.nil?
+            else
+                Brightpearl::Terminal::output("Updating origin (#{get_repo_shorthand(repo_dir)})")
+                case repo_dir
+                    when Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE)
+                        @origin_updated_code = true
+                        Brightpearl::Terminal::command(['git fetch -p'], Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE))
+                    when Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB)
+                        @origin_updated_db = true
+                        Brightpearl::Terminal::command(['git fetch -p'], Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB))
+                    else
+                        @origin_updated_code = true
+                        @origin_updated_db = true
+                        repo_loop.each do |repo_dir_inner|
+                            Brightpearl::Terminal::command(['git fetch -p'], repo_dir_inner)
+                        end
+                end
+            end
+        end
+
+        # Merges master into current branch (for repo) and pushes changes to origin.
+        # @deprecated
+        # @return void
+        def merge_master_into_current_branch(repo_dir, push_to_origin = true)
+            current_branch = current_branch_for_repo(repo_dir)
+            if current_branch == Brightpearl::Git::MASTER
+                return
+            end
+            commands = Array.new
+            commands << 'git checkout master'
+            commands << 'git pull'
+            if current_branch != Brightpearl::Git::MASTER
+                commands << "git checkout #{current_branch}"
+                commands << 'git pull'
+                commands << 'git merge master'
+            end
+            if push_to_origin
+                commands << 'git push'
+            end
+            Brightpearl::Terminal::command(commands, repo_dir)
+        end
+
+        # Makes sure that both BP-CODE & BP-DB are on the same branch.
+        # @return void
+        # @deprecated
+        def verify_same_branch
+            branch_names = Array.new
+            repo_loop.each do |repo_dir|
+                branch_names << current_branch_for_repo(repo_dir)
+            end
+            if branch_names[0] != branch_names[1]
+                puts
+                puts "\x1B[41m ERROR \x1B[0m Cannot continue because your repos are not on the same branch."
+                puts
+                puts "\x1B[33m/brightpearl-code\x1B[0m is on: \x1B[32m#{branch_names[0]}\x1B[0m"
+                puts "\x1B[33m/brightpearl-db  \x1B[0m is on: \x1B[32m#{branch_names[1]}\x1B[0m"
+                puts
+                puts "Use \x1B[33mbrightpearl checkout\x1B[0m \x1B[32m[branch-name]\x1B[0m to switch both repos to the same branch."
+                puts
+                exit
+            end
+            branch_names[0]
+        end
+
+        # Checks if you have staged changes in current repo and if so, prompts to stash them.
+        # @return void
+        def stash_staged_changes
+            repo_loop.each do |repo_dir|
+                results = `cd #{repo_dir} && git status | grep 'Changes '`
+                results = results.split("\n")
+                if results.any?
+                    Brightpearl::Terminal::command(['git status'], repo_dir)
+                    current_branch = current_branch_for_repo(repo_dir)
+                    if Brightpearl::Terminal::prompt_yes_no("Found uncommitted files on branch #{Brightpearl::Terminal::format_branch(current_branch)}", nil, "Would you like to #{Brightpearl::Terminal::format_action('stash')}\x1B[38;5;89m these changes before continuing?")
+                        Brightpearl::Terminal::command('git stash', repo_dir)
+                    else
+                        unless Brightpearl::Terminal::prompt_yes_no('Continue without stashing?', "By selecting #{Brightpearl::Terminal::format_action('Yes')}\x1B[38;5;240m, you're changes will be carried over to the next branch.", nil, false)
+                            Brightpearl::Terminal::abort(nil, nil, true, false)
+                        end
+                    end
+                end
+            end
+        end
+
+        # Checks if you currently have stashed changes for current branch and if so, prompt to un-stash them.
+        # @return void
+        def check_for_stash
+            repo_loop.each do |repo_dir|
+                results = check_for_stash_get_stashes(repo_dir)
+                if results.any?
+                    results_output = Array.new
+                    results.each do |result|
+                        results_output << "#{result}"
+                    end
+                    stashes_to_skip = 0
+                    while results.any?
+                        stash_name = results[0].split(/:/).first
+                        if Brightpearl::Terminal::prompt_yes_no("Found the following stash on #{Brightpearl::Terminal::format_branch(current_branch_for_repo(repo_dir))}", "#{results[0]}", "Would you like to #{Brightpearl::Terminal::format_action('apply')}\x1B[38;5;89m this stash now?")
+                            stash_apply_successful = Brightpearl::Terminal::command(["git stash apply #{stash_name}"], repo_dir)
+                            if stash_apply_successful[0] == true
+                                Brightpearl::Terminal::command("git stash drop #{stash_name}", repo_dir)
+                                results = check_for_stash_get_stashes(repo_dir)
+                            else
+                                Brightpearl::Terminal::error("Stash could not be applied successfully (and therefore wasn't dropped).", ["#{results[0]}", nil, "Please #{Brightpearl::Terminal::format_action('open an IDE')} and resolve your conflicts before continuing.", "Don't forget to drop your stash afterwards with: #{Brightpearl::Terminal::format_command("git stash drop #{stash_name}")}"], false)
+                                results = []
+                            end
+                        else
+                            stashes_to_skip = stashes_to_skip + 1
+                            results = check_for_stash_get_stashes(repo_dir)
+                            a = (stashes_to_skip + 0)
+                            b = 0
+                            while b < a do
+                                results.shift
+                                b += 1
+                            end
+                        end
+                    end
+                end
+            end
+        end
+
+        # Sub-method for 'show_branches'. Don't call independently.
+        # @return Array
+        def check_for_stash_get_stashes(repo_dir)
+            results = `cd #{repo_dir} && git stash list | grep 'WIP on #{current_branch_for_repo(repo_dir)}:'`
+            results = results.split("\n")
+        end
+
+        # Returns an array that include info for BOTH repos. Finds out whether a branch exists and if it's current or not
+        # Only does it locally.
+        # @return Array
+        def branch_data(branch_name, code_db = nil, verbose = true)
+            data = []
+            repo_loop.each do |repo_dir|
+                unless code_db.nil?
+                    validate_code_db(code_db)
+                    case code_db
+                        when CODE
+                            if repo_dir == Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB)
+                                data << nil
+                                next
+                            end
+                        else
+                            if repo_dir == Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE)
+                                data << nil
+                                next
+                            end
+                    end
+                end
+                Brightpearl::Terminal::output("Retrieving branch data for #{Brightpearl::Terminal::format_branch(branch_name)} \xe2\x80\x94 (#{get_repo_shorthand(repo_dir)})")
+                repo_data = {}
+                repo_data
+                repo_data[:"#{BRANCH_NAME}"] = branch_name
+                repo_data[:"#{BRANCH_LOCATION}"] = repo_dir
+                repo_data[:"#{BRANCH_EXISTS}"] = true
+                repo_data[:"#{BRANCH_EXISTS_LOCALLY}"] = true
+                repo_data[:"#{BRANCH_HAS_STASH}"] = false
+                repo_data[:"#{BRANCH_HAS_UPSTREAM}"] = branch_has_upstream(repo_dir, branch_name)
+                repo_data[:"#{BRANCH_IS_CURRENT}"] = (current_branch_for_repo(repo_dir) == branch_name ? true : false)
+                if repo_data[:"#{BRANCH_HAS_UPSTREAM}"]
+                    # @todo
+                    repo_data[:"#{BRANCH_IS_UP_TO_DATE}"] = nil
+                else
+                    # @todo
+                    repo_data[:"#{BRANCH_IS_UP_TO_DATE}"] = nil
+                end
+                # Check branch exists
+                unless branch_exists(branch_name, repo_dir, Brightpearl::Git::LOCAL)
+                    repo_data[:"#{BRANCH_EXISTS_LOCALLY}"] = false
+                    Brightpearl::Terminal::warning("Branch #{Brightpearl::Terminal::format_branch(branch_name)} not found #{Brightpearl::Terminal::format_action('locally')} - (#{get_repo_shorthand(repo_dir)})", nil) if verbose
+                    Brightpearl::Terminal::output('Checking origin') if verbose
+                    unless branch_exists(branch_name, repo_dir, Brightpearl::Git::REMOTE)
+                        Brightpearl::Terminal::warning("Branch #{Brightpearl::Terminal::format_branch(branch_name)} not found #{Brightpearl::Terminal::format_action('remotely')} - (#{get_repo_shorthand(repo_dir)})", nil) if verbose
+                        repo_data[:"#{BRANCH_EXISTS}"] = false
+                        data << repo_data
+                        next
+                    end
+                end
+                # Check for stashed changes
+                stashes = `cd #{repo_dir} && git stash list | grep 'WIP on #{branch_name}:'`
+                stashes = stashes.split("\n")
+                if stashes.any?
+                    repo_data[:"#{BRANCH_HAS_STASH}"] = stashes.count
+                end
+                data << repo_data
+            end
+            data
+        end
+
+        # Returns TRUE if branch exists, FALSE if not
+        # @return Array
+        def branch_exists(branch_name, repo_dir, local_remote = LOCAL)
+            validate_repo_dir(repo_dir)
+            validate_local_remote(local_remote)
+            case local_remote
+                when LOCAL
+                    branches = get_branches_as_array(LOCAL, repo_dir)
+                else
+                    branches = get_branches_as_array(REMOTE, repo_dir)
+            end
+            unless branches.include?(branch_name)
+                return false
+            end
+            true
+        end
+
+        # Checks if branch exists ANYWHERE -- Local, Remote, Code, DB. If the branch name is found anywhere, will return FALSE.
+        # @return boolean
+        def branch_exists_anywhere(branch_name, case_sensitive = false)
+            existing_branches = get_all_branches_as_array
+            if case_sensitive
+                existing_branches.map!(&:downcase)
+                branch_name.downcase!
+            end
+            unless existing_branches.include?(branch_name)
+                return false
+            end
+            true
+        end
+
+        # Checks if a branch has an upstream (remote) branch. Returns TRUE or FALSE.
+        # @return boolean
+        # @deprecated
+        def branch_has_upstream(repo_dir, branch_name)
+            validate_repo_dir(repo_dir)
+            result = `cd #{repo_dir} && git branch -vv | grep 'origin/#{branch_name}'`
+            result == '' ? false : true
+        end
+
+        # Checks if a branch is at same HEAD as upstream. Returns TRUE or FALSE.
+        # @return boolean
+        # @deprecated
+        def branch_synced_with_upstream(repo_dir, branch_name)
+            validate_repo_dir(repo_dir)
+            result = `cd #{repo_dir} && git branch -vv | grep 'origin/#{branch_name}'`
+            result == '' ? false : true
+        end
+
+        # Gets upstream info for a branch
+        # @return hash
+        def branch_upstream_info(branch_name)
+            unless @branch_upstream_data
+                @branch_upstream_data = []
+                repo_loop.each do |repo_dir|
+                    output = `git for-each-ref --shell --format='
+                        b=%(refname:short)
+                        u=${b}'@{upstream}'
+                        if git rev-parse --verify --quiet "$u" >/dev/null 2>&1; then
+                            test -n "$(git rev-list -n 1 "$u..$b")" &&
+                            echo "$b: has unpushed commits"
+                        else
+                            echo "$b: no upstream configuration" >&2
+                        fi
+                        ' refs/heads | sh`
+
+                    @branch_upstream_data << output
+                end
+            end
+            puts @branch_upstream_data
+        end
+
+        # Checks if a branch is up-to-date with its remote
+        # @return boolea
+        def branch_is_up_to_date(repo_dir, branch_name)
+            validate_repo_dir(repo_dir)
+            result_local = `cd #{repo_dir} && git rev-parse #{branch_name}`
+            result_remote = `cd #{repo_dir} && git rev-parse origin/#{branch_name}`
+            result_local == result_remote ? true : false
+
+        end
+
+        # Returns array with the paths to both repos.
+        # @return Array
+        def repo_loop
+            Array[
+                Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE),
+                Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB)
+            ]
+        end
+
+        # Validates that a parameter is either 'local' or 'remote'
+        # @return void
+        def validate_local_remote(local_remote)
+            unless Array[LOCAL, REMOTE].include?(local_remote)
+                ("'#{local_remote}' is not a valid parameter. Must be LOCAL or REMOTE.")
+            end
+        end
+
+        # Validates that a parameter is either 'code' or 'db'
+        # @return void
+        def validate_code_db(code_db)
+            unless Array[CODE, DB].include?(code_db)
+                abort("'#{code_db}' is not a valid parameter. Must be CODE or DB.")
+            end
+        end
+
+        # Makes sure the repo directory is valid.
+        # @return void
+        def validate_repo_dir(repo_dir)
+            unless Array[
+                Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE),
+                Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB)
+            ].include?(repo_dir)
+                abort("'#{repo_dir}' is not a valid directory.")
+            end
+        end
+
+        # Validates if sort option is supported.
+        # @return void
+        def validate_sort(sort_option)
+            unless Array[SORT_DATE, SORT_REFNAME].include?(sort_option)
+                abort("'#{sort_option}' is not a valid sort option.")
+            end
+        end
+
+        # Returns short-hand string for repo
+        # @return String
+        def get_repo_shorthand(repo_dir)
+            repo_dir == Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE) ? 'brightpearl-code' : 'brightpearl-db'
+        end
+
+    end
+
+end