brightpearl-cli 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51a9cc4563e9b20fd81701be0bdadfa0940b7f46
-  data.tar.gz: fcf47560efc4fa89341b7ac5170baeb72965b990
+  metadata.gz: 11ca22551ed1104e27ddb26e0eec561ee6e9f2b8
+  data.tar.gz: f2ef6b2558466256904cc7fd55129af139abfbef
 SHA512:
-  metadata.gz: 1bdec6a11746ae770483a1e8f0598e6ad10c6511e96b2d69a459ad5fbead22bcf36e816541084286d3c87a471c738b726d193c441afa49901ce09b434e82a0be
-  data.tar.gz: d4e30df9916e8ff9a8e024eea98533998910c9094bf6f23e57a21592b90b37596a29ba3fd3293889aefa52dcf57d6df60cb01bd753e1cec7b85b2f71afc0c1c4
+  metadata.gz: 8c3843d7e7c4514596f292188a026b6716fa8688342550941b8cc7637559a22f2693e0755d061001649697c41906bcdc116f59fd300516216cde0226d01705a9
+  data.tar.gz: 8a79acee84d9402c9572fbd0eddc111cbad4711a3fbe21def90b44f47a74abd1ce99790c397d53be1768ed30e084688687ebce9923edd0b910accd4820d8b62e

data/lib/brightpearl_cli.rb

@@ -63,7 +63,7 @@ module App
 
             Convoy::App.create do |app|
 
-                #  COLOR OF TITLE TEXT
+                # COLOR OF TITLE TEXT
                 title_color = 255
 
                 beta = App::Config::param(ConfigUnique::BETA) == 'true' ? true : false

data/lib/core/git.rb

@@ -48,7 +48,8 @@ module App
 
         RELEASE_BRANCH_REGEX = /release-\d+\.\d+\.\d+-\d{4}/
 
-        GIT_MERGE_DEFAULT_FILE = '~/tmp/merge.txt'
+        GIT_MERGE_DEFAULT_FILE = '~/tmp/bp-merge.txt'
+        GIT_LAST_GIT_FETCH_FILE = '~/tmp/bp-last-git-fetch.tmp'
 
         def initialize
 
@@ -453,11 +454,24 @@ module App
         # @return void
         def update_origin(repo_dir = nil)
             validate_repo_dir(repo_dir)
+            epoch_current = Time.now.strftime('%s')
+            unless App::UtilsFiles::file_exists(GIT_LAST_GIT_FETCH_FILE)
+                App::UtilsFiles::write_file(GIT_LAST_GIT_FETCH_FILE, [epoch_current])
+            end
             unless @origin_updated_code && repo_dir == App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE) ||
                 @origin_updated_db && repo_dir == App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_DB) ||
                 @origin_updated_code && @origin_updated_db && repo_dir.nil?
 
-                App::Terminal::output("Updating origin (#{get_repo_shorthand(repo_dir)})")
+                # IF ORIGIN WAS UPDATED IN THE LAST HOUR, DON'T DO IT AGAIN
+                epoch_last_fetch = App::UtilsFiles::read_file(GIT_LAST_GIT_FETCH_FILE)[0]
+                time_difference = epoch_current.to_i - epoch_last_fetch.to_i
+                if time_difference < 3600
+                    App::UtilsFiles::write_file(GIT_LAST_GIT_FETCH_FILE, [epoch_current])
+                    App::Terminal::output("Origin already up to date \xe2\x80\x94 #{App::Terminal::format_directory(get_repo_shorthand(repo_dir))}")
+                    return
+                end
+
+                App::Terminal::output("Updating origin \xe2\x80\x94 #{App::Terminal::format_directory(get_repo_shorthand(repo_dir))}")
                 case repo_dir
                     when App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE)
                         @origin_updated_code = true
