brightpearl-cli 1.3.0 → 1.4.0

data/lib/routes/git_push.rb

@@ -1,4 +1,4 @@
-module BrightpearlCommand
+module AppCommand
 
     class GitPush < ::Convoy::ActionCommand::Base
 
@@ -6,7 +6,7 @@ module BrightpearlCommand
 
             @opts = command_options
             @args = arguments
-            @git = Brightpearl::Git.new
+            @git = App::Git.new
 
             opts_validate
             opts_routing
@@ -16,7 +16,7 @@ module BrightpearlCommand
         def opts_validate
 
             if @args[0].nil?
-                @args[0] = @git.current_branch_for_repo(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE))
+                @args[0] = @git.current_branch_for_repo(App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE))
             end
 
         end
@@ -29,17 +29,26 @@ module BrightpearlCommand
 
         def git_push
 
-            @git.check_for_same_branch(Brightpearl::Git::SAME_BRANCH_WARNING)
-            branch_code = @git.current_branch_for_repo(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE))
-            branch_db = @git.current_branch_for_repo(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB))
-            if Brightpearl::Terminal::prompt_yes_no("#{Brightpearl::Terminal::format_action('push')} the following repos:", [
-                "#{Brightpearl::Terminal::format_directory(@git.get_repo_shorthand(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE)))} will push #{Brightpearl::Terminal::format_branch(branch_code)} \xe2\x86\x92 #{Brightpearl::Terminal::format_branch("origin/#{branch_code}")}",
-                "#{Brightpearl::Terminal::format_directory(@git.get_repo_shorthand(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB)))}   will push #{Brightpearl::Terminal::format_branch(branch_db)} \xe2\x86\x92 #{Brightpearl::Terminal::format_branch("origin/#{branch_db}")}"
-            ])
+            @git.check_for_same_branch(App::Git::SAME_BRANCH_WARNING)
+            branch_code = @git.current_branch_for_repo(App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE))
+            branch_db = @git.current_branch_for_repo(App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_DB))
+
+            branches_to_push = []
+            branches_to_push << "#{App::Terminal::format_directory(@git.get_repo_shorthand(App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE)))} will push #{App::Terminal::format_branch(branch_code)} \xe2\x86\x92 #{App::Terminal::format_branch("origin/#{branch_code}")}" unless branch_code == App::Git::MASTER
+            branches_to_push << "#{App::Terminal::format_directory(@git.get_repo_shorthand(App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_DB)))}   will push #{App::Terminal::format_branch(branch_db)} \xe2\x86\x92 #{App::Terminal::format_branch("origin/#{branch_db}")}" unless branch_db == App::Git::MASTER
+
+            unless branches_to_push.any?
+                App::Terminal::error("#{App::Terminal::format_action('pushing')} to #{App::Terminal::format_branch(App::Git::MASTER)} is best done manually.", nil, true)
+            end
+
+            if App::Terminal::prompt_yes_no("#{App::Terminal::format_action('push')} the following repos:", branches_to_push)
                 @git.check_for_uncommitted_files(true)
                 @git.repo_loop.each do |repo_dir|
-                    unless Brightpearl::Terminal::command_capture("git push origin #{@git.current_branch_for_repo(repo_dir)}", repo_dir)
-                        Brightpearl::Terminal::warning('Something went wrong', "Not sure what the reason was, but doing a #{Brightpearl::Terminal::format_command('git push')} on #{Brightpearl::Terminal::format_directory(@git.get_repo_shorthand(repo_dir))} was unsuccessful.")
+                    current_branch = @git.current_branch_for_repo(repo_dir)
+                    if current_branch != App::Git::MASTER
+                        unless App::Terminal::command_capture("git push origin #{current_branch}", repo_dir)
+                            App::Terminal::warning('Something went wrong', "Not sure what the reason was, but doing a #{App::Terminal::format_command('git push')} on #{App::Terminal::format_directory(@git.get_repo_shorthand(repo_dir))} was unsuccessful.")
+                        end
                     end
                 end
                 @git.check_for_stash(true)

