brightpearl-cli 1.4.0 → 1.7.0

data/lib/core/git_delete.rb

@@ -6,6 +6,8 @@ module App
 
             @git = git.nil? ? App::Git.new : git
 
+            branch_info = @git.branch_data(branch_name)
+
             App::Terminal::output("Must check that branch is up-to-date with it's remote counter-part, otherwise DO NOT delete!", App::Terminal::MSG_TODO)
             App::Terminal::output('Must check branch even exists.', App::Terminal::MSG_TODO)
 
@@ -16,12 +18,20 @@ module App
             end
 
             @git.repo_loop.each do |repo_dir|
-                commands = []
                 if @git.current_branch_for_repo(repo_dir) == branch_name
-                    commands << 'git checkout master'
+                    App::Terminal::command("git checkout #{App::Git::MASTER}", repo_dir)
+                end
+                if (repo_dir == App::Config.param(ConfigUnique::WORKSTATION_PATH_TO_BP_CODE) && branch_info[0][:"#{App::Git::BRANCH_EXISTS_LOCALLY}"]) || (repo_dir == App::Config.param(ConfigUnique::WORKSTATION_PATH_TO_BP_CODE) && branch_info[0][:"#{App::Git::BRANCH_EXISTS_LOCALLY}"])
+                    commands = [
+                        "git branch --unset-upstream #{branch_name}",
+                        "git branch -d #{branch_name}"
+                    ]
+                    results = App::Terminal::command(commands, repo_dir)
+                    handle_results_1(branch_name, repo_dir, results)
+                else
+                    App::Terminal::output("Skipping #{App::Terminal::format_directory(@git.get_repo_shorthand(repo_dir))} because branch #{App::Terminal::format_branch(branch_name)} doesn't exist there.", App::Terminal::MSG_WARNING)
                 end
-                commands << "git branch -d #{branch_name}"
-                App::Terminal::command_capture(commands, repo_dir)
+
             end
 
             App::Terminal::success('Branch deleted', "Successfully #{App::Terminal::format_highlight('locally')} #{App::Terminal::format_action('deleted')} branch #{App::Terminal::format_branch(branch_name)}")
@@ -45,11 +55,15 @@ module App
                     puts "Branch \x1B[32m[#{branch_name}]\x1B[0m not found in: \x1B[33m#{repo_dir}\x1B[0m. Aborting \x1B[35mREMOTE DELETE\x1B[0m for this repo."
                     next
                 end
-                commands = [
-                    "git branch --unset-upstream #{branch_name}",
-                    "git push origin --delete #{branch_name}",
-                ]
-                App::Terminal::command_capture(commands, repo_dir)
+
+                # This is hacky (but no time) !
+                results = App::Terminal::command("git branch --unset-upstream #{branch_name}", repo_dir)
+                results[1] = true
+                handle_results_1(branch_name, repo_dir, results)
+
+                results = App::Terminal::command("git push origin --delete #{branch_name}", repo_dir)
+                handle_results_2(branch_name, repo_dir, results)
+
             end
 
             App::Terminal::success('Branch deleted', "Successfully #{App::Terminal::format_highlight('remotely')} #{App::Terminal::format_action('deleted')} branch #{App::Terminal::format_branch(branch_name)}")
@@ -70,20 +84,48 @@ module App
             end
 
             @git.repo_loop.each do |repo_dir|
-                commands = []
                 if @git.current_branch_for_repo(repo_dir) == branch_name
-                    commands << 'git checkout master'
+                    App::Terminal::command("git checkout #{App::Git::MASTER}", repo_dir)
                 end
-                commands << "git branch -d #{branch_name}"
-                commands << "git branch --unset-upstream #{branch_name}"
-                commands << "git push origin --delete  #{branch_name}"
-                App::Terminal::command_capture(commands, repo_dir)
+
+                commands = [
+                    "git branch --unset-upstream #{branch_name}",
+                    "git branch -d #{branch_name}"
+                ]
+                results = App::Terminal::command(commands, repo_dir)
+                handle_results_1(branch_name, repo_dir, results)
+
+                commands = [
+                    "git push origin --delete  #{branch_name}"
+                ]
+                results = App::Terminal::command(commands, repo_dir)
+                handle_results_2(branch_name, repo_dir, results)
+
             end
 
             App::Terminal::success('Branch deleted', "Successfully #{App::Terminal::format_highlight('locally')} and #{App::Terminal::format_highlight('remotely')} #{App::Terminal::format_action('deleted')} branch #{App::Terminal::format_branch(branch_name)}")
 
         end
 
