brightpearl-cli 1.3.0 → 1.4.0

data/lib/core/git.rb

@@ -2,7 +2,7 @@ require 'columnist'
 require 'date'
 require 'highline'
 
-module Brightpearl
+module App
 
     class Git
 
@@ -19,7 +19,7 @@ module Brightpearl
         DB = 'db'
 
         MERGED_PREFIX = 'MERGED-'
-        MDASH = '-'
+        MDASH = '━'
 
         MASTER = 'master'
         REFNAME = 'refname'
@@ -81,7 +81,7 @@ module Brightpearl
             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)
+                    App::Terminal::error('Directory not found', "Directory doesn't exist: #{App::Terminal::format_directory(repo_dir_inner)}", true)
                 end
                 raw_terminal_output = `
                     cd #{repo_dir_inner} &&
@@ -110,7 +110,7 @@ module Brightpearl
                             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)
+                            App::Terminal::error('Sort not supported', "The following sorting option is not yet supported: #{sort}", true)
                     end
                 end
                 branch_keys = branches.keys
@@ -121,7 +121,7 @@ module Brightpearl
                         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)
+                        App::Terminal::error('Sort not supported', "The following sorting option is not yet supported: #{sort}", true)
                 end
                 branch_data = []
                 branch_keys.each do |key|
@@ -152,7 +152,7 @@ module Brightpearl
             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)
+                    App::Terminal::error('Directory not found', "Directory doesn't exist: #{App::Terminal::format_directory(repo_dir)}", true)
                 end
                 update_origin(repo_dir_inner)
                 raw_terminal_output = `
@@ -176,7 +176,7 @@ module Brightpearl
                             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)
+                            App::Terminal::error('Sort not supported', "The following sorting option is not yet supported: #{sort}", true)
                     end
                 end
                 branch_keys = branches.keys
@@ -187,7 +187,7 @@ module Brightpearl
                         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)
+                        App::Terminal::error('Sort not supported', "The following sorting option is not yet supported: #{sort}", true)
                 end
                 branch_data = []
                 branch_keys.each do |key|
@@ -215,7 +215,7 @@ module Brightpearl
                     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 repo_dir == App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE)
                     if local_remote == LOCAL
                         return @branches_as_array[:local_code] if @branches_as_array[:local_code] != nil
                     else
@@ -263,7 +263,7 @@ module Brightpearl
                     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 repo_dir == App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE)
                     if local_remote == LOCAL
                         return @branches_as_array[:local_code] = repos_to_return[0]
                     else
@@ -283,8 +283,8 @@ module Brightpearl
         # @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)
+                local_branches = get_branches_as_array(App::Git::LOCAL)
+                remote_branches = get_branches_as_array(App::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 }
@@ -315,10 +315,10 @@ module Brightpearl
         # Draws the actual table of branches.
         # @return void
         def show_branches_draw_table(brightpearl_code, brightpearl_db)
-            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))
+            current_code_branch = current_branch_for_repo(App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE))
+            current_db_branch = current_branch_for_repo(App::Config.param(App::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)
+            App::Tools::validate_report_width(column_width)
             puts "\n"
             table(:border => false) do
                 row do
@@ -345,7 +345,7 @@ module Brightpearl
                     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(App::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)
@@ -353,7 +353,7 @@ module Brightpearl
                         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_branch[:"#{COMMITTER_DATE}"] == nil) ? MDASH : App::Tools::time_passed_since(db_branch[:"#{COMMITTER_DATE}"] - (1 / 24.0)), :color => db_color)
                         column("#{db_star}", :color => db_color)
                     end
                 end
@@ -370,7 +370,7 @@ module Brightpearl
                             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((db_branch[:"#{COMMITTER_DATE}"] == nil) ? MDASH : App::Tools::time_passed_since(db_branch[:"#{COMMITTER_DATE}"]), :color => db_color)
                             column('')
                         end
                     end
@@ -426,17 +426,17 @@ module Brightpearl
         # @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)