data/lib/routes/git_stash.rb

@@ -1,4 +1,4 @@
-module BrightpearlCommand
+module AppCommand
 
     class GitStash < ::Convoy::ActionCommand::Base
 
@@ -6,7 +6,7 @@ module BrightpearlCommand
 
             @opts = command_options
             @args = arguments
-            @git = Brightpearl::Git.new
+            @git = App::Git.new
             opts_validate
             opts_routing
 
@@ -24,16 +24,21 @@ module BrightpearlCommand
 
         def show_all_stashes
 
+            no_stash_found_count = 0
             @git.repo_loop.each do |repo_dir|
                 stashes = `cd #{repo_dir} && git stash list`
                 stashes = stashes.split("\n")
                 # Skip if no stashes.
-                next unless stashes.any?
-                Brightpearl::Terminal::info("Showing stashes for: #{Brightpearl::Terminal::format_directory(@git.get_repo_shorthand(repo_dir))}")
-                stashes.each do |stash|
-                    stash_name = stash.split(/:/).first
-                    output = Brightpearl::Terminal::command_capture("git stash show --name-only #{stash_name}", repo_dir, false)
-                    Brightpearl::Terminal::info("#{stash}", output[0], false)
+                if stashes.any?
+                    App::Terminal::info("Showing stashes for: #{App::Terminal::format_directory(@git.get_repo_shorthand(repo_dir))}")
+                    stashes.each do |stash|
+                        stash_name = stash.split(/:/).first
+                        output = App::Terminal::command_capture("git stash show --name-only #{stash_name}", repo_dir, false)
+                        App::Terminal::info("#{stash}", output[0], false)
+                    end
+                else
+                    App::Terminal::info("No stashes found in: #{App::Terminal::format_directory(@git.get_repo_shorthand(repo_dir))}", nil, (no_stash_found_count > 0) ? false : true)
+                    no_stash_found_count = no_stash_found_count + 1
                 end
             end
 

data/lib/routes/git_update.rb

@@ -1,9 +1,9 @@
-module BrightpearlCommand
+module AppCommand
 
     class GitUpdate < ::Convoy::ActionCommand::Base
 
         def execute
-            @git = Brightpearl::Git.new
+            @git = App::Git.new
             @opts = command_options
             opts_validate
             opts_routing
@@ -14,14 +14,7 @@ module BrightpearlCommand
 
         def opts_routing
 
-            if @opts[:all]
-
-                Brightpearl::Terminal::error('Note yet implemented', "Must write code to update ALL branches.\nCould get complicated as there will likely be merge conflicts.\nMust think about this...", true)
-
-                # update_branch_all
-            else
-                update_branch_single
-            end
+            update_branch_single
 
         end
 
@@ -32,28 +25,30 @@ module BrightpearlCommand
             @git.repo_loop.each do |repo_dir|
                 current_branch = @git.current_branch_for_repo(repo_dir)
                 commands = Array.new
-                if current_branch != Brightpearl::Git::MASTER
-                    commands << 'git checkout master'
+                if current_branch != App::Git::MASTER
+                    commands << "git checkout #{App::Git::MASTER}"
                 end
-                commands << 'git pull'
-                if current_branch != Brightpearl::Git::MASTER
+                commands << "git pull origin #{App::Git::MASTER}"
+                if current_branch != App::Git::MASTER
                     commands << "git checkout #{current_branch}"
-                    commands << 'git pull'
+                    commands << "git pull origin #{current_branch}"
                     commands << 'git merge master'
                 end
-                results = Brightpearl::Terminal::command(commands, repo_dir)
-                if current_branch != Brightpearl::Git::MASTER
+                results = App::Terminal::command(commands, repo_dir)
+                if current_branch != App::Git::MASTER
                     if results[3] == false
                         @git.ask_to_setup_remote_tracking(current_branch, repo_dir)
                     end
                     if results[4] == false