+        private
+
+        def self.handle_results_1(branch_name, repo_dir, results)
+            unless results[0]
+                App::Terminal::output("The branch #{App::Terminal::format_branch(branch_name)} in #{App::Terminal::format_directory(@git.get_repo_shorthand(repo_dir))} has #{App::Terminal::format_highlight('no upstream information')}.", App::Terminal::MSG_WARNING)
+            end
+            unless results[1]
+                if App::Terminal::prompt_yes_no("The branch #{App::Terminal::format_branch(branch_name)} in #{App::Terminal::format_directory(@git.get_repo_shorthand(repo_dir))} is #{App::Terminal::format_invalid('not fully merged!', true)}", nil, "Are you #{App::Terminal::format_action('absolutely sure')}\x1B[38;5;89m you want to delete it?");
+                    App::Terminal::command("git branch -D #{branch_name}", repo_dir)
+                end
+            end
+        end
+
+        def self.handle_results_2(branch_name, repo_dir, results)
+            unless results[0]
+                App::Terminal::output("#{App::Terminal::format_branch(branch_name)} in #{App::Terminal::format_directory(@git.get_repo_shorthand(repo_dir))} has #{App::Terminal::format_invalid('no remote branch to delete')}.", App::Terminal::MSG_WARNING)
+            end
+        end
+
     end
 
 end

data/lib/core/mysql.rb

@@ -1,4 +1,4 @@
-require 'mysql'
+require 'mysql2'
 
 module App
 
@@ -16,11 +16,11 @@ module App
         def self.vm(schema = DEFAULT_VM_SCHEMA)
 
             if @vm_connection[schema].nil?
-                @vm_connection[schema] = Mysql.new(
-                    App::Config.param(App::Config::VM_IP),
-                    App::Config.param(App::Config::VM_MYSQL_USER),
-                    App::Config.param(App::Config::VM_MYSQL_PASSWORD),
-                    schema
+                @vm_connection[schema] = Mysql2::Client.new(
+                    :host => App::Config.param(App::Config::VM_IP),
+                    :username => App::Config.param(App::Config::VM_MYSQL_USER),
+                    :password => App::Config.param(App::Config::VM_MYSQL_PASSWORD),
+                    :database => schema
                 )
             end
             @vm_connection[schema]
@@ -38,11 +38,11 @@ module App
                 if host.nil? || user.nil? || pass.nil? || host == '' || user == '' || pass == ''
                     App::Terminal::error('EC2 access data not found', ["The command you're trying to run requires access to an EC2 database.", "In order for this to work you will need valid #{App::Terminal::format_highlight('access data')}.", "Please speak to #{App::Terminal::format_highlight('Albert')} (or team Raptor) for more info."], true)
                 end
-                @ec2_connection = Mysql.new(
-                    encrypter.decrypt(host),
-                    encrypter.decrypt(user),
-                    encrypter.decrypt(pass),
-                    schema
+                @ec2_connection = Mysql2::Client.new(
+                    :host => encrypter.decrypt(host),
+                    :username => encrypter.decrypt(user),
+                    :password => encrypter.decrypt(pass),
+                    :database => schema
                 )
             end
             @ec2_connection
@@ -52,7 +52,7 @@ module App
         def self.get_random_customer_id
             unless @ids_customers.any?
                 customers = App::MySQL::vm.query('SELECT customers_id FROM customers ORDER BY customers_id DESC LIMIT 100')
-                customers.each_hash do |row|
+                customers.each do |row|
                     @ids_customers << row['customers_id']
                 end
             end
@@ -62,7 +62,7 @@ module App
         def self.get_random_shipping_id
             unless @ids_shipping.any?
                 ship_methods = App::MySQL::vm.query('SELECT ship_method_id FROM ship_methods ORDER BY ship_method_id DESC LIMIT 100')
-                ship_methods.each_hash do |row|
+                ship_methods.each do |row|
                     @ids_shipping << row['ship_method_id']
                 end
             end

data/lib/core/pom.rb

@@ -2,11 +2,6 @@ module App
 
     class Pom
 
-        # Initialise credentials
-        # @return void
-        def initialize
-        end
-
         # Retrieves list of pom.xml files which need to be un-snapshotted
         # @return Array
         def self.get_files_to_change
@@ -66,18 +61,29 @@ module App
                 File.open(filename, 'w') { |file| file.puts contents_new }
             end
 
+            red_versions = []
+            green_versions = []
+
             diff_result = App::Terminal::command_capture('git diff | grep "+  \|-  "', App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE))
             puts
             diff_result[0].split("\n").each do |line|
                 if line[0] == '+'
                     puts "  \x1B[38;5;46m#{line.gsub(' ', '')}\x1B[0m"
+                    green_versions << get_version_from_line(line)
                 else
                     puts "  \x1B[38;5;196m#{line.gsub(' ', '')}\x1B[0m"
+                    red_versions << get_version_from_line(line)
                 end
             end
             puts
 
-            App::Terminal::command(['git add .', 'git status'], App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE))
+            if red_versions != green_versions
+                unless App::Terminal::prompt_yes_no('POM version conflict occurred', ['Unable to successfully Un-snapshot POMs.', 'Please fix the POM versions before continuing.'], 'POMs fixed and ready to continue?')
+                    App::Terminal::abort(nil, nil, true, false)
+                end
+            end
+
+            App::Terminal::command_capture(['git add .', 'git status'], App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE))
 
             # Figure out the commit message.
             git = App::Git.new
