brightpearl-cli 1.4.0 → 1.7.0

data/lib/routes/git_checkout.rb

@@ -49,7 +49,7 @@ module AppCommand
             source_branch_name = @args[1].nil? ? App::Git::MASTER : @args[1]
 
             # If new branch is 12345, add 'bp-' prefix.
-            if new_branch_name =~ /\A\d{5}\z/i
+            if new_branch_name =~ /\A\d{4,5}\z/i
                 new_branch_name = "bp-#{new_branch_name}"
             end
 
@@ -107,6 +107,11 @@ module AppCommand
         def checkout_branch
 
             branch_to_checkout = @args[0]
+
+            if branch_to_checkout =~ /\A\d{4,5}\z/i
+                branch_to_checkout = @git.resolve_branch_for_jira(branch_to_checkout)
+            end
+
             branch_data = @git.branch_data(branch_to_checkout)
 
             # If branch is already checked out.
@@ -142,7 +147,7 @@ module AppCommand
                 end
                 if @opts[:update] || @opts[:updatePush]
                     commands << 'git pull'
-                    commands << "git merge #{App::Git::MASTER}"
+                    commands << "git merge #{App::Git::MASTER} --no-edit"
                 end
                 if @opts[:updatePush]
                     commands << 'git push'

data/lib/routes/git_delete.rb

@@ -36,12 +36,18 @@ module AppCommand
 
         def opts_routing
 
+            branch_to_delete = @args[0]
+
+            if branch_to_delete =~ /\A\d{4,5}\z/i
+                branch_to_delete = @git.resolve_branch_for_jira(branch_to_delete)
+            end
+
             if @opts[:delete_local]
-                App::GitDelete::delete_local(@args[0])
+                App::GitDelete::delete_local(branch_to_delete)
             elsif @opts[:delete_remote]
-                App::GitDelete::delete_remote(@args[0])
+                App::GitDelete::delete_remote(branch_to_delete)
             elsif @opts[:delete_both]
-                App::GitDelete::delete_both(@args[0])
+                App::GitDelete::delete_both(branch_to_delete)
             end
 
         end

data/lib/routes/git_merge.rb

@@ -228,6 +228,8 @@ 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}",
                     'git pull'
@@ -271,6 +273,7 @@ module AppCommand
                     end
 
                     changed_files_code["#{branch_name}"] = App::Terminal::command_capture(commands_3, cd_repo)
+
                     App::Terminal::command(commands_4, cd_repo)
                     merge_to_target = App::Terminal::command(commands_5, cd_repo)
                     if merge_to_target[0] == false
@@ -292,7 +295,22 @@ module AppCommand
                             App::Terminal::abort(nil, nil, true, false)
                         end
                     end
+
                     changed_files_db["#{branch_name}"] = App::Terminal::command_capture(commands_3, db_repo)
+
+                    unless changed_files_db["#{branch_name}"].nil? || changed_files_db["#{branch_name}"] == '' || changed_files_db["#{branch_name}"] == ['']
+
+                        puts changed_files_db
+                        puts
+                        puts
+                        puts changed_files_db["#{branch_name}"].inspect
+
+                        unless App::Terminal::prompt_yes_no('BOMBED OUT ON SQL CHANGES!!', changed_files_db["#{branch_name}"])
+                            App::Terminal::abort(nil, nil, true, false)
+                        end
+
+                    end
+
                     App::Terminal::command(commands_4, db_repo, false)
                     merge_to_target = App::Terminal::command(commands_5, db_repo)
                     if merge_to_target[0] == false
@@ -365,9 +383,6 @@ module AppCommand
                 @source_branches.concat(source_branches)
             end
 
-            # Un-comment to sort alphanumerically.
-            # @source_branches.sort_by! { |m| m.downcase }
-
             @source_branches.uniq!
 
             # If branch(es) was/were specified as '1234' or '12345', this code tries to resolve it automatically as bp-12345/bug-12345/feature-12345
@@ -378,6 +393,7 @@ module AppCommand
                 end
             end
             if branches_to_resolve.any?