-                        Brightpearl::Terminal::error('Merge conflict occurred', ["Unable to successfully merge #{Brightpearl::Terminal::format_branch(Brightpearl::Git::MASTER)} into #{Brightpearl::Terminal::format_branch(current_branch)} on #{Brightpearl::Terminal::format_directory(@git.get_repo_shorthand(repo_dir))}", "Please #{Brightpearl::Terminal::format_action('open an IDE')}\x1B[38;5;240m and resolve your conflicts as soon as this script has finished executing."])
+                        unless App::Terminal::prompt_yes_no('Merge conflict occurred', ["Unable to successfully merge #{App::Terminal::format_branch(App::Git::MASTER)} into #{App::Terminal::format_branch(current_branch)} on #{App::Terminal::format_directory(@git.get_repo_shorthand(repo_dir))}", "Please #{App::Terminal::format_action('open an IDE')}\x1B[38;5;240m and resolve your conflicts as soon as this script has finished executing."])
+                            App::Terminal::abort(nil, nil, true, false)
+                        end
                     end
                 end
-                if @opts[:push] && current_branch != Brightpearl::Git::MASTER
-                    Brightpearl::Terminal::command("git push origin #{current_branch}", repo_dir)
-                elsif @opts[:push] && current_branch == Brightpearl::Git::MASTER
-                    Brightpearl::Terminal::warning("#{Brightpearl::Terminal::format_action('push')} to #{Brightpearl::Terminal::format_branch(Brightpearl::Git::MASTER)} not allowed!", ["Your #{Brightpearl::Terminal::format_directory(@git.get_repo_shorthand(repo_dir))} repo is currently on #{Brightpearl::Terminal::format_branch(Brightpearl::Git::MASTER)}","The script will not perform a #{Brightpearl::Terminal::format_action('push')} as requested for safety reasons."])
+                if @opts[:push] && current_branch != App::Git::MASTER
+                    App::Terminal::command("git push origin #{current_branch}", repo_dir)
+                elsif @opts[:push] && current_branch == App::Git::MASTER
+                    App::Terminal::warning("#{App::Terminal::format_action('push')} to #{App::Terminal::format_branch(App::Git::MASTER)} not allowed!", ["Your #{App::Terminal::format_directory(@git.get_repo_shorthand(repo_dir))} repo is currently on #{App::Terminal::format_branch(App::Git::MASTER)}", "The script will not perform a #{App::Terminal::format_action('push')} as requested for safety reasons."])
                 end
 
             end

data/lib/routes/jira.rb

@@ -1,4 +1,4 @@
-module BrightpearlCommand
+module AppCommand
 
     class JiraCard < ::Convoy::ActionCommand::Base
 
@@ -6,7 +6,7 @@ module BrightpearlCommand
 
             @opts = command_options
             @args = arguments
-            @jira = Brightpearl::Jira.new
+            @jira = App::Jira.new
 
             opts_validate
             opts_routing
@@ -26,7 +26,7 @@ module BrightpearlCommand
 
             if @opts[:card]
                 if @args[0].nil? || @args[0] == ''
-                    Brightpearl::Terminal::error('Argument required', 'You must supply a valid Jira Number as an argument.', true)
+                    App::Terminal::error('Argument required', 'You must supply a valid Jira Number as an argument.', true)
                 end
             end
 

data/lib/routes/production_logs.rb

@@ -1,7 +1,7 @@
 require 'columnist'
 require 'rest-client'
 
-module BrightpearlCommand
+module AppCommand
 
     class ProductionLogs < ::Convoy::ActionCommand::Base
 
@@ -21,8 +21,8 @@ module BrightpearlCommand
             @opts = command_options
             @args = arguments
 
-            @ec2_connection = Brightpearl::MySQL::ec2
-            @terminal_width = Brightpearl::Terminal::get_terminal_width
+            @ec2_connection = App::MySQL::ec2
+            @terminal_width = App::Terminal::get_terminal_width
 
             opts_validate
             opts_routing
@@ -36,7 +36,7 @@ module BrightpearlCommand
             watch = watch + 1 if @opts[:watchJava]
 
             if watch >= 2
