brightpearl-cli 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5511302aa94c45f7e4df5f5403ce2e4e0d960990
-  data.tar.gz: 385903c655d76a683bb9b7209beb46ce92546daa
+  metadata.gz: 51a9cc4563e9b20fd81701be0bdadfa0940b7f46
+  data.tar.gz: fcf47560efc4fa89341b7ac5170baeb72965b990
 SHA512:
-  metadata.gz: 58f651cea48fb26cfd926c3b5833b75ea5e91f1219237bfc3cf5d5b9b3e1e575e311e6092f538c5ace5e33e92e922aff3d37226f29319bd202888e19756ec494
-  data.tar.gz: aea53efeae952d2cf08beb008c2e6a8402c39ad07b3a8c5763ee975ed122be0dc2820fda45b660597d7dd6473d2c8d9a819936181f3d734e8247ef563f131cf1
+  metadata.gz: 1bdec6a11746ae770483a1e8f0598e6ad10c6511e96b2d69a459ad5fbead22bcf36e816541084286d3c87a471c738b726d193c441afa49901ce09b434e82a0be
+  data.tar.gz: d4e30df9916e8ff9a8e024eea98533998910c9094bf6f23e57a21592b90b37596a29ba3fd3293889aefa52dcf57d6df60cb01bd753e1cec7b85b2f71afc0c1c4

data/lib/brightpearl_cli.rb

@@ -13,9 +13,7 @@ require 'core/pom'
 require 'core/sql_update'
 require 'core/tools'
 require 'core/validate'
-require 'core/vm'
 require 'routes/build'
-require 'routes/dummy_order'
 require 'routes/fix'
 require 'routes/git_branch'
 require 'routes/git_checkout'
@@ -42,15 +40,19 @@ require 'routes/test'
 # SHARED
 require 'core/config'
 require 'core/encrypter'
+require 'core/ssh'
 require 'core/terminal'
 require 'core/utils_files'
 require 'core/utils_routes'
 require 'core/utils_strings'
+require 'core/utils_tools'
 require 'routes/setup'
 require 'routes/ssh'
 
 module App
 
+    DEFAULT_OPTION = "\xe2\x80\x94 \x1B[38;5;148mDefault\x1B[0m"
+
     def self.execute
 
         begin
@@ -64,6 +66,8 @@ module App
                 #  COLOR OF TITLE TEXT
                 title_color = 255
 
+                beta = App::Config::param(ConfigUnique::BETA) == 'true' ? true : false
+
                 app.version VERSION
                 app.summary "\x1B[38;5;166mBRIGHTPEARL-CLI\x1B[0m \x1B[38;5;240m\xe2\x80\x94 BETA\x1B[0m"
                 app.description "\x1B[38;5;#{title_color}mA command line utility for Brightpearl developers and QAs.\nUsed for automating daily work flows & completing repetitive tasks quicker with less errors.\nDesigned to work from anywhere on your workstation.\n\nUse #{App::Terminal::format_command('app')}\x1B[38;5;#{title_color}m or #{App::Terminal::format_command('bp')}\x1B[38;5;#{title_color}m to run.\x1B[0m"
@@ -72,7 +76,7 @@ module App
                 app.command :build, :aliases => [:b] do |build|
                     build.summary 'Build (and deploy) Java services'
                     build.options do |opts|
-                        opts.opt :serviceOnly, 'Build service only (default)', :short => '-s', :long => '--service-only', :type => :boolean
+                        opts.opt :serviceOnly, "Build service only #{DEFAULT_OPTION}", :short => '-s', :long => '--service-only', :type => :boolean
                         opts.opt :apiOnly, 'Build API only', :short => '-a', :long => '--api-only', :type => :boolean
                         opts.opt :both, 'Build both', :short => '-b', :long => '--both', :type => :boolean
                         opts.opt :deploy, 'Deploy to SkyFactory', :short => '-d', :long => '--deploy', :type => :boolean