+                column(App::Terminal::fill(column_width[0], MDASH), :color => color)
+                column(App::Terminal::fill(column_width[1], MDASH), :color => color)
+                column(App::Terminal::fill(column_width[2], MDASH), :color => color)
+                column(App::Terminal::fill(column_width[3], MDASH), :color => color)
+                column(App::Terminal::fill(column_width[4], MDASH), :color => color)
+                column(App::Terminal::fill(column_width[5], MDASH), :color => color)
+                column(App::Terminal::fill(column_width[6], MDASH), :color => color)
+                column(App::Terminal::fill(column_width[7], MDASH), :color => color)
+                column(App::Terminal::fill(column_width[8], MDASH), :color => color)
+                column(App::Terminal::fill(column_width[9], MDASH), :color => color)
+                column(App::Terminal::fill(column_width[10], MDASH), :color => color)
             end
         end
 
@@ -451,23 +451,23 @@ module Brightpearl
         # @return void
         def update_origin(repo_dir = nil)
             validate_repo_dir(repo_dir)
-            unless @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) ||
+            unless @origin_updated_code && repo_dir == App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE) ||
+                @origin_updated_db && repo_dir == App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_DB) ||
                 @origin_updated_code && @origin_updated_db && repo_dir.nil?
 
-                Brightpearl::Terminal::output("Updating origin (#{get_repo_shorthand(repo_dir)})")
+                App::Terminal::output("Updating origin (#{get_repo_shorthand(repo_dir)})")
                 case repo_dir
-                    when Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE)
+                    when App::Config.param(App::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)
+                        App::Terminal::command(['git fetch -p'], App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE))
+                    when App::Config.param(App::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))
+                        App::Terminal::command(['git fetch -p'], App::Config.param(App::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)
+                            App::Terminal::command(['git fetch -p'], repo_dir_inner)
                         end
                 end
             end
@@ -478,13 +478,13 @@ module Brightpearl
         # @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
+            if current_branch == App::Git::MASTER
                 return
             end
             commands = Array.new
             commands << 'git checkout master'
             commands << 'git pull'
-            if current_branch != Brightpearl::Git::MASTER
+            if current_branch != App::Git::MASTER
                 commands << "git checkout #{current_branch}"
                 commands << 'git pull'
                 commands << 'git merge master'
@@ -492,7 +492,7 @@ module Brightpearl
             if push_to_origin
                 commands << 'git push'
             end
-            Brightpearl::Terminal::command(commands, repo_dir)
+            App::Terminal::command(commands, repo_dir)
         end
 
         # Makes sure that both BP-CODE & BP-DB are on the same branch.
@@ -518,24 +518,25 @@ module Brightpearl
         end
 
         # Checks if you have staged changes in current repo and if so, prompts to stash them.
+        # @param force_stash_message -- If a string is passed, will be displayed as the "FORCE STASH WARNING" and a stash will be enforced.
         # @return void
         def check_for_uncommitted_files(automatic = false, force_stash_message = false)
             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)
+                    App::Terminal::command(['git status'], repo_dir)
                     current_branch = current_branch_for_repo(repo_dir)
-                    if automatic || 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::output('Stashing working changes', Brightpearl::Terminal::MSG_AUTOMATIC) if automatic
-                        Brightpearl::Terminal::command('git stash', repo_dir)
+                    if automatic || App::Terminal::prompt_yes_no("Found uncommitted files on branch #{App::Terminal::format_branch(current_branch)}", nil, "Would you like to #{App::Terminal::format_action('stash')}\x1B[38;5;89m these changes before continuing?")
+                        App::Terminal::output('Stashing working changes', App::Terminal::MSG_AUTOMATIC) if automatic
+                        App::Terminal::command('git stash', repo_dir)
                     else
                         if force_stash_message != false
                             abort_message = force_stash_message.is_a?(String) ? force_stash_message : nil
-                            Brightpearl::Terminal::abort(abort_message,["In this particular scenario, you #{Brightpearl::Terminal::format_invalid('cannot continue', true)} unless you stash your changes."], true, false)
+                            App::Terminal::abort(abort_message,["In this particular scenario, you #{App::Terminal::format_invalid('cannot continue', true)} unless you stash your changes."], true, false)
                         end
-                        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)
+                        unless App::Terminal::prompt_yes_no('Continue without stashing?', "By selecting #{App::Terminal::format_action('Yes')}\x1B[38;5;240m, you're changes will be carried over to the next branch.", nil, false)
+                            App::Terminal::abort(nil, nil, true, false)
                         end
                     end
                 end