-                Brightpearl::Terminal::error('You can only watch one set of logs at a time', "Please set only 1 one of the following flags: #{Brightpearl::Terminal::format_flag('p', false)} #{Brightpearl::Terminal::format_flag('j', false)}", true)
+                App::Terminal::error('You can only watch one set of logs at a time', "Please set only 1 one of the following flags: #{App::Terminal::format_flag('p', false)} #{App::Terminal::format_flag('j', false)}", true)
             elsif watch == 0
                 @opts[:watchPHP] = true
             end
@@ -44,7 +44,7 @@ module BrightpearlCommand
             if @opts[:compare]
                 [@args[0], @args[1]].each do |version_number|
                     if version_number.nil?
-                        Brightpearl::Terminal::error('Missing arguments', ["When using the #{Brightpearl::Terminal::format_flag('c')} the system expects #{Brightpearl::Terminal::format_highlight('2 arguments ')} \xe2\x80\x94 application version numbers.", "An example of a valid command would be: #{Brightpearl::Terminal::format_command('bp p l -c 4.76.6 4.78.4')}"], true)
+                        App::Terminal::error('Missing arguments', ["When using the #{App::Terminal::format_flag('c')} the system expects #{App::Terminal::format_highlight('2 arguments ')} \xe2\x80\x94 application version numbers.", "An example of a valid command would be: #{App::Terminal::format_command('bp p l -c 4.76.6 4.78.4')}"], true)
                     end
                     validate_version_number(version_number)
                 end
@@ -131,14 +131,14 @@ module BrightpearlCommand
                 puts # PUTS SPACE AFTER TABLE
 
             rescue Exception => e
-                Brightpearl::Terminal::error('Something went wrong', "#{e.message}", true)
+                App::Terminal::error('Something went wrong', "#{e.message}", true)
             end
 
         end
 
         def watch_java
 
-            Brightpearl::Terminal::info('Not yet implemented', 'Please wait for Albert to program this and try again later.')
+            App::Terminal::info('Not yet implemented', 'Please wait for Albert to program this and try again later.')
             exit
 
         end
@@ -184,7 +184,7 @@ module BrightpearlCommand
                                 error_output << log_message
                                 error_output << nil
                                 error_output << sql
-                                Brightpearl::Terminal::warning('Query Failed', error_output)
+                                App::Terminal::warning('Query Failed', error_output)
                             end
                         end
                         error_parsed = "     \x1B[38;5;34m#{account_version}\x1B[0m \xe2\x86\x92 \x1B[38;5;81m#{account_name}\x1B[0m \xe2\x80\x94 \x1B[38;5;#{error_color}m#{error_message} \xe2\x80\x94 #{error_file} \xe2\x80\x94 Line #{error_line}"
@@ -211,7 +211,7 @@ module BrightpearlCommand
                 LOG_URI_STG2,
             ]
             raw_log_uris.each do |log_uri|
-                Brightpearl::Terminal::output("Retrieving data from: #{log_uri}")
+                App::Terminal::output("Retrieving data from: #{log_uri}")
                 raw_log_data << RestClient.get(log_uri)
             end
 
@@ -314,16 +314,16 @@ module BrightpearlCommand
         # @return void
         def validate_version_number(version_number)
             unless version_number =~ /\A\d\.\d{1,3}\.\d{1,2}\z/
-                Brightpearl::Terminal::error('Invalid version number', "#{Brightpearl::Terminal::format_highlight(version_number)} is not a valid version number.", true)
+                App::Terminal::error('Invalid version number', "#{App::Terminal::format_highlight(version_number)} is not a valid version number.", true)
             end
             sql = "SELECT id FROM php_logs WHERE account_version='#{version_number}' LIMIT 1"
             begin
                 result = @ec2_connection.query(sql)
             rescue
-                Brightpearl::Terminal::warning('Query Failed', sql)
+                App::Terminal::warning('Query Failed', sql)
             end
             unless result.num_rows > 0