@@ -529,7 +543,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 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?")
+                    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?", false)
                         App::Terminal::output('Stashing working changes', App::Terminal::MSG_AUTOMATIC) if automatic
                         App::Terminal::command('git stash', repo_dir)
                     else
@@ -600,16 +614,16 @@ module App
                 case display
                     when SAME_BRANCH_WARNING
                         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)}"
-                                                                                                                     ])
+                            "#{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 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,
-                                                                                                                       'You cannot run this command unless both of your repos are on the same branch.'
-                                                                                                                   ])
+                            "#{App::Terminal::format_directory(get_repo_shorthand(App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE)))} is on #{App::Terminal::format_branch(branch_code)}",
+                            "#{App::Terminal::format_directory(get_repo_shorthand(App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_DB)))}   is on #{App::Terminal::format_branch(branch_db)}",
+                            nil,
+                            'You cannot run this command unless both of your repos are on the same branch.'
+                        ])
                 end
                 return false
             end
@@ -833,8 +847,7 @@ module App
                 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
+                branch_name
             end
         end
 
@@ -881,27 +894,49 @@ module App
 
         # 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)
-            final_info = []
+        def check_for_conflicts(result, repo_dir, additional_info = nil)
+            validate_repo_dir(repo_dir)
+            error_array = []
             unless additional_info.nil?
+                error_array = []
                 if additional_info.is_a? Array
                     additional_info.each do |info|
-                        final_info << info
+                        error_array << info
                     end
                 else
                     if additional_info.is_a? String
-                        final_info << additional_info
+                        error_array << additional_info
                     else
                         raise RuntimeError, "Expected String, got: #{additional_info.class}"
                     end
                 end
             end
-            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?")
+            error_message = "Merge conflict occurred in: #{get_repo_shorthand(repo_dir)}"
+            error_array << "Please #{App::Terminal::format_action('open an IDE')} and resolve your conflicts before continuing."
+            conflict_resolved = (result == false) ? false : true
+            changes_to_be_committed = false
+            while conflict_resolved == false
+                unless App::Terminal::prompt_yes_no(error_message, error_array, "Have you #{App::Terminal::format_highlight('resolved', true)}\x1B[38;5;89m your conflicts?")
                     App::Terminal::abort
                 end
+                conflict_resolved = true
+                changes_to_be_committed = false
+                error_message = 'It seems there are still files which need resolving:'
+                error_array = []
+                git_status = `git status`
+                git_status.split("\n").each do |line|
+                    if line.strip =~ /\Aunmerged\spaths:\z/i
+                        conflict_resolved = false
+                    elsif line.strip =~ /\Aboth\smodified:/i
+                        conflict_resolved = false
+                        line_split = line.split('modified:')
+                        error_array << "\x1B[38;5;223m#{line_split[1].strip}\x1B[0m"
+                    elsif line.strip =~ /\Achanges\sto\sbe\scommitted:/i
+                        changes_to_be_committed = true
+                    end
+                end
             end
+            App::Terminal::command('git commit --no-edit', repo_dir) if changes_to_be_committed
         end
 
         # Get list of files that have changed between 2 branches

data/lib/core/utils_files.rb

@@ -6,6 +6,7 @@ module App
     class UtilsFiles
 
         def self.write_file(full_path_and_file, array_of_lines)
+            full_path_and_file = File.expand_path(full_path_and_file)
             unless array_of_lines.is_a? Array
                 raise RuntimeError, "Expected an array of lines to write to file, instead got: #{array_of_lines.class}"
             end
@@ -24,7 +25,6 @@ module App
                             file.write("#{line}\n")
                         end
                     end
-
                     file.close
                 }
             rescue Exception => e
@@ -33,8 +33,9 @@ module App
         end
 
         def self.read_file(full_path_and_file)
+            full_path_and_file = File.expand_path(full_path_and_file)
             unless file_exists(full_path_and_file)