@@ -555,14 +556,14 @@ module Brightpearl
                     stashes_to_skip = 0
                     while results.any?
                         stash_name = results[0].split(/:/).first
-                        if automatic || 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?")
-                            Brightpearl::Terminal::output('Un-stashing working changes', Brightpearl::Terminal::MSG_AUTOMATIC) if automatic
-                            stash_apply_successful = Brightpearl::Terminal::command(["git stash apply #{stash_name}"], repo_dir)
+                        if automatic || App::Terminal::prompt_yes_no("Found the following stash on #{App::Terminal::format_branch(current_branch_for_repo(repo_dir))}", "#{results[0]}", "Would you like to #{App::Terminal::format_action('apply')}\x1B[38;5;89m this stash now?")
+                            App::Terminal::output('Un-stashing working changes', App::Terminal::MSG_AUTOMATIC) if automatic
+                            stash_apply_successful = App::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)
+                                App::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)
+                                App::Terminal::error("Stash could not be applied successfully (and therefore wasn't dropped).", ["#{results[0]}", nil, "Please #{App::Terminal::format_action('open an IDE')} and resolve your conflicts before continuing.", "Don't forget to drop your stash afterwards with: #{App::Terminal::format_command("git stash drop #{stash_name}")}"], false)
                                 results = []
                             end
                         else
@@ -588,27 +589,29 @@ module Brightpearl
         end
 
         # Checks if both repos are on same branch and displays either ERROR or WARNING.
-        # @return void
+        # @return boolean -- TRUE if same branch, FALSE if not.
         def check_for_same_branch(display = SAME_BRANCH_WARNING)
-            branch_code = current_branch_for_repo(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE))
-            branch_db = current_branch_for_repo(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB))
+            branch_code = current_branch_for_repo(App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE))
+            branch_db = current_branch_for_repo(App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_DB))
             if branch_code != branch_db
                 case display
                     when SAME_BRANCH_WARNING
-                        Brightpearl::Terminal::warning("You're on #{Brightpearl::Terminal::format_highlight('2 different branches')}", [
-                            "#{Brightpearl::Terminal::format_directory(get_repo_shorthand(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE)))} is on #{Brightpearl::Terminal::format_branch(branch_code)}",
-                            "#{Brightpearl::Terminal::format_directory(get_repo_shorthand(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB)))}   is on #{Brightpearl::Terminal::format_branch(branch_db)}"
+                        App::Terminal::warning("You're on #{App::Terminal::format_highlight('2 different branches')}", [
+                            "#{App::Terminal::format_directory(get_repo_shorthand(App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE)))} is on #{App::Terminal::format_branch(branch_code)}",
+                            "#{App::Terminal::format_directory(get_repo_shorthand(App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_DB)))}   is on #{App::Terminal::format_branch(branch_db)}"
                         ])
                     when SAME_BRANCH_ERROR
                     else
-                        Brightpearl::Terminal::error("You're on #{Brightpearl::Terminal::format_highlight('2 different branches')}", [
-                            "#{Brightpearl::Terminal::format_directory(get_repo_shorthand(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE)))} is on #{Brightpearl::Terminal::format_branch(branch_code)}",
-                            "#{Brightpearl::Terminal::format_directory(get_repo_shorthand(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB)))}   is on #{Brightpearl::Terminal::format_branch(branch_db)}",
+                        App::Terminal::error("You're on #{App::Terminal::format_highlight('2 different branches')}", [
+                            "#{App::Terminal::format_directory(get_repo_shorthand(App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE)))} is on #{App::Terminal::format_branch(branch_code)}",
+                            "#{App::Terminal::format_directory(get_repo_shorthand(App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_DB)))}   is on #{App::Terminal::format_branch(branch_db)}",
                             nil,
                             'You cannot run this command unless both of your repos are on the same branch.'
                         ])
                 end
+                return false
             end
+            true
         end
 
         # Returns an array that include info for BOTH repos. Finds out whether a branch exists and if it's current or not
@@ -621,18 +624,18 @@ module Brightpearl
                     validate_code_db(code_db)
                     case code_db
                         when CODE
-                            if repo_dir == Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB)
+                            if repo_dir == App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_DB)
                                 data << nil
                                 next
                             end
                         else
-                            if repo_dir == Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE)
+                            if repo_dir == App::Config.param(App::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)})")
+                App::Terminal::output("Retrieving branch data for #{App::Terminal::format_branch(branch_name)} \xe2\x80\x94 (#{get_repo_shorthand(repo_dir)})")
                 repo_data = {}
                 repo_data
                 repo_data[:"#{BRANCH_NAME}"] = branch_name