-                Brightpearl::Terminal::info('No data', "We currently don't have any data for version: #{Brightpearl::Terminal::format_highlight(version_number)}")
+                App::Terminal::info('No data', "We currently don't have any data for version: #{App::Terminal::format_highlight(version_number)}")
                 exit
             end
         end

data/lib/routes/reset.rb

@@ -1,4 +1,4 @@
-module BrightpearlCommand
+module AppCommand
 
     class Reset < ::Convoy::ActionCommand::Base
 

data/lib/routes/review.rb

@@ -1,4 +1,4 @@
-module BrightpearlCommand
+module AppCommand
 
     class Review < ::Convoy::ActionCommand::Base
 
@@ -6,7 +6,7 @@ module BrightpearlCommand
 
             @opts = command_options
             @args = arguments
-            @git = Brightpearl::Git.new
+            @git = App::Git.new
             opts_validate
             opts_routing
 
@@ -15,8 +15,9 @@ module BrightpearlCommand
         def opts_validate
 
             unless @args.any?
-                system('bp r -h')
-                exit
+                
+                App::Terminal::error('Must specify a valid branch name', nil, true)
+                
             end
 
         end
@@ -29,7 +30,7 @@ module BrightpearlCommand
 
         def review
 
-            current_branch = @git.current_branch_for_repo(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE))
+            current_branch = @git.current_branch_for_repo(App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE))
 
             @git.check_branch_exists_somewhere(@args[0])
 

data/lib/routes/scripts_api_docs.rb

@@ -1,4 +1,4 @@
-module BrightpearlCommand
+module AppCommand
 
     class ScriptsApiDocs < ::Convoy::ActionCommand::Base
 
@@ -23,14 +23,14 @@ module BrightpearlCommand
 
         def build_api_docs
 
-            if Brightpearl::Tools::this_is_a_mac
+            if App::Tools::this_is_a_mac
 
-                Brightpearl::Terminal::info('Building API Docs')
-                system("sshpass -p#{Brightpearl::Config.param(Brightpearl::Config::VM_USER_PASSWORD)} ssh #{Brightpearl::Config.param(Brightpearl::Config::VM_USER)}@#{Brightpearl::Config.param(Brightpearl::Config::VM_IP)} -t 'su root && cd /brightpearl-source/dev-vm-control-scripts && ./build-api-docs'")
+                App::Terminal::info('Building API Docs')
+                system("sshpass -p#{App::Config.param(App::Config::VM_USER_PASSWORD)} ssh #{App::Config.param(App::Config::VM_USER)}@#{App::Config.param(App::Config::VM_IP)} -t 'su root && cd /brightpearl-source/dev-vm-control-scripts && ./build-api-docs'")
 
             else
 
-                Brightpearl::Terminal::info('This functionality has not yet been implemented on your OS', ["Currently only works on #{Brightpearl::Terminal::format_action(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_OS))}", nil, "You are on #{Brightpearl::Terminal::format_action(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_OS))}"])
+                App::Terminal::info('This functionality has not yet been implemented on your OS', ["Currently only works on #{App::Terminal::format_action(App::Config.param(App::Config::WORKSTATION_OS))}", nil, "You are on #{App::Terminal::format_action(App::Config.param(App::Config::WORKSTATION_OS))}"])
 
             end
 

data/lib/routes/scripts_branch_cleaner.rb

@@ -1,4 +1,4 @@
-module BrightpearlCommand
+module AppCommand
 
     class ScriptsBranchCleaner < ::Convoy::ActionCommand::Base
 
@@ -6,7 +6,7 @@ module BrightpearlCommand
 
             @opts = command_options
             @args = arguments
-            @git = Brightpearl::Git.new
+            @git = App::Git.new
 
             opts_validate
             opts_routing
@@ -15,14 +15,6 @@ module BrightpearlCommand
 
         def opts_validate
 