@@ -82,39 +86,12 @@ module App
                     end
                 end
 
-                # DUMMY
-                app.command :dummy, :aliases => [:d] do |dummy|
-
-                    dummy.summary 'Insert dummy data into the App'
-
-                    # DUMMY ORDER
-                    dummy.command :order, :aliases => [:o] do |dummy_order|
-                        dummy_order.summary 'Create dummy orders'
-                        dummy_order.options do |opts|
-                            opts.opt :salesOrder, 'Create sales order', :short => '-s', :long => '--sales-order', :type => :boolean
-                            opts.opt :salesCredit, 'Create sales credit', :short => '-S', :long => '--sales-credit', :type => :boolean
-                            opts.opt :purchaseOrder, 'Create purchase order', :short => '-p', :long => '--purchase-order', :type => :boolean
-                            opts.opt :purchaseCredit, 'Create purchase credit', :short => '-P', :long => '--purchase-credit', :type => :boolean
-                            opts.opt :times, 'Specify number of orders (maximum 50)', :short => '-x', :long => '--times', :type => :int
-                        end
-                        dummy_order.action do |opts, args|
-                            AppCommand::DummyOrder.new(opts, args).execute
-                        end
-                    end
-
-                    # CREATE (DEFAULT)
-                    dummy.action do
-                        system('bp d -h')
-                    end
-
-                end
-
                 # FIX
                 app.command :fix, :aliases => [:f] do |fix|
                     fix.summary 'Quick fixes for common problems'
                     fix.options do |opts|
-                        opts.opt :login_sessions, 'LOGIN - Clear sessions to fix login problem(s)', :short => '-l', :long => '--login-sessions', :type => :boolean
-                        opts.opt :sql_updates, 'SQL UPDATE(S) - Run SQL updates from a specific update (specified as 1st argument).', :short => '-s', :long => '--sql-updates', :type => :boolean
+                        opts.opt :login_sessions, 'Fix login problem(s) by clearing out the sessions table.', :short => '-l', :long => '--login-sessions', :type => :boolean
+                        opts.opt :sql_mode, 'Fix problem when SQL goes into "STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION" mode.', :short => '-s', :long => '--sql-mode', :type => :boolean
                     end
                     fix.action do |opts, args|
                         AppCommand::Fix.new(opts, args).execute
@@ -122,7 +99,6 @@ module App
                 end
 
                 # GIT
-
                 app.command :git, :aliases => [:g] do |git|
 
                     git.summary 'All git related functionality'
@@ -134,7 +110,7 @@ module App
                             opts.opt :local, 'List local branches', :short => '-l', :long => '--local', :type => :boolean
                             opts.opt :remote, 'List remote branches', :short => '-r', :long => '--remote', :type => :boolean
                             opts.opt :sortDate, 'Sort by date', :short => '-d', :long => '--sort-date', :type => :boolean
-                            opts.opt :sortRefname, 'Sort by branch name (default)', :short => '-n', :long => '--sort-refname', :type => :boolean
+                            opts.opt :sortRefname, "Sort by branch name #{DEFAULT_OPTION}", :short => '-n', :long => '--sort-refname', :type => :boolean
                             opts.opt :detailed, 'Show a more detailed output w/Jira data, etc. (takes longer)', :short => '-D', :long => '--detailed', :type => :boolean
                         end
                         git_branch.action do |opts, args|
@@ -187,19 +163,20 @@ module App
                         d << "\n"
                         d << "\nAlternatively, use the #{App::Terminal::format_flag('o', false)} and #{App::Terminal::format_flag('f', false)} flags to specify your source branches using a temporary file:"
                         d << "\n"