@@ -650,12 +653,12 @@ module Brightpearl
                     repo_data[:"#{BRANCH_IS_UP_TO_DATE}"] = nil
                 end
                 # Check branch exists
-                unless branch_exists(branch_name, repo_dir, Brightpearl::Git::LOCAL)
+                unless branch_exists(branch_name, repo_dir, App::Git::LOCAL)
                     repo_data[:"#{BRANCH_EXISTS_LOCALLY}"] = false
-                    Brightpearl::Terminal::output("Branch #{Brightpearl::Terminal::format_branch(branch_name)} not found #{Brightpearl::Terminal::format_action('locally')} in #{Brightpearl::Terminal::format_directory(get_repo_shorthand(repo_dir))}", Brightpearl::Terminal::MSG_WARNING) if verbose
-                    Brightpearl::Terminal::output('Checking origin') if verbose
-                    unless branch_exists(branch_name, repo_dir, Brightpearl::Git::REMOTE)
-                        Brightpearl::Terminal::output("Branch #{Brightpearl::Terminal::format_branch(branch_name)} not found #{Brightpearl::Terminal::format_action('remotely')} in #{Brightpearl::Terminal::format_directory(get_repo_shorthand(repo_dir))}", Brightpearl::Terminal::MSG_WARNING) if verbose
+                    App::Terminal::output("Branch #{App::Terminal::format_branch(branch_name)} not found #{App::Terminal::format_action('locally')} in #{App::Terminal::format_directory(get_repo_shorthand(repo_dir))}", App::Terminal::MSG_WARNING) if verbose
+                    App::Terminal::output('Checking origin') if verbose
+                    unless branch_exists(branch_name, repo_dir, App::Git::REMOTE)
+                        App::Terminal::output("Branch #{App::Terminal::format_branch(branch_name)} not found #{App::Terminal::format_action('remotely')} in #{App::Terminal::format_directory(get_repo_shorthand(repo_dir))}", App::Terminal::MSG_WARNING) if verbose
                         repo_data[:"#{BRANCH_EXISTS}"] = false
                         data << repo_data
                         next
@@ -736,11 +739,58 @@ module Brightpearl
         # @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)
+                App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE),
+                App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_DB)
             ]
         end
 
+        # Returns short-hand string for repo.
+        # @return String
+        def get_repo_shorthand(repo_dir)
+            repo_dir == App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE) ? 'brightpearl-code' : 'brightpearl-db'
+        end
+
+        # Checks that a branch DOESN'T exist anywhere (local, remote, code and db). If it does, will exit with error.
+        # @return void
+        def check_branch_does_not_exist_anywhere(branch_name)
+            App::Terminal::info("Checking that branch #{App::Terminal::format_branch(branch_name)} doesn't already exist somewhere")
+            if branch_exists_anywhere(branch_name)
+                App::Terminal::error('Branch already exists', "Cannot continue because a branch named #{App::Terminal::format_branch(branch_name)}\x1B[38;5;240m already exists somewhere.", true)
+            end
+        end
+
+        # Checks that a branch DOES exist somewhere (local, remote, code or db). If it does not, will exit with error.
+        # @return void
+        def check_branch_exists_somewhere(branch_name)
+            unless branch_exists_anywhere(branch_name)
+                App::Terminal::error("Branch doesn't exist", "Cannot continue because branch #{App::Terminal::format_branch(branch_name)}\x1B[38;5;240m doesn't exist.", true)
+            end
+        end
+
+        # Asks if you would like to setup remote tracking. WILL ASSUME that branch doesn't have this (but won't actually check).
+        # @return void
+        def ask_to_setup_remote_tracking(current_branch, repo_dir)
+            tracking_setup_command = "git branch --set-upstream-to=origin/#{current_branch} #{current_branch}"
+            if App::Terminal::prompt_yes_no('Setup remote tracking?', ["No tracking information found for #{App::Terminal::format_branch(current_branch)} on #{App::Terminal::format_directory(get_repo_shorthand(repo_dir))}", "By continuing, the script will automatically setup your tracking information with: #{tracking_setup_command}"])
+                App::Terminal::output("Setting tracking information for this branch to origin/#{current_branch}")
+                if !branch_exists(current_branch, repo_dir, App::Git::REMOTE)
+                    App::Terminal::command("git push -u origin #{current_branch}", repo_dir)
+                end
+                App::Terminal::command(tracking_setup_command, repo_dir)
+            else
+                App::Terminal::warning('No remote tracking setup', "You have not setup remote tracking for branch #{App::Terminal::format_branch(current_branch)}", false)
+            end
+        end
+
+        # Get list of files that have changed between 2 branches
+        # @return Array
+        def get_changed_files(repo_dir, branch_to_compare_to = "origin/#{App::Git::MASTER}")
+            validate_repo_dir(repo_dir)
+            command = "git diff #{branch_to_compare_to}..#{current_branch_for_repo(repo_dir)} --name-only"
+            App::Terminal::command_capture(command, repo_dir)
+        end
+
+
         # Validates that a parameter is either 'local' or 'remote'
         # @return void
         def validate_local_remote(local_remote)