@@ -87,25 +93,37 @@ module App
             else
                 jira_number = '0000'
             end
-            commit_message = "BP-#{jira_number} Updated POM tags on #{current_branch_code_repo}."
 
-            unless current_branch_code_repo == App::Git::MASTER
+            if current_branch_code_repo == App::Git::MASTER
+                commit_message = "BP-#{jira_number} Removed POM tags."
+            else
+                commit_message = "BP-#{jira_number} Updated POM tags on #{current_branch_code_repo}."
+            end
 
-                if 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("'", "\\'")}'"], App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE))
-                else
-                    App::Terminal::info('Un-snapshotting complete', "Please note that your changes #{App::Terminal::format_highlight('HAVE NOT')} been #{App::Terminal::format_action('committed')} to Git.", false)
-                    return
-                end
+            git = App::Git.new
 
-                if App::Terminal::prompt_yes_no('Push changes to origin')
-                    App::Terminal::command('git push', App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE))
-                    App::Terminal::info('Un-snapshotting complete', "Your POMs have been un-snapshotted, the changes #{App::Terminal::format_action('committed')} to Git and #{App::Terminal::format_action('pushed')} to origin.")
-                else
-                    App::Terminal::info('Un-snapshotting complete', ["Your POMs have been un-snapshotted and the changes #{App::Terminal::format_action('committed')} to Git.", 'However, nothing has been pushed to origin. You will need to do this manually.'], false)
-                end
-            else
+            if git.current_branch_for_repo(App::Config.param(ConfigUnique::WORKSTATION_PATH_TO_BP_CODE)) == App::Git::MASTER
                 App::Terminal::info('Un-snapshotting complete', ["Your POMs have been un-snapshotted. However, nothing has been committed to Git or pushed to origin because you are on #{App::Git::MASTER}.", 'You will need to do this manually.'], false)
+            else
+
+                if git.changes_exist(App::Config.param(ConfigUnique::WORKSTATION_PATH_TO_BP_CODE))
+
+                    if 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("'", "\\'")}'"], App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE))
+                    else
+                        App::Terminal::info('Un-snapshotting complete', "Please note that your changes #{App::Terminal::format_highlight('HAVE NOT')} been #{App::Terminal::format_action('committed')} to Git.", false)
+                        return
+                    end
+
+                    if App::Terminal::prompt_yes_no('Push changes to origin')
+                        App::Terminal::command('git push', App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE))
+                        App::Terminal::info('Un-snapshotting complete', "Your POMs have been un-snapshotted, the changes #{App::Terminal::format_action('committed')} to Git and #{App::Terminal::format_action('pushed')} to origin.")
+                    else
+                        App::Terminal::info('Un-snapshotting complete', ["Your POMs have been un-snapshotted and the changes #{App::Terminal::format_action('committed')} to Git.", 'However, nothing has been pushed to origin. You will need to do this manually.'], false)
+                    end
+
+                end
+
             end
 
         end