-            if @opts[:scanLocal] && @opts[:scanRemote]
-                Brightpearl::Terminal::error("Cannot scan #{Brightpearl::Terminal::format_action('local')} & #{Brightpearl::Terminal::format_action('remote')} simultaneously", "Must use either the #{Brightpearl::Terminal::format_flag('l')} or the #{Brightpearl::Terminal::format_flag('r')} \xe2\x80\x94 cannot use both.", true)
-            end
-
-            if @opts[:scanLocal] == false && @opts[:scanRemote] == false
-                @opts[:scanLocal] = true
-            end
-
         end
 
         def opts_routing
@@ -33,12 +25,10 @@ module BrightpearlCommand
 
         def clean
 
-            local_remote = @opts[:scanRemote] ? 'remote' : 'local'
-
-            Brightpearl::Terminal::info('Running branch cleaner', "Gathering list of #{Brightpearl::Terminal::format_action(local_remote)} branches which are safe to delete.")
+            App::Terminal::info('Running branch cleaner', "Gathering list of #{App::Terminal::format_highlight('local')} branches where last commit was #{App::Terminal::format_highlight('more than 1 month ago')}")
 
             branches_code, branches_db = get_historic_branches
-            umc_branches = get_unsafe_branches(branches_code, branches_db)
+            umc_branches = get_unmerged_commit_branches(branches_code, branches_db)
             fnl_branches_cd, fnl_branches_db = get_final_branches(branches_code, branches_db, umc_branches)
 
             puts "\n"
@@ -46,99 +36,90 @@ module BrightpearlCommand
             atleast_one_error = false
 
             if umc_branches.any?
-                Brightpearl::Terminal::warning("The following branches have commits which #{Brightpearl::Terminal::format_invalid('have not been merged to', true)} #{Brightpearl::Terminal::format_branch(Brightpearl::Git::MASTER)} \xe2\x80\x94 #{Brightpearl::Terminal::format_directory(@git.get_repo_shorthand(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE)))}", umc_branches, false)
+                App::Terminal::warning("The following branches have commits which #{App::Terminal::format_invalid('have not been merged to', true)} #{App::Terminal::format_branch(App::Git::MASTER)}", umc_branches, false)
                 atleast_one_error = true
             end
 
-            if atleast_one_error
-                unless Brightpearl::Terminal::prompt_yes_no('Skip these branches?', ["The above branch(es) have unmerged commits and will be #{Brightpearl::Terminal::format_action('skipped')} in the removal process."])
-                    Brightpearl::Terminal::abort(nil, nil, true, false)
-                end
+            unless fnl_branches_cd.any? || fnl_branches_db.any?
+                App::Terminal::info('No branches to delete', ["The script found no branches which are #{App::Terminal::format_action('eligible for deletion')}.","All branches on your system have either a #{App::Terminal::format_highlight('commit within the last month')} or a #{App::Terminal::format_highlight('commit not in')} #{App::Terminal::format_branch(App::Git::MASTER)}."])
+                exit
             end
 
-            unless fnl_branches_cd.any? && fnl_branches_db.any?
-                Brightpearl::Terminal::info('Nothing to delete', nil, false)
-                exit
+            if atleast_one_error
+                unless App::Terminal::prompt_yes_no('Skip these branches?', ["The above branch(es) have unmerged commits and will be #{App::Terminal::format_action('skipped')} in the removal process.", "You #{App::Terminal::format_invalid('cannot delete', true)} these branches using this script, this must be done manually #{App::Terminal::format_highlight('afterwards')}."])
+                    App::Terminal::abort(nil, nil, true, false)
+                end
             end
 
             @git.show_branches_draw_table(fnl_branches_cd, fnl_branches_db)
 
-            unless Brightpearl::Terminal::prompt_yes_no('Remove these branches?', ["By continuing, the above branches will be #{Brightpearl::Terminal::format_action('removed permanently')}"], 'Are you absolutely sure you want to continue?', false)
-                Brightpearl::Terminal::abort(nil, nil, true, false)
+            unless App::Terminal::prompt_yes_no('Remove these branches?', ["By continuing, the above branches will be #{App::Terminal::format_action('removed permanently')} both #{App::Terminal::format_highlight('locally & remotely')}!"], 'Are you absolutely sure you want to continue?', false)
+                App::Terminal::abort(nil, nil, true, false)
             end
 