-                        d << "\n    #{App::Terminal::format_flag('o', false)} opens #{App::Terminal::format_directory(App::Enum::GIT_MERGE_DEFAULT_FILE)}"
-                        d << "\n    #{App::Terminal::format_flag('f', false)} parses the contents of #{App::Terminal::format_directory(App::Enum::GIT_MERGE_DEFAULT_FILE)} as source branches (one branch per line)"
+                        d << "\n    #{App::Terminal::format_flag('o', false)} opens #{App::Terminal::format_directory(App::Git::GIT_MERGE_DEFAULT_FILE)}"
+                        d << "\n    #{App::Terminal::format_flag('f', false)} parses the contents of #{App::Terminal::format_directory(App::Git::GIT_MERGE_DEFAULT_FILE)} as source branches (one branch per line)"
                         d << "\n"
                         d << "\n    #{App::Terminal::format_command('bp g m -o')} \x1B[0m"
                         d << "\n    #{App::Terminal::format_command('bp g m -f')} \x1B[0m"
                         d << "\n    #{App::Terminal::format_command('bp g m -f target_branch')} \x1B[0m"
                         git_merge.description d
                         git_merge.options do |opts|
-                            opts.opt :open_file, "Creates (and opens) #{App::Terminal::format_directory(App::Enum::GIT_MERGE_DEFAULT_FILE)}", :short => '-o', :long => '--open-file', :type => :boolean
+                            opts.opt :open_file, "Creates (and opens) #{App::Terminal::format_directory(App::Git::GIT_MERGE_DEFAULT_FILE)}", :short => '-o', :long => '--open-file', :type => :boolean
                             opts.opt :from_file, 'Get branch names from file (1 branch per line)', :short => '-f', :long => '--from-file', :type => :boolean
-                            opts.opt :delete_source_branches_local, "Delete all source branches (locally) in #{App::Terminal::format_directory(App::Enum::GIT_MERGE_DEFAULT_FILE)}", :short => '-d', :long => '--delete-local', :type => :boolean
-                            opts.opt :delete_source_branches_remote, "Delete all source branches (remotely) in #{App::Terminal::format_directory(App::Enum::GIT_MERGE_DEFAULT_FILE)}", :short => '-D', :long => '--delete-remote', :type => :boolean
+                            opts.opt :delete_source_branches_local, "Delete all source branches (locally) in #{App::Terminal::format_directory(App::Git::GIT_MERGE_DEFAULT_FILE)}", :short => '-d', :long => '--delete-local', :type => :boolean
+                            opts.opt :delete_source_branches_remote, "Delete all source branches (remotely) in #{App::Terminal::format_directory(App::Git::GIT_MERGE_DEFAULT_FILE)}", :short => '-D', :long => '--delete-remote', :type => :boolean
                             opts.opt :sanity_check, 'Run sanity check. Submit source/target branches same as you would during a merge.', :short => '-s', :long => '--sanity-check', :type => :boolean
+                            opts.opt :build_services, "Determine what services need to be built before merging to #{App::Terminal::format_branch(App::Git::MASTER)}.", :short => '-b', :long => '--build-services', :type => :boolean
                         end
                         git_merge.action do |opts, args|
                             AppCommand::GitMerge.new(opts, args).execute
@@ -286,7 +263,7 @@ module App
                     production.command :logs, :aliases => [:l] do |production_logs|
                         production_logs.summary 'Scan production logs'
                         production_logs.options do |opts|
-                            opts.opt :watchPHP, 'Watch PHP logs (default)', :short => '-p', :long => '--watch-php-logs', :type => :boolean
+                            opts.opt :watchPHP, "Watch PHP logs #{DEFAULT_OPTION}", :short => '-p', :long => '--watch-php-logs', :type => :boolean
                             opts.opt :watchJava, 'Watch Java logs', :short => '-j', :long => '--watch-java-logs', :type => :boolean
                             opts.opt :skipFetch, 'Skip fetching of new logs (quicker)', :short => '-s', :long => '--skip-fetch', :type => :boolean
                             opts.opt :compare, 'Compare logs between 2 versions (requires 2 parameters -- source & target version)', :short => '-c', :long => '--compare', :type => :boolean