@@ -124,6 +142,11 @@ module App
 
         end
 
+        def self.get_version_from_line(line)
+            version = line.match(/>\d{1,2}.\d{1,2}.\d{1,2}-/)
+            version[0].gsub('>', '').gsub('-', '')
+        end
+
     end
 
 end

data/lib/core/sql_update.rb

@@ -0,0 +1,24 @@
+module App
+
+    class SqlUpdate
+
+        def self.run_sql_update
+
+            unless App::Terminal::prompt_yes_no("You're about to run the SQL update script", ["Please note this script is still in #{App::Terminal::format_highlight('BETA')} and will only work under certain (assumed) circumstances."])
+                App::Terminal::abort(nil, nil, true, false)
+            end
+
+            @git = App::Git::new
+
+            App::Terminal::output('Checking that both your repositories are on the same branch')
+            @git.check_for_same_branch(App::Git::SAME_BRANCH_ERROR)
+
+            branch_number = @git.current_branch_for_repo(App::Config.param(ConfigUnique::WORKSTATION_PATH_TO_BP_DB))
+
+            puts branch_number
+
+        end
+
+    end
+
+end

data/lib/core/terminal.rb

@@ -123,7 +123,7 @@ module App
             if preceding_blank_line
                 puts
             end
-            puts "  \x1B[48;5;27m Message \x1B[0m \xe2\x86\x92 #{title}"
+            puts "  \x1B[48;5;240m Message \x1B[0m \xe2\x86\x92 #{title}"
             parse_messages(message)
         end
 
@@ -136,7 +136,7 @@ module App
             if preceding_blank_line
                 puts
             end
-            puts "  \x1B[48;5;34m Success \x1B[0m \xe2\x86\x92 #{title}"
+            puts "  \x1B[48;5;12m Success \x1B[0m \xe2\x86\x92 #{title}"
             parse_messages(message)
         end
 
@@ -302,10 +302,11 @@ module App
                 end
                 table(:border => false) do
                     messages.each do |line|
-                        line.gsub! "\x1B[0m", "\x1B[38;5;240m" unless line.nil?
+                        new_line = line
+                        new_line = line.gsub("\x1B[0m", "\x1B[38;5;240m") unless line.nil?
                         row do
                             column('', :align => 'left', :width => 4)
-                            column("\x1B[38;5;240m#{line}\x1B[0m", :align => 'left', :width => 180)
+                            column("\x1B[38;5;240m#{new_line}\x1B[0m", :align => 'left', :width => 180)
                         end
                     end
                 end

data/lib/core/utils_files.rb

@@ -34,8 +34,6 @@ module App
                     file.close
                 }
 
-                add_file_to_git(full_path_and_file)
-
             rescue Exception => e
 
                 App::Terminal::error('Something went wrong', "#{e.message}", true)
@@ -81,12 +79,6 @@ module App
             files
         end
 
-        def self.add_file_to_git(full_path_and_file)
-
-            App::Terminal::error('Must program add_file_to_git', "#{full_path_and_file}", true)
-
-        end
-
     end
 
 end

data/lib/core/vm.rb