@@ -761,8 +811,8 @@ module Brightpearl
         # @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)
+                App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE),
+                App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_DB)
             ].include?(repo_dir)
                 abort("'#{repo_dir}' is not a valid directory.")
             end
@@ -776,41 +826,6 @@ module Brightpearl
             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
-
-        # Checks that a branch DOESN'T exist anywhere (local, remote, code and db). If it does, will exit with error.
-        # @return void
-        def check_branch_does_not_exist_anywhere(branch_name)
-            Brightpearl::Terminal::info("Checking that branch #{Brightpearl::Terminal::format_branch(branch_name)} doesn't already exist somewhere")
-            if branch_exists_anywhere(branch_name)
-                Brightpearl::Terminal::error('Branch already exists', "Cannot continue because a branch named #{Brightpearl::Terminal::format_branch(branch_name)}\x1B[38;5;240m already exists somewhere.", true)
-            end
-        end
-
-        # Checks that a branch DOES exist somewhere (local, remote, code or db). If it does not, will exit with error.
-        # @return void
-        def check_branch_exists_somewhere(branch_name)
-            unless branch_exists_anywhere(branch_name)
-                Brightpearl::Terminal::error("Branch doesn't exist", "Cannot continue because branch #{Brightpearl::Terminal::format_branch(branch_name)}\x1B[38;5;240m doesn't exist.", true)
-            end
-        end
-
-        # Asks if you would like to setup remote tracking. WILL ASSUME that branch doesn't have this (but won't actually check).
-        # @return void
-        def ask_to_setup_remote_tracking(current_branch, repo_dir)
-            tracking_setup_command = "git branch --set-upstream-to=origin/#{current_branch} #{current_branch}"
-            if Brightpearl::Terminal::prompt_yes_no('Setup remote tracking?', ["No tracking information found for #{Brightpearl::Terminal::format_branch(current_branch)} on #{Brightpearl::Terminal::format_directory(get_repo_shorthand(repo_dir))}", "By continuing, the script will automatically setup your tracking information with: #{tracking_setup_command}"], Brightpearl::Terminal::MSG_WARNING)
-                Brightpearl::Terminal::output("Setting tracking information for this branch to origin/#{current_branch}")
-                Brightpearl::Terminal::command(tracking_setup_command, repo_dir)
-            else
-                Brightpearl::Terminal::warning('No remote tracking setup', "You have not setup remote tracking for branch #{Brightpearl::Terminal::format_branch(current_branch)}", false)
-            end
-        end
-
     end
 
 end

data/lib/core/git_delete.rb