@@ -381,7 +358,7 @@ module App
                 end
 
                 # SSH - SSH
-                app.command :ssh, :aliases => [:s] do |ssh|
+                app.command :ssh, :aliases => [:sh] do |ssh|
                     ssh.summary 'SSH into various stuff.'
                     ssh.action do |opts, args|
                         AppCommand::SSH.new(opts, args).execute
@@ -390,7 +367,13 @@ module App
 
                 # TAIL
                 app.command :tail, :aliases => [:T] do |tail|
-                    tail.summary 'Tail various logs (all catalina.out by default)'
+                    tail.summary 'Tail various logs'
+                    tail.options do |opts|
+                        opts.opt :catalina, "Tail #{App::Terminal::format_directory('/var/log/tomcat/*/catalina.out')}", :short => '-c', :long => '--catalina', :type => :boolean
+                        opts.opt :access, "Tail #{App::Terminal::format_directory('/var/log/tomcat/*/access*')}", :short => '-a', :long => '--access', :type => :boolean
+                        opts.opt :php, "Tail #{App::Terminal::format_directory('/var/log/php/php.log')}", :short => '-p', :long => '--php', :type => :boolean
+                        opts.opt :phpunit, "Tail #{App::Terminal::format_directory('/tmp/phpunit.error.log')}", :short => '-P', :long => '--php-unit', :type => :boolean
+                    end
                     tail.action do |opts, args|
                         AppCommand::Tail.new(opts, args).execute
                     end
@@ -398,12 +381,12 @@ module App
 
                 # TEST
                 app.command :test, :aliases => [:t] do |test|
-                    test.summary 'Run various tests (PHPUnit by default)'
+                    test.summary 'Run various tests'
                     test.options do |opts|
                         opts.opt :cucumber, 'Run Cucumber tests', :short => '-c', :long => '--cucumber', :type => :boolean
                         opts.opt :fitnesse, 'Run FitNesse tests', :short => '-f', :long => '--fitnesse', :type => :boolean
-                        opts.opt :php, 'Run PHPUnit tests (default)', :short => '-p', :long => '--php-unit', :type => :boolean
-                        opts.opt :php_local, 'Run PHPUnit tests locally', :short => '-P', :long => '--php-unit-local', :type => :boolean
+                        opts.opt :php, "Run PHPUnit tests #{DEFAULT_OPTION}", :short => '-p', :long => '--php-unit', :type => :boolean
+                        opts.opt :behat, 'Run Behat tests', :short => '-b', :long => '--behat', :type => :boolean
                         opts.opt :ruby, 'Run Ruby UI tests', :short => '-r', :long => '--ruby-ui', :type => :boolean
                     end
                     test.action do |opts, args|

data/lib/core/config.rb

@@ -44,7 +44,7 @@ module App
             puts "CLI stands for 'Command Line Interface'."
             puts
             puts "The first thing you'll need to do is setup your configuration file."
-            puts "The file is located at: #{App::Terminal::format_directory(App::Config)}"
+            puts "The file is located at: #{App::Terminal::format_directory(ConfigUnique::CONFIG_FILE)}"
             puts
             puts "You probably won't have this file so the program will create it for you."
             puts "\n"
@@ -101,6 +101,19 @@ module App
             @params.has_key?(param_name)
         end
 
+        # Get custom keys from the config file (IE: ssh_ec2=user|host|pem)
+        # @return String
+        def self.get_custom_key(prefix, config_key)
+            if config_key.nil?
+                App::Terminal::error("The script requires a config parameter from your #{App::Terminal::format_directory(ConfigUnique::CONFIG_FILE)} file", "The key should have a prefix of: #{App::Terminal::format_highlight(prefix)}", true)
+            end
+            config_param = (config_key =~ /\A#{prefix}\S+\z/i) ? config_key : "#{prefix}#{config_key}"
+            unless App::Config::param_exists(config_param)
+                App::Terminal::error('Invalid config parameter', "Cannot find #{App::Terminal::format_highlight('key')} #{App::Terminal::format_invalid("\"#{config_param}\"")} in: #{App::Terminal::format_directory(ConfigUnique::CONFIG_FILE)}", true)
+            end
+            App::Config.param(config_param)
+        end
+
     end
 
 end