-            repo_cd = Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE)
-            repo_db = Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB)
+            repo_cd = App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE)
+            repo_db = App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_DB)
 
             branch_count = 0
 
             fnl_branches_cd.each do |branch|
-                branch_name = branch[:"#{Brightpearl::Git::REFNAME}"]
-                commands = []
-                if @opts[:scanLocal]
-                    commands << "git branch -D #{branch_name}"
-                else
+                branch_name = branch[:"#{App::Git::REFNAME}"]
+                unless branch_name == App::Git::MASTER
+                    commands = []
                     commands << "git branch --unset-upstream #{branch_name}"
-                    commands << "git push origin --delete  #{branch_name}"
+                    commands << "git branch -D #{branch_name}"
+                    commands << "git push origin --delete #{branch_name}" unless release_branch(branch_name)
+                    App::Terminal::command(commands, repo_cd)
+                    branch_count = branch_count + 1
                 end
-                Brightpearl::Terminal::command(commands, repo_cd)
-                branch_count = branch_count + 1
             end
 
             fnl_branches_db.each do |branch|
-                branch_name = branch[:"#{Brightpearl::Git::REFNAME}"]
-                commands = []
-                if @opts[:scanLocal]
-                    commands << "git branch -D #{branch_name}"
-                else
+                branch_name = branch[:"#{App::Git::REFNAME}"]
+                unless branch_name == App::Git::MASTER
+                    commands = []
                     commands << "git branch --unset-upstream #{branch_name}"
-                    commands << "git push origin --delete  #{branch_name}"
+                    commands << "git branch -D #{branch_name}"
+                    commands << "git push origin --delete #{branch_name}" unless release_branch(branch_name)
+                    App::Terminal::command(commands, repo_db)
+                    branch_count = branch_count + 1
                 end
-                Brightpearl::Terminal::command(commands, repo_db)
-                branch_count = branch_count + 1
             end
 
-            Brightpearl::Terminal::success("#{Brightpearl::Terminal::format_highlight(branch_count)} branches successfully #{Brightpearl::Terminal::format_action('removed')}")
-
+            App::Terminal::success("#{App::Terminal::format_highlight(branch_count)} branches successfully #{App::Terminal::format_action('removed')}")
         end
 
         private
 
+        def release_branch(branch)
+            branch =~ /release-(\d){1,3}.(\d){1,3}.(\d){1,3}-(\d){4}/i
+        end
+
         # Gets all (remote) branches where last commit was longer than 1 month ago and committer is CONFIG::GIT_USERNAME
         # @return Array
         def get_historic_branches
 
-            committer_name = Brightpearl::Config.param(Brightpearl::Config::GIT_USERNAME)
             date_1_month_ago = DateTime.now << 1
 
             fnl_branches_cd = []
             fnl_branches_db = []
+            all_branches_db = []
 
-            if @opts[:scanRemote]
-                repos = @git.get_remote_branches(Brightpearl::Git::SORT_DATE)
-            else
-                repos = @git.get_local_branches(Brightpearl::Git::SORT_DATE)
-            end
-
-            repos[0].each do |branch|
-                unless branch[:"#{Brightpearl::Git::REFNAME}"].match(Brightpearl::Git::RELEASE_BRANCH_REGEX) || branch[:"#{Brightpearl::Git::COMMITTER_DATE}"] > date_1_month_ago
-                    if branch[:"#{Brightpearl::Git::COMMITTER_NAME}"] == committer_name && @opts[:anyName] == false
-                        fnl_branches_cd << branch
-                    elsif @opts[:anyName] == true
-                        fnl_branches_cd << branch
-                    end
+            repos = @git.get_local_branches(App::Git::SORT_DATE)
+            repos[1].each do |branch|
+                all_branches_db << branch[:"#{App::Git::REFNAME}"]
+                if branch[:"#{App::Git::COMMITTER_DATE}"] < date_1_month_ago
+                    fnl_branches_db << branch
                 end
             end