-                App::Terminal::error("The file doesn't exist: #{full_path_and_file}", nil, true)
+                App::Terminal::error("The file doesn't exist: #{App::Terminal::format_directory(full_path_and_file)}", nil, true)
             end
             file_content = []
             file = File.open(full_path_and_file).read
@@ -56,7 +57,7 @@ module App
         end
 
         def self.file_exists(full_path_and_file)
-            File.exist?(full_path_and_file)
+            File.exist?(File.expand_path(full_path_and_file))
         end
 
         def self.get_full_path(path)

data/lib/core/utils_routes.rb

@@ -20,6 +20,25 @@ module App
             flags_set
         end
 
+        # Will throw an error if more than one flag is set
+        # @param Array (@opts)
+        # @return void
+        def self.max_one_flag(opts)
+            all_flags = []
+            opts.each_key do |key|
+                unless key.to_s =~ /_given\z/i || key == :version || key == :help
+                    all_flags << key.to_s
+                end
+            end
+            if flags_set(opts) >= 2
+                error_text = ['Please set 1 one of the following flags:', nil]
+                all_flags.each do |flag|
+                    error_text << "  \x1B[38;5;244m--#{flag}\x1B[0m"
+                end
+                App::Terminal::error("You can only set one #{App::Terminal::format_highlight('flag')} at a time", error_text)
+            end
+        end
+
     end
 
 end

data/lib/routes/git_checkout.rb

@@ -149,7 +149,7 @@ module AppCommand
                         "git merge #{App::Git::MASTER} --no-edit"
                     ]
                     results = App::Terminal::command(commands, repo_dir, true, false)