+                App::Terminal::info('Attempting to automatically resolve branches for:', branches_to_resolve.keys)
                 new_source_branches = []
                 @source_branches.each do |branch_name|
                     unless branches_to_resolve.keys.include?(branch_name)
@@ -390,17 +406,17 @@ module AppCommand
 
                             # If more than one possible branch exists, IE: bug-14145 & bp-14145
                             unless branches_to_resolve[branch_to_resolve] == false
-                                App::Terminal::error("More than one possible branch found for string: #{App::Terminal::format_highlight(branch_to_resolve)}", [App::Terminal::format_branch(possible_branch), App::Terminal::format_branch(branches_to_resolve[branch_to_resolve]), nil, "In this case, you must specify the branch name #{App::Terminal::format_highlight('explicitly')}."], true)
+                                App::Terminal::error("More than one possible branch found for jira number: #{App::Terminal::format_highlight(branch_to_resolve)}", [App::Terminal::format_branch(possible_branch), App::Terminal::format_branch(branches_to_resolve[branch_to_resolve]), nil, "In this case, you must specify the branch name #{App::Terminal::format_highlight('explicitly')}."], true)
                             end
 
                             branches_to_resolve[branch_to_resolve] = possible_branch
-                            App::Terminal::output("Resolved branch #{App::Terminal::format_branch(possible_branch)} from string: #{App::Terminal::format_highlight(branch_to_resolve)}", App::Terminal::MSG_AUTOMATIC)
+                            App::Terminal::output("Resolved branch #{App::Terminal::format_branch(possible_branch)} from jira number: #{App::Terminal::format_highlight(branch_to_resolve)}", App::Terminal::MSG_AUTOMATIC)
                         end
                     end
                 end
                 branches_to_resolve.each do |branch_to_resolve|
                     if branch_to_resolve[1] == false
-                        App::Terminal::error("No branch found for string: #{App::Terminal::format_highlight(branch_to_resolve[0])}", ['Please check your input and try again.'], true)
+                        App::Terminal::error("No branch found for jira number: #{App::Terminal::format_highlight(branch_to_resolve[0])}", ['Please check your input and try again.'], true)
                     end
                     new_source_branches << branch_to_resolve[1] unless branch_to_resolve[1] == '' || branch_to_resolve[1].nil?
                 end

data/lib/routes/git_update.rb

@@ -32,7 +32,7 @@ module AppCommand
                 if current_branch != App::Git::MASTER
                     commands << "git checkout #{current_branch}"
                     commands << "git pull origin #{current_branch}"
-                    commands << 'git merge master'
+                    commands << 'git merge master --no-edit'
                 end
                 results = App::Terminal::command(commands, repo_dir)
                 if current_branch != App::Git::MASTER

data/lib/routes/production_logs.rb

@@ -79,7 +79,7 @@ module AppCommand
                     data_previous = []
                     sql_1 = "SELECT COUNT(*) AS frequency, account_version, error_message, error_file, error_line FROM brightpearl.php_logs WHERE account_version='#{@args[0]}' GROUP BY error_message, error_file, error_line ORDER BY frequency DESC"
                     data_previous_result = @ec2_connection.query(sql_1)
-                    data_previous_result.each_hash do |result|
+                    data_previous_result.each do |result|
                         data_previous << result
                     end
                     sql_2 = "SELECT COUNT(*) AS frequency, account_version, error_message, error_file, error_line FROM brightpearl.php_logs WHERE account_version='#{@args[1]}' GROUP BY error_message, error_file, error_line HAVING frequency > 1 ORDER BY frequency DESC"
@@ -115,7 +115,7 @@ module AppCommand
                         column('')
                         column('')
                     end
-                    data.each_hash do |row_data|
+                    data.each do |row_data|
                         row_color = get_color_php_logs(data_previous, row_data)
                         error_file = row_data['error_file'].split('/')
                         error_file = "#{error_file[error_file.count - 2]}/#{error_file[error_file.count - 1]}"
