brightpearl-cli 1.3.0 → 1.4.0

data/lib/routes/fix.rb

@@ -0,0 +1,49 @@
+module AppCommand
+
+    class Fix < ::Convoy::ActionCommand::Base
+
+        def execute
+
+            @opts = command_options
+            @args = arguments
+
+            @mysql_app = App::MySQL::vm
+            @mysql_ses = App::MySQL::vm('_session')
+
+            opts_validate
+            opts_routing
+
+        end
+
+        def opts_validate
+
+        end
+
+        def opts_routing
+
+            if @opts[:clear_sessions]
+                clear_sessions
+            else
+                system('bp f -h')
+            end
+
+        end
+
+        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
+
+    end
+
+end

data/lib/routes/git_branch.rb

@@ -1,12 +1,12 @@
-module BrightpearlCommand
+module AppCommand
 
     class GitBranch < ::Convoy::ActionCommand::Base
 
         def execute
 
             @opts = command_options
-            @sort = Brightpearl::Git::SORT_REFNAME
-            @git = Brightpearl::Git.new
+            @sort = App::Git::SORT_REFNAME
+            @git = App::Git.new
             opts_validate
             opts_routing
 
@@ -18,7 +18,7 @@ module BrightpearlCommand
                 # @todo Change to new style error messages.
                 abort('Cannot list both local & remote branches simultaneously. Please choose one option only.')
             end
-            @sort = Brightpearl::Git::SORT_DATE if @opts[:sortDate]
+            @sort = App::Git::SORT_DATE if @opts[:sortDate]
 
         end
 
@@ -41,13 +41,13 @@ module BrightpearlCommand
         # List local branches.
         # @return void
         def list_local_branches
-            @git.show_branches(@sort, Brightpearl::Git::LOCAL)
+            @git.show_branches(@sort, App::Git::LOCAL)
         end
 
         # List remote branches.
         # @return void
         def list_remote_branches
-            @git.show_branches(@sort, Brightpearl::Git::REMOTE)
+            @git.show_branches(@sort, App::Git::REMOTE)
         end
 
     end

data/lib/routes/git_checkout.rb

@@ -1,4 +1,4 @@
-module BrightpearlCommand
+module AppCommand
 
     class GitCheckout < ::Convoy::ActionCommand::Base
 
@@ -6,7 +6,7 @@ module BrightpearlCommand
 
             @opts = command_options
             @args = arguments
-            @git = Brightpearl::Git.new
+            @git = App::Git.new
 
             opts_validate
             opts_routing
@@ -16,13 +16,15 @@ module BrightpearlCommand
         def opts_validate
 
             unless @args.any?
+
                 if @opts[:branch] || @opts[:branch_origin]
-                    Brightpearl::Terminal::error('You must specify a branch name')
+                    App::Terminal::error('You must specify a branch name')
                 else
-                    puts "\n\x1B[41m ERROR \x1B[0m You must specify a branch to checkout. Here is a list of your \x1B[35mLOCAL BRANCHES\x1B[0m"
-                    Brightpearl::Git.new.show_branches(Brightpearl::Git::SORT_REFNAME, Brightpearl::Git::LOCAL)
+                    system('bp g co -h')
                 end
+
                 exit
+
             end
 
         end
@@ -44,42 +46,48 @@ module BrightpearlCommand
         def create_branch(push_to_origin = false)
 
             new_branch_name = @args[0]
-            source_branch_name = @args[1].nil? ? Brightpearl::Git::MASTER : @args[1]
+            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
+                new_branch_name = "bp-#{new_branch_name}"
+            end
 
             # Validate that new branch doesn't already exist.
             @git.check_branch_does_not_exist_anywhere(new_branch_name)
 
             # Validate that source branch (if not MASTER) exists locally.
-            if source_branch_name != Brightpearl::Git::MASTER
+            if source_branch_name != App::Git::MASTER
                 @git.check_branch_exists_somewhere(source_branch_name)
             end
 
             @git.check_for_uncommitted_files