data/lib/core/config_unique.rb

@@ -12,15 +12,12 @@ module ConfigUnique
     LINUX = 'linux'
 
     # STORED PARAMETERS
-    WORKSTATION_IP = 'workstation_ip'
     WORKSTATION_OS = 'workstation_os'
     WORKSTATION_PATH_TO_BP_CODE = 'workstation_path_to_bp_code'
     WORKSTATION_PATH_TO_BP_DB = 'workstation_path_to_bp_db'
     VM_IP = 'vm_ip'
     VM_USER = 'vm_user'
     VM_USER_PASSWORD = 'vm_user_password'
-    VM_ROOT = 'vm_root'
-    VM_ROOT_PASSWORD = 'vm_root_password'
     VM_MYSQL_USER = 'vm_mysql_user'
     VM_MYSQL_PASSWORD = 'vm_mysql_password'
     PREFERRED_TEXT_EDITOR = 'preferred_text_editor'
@@ -31,7 +28,23 @@ module ConfigUnique
     EC2_USER = 'ec2_user'
     EC2_PASS = 'ec2_pass'
 
+    # BETA
+    BETA = 'beta'
+
     def param(param_name)
+
+        # IF RETRIEVING DIRECTORIES
+        if [
+            WORKSTATION_PATH_TO_BP_CODE,
+            WORKSTATION_PATH_TO_BP_DB,
+        ].include?(param_name)
+            begin
+                return "/#{App::UtilsStrings.remove_surrounding_slashes(File.expand_path(@params[param_name]))}"
+            rescue Exception => e
+                App::Terminal::error("Something went wrong trying to get parameter: #{param_name}", e.message)
+            end
+        end
+
         @params[param_name]
     end
 