@@ -156,7 +156,7 @@ module AppCommand
                     unless error_message.nil? || error_file.nil? || error_line.nil? || account_version.nil? || account_name.nil? || ruid.nil?
                         error_color = 248
                         result = @ec2_connection.query("SELECT id FROM php_logs WHERE ruid='#{ruid}' AND error_file='#{error_file.gsub("'",) { "\\'" }}' AND error_line='#{error_line.gsub("'", '')}'")
-                        if result.num_rows == 0
+                        if result.count == 0
                             error_color = 198
                             sql = "INSERT INTO php_logs (
                                         ruid,
@@ -322,7 +322,7 @@ module AppCommand
             rescue
                 App::Terminal::warning('Query Failed', sql)
             end
-            unless result.num_rows > 0
+            unless result.count > 0
                 App::Terminal::info('No data', "We currently don't have any data for version: #{App::Terminal::format_highlight(version_number)}")
                 exit
             end

data/lib/routes/review.rb

@@ -32,9 +32,15 @@ module AppCommand
 
             current_branch = @git.current_branch_for_repo(App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE))
 
-            @git.check_branch_exists_somewhere(@args[0])
+            if @args[0] =~ /\A\d{4,5}\z/i
+                branch_to_review = @git.resolve_branch_for_jira(@args[0])
+            else
+                branch_to_review = @args[0]
+            end
+
+            @git.check_branch_exists_somewhere(branch_to_review)
 
-            system("BR=#{@args[0]} && bp g co -U ${BR} && bp g d -l ${BR} && bp g co #{current_branch}")
+            system("BR=#{branch_to_review} && bp g co -u ${BR} && bp g d -l ${BR} && bp g co #{current_branch}")
 
         end
 

data/lib/routes/scripts_sonar.rb

@@ -47,7 +47,12 @@ module AppCommand
             end
 
             unless file_found_to_scan
