brightpearl-cli 1.1.0 → 1.2.0

data/lib/core/git.rb

@@ -43,6 +43,11 @@ module Brightpearl
         BRANCH_HAS_STASH = 'branch_has_stash'
         BRANCH_HAS_UPSTREAM = 'branch_has_upstream'
 
+        SAME_BRANCH_WARNING = 'same_branch_warning'
+        SAME_BRANCH_ERROR = 'same_branch_error'
+
+        RELEASE_BRANCH_REGEX = /release-\d+\.\d+\.\d+-\d{4}/i
+
         def initialize
 
             @origin_updated_code = false
@@ -304,6 +309,12 @@ module Brightpearl
                 else
                     brightpearl_code, brightpearl_db = get_remote_branches(sort)
             end
+            show_branches_draw_table(brightpearl_code, brightpearl_db)
+        end
+
+        # 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))
             column_width = [2, 20, 23, 15, 34, 1, 34, 15, 23, 20, 1]
@@ -329,9 +340,6 @@ module Brightpearl
                     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
@@ -443,10 +451,10 @@ module Brightpearl
         # @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) ||
+            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) ||
                 @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)
@@ -511,16 +519,21 @@ module Brightpearl
 
         # Checks if you have staged changes in current repo and if so, prompts to stash them.
         # @return void
-        def stash_staged_changes
+        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)
                     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?")
+                    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)
                     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)
+                        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)
                         end
@@ -531,7 +544,7 @@ module Brightpearl
 
         # Checks if you currently have stashed changes for current branch and if so, prompt to un-stash them.
         # @return void
-        def check_for_stash
+        def check_for_stash(automatic = false)
             repo_loop.each do |repo_dir|
                 results = check_for_stash_get_stashes(repo_dir)
                 if results.any?
@@ -542,7 +555,8 @@ module Brightpearl
                     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?")
+                        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 stash_apply_successful[0] == true
                                 Brightpearl::Terminal::command("git stash drop #{stash_name}", repo_dir)
@@ -570,7 +584,31 @@ module Brightpearl
         # @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")
+            results.split("\n")
+        end
+
+        # Checks if both repos are on same branch and displays either ERROR or WARNING.
+        # @return void
+        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))
+            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)}"
+                        ])
+                    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)}",
+                            nil,
+                            'You cannot run this command unless both of your repos are on the same branch.'
+                        ])
+                end
+            end
         end
 
         # Returns an array that include info for BOTH repos. Finds out whether a branch exists and if it's current or not
@@ -614,10 +652,10 @@ module Brightpearl
                 # 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("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::warning("Branch #{Brightpearl::Terminal::format_branch(branch_name)} not found #{Brightpearl::Terminal::format_action('remotely')} - (#{get_repo_shorthand(repo_dir)})", nil) if verbose
+                        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
                         repo_data[:"#{BRANCH_EXISTS}"] = false
                         data << repo_data
                         next
@@ -670,6 +708,7 @@ module Brightpearl
         # @deprecated
         def branch_has_upstream(repo_dir, branch_name)
             validate_repo_dir(repo_dir)
+            update_origin(repo_dir)
             result = `cd #{repo_dir} && git branch -vv | grep 'origin/#{branch_name}'`
             result == '' ? false : true
         end
@@ -683,31 +722,8 @@ module Brightpearl
             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