-            repos[1].each do |branch|
-                unless branch[:"#{Brightpearl::Git::REFNAME}"].match(Brightpearl::Git::RELEASE_BRANCH_REGEX) || branch[:"#{Brightpearl::Git::COMMITTER_DATE}"] > date_1_month_ago
-                    if branch[:"#{Brightpearl::Git::COMMITTER_NAME}"] == committer_name && @opts[:anyName] == false
-                        fnl_branches_db << branch
-                    elsif @opts[:anyName] == true
+            repos[0].each do |branch|
+                if branch[:"#{App::Git::COMMITTER_DATE}"] < date_1_month_ago
+                    fnl_branches_cd << branch
+                    if all_branches_db.include?(branch[:"#{App::Git::REFNAME}"])
                         fnl_branches_db << branch
                     end
                 end
             end
-
             fnl_branches_cd.uniq!
             fnl_branches_db.uniq!
             return fnl_branches_cd, fnl_branches_db
@@ -146,21 +127,24 @@ module BrightpearlCommand
 
         # Gets array of branches which still have commits NOT in master.
         # @return Array
-        def get_unsafe_branches(branches_code, branches_db)
+        def get_unmerged_commit_branches(branches_code, branches_db)
             branches_unmerged_commits = []
-            origin = @opts[:scanLocal] ? '' : 'origin/'
             branches_code.each do |code_branch|
-                missing_commits = Brightpearl::Terminal::command_capture("git log #{origin}master..#{origin}#{code_branch[:"#{Brightpearl::Git::REFNAME}"]}", Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE))
+                missing_commits = App::Terminal::command_capture("git log origin/master..origin/#{code_branch[:"#{App::Git::REFNAME}"]}", App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE), true, false)
                 if missing_commits[0] != ''
-                    puts missing_commits
-                    branches_unmerged_commits << code_branch[:"#{Brightpearl::Git::REFNAME}"]
+                    missing_commits[0].split("\n").each do |line|
+                        App::Terminal::output(line, App::Terminal::MSG_WARNING)
+                    end
+                    branches_unmerged_commits << code_branch[:"#{App::Git::REFNAME}"]
                 end
             end
             branches_db.each do |db_branch|
-                missing_commits = Brightpearl::Terminal::command_capture("git log #{origin}master..#{origin}#{db_branch[:"#{Brightpearl::Git::REFNAME}"]}", Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB))
+                missing_commits = App::Terminal::command_capture("git log origin/master..origin/#{db_branch[:"#{App::Git::REFNAME}"]}", App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_DB), true, false)
                 if missing_commits[0] != ''
-                    puts missing_commits
-                    branches_unmerged_commits << db_branch[:"#{Brightpearl::Git::REFNAME}"]
+                    missing_commits[0].split("\n").each do |line|
+                        App::Terminal::output(line, App::Terminal::MSG_WARNING)
+                    end
+                    branches_unmerged_commits << db_branch[:"#{App::Git::REFNAME}"]
                 end
             end
             branches_unmerged_commits.uniq!
@@ -171,20 +155,15 @@ module BrightpearlCommand
         # Gets final array of branches which are safe to delete.
         # @return Array
         def get_final_branches(branches_code, branches_db, umc_branches)
-
-            puts branches_code
-            puts umc_branches
-            exit
-
             fnl_branches_cd = []
             fnl_branches_db = []
             branches_code.each do |branch|
-                unless umc_branches.include?(branch[:"#{Brightpearl::Git::REFNAME}"])
+                unless umc_branches.include?(branch[:"#{App::Git::REFNAME}"])
                     fnl_branches_cd << branch
                 end
             end
             branches_db.each do |branch|
-                unless umc_branches.include?(branch[:"#{Brightpearl::Git::REFNAME}"])
+                unless umc_branches.include?(branch[:"#{App::Git::REFNAME}"])
                     fnl_branches_db << branch
                 end
             end

data/lib/routes/scripts_color.rb

@@ -1,4 +1,4 @@
-module BrightpearlCommand
+module AppCommand
 
     class ScriptsColor < ::Convoy::ActionCommand::Base