-                    @git.check_for_conflicts(results[1], "Unable to successfully merge #{App::Terminal::format_branch(App::Git::MASTER)} into #{App::Terminal::format_branch(branch_to_checkout)} on #{App::Terminal::format_directory(@git.get_repo_shorthand(repo_dir))}")
+                    @git.check_for_conflicts(results[1], repo_dir, "Unable to successfully merge #{App::Terminal::format_branch(App::Git::MASTER)} into #{App::Terminal::format_branch(branch_to_checkout)} on #{App::Terminal::format_directory(@git.get_repo_shorthand(repo_dir))}")
                 end
                 if @opts[:updatePush]
                     commands =[

data/lib/routes/git_merge.rb

@@ -117,14 +117,14 @@ module AppCommand
             changed_files_db = {}
             ran_db_update = false
 
-            # UPDATE MASTER & CHECKOUT BRANCH TO MERGE TO
-            App::Terminal::output("Updating #{App::Terminal::format_branch(@target_branch)}")
             target_branch_data = @git.branch_data(@target_branch, nil, false)
+
+            # IF TARGET BRANCH DOESN'T EXIST...
             if target_branch_data[0][:"#{App::Git::BRANCH_EXISTS}"] == false && target_branch_data[1][:"#{App::Git::BRANCH_EXISTS}"] == false
                 App::Terminal::error("Target branch #{App::Terminal::format_branch(@target_branch)} doesn't exist", 'Please check your spelling and try again.', true)
             end
 
-            # CREATE TARGET BRANCH (CODE OR DB) IF ONE OR THE OTHER DOESN'T EXIST
+            # CREATE TARGET BRANCH (CODE OR DB) IF ONE OR THE OTHER DOESN'T EXIST (THIS CODE IS CURRENTLY NEVER REACHED)
             if target_branch_data[0][:"#{App::Git::BRANCH_EXISTS}"] == false
                 App::Terminal::warning("Target #{App::Terminal::format_highlight('CODE')} branch doesn't exist")
                 App::Terminal::output("Creating branch #{App::Terminal::format_branch(@target_branch)} in #{App::Terminal::format_directory(App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE))}")
@@ -135,13 +135,22 @@ module AppCommand
                 App::Terminal::error('Not yet implemented', ["The code which should create branch #{App::Terminal::format_branch(@target_branch)} on #{App::Terminal::format_directory(@git.get_repo_shorthand(App::Config::WORKSTATION_PATH_TO_BP_DB))} hasn't been programmed yet.", "Please speak to #{App::Terminal::format_highlight('Albert')}."], true)
             end
 
+            # UPDATE MASTER & CHECKOUT BRANCH TO MERGE TO
+            App::Terminal::output("Updating #{App::Terminal::format_branch(@target_branch)}")
+
             commands = [
                 "git checkout #{App::Git::MASTER}",
-                'git pull',
-                "git checkout #{@target_branch}",
-                'git pull',
-                "git merge #{App::Git::MASTER} --no-edit"
+                'git pull'
             ]
+            if @target_branch != App::Git::MASTER
+                additional_commands = [
+                    "git checkout #{@target_branch}",
+                    'git pull',
+                    "git merge #{App::Git::MASTER} --no-edit"
+                ]
+                commands.push(*additional_commands)
+            end
+
             @git.repo_loop.each do |repo_dir|
                 App::Terminal::command(commands, repo_dir)
             end
@@ -153,7 +162,7 @@ module AppCommand
             end
 
             # RUN CHECKS (AND CHECKOUT BRANCHES WHICH DON'T EXIST LOCALLY)
-            branches_data.each do |branch_data|
+            branches_data.each_with_index do |branch_data, idx|
                 if branch_data[0][:"#{App::Git::BRANCH_EXISTS}"] || branch_data[1][:"#{App::Git::BRANCH_EXISTS}"]
                     atleast_one_branch_found = true
                 end
@@ -169,46 +178,40 @@ module AppCommand
                 if branch_data[1][:"#{App::Git::BRANCH_HAS_STASH}"]
                     branches_with_stashes_db << branch_data[1][:"#{App::Git::BRANCH_NAME}"]
                 end
-                if branch_data[0][:"#{App::Git::BRANCH_EXISTS_LOCALLY}"] == false && branch_data[0][:"#{App::Git::BRANCH_EXISTS}"]
+                if branch_data[0][:"#{App::Git::BRANCH_EXISTS}"]
                     commands_cd = [
                         "git checkout #{branch_data[0][:"#{App::Git::BRANCH_NAME}"]}",
-                        'git pull',
-                        "git checkout #{current_branch_cd}"
+                        'git pull'
                     ]
+                    commands_cd << "git checkout #{current_branch_cd}" if idx == (branches_data.length - 1)
                     App::Terminal::command(commands_cd, App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE))
                 end
-                if branch_data[1][:"#{App::Git::BRANCH_EXISTS_LOCALLY}"] == false && branch_data[1][:"#{App::Git::BRANCH_EXISTS}"]
+                if branch_data[1][:"#{App::Git::BRANCH_EXISTS}"]
                     commands_db = [
                         "git checkout #{branch_data[1][:"#{App::Git::BRANCH_NAME}"]}",
-                        'git pull',
-                        "git checkout #{current_branch_db}"
+                        'git pull'
                     ]
+                    commands_db << "git checkout #{current_branch_db}" if idx == (branches_data.length - 1)
                     App::Terminal::command(commands_db, App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_DB))
                 end
             end
 
             puts # DO NOT REMOVE.
 
-            if non_existent_branches_cd.any? || branches_with_stashes_cd.any?
-                puts "\n  #{App::Terminal::format_directory(@git.get_repo_shorthand(App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE)))}\n\n"
-            end
             if non_existent_branches_cd.any?
-                App::Terminal::warning("The following branches #{App::Terminal::format_invalid('could not be found', true)} \xe2\x80\x94 #{App::Terminal::format_directory(@git.get_repo_shorthand(App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE)))}", non_existent_branches_cd, false)
+                App::Terminal::warning("The following branches could not be found \xe2\x80\x94 #{App::Terminal::format_directory(@git.get_repo_shorthand(App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE)))}", non_existent_branches_cd, false)
                 atleast_one_error = true
             end
             if branches_with_stashes_cd.any?