-            if Brightpearl::Terminal::prompt_yes_no('Create new branch?', "You're about to cut branch #{Brightpearl::Terminal::format_branch(new_branch_name)}\x1B[38;5;240m from #{Brightpearl::Terminal::format_branch(source_branch_name)}\x1B[38;5;240m#{push_to_origin ? ' and push it to origin.' : ''}")
+
+            if App::Terminal::prompt_yes_no('Create new branch?', "You're about to cut branch #{App::Terminal::format_branch(new_branch_name)}\x1B[38;5;240m from #{App::Terminal::format_branch(source_branch_name)}\x1B[38;5;240m#{push_to_origin ? ' and push it to origin.' : ''}")
                 source_branch_final = []
                 source_branch_data = @git.branch_data(source_branch_name)
                 source_branch_data.each do |branch_data|
-                    if branch_data[:"#{Brightpearl::Git::BRANCH_EXISTS}"]
+                    if branch_data[:"#{App::Git::BRANCH_EXISTS}"]
                         sb = source_branch_name
                         source_branch_final << source_branch_name
                     else
-                        sb = Brightpearl::Git::MASTER
-                        source_branch_final << Brightpearl::Git::MASTER
-                        if source_branch_name != Brightpearl::Git::MASTER
-                            Brightpearl::Terminal::warning('Branch not found', ["The repo: #{Brightpearl::Terminal::format_directory(branch_data[:"#{Brightpearl::Git::BRANCH_LOCATION}"])}\x1B[38;5;240m doesn't have have a branch called #{Brightpearl::Terminal::format_branch(source_branch_name)}", "Because of this, branch for this repo will be cut from #{Brightpearl::Terminal::format_branch(Brightpearl::Git::MASTER)}\x1B[38;5;240m instead."])
+                        sb = App::Git::MASTER
+                        source_branch_final << App::Git::MASTER
+                        if source_branch_name != App::Git::MASTER
+                            App::Terminal::warning('Branch not found', ["The repo: #{App::Terminal::format_directory(branch_data[:"#{App::Git::BRANCH_LOCATION}"])}\x1B[38;5;240m doesn't have have a branch called #{App::Terminal::format_branch(source_branch_name)}", "Because of this, branch for this repo will be cut from #{App::Terminal::format_branch(App::Git::MASTER)}\x1B[38;5;240m instead."])
                         end
                     end
                     commands = [
                         "git checkout #{sb}"
                     ]
-                    if branch_data[:"#{Brightpearl::Git::BRANCH_HAS_UPSTREAM}"]
+                    if branch_data[:"#{App::Git::BRANCH_HAS_UPSTREAM}"]
                         commands << 'git pull'
                     end
                     commands << "git checkout -b #{new_branch_name}"
                     if push_to_origin
                         commands << "git push --set-upstream origin #{new_branch_name}"
                     end
-                    Brightpearl::Terminal::command(commands, branch_data[:"#{Brightpearl::Git::BRANCH_LOCATION}"])
+                    App::Terminal::command(commands, branch_data[:"#{App::Git::BRANCH_LOCATION}"])
                 end
 
                 if source_branch_final[0] == source_branch_final[1]
@@ -87,9 +95,9 @@ module BrightpearlCommand
                 else
                     source_branch_final = "#{source_branch_final[0]}/#{source_branch_final[1]}"
                 end
-                Brightpearl::Terminal::success('Branch created', "Branch #{Brightpearl::Terminal::format_branch(new_branch_name)}\x1B[38;5;240m has been successfully cut from #{Brightpearl::Terminal::format_branch(source_branch_final)}")
+                App::Terminal::success('Branch created', "Branch #{App::Terminal::format_branch(new_branch_name)}\x1B[38;5;240m has been successfully cut from #{App::Terminal::format_branch(source_branch_final)}")
             else
-                Brightpearl::Terminal::abort(nil, nil, true, false)
+                App::Terminal::abort(nil, nil, true, false)
             end
 
         end
@@ -97,48 +105,49 @@ module BrightpearlCommand
         # Checks out a branch for both /code & /db.
         # @return void
         def checkout_branch
+
             branch_to_checkout = @args[0]
             branch_data = @git.branch_data(branch_to_checkout)
+
             # If branch is already checked out.
-            if branch_data[0][:"#{Brightpearl::Git::BRANCH_IS_CURRENT}"] && branch_data[1][:"#{Brightpearl::Git::BRANCH_IS_CURRENT}"]
-                Brightpearl::Terminal::info("You are already on branch #{Brightpearl::Terminal::format_branch(branch_to_checkout)}")
+            if branch_data[0][:"#{App::Git::BRANCH_IS_CURRENT}"] && branch_data[1][:"#{App::Git::BRANCH_IS_CURRENT}"]
+                App::Terminal::info("You are already on branch #{App::Terminal::format_branch(branch_to_checkout)}")
                 if @opts[:update] || @opts[:updatePush]
-                    Brightpearl::Terminal::info("To update the branch, run: #{Brightpearl::Terminal::format_command('bp g u')}", nil, false)
+                    App::Terminal::info("To update the branch, run: #{App::Terminal::format_command('bp g u')}", nil, false)
                 end
                 @git.check_for_stash
                 exit
             end
+
             # If branch doesn't exist.
-            if branch_data[0][:"#{Brightpearl::Git::BRANCH_EXISTS}"] == false && branch_data[1][:"#{Brightpearl::Git::BRANCH_EXISTS}"] == false
-                Brightpearl::Terminal::error("The branch you're trying to checkout #{Brightpearl::Terminal::format_branch(branch_to_checkout)} doesn't exist", 'Please check your spelling and try again.', true)
+            if branch_data[0][:"#{App::Git::BRANCH_EXISTS}"] == false && branch_data[1][:"#{App::Git::BRANCH_EXISTS}"] == false
+                App::Terminal::error("The branch you're trying to checkout #{App::Terminal::format_branch(branch_to_checkout)} doesn't exist", 'Please check your spelling and try again.', true)
             end
+
             @git.check_for_uncommitted_files
+
             count = 0
             branch_data.each do |branch_data_inner|
-                repo_dir = branch_data_inner[:"#{Brightpearl::Git::BRANCH_LOCATION}"]
-                if branch_data_inner[:"#{Brightpearl::Git::BRANCH_EXISTS}"] == false
+                repo_dir = branch_data_inner[:"#{App::Git::BRANCH_LOCATION}"]
+                if branch_data_inner[:"#{App::Git::BRANCH_EXISTS}"] == false
                     next
                 end
                 commands = []
                 if @opts[:update] || @opts[:updatePush]
-                    commands << "git checkout #{Brightpearl::Git::MASTER}"
+                    commands << "git checkout #{App::Git::MASTER}"
                     commands << 'git pull'
                 end
-                unless branch_data_inner[:"#{Brightpearl::Git::BRANCH_IS_CURRENT}"]
+                unless branch_data_inner[:"#{App::Git::BRANCH_IS_CURRENT}"]
                     commands << "git checkout #{branch_to_checkout}"
                 end
                 if @opts[:update] || @opts[:updatePush]
-                    if branch_data[count][:"#{Brightpearl::Git::BRANCH_HAS_UPSTREAM}"]
-                        commands << 'git pull'
-                    else
-                        @git.ask_to_setup_remote_tracking(@git.current_branch_for_repo(repo_dir), repo_dir)
-                    end
-                    commands << "git merge #{Brightpearl::Git::MASTER}"
+                    commands << 'git pull'
+                    commands << "git merge #{App::Git::MASTER}"
                 end
                 if @opts[:updatePush]
                     commands << 'git push'
                 end
-                Brightpearl::Terminal::command(commands, repo_dir)
+                App::Terminal::command(commands, repo_dir)
                 count = count + 1
             end
             @git.check_for_same_branch

data/lib/routes/git_delete.rb

@@ -1,11 +1,12 @@
-module BrightpearlCommand
+module AppCommand
 
     class GitDelete < ::Convoy::ActionCommand::Base
 
         def execute
+
             @opts = command_options
             @args = arguments
-            @git = Brightpearl::Git.new
+            @git = App::Git.new
             opts_validate
             opts_routing
 
@@ -14,7 +15,7 @@ module BrightpearlCommand
         def opts_validate
 
             if @opts[:delete_local] == false && @opts[:delete_remote] == false && @opts[:delete_both] == false
-                Brightpearl::Terminal::error('You must specify one of the following flags:', [
+                App::Terminal::error('You must specify one of the following flags:', [
                     "-l --delete-local   \xe2\x86\x92  Delete local branch",
                     "-r --delete-remote  \xe2\x86\x92  Delete remote branch",
                     "-b --delete-both    \xe2\x86\x92  Delete both local & remote branches"
@@ -23,7 +24,7 @@ module BrightpearlCommand
             end
 
             unless @args.any?
-                @args[0] = @git.current_branch_for_repo(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE))
+                @args[0] = @git.current_branch_for_repo(App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE))
             end
 
             if @args[0] == 'master'
@@ -36,70 +37,15 @@ module BrightpearlCommand
         def opts_routing
 
             if @opts[:delete_local]
-                delete_local
+                App::GitDelete::delete_local(@args[0])
             elsif @opts[:delete_remote]
-                delete_remote
+                App::GitDelete::delete_remote(@args[0])
             elsif @opts[:delete_both]
-                delete_both
+                App::GitDelete::delete_both(@args[0])
             end
 
         end
 
-        def delete_local
-            Brightpearl::Terminal::output("Must check that branch is up-to-date with it's remote counter-part, otherwise DO NOT delete!", Brightpearl::Terminal::MSG_TODO)
-            Brightpearl::Terminal::output('Must check branch even exists.', Brightpearl::Terminal::MSG_TODO)
-            unless Brightpearl::Terminal::prompt_yes_no("#{Brightpearl::Terminal::format_action('locally delete')} branch #{Brightpearl::Terminal::format_branch(@args[0])}?")
-                Brightpearl::Terminal::abort
-            end
-            @git.repo_loop.each do |repo_dir|
-                commands = []
-                if @git.current_branch_for_repo(repo_dir) == @args[0]
-                    commands << 'git checkout master'
-                end
-                commands << "git branch -d #{@args[0]}"
-                Brightpearl::Terminal::command(commands, repo_dir)
-            end
-            Brightpearl::Terminal::success('Branch deleted', "Successfully #{Brightpearl::Terminal::format_highlight('locally')} #{Brightpearl::Terminal::format_action('deleted')} branch #{Brightpearl::Terminal::format_branch(@args[0])}")
-        end
-
-        def delete_remote
-            Brightpearl::Terminal::output('Must check branch even exists.', Brightpearl::Terminal::MSG_TODO)
-            unless Brightpearl::Terminal::prompt_yes_no("#{Brightpearl::Terminal::format_action('remotely delete')} branch #{Brightpearl::Terminal::format_branch(@args[0])}?")
-                Brightpearl::Terminal::abort
-            end
-            @git.repo_loop.each do |repo_dir|
-                unless @git.branch_exists(@args[0], repo_dir, Brightpearl::Git::REMOTE)
-                    puts "Branch \x1B[32m[#{@args[0]}]\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 #{@args[0]}",
-                    "git push origin --delete #{@args[0]}",
-                ]
-                Brightpearl::Terminal::command(commands, repo_dir)
-            end
-            Brightpearl::Terminal::success('Branch deleted', "Successfully #{Brightpearl::Terminal::format_highlight('remotely')} #{Brightpearl::Terminal::format_action('deleted')} branch #{Brightpearl::Terminal::format_branch(@args[0])}")
-        end
-
-        def delete_both
-            Brightpearl::Terminal::output("Must check that branch is up-to-date with it's remote counter-part, otherwise DO NOT delete!", Brightpearl::Terminal::MSG_TODO)
-            Brightpearl::Terminal::output('Must check branch even exists.', Brightpearl::Terminal::MSG_TODO)
-            unless Brightpearl::Terminal::prompt_yes_no("#{Brightpearl::Terminal::format_action('locally & remotely delete')} branch #{Brightpearl::Terminal::format_branch(@args[0])}?")
-                Brightpearl::Terminal::abort
-            end
-            @git.repo_loop.each do |repo_dir|
-                commands = []
-                if @git.current_branch_for_repo(repo_dir) == @args[0]
-                    commands << 'git checkout master'
-                end
-                commands << "git branch -d #{@args[0]}"
-                commands << "git branch --unset-upstream #{@args[0]}"
-                commands << "git push origin --delete  #{@args[0]}"
-                Brightpearl::Terminal::command(commands, repo_dir)
-            end
-            Brightpearl::Terminal::success('Branch deleted', "Successfully #{Brightpearl::Terminal::format_highlight('locally')} and #{Brightpearl::Terminal::format_highlight('remotely')} #{Brightpearl::Terminal::format_action('deleted')} branch #{Brightpearl::Terminal::format_branch(@args[0])}")
-        end
-
     end
 
 end