@@ -0,0 +1,62 @@
+module App
+
+    class VM
+
+        def self.run_on_vm(script_name, args = [])
+
+            unless args.is_a? Array
+                raise RuntimeError, 'args (to run_on_vm) must be an Array'
+            end
+
+            script_name_vm = "#{App::Config.param(ConfigUnique::VM_USER)}-#{script_name}"
+
+            scripts = get_all_scripts.keys
+            unless scripts.include?(script_name)
+                App::Terminal::error("Script doesn't exist: #{App::Terminal::format_invalid(script_name)}", nil, true)
+            end
+
+            commands = [
+                "scp #{App::Enum::get_base_path}/vm-scripts/#{script_name} #{App::Config.param(ConfigUnique::VM_USER)}@#{App::Config.param(ConfigUnique::VM_IP)}:/tmp/#{script_name_vm}",
+            ]
+
+            App::Terminal::command(commands, nil, false, false)
+
+            command("chmod 0755 /tmp/#{script_name_vm}")
+            command("/tmp/#{script_name_vm} #{args.join(' ')}")
+            command("rm /tmp/#{script_name_vm}")
+
+        end
+
+        # Runs a series of commands on the VM.
+        # @return void
+        def self.command(commands, verbose = true)
+            unless commands.is_a?(Array)
+                commands = [commands]
+            end
+            if commands.any?
+                commands.each do |command|
+                    if verbose
+                        puts "\x1B[48;5;136m Executing \x1B[0m \x1B[0m\xe2\x86\x92\x1B[0m #{App::Terminal::format_command("#{command}")}"
+                    end
+                    system("sshpass -p#{App::Config.param(ConfigUnique::VM_USER)} ssh #{App::Config.param(ConfigUnique::VM_USER)}@#{App::Config.param(ConfigUnique::VM_IP)} -t  \"#{command}\"")
+                end
+            end
+        end
+
+        private
+
+        # Returns all script files as hash, IE: {'sql-updates' => '/Library/Ruby/Gems/2.0.0/gems/brightpearl-cli-1.4.0/vm-scripts/sql-updates.sh'}
+        # @return Hash
+
+        def self.get_all_scripts
+            return_hash = {}
+            all_scripts = App::UtilsFiles::get_files_in_dir("#{App::Enum::get_base_path}/vm-scripts")
+            all_scripts.each do |file|
+                return_hash[File.basename(file)] = file
+            end
+            return_hash
+        end
+
+    end
+
+end

data/lib/routes/dummy_order.rb

@@ -1,5 +1,4 @@
 require 'rest_client'
-require 'mysql'
 require 'json'
 
 module AppCommand

data/lib/routes/fix.rb

@@ -10,6 +10,9 @@ module AppCommand
             @mysql_app = App::MySQL::vm
             @mysql_ses = App::MySQL::vm('_session')
 
+            @sql_index_start = nil
+            @sql_index_end = nil
+
             opts_validate
             opts_routing
 
@@ -17,33 +20,55 @@ module AppCommand
 
         def opts_validate
 
+            if @opts[:sql_updates]
+                unless @args.any?
+                    App::Terminal::error('Must specify a SQL update to run from', "For example, if the #{App::Terminal::format_highlight('current update fail')} happened at #{App::Terminal::format_directory('0306.sql')}, type \xe2\x86\x92 #{App::Terminal::format_action('306')}", true)
+                end
+                if @args[0] =~ /\A0?\d{3}\z/i
+                    @sql_index_start = @args[0].to_i
+                    sql_files = App::UtilsFiles::get_files_in_dir("#{App::Config.param(ConfigUnique::WORKSTATION_PATH_TO_BP_DB)}/brightpearl/structure")
+                    @sql_index_end = File.basename(sql_files[sql_files.length - 1], '.sql').to_i
+                    if @sql_index_start > @sql_index_end
+                        App::Terminal::error("Invalid SQL update index: #{App::Terminal::format_invalid(@args[0])}", "The most recent SQL update is currently: #{App::Terminal::format_directory("0#{@sql_index_end}.sql")}", true)
+                    end
+                else
+                    App::Terminal::error("Invalid SQL update index: #{App::Terminal::format_invalid(@args[0])}", "The SQL update index you supplied does not match the required format (IE: #{App::Terminal::format_highlight('306')} or #{App::Terminal::format_highlight('0306')}).", true)
+                end
+            end
+
         end
 
         def opts_routing
 
-            if @opts[:clear_sessions]
+            if @opts[:login_sessions]
                 clear_sessions
+            elsif @opts[:sql_updates]
+                sql_updates
             else
                 system('bp f -h')
             end
 
         end
 
+        # Fixes problem with Login (when sessions get screwed up)
+        # @return void
         def clear_sessions
             App::Terminal::info('Attempting to clear all sessions from DB..')
-
             App::Terminal::output('DELETE FROM _session.session;')
             @mysql_ses.query('DELETE FROM session;')
-
             App::Terminal::output('DELETE FROM app.session_to_licence_type;')
             @mysql_app.query('DELETE FROM session_to_licence_type;')
-
             App::Terminal::output('DELETE FROM app.sessions;')
             @mysql_app.query('DELETE FROM sessions;')
-
             puts
         end
 
+        # Runs all SQL updates from a specified index
+        # @return void
+        def sql_updates
+            App::VM::run_on_vm('sql-updates.sh', [@sql_index_start, @sql_index_end + 1])
+        end
+
     end
 
 end