-                App::Terminal::warning("The following branches #{App::Terminal::format_invalid('have stashes', true)} \xe2\x80\x94 #{App::Terminal::format_directory(@git.get_repo_shorthand(App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE)))}", branches_with_stashes_cd, false)
+                App::Terminal::warning("The following branches have #{App::Terminal::format_highlight('stashes', true)} \xe2\x80\x94 #{App::Terminal::format_directory(@git.get_repo_shorthand(App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE)))}", branches_with_stashes_cd, false)
                 atleast_one_error = true
             end
-            if non_existent_branches_db.any? || branches_with_stashes_db.any?
-                puts "\n  #{App::Terminal::format_directory(@git.get_repo_shorthand(App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_DB)))}\n\n"
-            end
             if non_existent_branches_db.any?
-                App::Terminal::warning("The following branches #{App::Terminal::format_invalid('could not be found', true)} \xe2\x80\x94 #{App::Terminal::format_directory(@git.get_repo_shorthand(App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_DB)))}", non_existent_branches_db, false)
+                App::Terminal::warning("The following branches could not be found \xe2\x80\x94 #{App::Terminal::format_directory(@git.get_repo_shorthand(App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_DB)))}", non_existent_branches_db, false)
                 atleast_one_error = true
             end
             if branches_with_stashes_db.any?
-                App::Terminal::warning("The following branches #{App::Terminal::format_invalid('have stashes', true)} \xe2\x80\x94 #{App::Terminal::format_directory(@git.get_repo_shorthand(App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_DB)))}", branches_with_stashes_db, false)
+                App::Terminal::warning("The following branches have #{App::Terminal::format_highlight('stashes', true)} \xe2\x80\x94 #{App::Terminal::format_directory(@git.get_repo_shorthand(App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_DB)))}", branches_with_stashes_db, false)
                 atleast_one_error = true
             end
             if atleast_one_branch_found == false
@@ -233,7 +236,6 @@ module AppCommand
             branches_data.each do |branch_data|
 
                 branch_name = branch_data[0][:"#{App::Git::BRANCH_NAME}"]