@@ -39,7 +52,6 @@ module ConfigUnique
         File.open("#{File.expand_path(CONFIG_FILE)}", 'w') { |file|
             file.write("# CONFIGURATION FILE -- Use this file to configure brightpearl-cli\n")
             file.write("\n")
-            file.write("#{WORKSTATION_IP}=172.27.X.X\n")
             file.write("#{WORKSTATION_OS}=linux\n")
             file.write("#{WORKSTATION_PATH_TO_BP_CODE}=~/brightpearl-source/brightpearl-code\n")
             file.write("#{WORKSTATION_PATH_TO_BP_DB}=~/brightpearl-source/brightpearl-db\n")
@@ -47,8 +59,6 @@ module ConfigUnique
             file.write("#{VM_IP}=172.27.X.X\n")
             file.write("#{VM_USER}=\n")
             file.write("#{VM_USER_PASSWORD}=\n")
-            file.write("#{VM_ROOT}=root\n")
-            file.write("#{VM_ROOT_PASSWORD}=peXXXXXXXre\n")
             file.write("#{VM_MYSQL_USER}=root\n")
             file.write("#{VM_MYSQL_PASSWORD}=peXXXXXXXre\n")
             file.write("\n")
@@ -62,15 +72,12 @@ module ConfigUnique
 
     def required_config_keys
         [
-            WORKSTATION_IP,
             WORKSTATION_OS,
             WORKSTATION_PATH_TO_BP_CODE,
             WORKSTATION_PATH_TO_BP_DB,
             VM_IP,
             VM_USER,
             VM_USER_PASSWORD,
-            VM_ROOT,
-            VM_ROOT_PASSWORD,
             VM_MYSQL_USER,
             VM_MYSQL_PASSWORD,
             PREFERRED_TEXT_EDITOR,

data/lib/core/enums.rb

@@ -2,17 +2,8 @@ module App
 
     class Enum
 
-        PORT_ORDER_SERVICE = '9240'
-
-        GIT_MERGE_DEFAULT_FILE = '/tmp/merge.txt'
-
-        # Get PATH to assets, scripts, etc.
-        # @return String
-        def self.get_base_path
-            base_path = File.dirname(File.expand_path(__FILE__))
-            base_path = base_path.gsub(/\/\w+\/\w+\z/i, '')
-            base_path
-        end
+        YES = 'yes'
+        NO = 'no'
 
     end
 

data/lib/core/git.rb

@@ -46,7 +46,9 @@ module App
         SAME_BRANCH_WARNING = 'same_branch_warning'
         SAME_BRANCH_ERROR = 'same_branch_error'
 
-        RELEASE_BRANCH_REGEX = /release-\d+\.\d+\.\d+-\d{4}/i
+        RELEASE_BRANCH_REGEX = /release-\d+\.\d+\.\d+-\d{4}/
+
+        GIT_MERGE_DEFAULT_FILE = '~/tmp/merge.txt'
 
         def initialize
 
@@ -527,7 +529,7 @@ module App
                 if results.any?
                     App::Terminal::command(['git status'], repo_dir)
                     current_branch = current_branch_for_repo(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?")
+                    if automatic || App::Terminal::prompt_yes_no("Found uncommitted files in #{App::Terminal::format_directory(get_repo_shorthand(repo_dir))} 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
@@ -536,7 +538,7 @@ module App
                             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 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)
+                            App::Terminal::abort
                         end
                     end
                 end
@@ -556,7 +558,7 @@ module App
                     stashes_to_skip = 0
                     while results.any?
                         stash_name = results[0].split(/:/).first
-                        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?")
+                        if automatic || App::Terminal::prompt_yes_no("Found the following stash in #{App::Terminal::format_directory(get_repo_shorthand(repo_dir))} on branch #{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
@@ -577,6 +579,7 @@ module App
                             end
                         end
                     end
+                    App::Terminal::command('git add .', repo_dir)
                 end
             end
         end
@@ -596,12 +599,12 @@ module App
             if branch_code != branch_db
                 case display
                     when SAME_BRANCH_WARNING
-                        App::Terminal::warning("You're on #{App::Terminal::format_highlight('2 different branches')}", [
+                        App::Terminal::warning("You're code is 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
-                        App::Terminal::error("You're on #{App::Terminal::format_highlight('2 different branches')}", [
+                        App::Terminal::error("You're code is 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,
@@ -756,7 +759,7 @@ module App
         # 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")
+            App::Terminal::info("Checking if 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
@@ -785,12 +788,13 @@ module App
             end
         end
 
-        # Resolves possible branch names from 12345
+        # Resolves possible branch names from jira numbers (IE: BP-12345 from 12345)
         # @return String
-        def resolve_branch_for_jira(jira_number)
+        def resolve_branch_for_jira(jira_number, ask_to_create = false)
             resolved_branch = jira_number
             possible_branches = []
             if jira_number =~ /\A\d{4,5}\z/
+                App::Terminal::automatic("Attempting to resolve branch for: #{App::Terminal::format_highlight(jira_number)}")
                 get_all_branches_as_array.each do |possible_branch|
                     if possible_branch =~ /#{jira_number}/i
                         # If more than one possible branch exists, IE: bug-14145 & bp-14145
@@ -802,13 +806,38 @@ module App
                     end
                 end
                 unless possible_branches.any?
-                    App::Terminal::error("No branch found for jira number: #{App::Terminal::format_highlight(jira_number)}", ['Please check your input and try again.'], true)
+                    if ask_to_create
+                        App::Terminal::error("No branch found for jira number: #{App::Terminal::format_highlight(jira_number)}", ['Please check your input and try again.'], true)
+
+                        # unless App::Terminal::prompt_yes_no("No branch found for jira number: #{App::Terminal::format_highlight(jira_number)}", nil, "Would you like to #{App::Terminal::format_action('CREATE')} branch ")
+                        #     App::Terminal::abort
+                        # end
+                        #
+                        # # todo
+                        # # INSERT CODE TO CREATE NEW BRANCH HERE !!
+                        # App::Terminal::abort
+
+                    else
+                        App::Terminal::error("No branch found for jira number: #{App::Terminal::format_highlight(jira_number)}", ['Please check your input and try again.'], true)
+                    end
                 end
                 resolved_branch = possible_branches[0]
             end
             resolved_branch
         end
 
+        # Resolves jira number from branch (IE: 12345 from BP-12345)
+        # @return String|boolean
+        def resolve_jira_for_branch(branch_name, exit_script = true)
+            if branch_name =~ /\d{4,5}/i
+                match = branch_name.match(/\d{4,5}/i)
+                match.to_s
+            else
+                App::Terminal::error("No jira number found for branch #{App::Terminal::format_branch(branch_name)}", nil, exit_script)
+                false
+            end
+        end
+
         # Returns TRUE if changes exist or FALSE if there is nothing to commit.
         # @return boolean
         def changes_exist(repo_dir)
@@ -824,6 +853,32 @@ module App
             changes_exist
         end
 
+        # Shows prompts asking to 'Commit to GIT' and 'Push to [master]'
+        # @return void
+        def ask_to_commit_to_git(commit_message, repo_dir, first_answer = nil, second_answer = nil)
+            if first_answer == App::Enum::NO
+                App::Terminal::warning("Your changes #{App::Terminal::format_highlight('HAVE NOT')} been #{App::Terminal::format_action('committed')} to GIT.", 'You will need to do this manually.', false)
+            else
+                if first_answer == App::Enum::YES || App::Terminal::prompt_yes_no('Commit to GIT', ["This will commit your changes to GIT with message: #{App::Terminal::format_highlight(commit_message)}"])
+                    App::Terminal::command(["git commit -m '#{commit_message.gsub("'", "\\'")}'"], repo_dir)
+                    App::Terminal::info("Your changes have been #{App::Terminal::format_action('committed')} to GIT.")
+                else
+                    App::Terminal::warning("Your changes #{App::Terminal::format_highlight('HAVE NOT')} been #{App::Terminal::format_action('committed')} to GIT.", 'You will need to do this manually.', false)
+                    return
+                end
+            end
+            if second_answer == App::Enum::NO
+                App::Terminal::warning("Your changes #{App::Terminal::format_highlight('HAVE NOT')} been #{App::Terminal::format_action('pushed')} to origin.", 'You will need to do this manually.', false)
+            else
+                if second_answer == App::Enum::YES || App::Terminal::prompt_yes_no('Push changes to origin')
+                    App::Terminal::command('git push', repo_dir)
+                    App::Terminal::info("Your changes have been #{App::Terminal::format_action('pushed')} to origin.")
+                else
+                    App::Terminal::warning("Your changes #{App::Terminal::format_highlight('HAVE NOT')} been #{App::Terminal::format_action('pushed')} to origin.", 'You will need to do this manually.', false)
+                end
+            end
+        end
+
         # Pass the result of App::Terminal::command() and this should do the rest. Bombs out if you don't confirm.
         # @return void
         def check_for_conflicts(result, additional_info = nil)
@@ -844,7 +899,7 @@ module App
             final_info << "Please #{App::Terminal::format_action('open an IDE')} and resolve your conflicts before continuing."
             if result == false
                 unless App::Terminal::prompt_yes_no('Merge conflict occurred', final_info, "Have you #{App::Terminal::format_highlight('resolved your conflicts', true)}\x1B[38;5;89m and #{App::Terminal::format_action('committed')}\x1B[38;5;89m the changes?")
-                    App::Terminal::abort(nil, nil, true, false)
+                    App::Terminal::abort
                 end
             end
         end