+        # @return boolean
         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}`
@@ -760,12 +776,41 @@ module Brightpearl
             end
         end
 
-        # Returns short-hand string for repo
+        # 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/mysql.rb

@@ -4,28 +4,54 @@ module Brightpearl
 
     class MySQL
 
-        DEFAULT_SCHEMA = 'app'
+        DEFAULT_VM_SCHEMA = 'app'
+        DEFAULT_EC2_SCHEMA = 'brightpearl'
 
-        @database_connection = nil
+        @vm_connection = nil
+        @ec2_connection = nil
 
         @ids_customers = []
         @ids_shipping = []
 
-        def self.get_database_connection(schema = DEFAULT_SCHEMA)
-            if @database_connection == nil
-                @database_connection = Mysql.new(
+        def self.vm(schema = DEFAULT_VM_SCHEMA)
+
+            if @vm_connection.nil?
+                @vm_connection = Mysql.new(
                     Brightpearl::Config.param(Brightpearl::Config::VM_IP),
                     Brightpearl::Config.param(Brightpearl::Config::VM_MYSQL_USER),
                     Brightpearl::Config.param(Brightpearl::Config::VM_MYSQL_PASSWORD),
                     schema
                 )
             end
-            @database_connection
+            @vm_connection
+
+        end
+
+        def self.ec2(schema = DEFAULT_EC2_SCHEMA)
+
+            if @ec2_connection.nil?
+
+                encrypter = Encrypter.new
+                host = Brightpearl::Config.param(Brightpearl::Config::EC2_HOST)
+                user = Brightpearl::Config.param(Brightpearl::Config::EC2_USER)
+                pass = Brightpearl::Config.param(Brightpearl::Config::EC2_PASS)
+                if host.nil? || user.nil? || pass.nil? || host == '' || user == '' || pass == ''
+                    Brightpearl::Terminal::error('EC2 access data not found', ["The command you're trying to run requires access to an EC2 database.", "In order for this to work you will need valid #{Brightpearl::Terminal::format_highlight('access data')}.", "Please speak to #{Brightpearl::Terminal::format_highlight('Albert')} (or team Raptor) for more info."], true)
+                end
+                @ec2_connection = Mysql.new(
+                    encrypter.decrypt(host),
+                    encrypter.decrypt(user),
+                    encrypter.decrypt(pass),
+                    schema
+                )
+            end
+            @ec2_connection
+
         end
 
         def self.get_random_customer_id
             unless @ids_customers.any?
-                customers = Brightpearl::MySQL::get_database_connection.query('SELECT customers_id FROM customers ORDER BY customers_id DESC LIMIT 100')
+                customers = Brightpearl::MySQL::vm.query('SELECT customers_id FROM customers ORDER BY customers_id DESC LIMIT 100')
                 customers.each_hash do |row|
                     @ids_customers << row['customers_id']
                 end
@@ -35,7 +61,7 @@ module Brightpearl
 
         def self.get_random_shipping_id
             unless @ids_shipping.any?
-                ship_methods = Brightpearl::MySQL::get_database_connection.query('SELECT ship_method_id FROM ship_methods ORDER BY ship_method_id DESC LIMIT 100')
+                ship_methods = Brightpearl::MySQL::vm.query('SELECT ship_method_id FROM ship_methods ORDER BY ship_method_id DESC LIMIT 100')
                 ship_methods.each_hash do |row|
                     @ids_shipping << row['ship_method_id']
                 end

data/lib/core/terminal.rb

@@ -10,6 +10,8 @@ module Brightpearl
         MSG_INFO = 'info'
         MSG_WARNING = 'warning'
         MSG_ERROR = 'error'
+        MSG_TODO = 'todo'
+        MSG_AUTOMATIC = 'automatic'
 
         # Runs a series of commands in the terminal.
         # @return void
@@ -23,13 +25,13 @@ module Brightpearl
                 end
             end
             output = []
-            if verbose_cd && verbose && commands.any?
-                puts "\x1B[42m Executing \x1B[0m \x1B[32m\xe2\x86\x92\x1B[0m #{Brightpearl::Terminal::format_command("cd #{location}")}"
+            if verbose_cd && verbose && commands.any? && !location.nil?
+                puts "\x1B[42m Executing \x1B[0m \x1B[0m\xe2\x86\x92\x1B[0m #{Brightpearl::Terminal::format_command("cd #{location}")}"
             end
             if commands.any?
                 commands.each do |command|
                     if verbose
-                        puts "\x1B[42m Executing \x1B[0m \x1B[32m\xe2\x86\x92\x1B[0m #{Brightpearl::Terminal::format_command("#{command}")}"
+                        puts "\x1B[42m Executing \x1B[0m \x1B[0m\xe2\x86\x92\x1B[0m #{Brightpearl::Terminal::format_command("#{command}")}"
                     end
                     if location.nil?
                         if capture_real_output
@@ -63,13 +65,18 @@ module Brightpearl
         def self.output(message = 'No message', type = MSG_INFO)
             case type
                 when MSG_INFO
-                    puts "\x1B[48;5;2m Executing \x1B[0m \x1B[32m\xe2\x86\x92\x1B[0m \x1B[0m#{message}\x1B[0m"
+                    puts "\x1B[48;5;2m Executing \x1B[0m \x1B[0m\xe2\x86\x92\x1B[0m \x1B[0m#{message}\x1B[0m"
                 when MSG_WARNING
-                    puts "\x1B[48;5;2m Vigilance \x1B[0m \x1B[33m\xe2\x86\x92\x1B[0m \x1B[0m#{message}\x1B[0m"
+                    puts "\x1B[48;5;202m  Warning  \x1B[0m \x1B[0m\xe2\x86\x92\x1B[0m \x1B[0m#{message}\x1B[0m"
                 when MSG_ERROR
-                    puts "  \x1B[48;5;2m Failure \x1B[0m \x1B[33m\xe2\x86\x92\x1B[0m \x1B[0m#{message}\x1B[0m"
+                    puts "\x1B[48;5;196m   Error   \x1B[0m \x1B[0m\xe2\x86\x92\x1B[0m \x1B[0m#{message}\x1B[0m"
+                when MSG_TODO
+                    puts "\x1B[48;5;199m   @TODO   \x1B[0m \x1B[0m\xe2\x86\x92\x1B[0m \x1B[0m#{message}\x1B[0m"
+                when MSG_AUTOMATIC
+                    puts "\x1B[48;5;96m Automatic \x1B[0m \x1B[0m\xe2\x86\x92\x1B[0m \x1B[0m#{message}\x1B[0m"
                 else
-                    raise RuntimeError "'#{type}' is not a valid type."
+                    puts "'#{type}' is not a valid Terminal::output() type."
+                    exit
             end
         end
 
@@ -87,31 +94,15 @@ module Brightpearl
 
         # Displays error and exits script by default.
         # @return void
-        def self.error(title = nil, message = nil, exit_script = true, preceding_blank_line = true, error_text = 'ERROR')
+        def self.error(title = nil, message = nil, exit_script = true, preceding_blank_line = true, error_text = 'Error')
             if title.nil?
                 title = "It seems you're trying to do something silly."
             end
             if preceding_blank_line
                 puts
             end
-            puts "    \x1B[48;5;196m #{error_text.upcase} \x1B[0m \xe2\x86\x92 #{title}"
-            puts
-            unless message.nil?
-                if message.is_a?(Array)
-                    messages = message
-                else
-                    messages = message.split("\n")
-                end
-                table(:border => false) do
-                    messages.each do |line|
-                        row do
-                            column('', :align => 'left', :width => 4)
-                            column("\x1B[38;5;240m#{line}\x1B[0m", :align => 'left', :width => 180)
-                        end
-                    end
-                end
-                puts
-            end
+            puts "    \x1B[48;5;196m #{error_text} \x1B[0m \xe2\x86\x92 #{title}"
+            parse_messages(message)
             if exit_script
                 exit
             end
@@ -126,24 +117,8 @@ module Brightpearl
             if preceding_blank_line
                 puts
             end
-            puts "  \x1B[48;5;27m MESSAGE \x1B[0m \xe2\x86\x92 #{title}"
-            puts
-            unless message.nil?
-                if message.is_a?(Array)
-                    messages = message
-                else
-                    messages = message.split("\n")
-                end
-                table(:border => false) do
-                    messages.each do |line|
-                        row do
-                            column('', :align => 'left', :width => 4)
-                            column("\x1B[38;5;240m#{line}\x1B[0m", :align => 'left', :width => 180)
-                        end
-                    end
-                end
-                puts
-            end
+            puts "  \x1B[48;5;27m Message \x1B[0m \xe2\x86\x92 #{title}"
+            parse_messages(message)
         end
 
         # Displays success message.
@@ -155,24 +130,8 @@ module Brightpearl
             if preceding_blank_line
                 puts
             end
-            puts "  \x1B[48;5;34m SUCCESS \x1B[0m \xe2\x86\x92 #{title}"
-            puts
-            unless message.nil?
-                if message.is_a?(Array)
-                    messages = message
-                else
-                    messages = message.split("\n")
-                end
-                table(:border => false) do
-                    messages.each do |line|
-                        row do
-                            column('', :align => 'left', :width => 4)
-                            column("\x1B[38;5;240m#{line}\x1B[0m", :align => 'left', :width => 180)
-                        end
-                    end
-                end
-                puts
-            end
+            puts "  \x1B[48;5;34m Success \x1B[0m \xe2\x86\x92 #{title}"
+            parse_messages(message)
         end
 
         # Displays warning message.
@@ -184,24 +143,8 @@ module Brightpearl
             if preceding_blank_line
                 puts
             end
-            puts "  \x1B[48;5;202m WARNING \x1B[0m \xe2\x86\x92 #{title}"
-            puts
-            unless message.nil?
-                if message.is_a?(Array)
-                    messages = message
-                else
-                    messages = message.split("\n")
-                end
-                table(:border => false) do
-                    messages.each do |line|
-                        row do
-                            column('', :align => 'left', :width => 4)
-                            column("\x1B[38;5;240m#{line}\x1B[0m", :align => 'left', :width => 180)
-                        end
-                    end
-                end
-                puts
-            end
+            puts "  \x1B[48;5;202m Warning \x1B[0m \xe2\x86\x92 #{title}"
+            parse_messages(message)
         end
 
         # Returns action text in consistent, uniform manner.
@@ -216,7 +159,7 @@ module Brightpearl
             "\x1B[38;5;40m[#{branch_name}]\x1B[0m"
         end
 
-        # Returns branch name in consistent, uniform manner.
+        # Returns command name in consistent, uniform manner.
         # @return String
         def self.format_command(command_name)
             "\x1B[38;5;220m#{command_name}\x1B[0m"
@@ -228,16 +171,26 @@ module Brightpearl
             "\x1B[38;5;48m#{directory_name}\x1B[0m"
         end
 
-        # Returns branch name in consistent, uniform manner.
+        # Returns flag name in consistent, uniform manner.
         # @return String
-        def self.format_flag(flag_letter)
-            "\x1B[38;5;117m-#{flag_letter} flag\x1B[0m"
+        def self.format_flag(flag_letter, display_flag_text = true)
+            "\x1B[38;5;152m-#{flag_letter}#{display_flag_text ? ' flag' : ''}\x1B[0m"
         end
 
-        # Returns branch name in consistent, uniform manner.
+        # Returns action text in consistent, uniform manner.
         # @return String
-        def self.format_invalid(invalid_string)
-            "\x1B[38;5;9m#{invalid_string}\x1B[0m"
+        def self.format_highlight(highlighted_text)
+            "\x1B[38;5;117m#{highlighted_text}\x1B[0m"
+        end
+
+        # Returns invalid data in consistent, uniform manner.
+        # @return String
+        def self.format_invalid(invalid_string, capitalize = false)
+            if capitalize
+                return "\x1B[38;5;196m#{invalid_string.upcase}\x1B[0m"
+            else
+                return "\x1B[38;5;196m#{invalid_string}\x1B[0m"
+            end
         end
 
         # Generates 'filler' string.
@@ -262,24 +215,8 @@ module Brightpearl
             if preceding_blank_line
                 puts
             end
-            puts "  \x1B[48;5;56m CONFIRM \x1B[0m \xe2\x86\x92 #{title}"
-            puts
-            unless message.nil?
-                if message.is_a?(Array)
-                    messages = message
-                else
-                    messages = message.split("\n")
-                end
-                table(:border => false) do
-                    messages.each do |line|
-                        row do
-                            column('', :align => 'left', :width => 4)
-                            column("\x1B[38;5;240m#{line}\x1B[0m", :align => 'left', :width => 180)
-                        end
-                    end
-                end
-                puts
-            end
+            puts "  \x1B[48;5;56m Confirm \x1B[0m \xe2\x86\x92 #{title}"
+            parse_messages(message)
             response = ''
             until %w[y Y n N x X a A].include? response
                 response = ask("     \x1B[38;5;89m#{confirmation_message} \x1B[0m[y/n]\x1B[90m => \x1B[0m")
@@ -299,34 +236,6 @@ module Brightpearl
             end
         end
 
-        # Used to display what is about to happen. Prompts for ENTER key before continuing.
-        # @return void
-        def self.prompt_enter(text)
-            puts
-            if text.is_a?(Array)
-                text.each do |line|
-                    puts line
-                end
-            else
-                puts text
-            end
-            enter_to_continue
-        end
-
-        # Used to confirm what is about to happen. Prompts for [y/n] key before continuing.
-        # @return void
-        def self.prompt_yes(text)
-            puts
-            if text.is_a?(Array)
-                text.each do |line|
-                    puts line
-                end
-            else
-                puts text
-            end
-            yes_to_continue
-        end
-
         # Shows a prompt waiting for user input.
         # @return string
         def self.prompt_for_input(text)
@@ -345,42 +254,42 @@ module Brightpearl
             nil
         end
 
-        # Gives a prompt where ONLY 'Enter' will continue the script, any other key will abort.
-        # @return void
-        # @deprecated
-        def self.enter_to_continue
-            print "\n\x1B[90mPress \x1B[32mENTER\x1B[90m to continue, any other key to abort\x1B[0m => "
-            begin
-                system('stty raw -echo')
-                response = STDIN.getc
-            ensure
-                system('stty -raw echo')
-            end
-            if response.chr == "\r"
-                puts "\n\n"
-            else
-                abort("\nScript aborted.\n\n")
-            end
+        # Gets the Terminal width
+        # @return Integer
+        def self.get_terminal_width
+            terminal_size = HighLine::SystemExtensions.terminal_size
+            terminal_size[0]
+        end
+
+        # Gets the Terminal height
+        # @return Integer
+        def self.get_terminal_height
+            terminal_size = HighLine::SystemExtensions.terminal_size
+            terminal_size[1]
         end
 
-        # Gives a prompt where ONLY 'Y' or 'y' will continue the script, any other key will abort.
+        private
+
+        # Parses messages for various output functions.
         # @return void
-        # @deprecated
-        def self.yes_to_continue
-            puts "\n"
-            response = ''
-            until %w[y n].include? response
-                response = ask("\x1B[90mWould you like to continue? \x1B[0m[y/n]\x1B[90m => \x1B[0m") { |q| q.limit = 1; q.case = :downcase }
-            end
-            case response
-                when 'y'
-                    puts
-                    return
+        def self.parse_messages(message)
+            puts
+            unless message.nil?
+                if message.is_a?(Array)
+                    messages = message
                 else
-                    puts
-                    output('Aborting script', MSG_ERROR)
-                    puts
-                    exit
+                    messages = message.split("\n")
+                end
+                table(:border => false) do
+                    messages.each do |line|
+                        line.gsub! "\x1B[0m", "\x1B[38;5;240m" unless line.nil?
+                        row do
+                            column('', :align => 'left', :width => 4)
+                            column("\x1B[38;5;240m#{line}\x1B[0m", :align => 'left', :width => 180)
+                        end
+                    end
+                end
+                puts
             end
         end