-                App::Terminal::info("Merging: #{App::Terminal::format_branch(branch_name)}")
 
                 commands_1 = [
                     "git checkout #{branch_name}",
@@ -262,6 +264,8 @@ module AppCommand
 
                 # CODE BRANCHES
                 unless non_existent_branches_cd.include?(branch_name)
+
+                    App::Terminal::info("Merging: #{App::Terminal::format_branch(branch_name)} \xe2\x80\x94 #{App::Terminal::format_directory(@git.get_repo_shorthand(App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE)))}")
                     App::Terminal::command(commands_1, cd_repo)
 
                     # FIND OUT IF WE NEED TO FIX POM FILES
@@ -293,6 +297,8 @@ module AppCommand
 
                 # DB BRANCHES
                 unless non_existent_branches_db.include?(branch_name)
+
+                    App::Terminal::info("Merging: #{App::Terminal::format_branch(branch_name)} \xe2\x80\x94 #{App::Terminal::format_directory(@git.get_repo_shorthand(App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_DB)))}")
                     App::Terminal::command(commands_1, db_repo)
                     merge_master_result = App::Terminal::command(commands_2, db_repo)
                     if merge_master_result[0] == false
@@ -326,13 +332,25 @@ module AppCommand
             App::Terminal::success('It seems as if everything ran smoothly', "#{@source_branches.count} #{(@source_branches.count) == 1 ? 'branch has' : 'branches have'} been successfully merged to #{App::Terminal::format_branch(@target_branch)}")
 
             if ran_db_update
-                # todo
-                App::Terminal::output('Update FitNesse + Skeleton DBs')
-                App::Terminal::info('Must still program this', ['For now, go on your VM and run:', "#{App::Terminal::format_action('update-skeletons')}, #{App::Terminal::format_action('update-fitnesse')}"])
+                App::Terminal::info("You have run a #{App::Terminal::format_highlight('DB Update')}. Don't forget to run the following on your VM:", %W(#{App::Terminal::format_command('update-skeleton')} #{App::Terminal::format_command('update-fitnesse')}), false)
             end
 
-            build_services
-            sanity_check
+            build_services(false)
+            sanity_check(false)
+
+            reminders = [
+                'Run the PHP Unit tests?',
+                'Run the PHP Behat tests?',
+                'Built and deployed all service?',
+                "Run the sonar checker? \xe2\x80\x94 #{App::Terminal::format_command('bp s s')}",
+                'Re-gulped everything?',
+                'Updated FitNesse DB?',
+                'Updated Skeleton DBs?',
+                'Removed all sandpit files?',
+            ]
+
+            puts
+            App::Terminal::info("#{App::Terminal::format_action('Final Reminders')} \xe2\x80\x94 Have you:", reminders, false)
             puts
 
             @git.check_for_stash(true)
@@ -365,9 +383,19 @@ module AppCommand
 
         end
 
-        def sanity_check
-            App::Terminal::info("Running sanity check against: #{App::Terminal::format_branch(@target_branch)}")
+        def sanity_check(preceding_blank_line = true)
             if @source_branches.any?
+                jira_numbers_resolved = false
+                @source_branches.each do |source_branch|
+                    if source_branch =~ /\d{4,5}/i
+                        jira_numbers_resolved = true
+                    end
+                end
+                unless jira_numbers_resolved
+                    App::Terminal::info("No #{App::Terminal::format_highlight('Sanity Check')} could be run because the system couldn't resolve any jira numbers from:", @source_branches, preceding_blank_line)
+                    return
+                end
+                App::Terminal::info("Running #{App::Terminal::format_highlight('Sanity Check')} against: #{App::Terminal::format_branch(@target_branch)}", nil, preceding_blank_line)
                 @source_branches.each do |source_branch|
                     jira_numbers = source_branch.scan(/\d{4,5}/i)
                     if jira_numbers.any?
@@ -377,20 +405,18 @@ module AppCommand
                             end
 
                         end
-                    else
-                        sanity_check_grep(source_branch, source_branch, @target_branch)
                     end
                 end
             else
-                App::Terminal::error("No #{App::Terminal::format_highlight('source branches', true)} specified", nil, true, false)
+                App::Terminal::error("Cannot run  #{App::Terminal::format_highlight('Sanity Check')}", 'No source branches specified.', true, preceding_blank_line)
             end
             puts
         end
 
-        def build_services
+        def build_services(preceding_blank_line = true)
             services_to_build = []
             directories_to_build = []
-            changed_files = App::Terminal::command_capture("git diff origin/#{App::Git::MASTER} --name-only", App::Config.param(ConfigUnique::WORKSTATION_PATH_TO_BP_CODE))
+            changed_files = App::Terminal::command_capture("git diff origin/#{App::Git::MASTER} --name-only", App::Config.param(ConfigUnique::WORKSTATION_PATH_TO_BP_CODE), false, false)
             if changed_files[0] != ''
                 puts
                 changed_files[0].split("\n").each do |file|
@@ -425,12 +451,16 @@ module AppCommand
                 end
             end
             if services_to_build.any?
-                App::Terminal::info("Please #{App::Terminal::format_action('build')} the following services before committing to #{App::Terminal::format_branch(App::Git::MASTER)}:", build_text)
+                App::Terminal::info("Please build the following #{App::Terminal::format_highlight('Services')} before committing to #{App::Terminal::format_branch(App::Git::MASTER)}:", build_text, preceding_blank_line)
                 puts
                 puts command_line_command
                 puts
             else
-                App::Terminal::info("No services need building. Files changed between #{App::Terminal::format_branch(@target_branch)} and origin/#{App::Terminal::format_branch(App::Git::MASTER)} are:", changed_files[0])
+                if changed_files[0] != ''
+                    App::Terminal::info("No #{App::Terminal::format_highlight('Services')} need building. The #{App::Terminal::format_highlight('only', true)} files changed between #{App::Terminal::format_branch(@target_branch)} and origin/#{App::Terminal::format_branch(App::Git::MASTER)} are:", changed_files[0], preceding_blank_line)
+                else
+                    App::Terminal::info("No #{App::Terminal::format_highlight('Services')} need building.", nil, preceding_blank_line)
+                end
             end
         end
 

data/lib/routes/git_update.rb

@@ -41,10 +41,10 @@ module AppCommand
                 if current_branch != App::Git::MASTER
                     commands << "git checkout #{App::Git::MASTER}"
                 end
-                commands << "git pull origin #{App::Git::MASTER}"
+                commands << "git pull origin #{App::Git::MASTER} --no-edit"
                 if current_branch != App::Git::MASTER
                     commands << "git checkout #{current_branch}"
-                    commands << "git pull origin #{current_branch}"
+                    commands << "git pull origin #{current_branch} --no-edit"
                     commands << 'git merge master --no-edit'
                 end
                 results = App::Terminal::command(commands, repo_dir)
@@ -52,7 +52,7 @@ module AppCommand
                     if results[3] == false
                         @git.ask_to_setup_remote_tracking(current_branch, repo_dir)
                     end
-                    @git.check_for_conflicts(results[4], "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))}")
+                    @git.check_for_conflicts(results[4], repo_dir, "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))}")
                 end
                 if @opts[:push] && current_branch != App::Git::MASTER
                     App::Terminal::command("git push origin #{current_branch}", repo_dir)

data/lib/routes/scripts_sonar.rb

@@ -94,7 +94,7 @@ module AppCommand
 
         def check_phpcs_is_installed
             App::Terminal::output("Checking if #{App::Terminal::format_highlight('phpcs')} is installed...")
-            result = App::Terminal::command_capture('phpcs --version', nil, false, false)
+            result = App::Terminal::command_capture('phpcs --version', App::Config.param(ConfigUnique::WORKSTATION_PATH_TO_BP_CODE), false, false)
             result = result[0].split(' ')
             unless result[0].downcase == 'php_codesniffer'
                 App::Terminal::error("#{App::Terminal::format_highlight('phpcs')} is not installed")

data/lib/routes/test.rb

@@ -13,12 +13,10 @@ module AppCommand
 
         def opts_validate
 
-            flags_set = App::UtilsRoutes::flags_set(@opts)
+            App::UtilsRoutes::max_one_flag(@opts)
 
-            if flags_set >= 2
-                App::Terminal::error('You can only run one set of tests at a time', "Please set only 1 one of the following flags: #{App::Terminal::format_flag('c', false)}, #{App::Terminal::format_flag('f', false)},#{App::Terminal::format_flag('p', false)},#{App::Terminal::format_flag('b', false)},#{App::Terminal::format_flag('r', false)}", true)
-            elsif flags_set == 0
-                @opts[:php] = true
+            if App::UtilsRoutes::flags_set(@opts) == 0
+                @opts[:php] == true
             end
 
         end
@@ -41,6 +39,7 @@ module AppCommand
 
         def run_cucumber
 
+            App::Terminal::info("Running #{App::Terminal::format_action('Cucumber Tests')} on VM \xe2\x80\x94 #{App::Terminal::format_highlight("#{App::Config.param(ConfigUnique::VM_IP)}")}")
             App::Terminal::info('Not yet implemented')
 
         end

data/lib/version.rb

@@ -1 +1 @@
-VERSION = '2.6.0'
+VERSION = '2.7.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brightpearl-cli
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Albert Rannetsperger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: columnist