@@ -0,0 +1,89 @@
+module App
+
+    class GitDelete
+
+        def self.delete_local(branch_name, confirm = true, git = nil)
+
+            @git = git.nil? ? App::Git.new : git
+
+            App::Terminal::output("Must check that branch is up-to-date with it's remote counter-part, otherwise DO NOT delete!", App::Terminal::MSG_TODO)
+            App::Terminal::output('Must check branch even exists.', App::Terminal::MSG_TODO)
+
+            if confirm
+                unless App::Terminal::prompt_yes_no("#{App::Terminal::format_action('locally delete')} branch #{App::Terminal::format_branch(branch_name)}?")
+                    App::Terminal::abort
+                end
+            end
+
+            @git.repo_loop.each do |repo_dir|
+                commands = []
+                if @git.current_branch_for_repo(repo_dir) == branch_name
+                    commands << 'git checkout master'
+                end
+                commands << "git branch -d #{branch_name}"
+                App::Terminal::command_capture(commands, repo_dir)
+            end
+
+            App::Terminal::success('Branch deleted', "Successfully #{App::Terminal::format_highlight('locally')} #{App::Terminal::format_action('deleted')} branch #{App::Terminal::format_branch(branch_name)}")
+
+        end
+
+        def self.delete_remote(branch_name, confirm = true, git = nil)
+
+            @git = git.nil? ? App::Git.new : git
+
+            App::Terminal::output('Must check branch even exists.', App::Terminal::MSG_TODO)
+
+            if confirm
+                unless App::Terminal::prompt_yes_no("#{App::Terminal::format_action('remotely delete')} branch #{App::Terminal::format_branch(branch_name)}?")
+                    App::Terminal::abort
+                end
+            end
+
+            @git.repo_loop.each do |repo_dir|
+                unless @git.branch_exists(branch_name, repo_dir, App::Git::REMOTE)
+                    puts "Branch \x1B[32m[#{branch_name}]\x1B[0m not found in: \x1B[33m#{repo_dir}\x1B[0m. Aborting \x1B[35mREMOTE DELETE\x1B[0m for this repo."
+                    next
+                end
+                commands = [
+                    "git branch --unset-upstream #{branch_name}",
+                    "git push origin --delete #{branch_name}",
+                ]
+                App::Terminal::command_capture(commands, repo_dir)
+            end
+
+            App::Terminal::success('Branch deleted', "Successfully #{App::Terminal::format_highlight('remotely')} #{App::Terminal::format_action('deleted')} branch #{App::Terminal::format_branch(branch_name)}")
+
+        end
+
+        def self.delete_both(branch_name, confirm = true, git = nil)
+
+            @git = git.nil? ? App::Git.new : git
+
+            App::Terminal::output("Must check that branch is up-to-date with it's remote counter-part, otherwise DO NOT delete!", App::Terminal::MSG_TODO)
+            App::Terminal::output('Must check branch even exists.', App::Terminal::MSG_TODO)
+
+            if confirm
+                unless App::Terminal::prompt_yes_no("#{App::Terminal::format_action('locally & remotely delete')} branch #{App::Terminal::format_branch(branch_name)}?")
+                    App::Terminal::abort
+                end
+            end
+
+            @git.repo_loop.each do |repo_dir|
+                commands = []
+                if @git.current_branch_for_repo(repo_dir) == branch_name
+                    commands << 'git checkout master'
+                end
+                commands << "git branch -d #{branch_name}"
+                commands << "git branch --unset-upstream #{branch_name}"
+                commands << "git push origin --delete  #{branch_name}"
+                App::Terminal::command_capture(commands, repo_dir)
+            end
+
+            App::Terminal::success('Branch deleted', "Successfully #{App::Terminal::format_highlight('locally')} and #{App::Terminal::format_highlight('remotely')} #{App::Terminal::format_action('deleted')} branch #{App::Terminal::format_branch(branch_name)}")
+
+        end
+
+    end
+
+end

data/lib/core/jira.rb

@@ -1,4 +1,4 @@
-module Brightpearl
+module App
 
     class Jira
 
@@ -19,7 +19,7 @@ module Brightpearl
                 end
             end
             if jira_number.nil?
-                Brightpearl::Terminal::error('Invalid Jira Number', "The Jira Number must be a 4-5 digit number. You tried to pass: #{Brightpearl::Terminal::format_invalid(argument)}", true)
+                App::Terminal::error('Invalid Jira Number', "The Jira Number must be a 4-5 digit number. You tried to pass: #{App::Terminal::format_invalid(argument)}", true)
             end
             jira_number
         end