-                App::Terminal::info("No files to scan. The only files which #{App::Terminal::format_highlight('changed')} between #{App::Terminal::format_branch(@git.current_branch_for_repo(App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE)))} and #{App::Terminal::format_branch("origin/#{App::Git::MASTER}")} are:", changed_files[0].split("\n"))
+                if changed_files[0] == '' && changed_files[1].nil?
+                    App::Terminal::info("No files to scan. #{App::Terminal::format_highlight('No files changed')} between #{App::Terminal::format_branch(@git.current_branch_for_repo(App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE)))} and #{App::Terminal::format_branch("origin/#{App::Git::MASTER}")}")
+                else
+                    App::Terminal::info("No files to scan. #{App::Terminal::format_highlight('The only files changed')} between #{App::Terminal::format_branch(@git.current_branch_for_repo(App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE)))} and #{App::Terminal::format_branch("origin/#{App::Git::MASTER}")} are:", changed_files[0].split("\n"))
+                end
+                exit
             end
 
             found_results = false
@@ -72,7 +77,6 @@ module AppCommand
                 App::Terminal::error('Found errors!', results_output)
             else
                 App::Terminal::success('No errors found.', nil, file_found_to_scan ? true : false)
-                exit
             end
 
         end

data/lib/routes/scripts_sql_update.rb

@@ -0,0 +1,33 @@
+module AppCommand
+
+    class ScriptsSqlUpdate < ::Convoy::ActionCommand::Base
+
+        def execute
+
+            @opts = command_options
+            @args = arguments
+
+            opts_validate
+            opts_routing
+
+        end
+
+        def opts_validate
+
+        end
+
+        def opts_routing
+
+            run_sql_update
+
+        end
+
+        def run_sql_update
+
+            App::SqlUpdate::run_sql_update
+
+        end
+
+    end
+
+end

data/lib/routes/test.rb

@@ -17,13 +17,13 @@ module AppCommand
             opts_set = opts_set + 1 if @opts[:cucumber]
             opts_set = opts_set + 1 if @opts[:fitnesse]
             opts_set = opts_set + 1 if @opts[:php]
+            opts_set = opts_set + 1 if @opts[:php_local]
             opts_set = opts_set + 1 if @opts[:ruby]
 
             if opts_set >= 2
-                puts "You can only run one set of tests at a time. Please set only 1 one of the following flags: \x1B[90m-c, -f, -p, -r\x1B[0m"
+                puts "You can only run one set of tests at a time. Please set only 1 one of the following flags: \x1B[90m-c, -f, -p, -P, -r\x1B[0m"
                 exit
-            elsif
-                opts_set == 0
+            elsif opts_set == 0
                 @opts[:php] = true
             end
 
@@ -35,7 +35,7 @@ module AppCommand
                 run_cucumber
             elsif @opts[:fitnesse]
                 run_fitnesse
-            elsif @opts[:php]
+            elsif @opts[:php] || @opts[:php_local]
                 run_php
             elsif @opts[:ruby]
                 run_ruby
@@ -53,10 +53,25 @@ module AppCommand
 
         def run_php
 
-            commands = [
-                "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)} 'cd /brightpearl-source/brightpearl-code/brightpearl/private/tests/ && ./phpunit.sh #{@args.join(' ')}'"
-            ]
-            App::Terminal::command(commands, nil, false)
+            if @opts[:php]
+
+                App::Terminal::info('Running PHPUnit tests on VM')
+
+                commands = [
+                    "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)} 'cd /brightpearl-source/brightpearl-code/brightpearl/private/tests/ && ./phpunit.sh #{@args.join(' ')}'"
+                ]
+                App::Terminal::command(commands, nil, false)
+
+            elsif @opts[:php_local]
+
+                App::Terminal::warning('Running PHPUnit tests on Workstation', "This isn't fully functioning yet.")
+
+                commands = [
+                    "phpunit --bootstrap #{App::Enum::get_base_path}/assets/phpunit/bootstrap.php"
+                ]
+                App::Terminal::command(commands, "#{App::Config.param(ConfigUnique::WORKSTATION_PATH_TO_BP_CODE)}/brightpearl/private/tests", false)
+
+            end
 
         end
 

data/lib/version.rb

@@ -0,0 +1 @@
+VERSION = '1.7.0'

data/vm-scripts/sql-updates.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+COUNTER=$1
+
+while [  ${COUNTER} -lt $2 ]; do
+    echo "mysql app < /brightpearl-source/brightpearl-db/brightpearl/structure/0${COUNTER}.sql"
+    mysql app < /brightpearl-source/brightpearl-db/brightpearl/structure/0${COUNTER}.sql
+    let COUNTER=COUNTER+1
+done

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brightpearl-cli
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Albert Rannetsperger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2015-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: columnist
@@ -111,10 +111,21 @@ extra_rdoc_files: []
 files:
 - README.md
 - LICENSE
+- assets/phpunit/bootstrap.php
+- assets/phpunit/IntegrationTestCase.php
+- assets/phpunit/jenkins-bootstrap.php
+- assets/phpunit/JournalEntries.php
+- assets/phpunit/Message.php
+- assets/phpunit/Providers.php
+- assets/phpunit/RedirectException.php
+- assets/phpunit/ReservedContactIds.php
+- assets/phpunit/Values.php
 - lib/brightpearl_cli.rb
 - lib/core/api.rb
 - lib/core/config.rb
 - lib/core/config_unique.rb
+- lib/core/ebay.rb
+- lib/core/ebay_factory.rb
 - lib/core/encrypter.rb
 - lib/core/enums.rb
 - lib/core/git.rb
@@ -122,12 +133,14 @@ files:
 - lib/core/jira.rb
 - lib/core/mysql.rb
 - lib/core/pom.rb
+- lib/core/sql_update.rb
 - lib/core/terminal.rb
 - lib/core/tools.rb
 - lib/core/utils_files.rb
 - lib/core/utils_routes.rb
 - lib/core/utils_strings.rb
 - lib/core/validate.rb
+- lib/core/vm.rb
 - lib/routes/build.rb
 - lib/routes/dummy_order.rb
 - lib/routes/fix.rb
@@ -148,10 +161,13 @@ files:
 - lib/routes/scripts_color.rb
 - lib/routes/scripts_pom_fixer.rb
 - lib/routes/scripts_sonar.rb
+- lib/routes/scripts_sql_update.rb
 - lib/routes/setup.rb
 - lib/routes/tail.rb
 - lib/routes/test.rb
 - lib/routes/update.rb
+- lib/version.rb
+- vm-scripts/sql-updates.sh
 - bin/bp
 - bin/brightpearl
 homepage: http://rubygems.org/gems/brightpearl-cli