brightpearl-cli 1.1.0 → 1.2.0

data/lib/core/tools.rb

@@ -7,15 +7,27 @@ module Brightpearl
         REPORT_WIDTH = 188
 
         # Check for internet access. Dies if not connected.
-        # @return boolean|void
+        # @return void
         def self.verify_internet_access
-            begin
-                return true if open('http://www.google.com')
-            rescue
-                abort('No internet connection. You must be online to run this command.')
+            if ping('www.google.com') != 0
+                Brightpearl::Terminal::error('You are not connected to the internet', 'Please check your connection and try and again.')
+            end
+        end
+
+        def self.verify_vm_is_reachable
+            if ping(Brightpearl::Config.param(Brightpearl::Config::VM_IP)) != 0
+                Brightpearl::Terminal::error('Cannot reach VM', ["The remote host #{Brightpearl::Terminal::format_highlight(Brightpearl::Config.param(Brightpearl::Config::VM_IP))} cannot be reached.", 'Please make sure your VM is online and correctly configured.'])
             end
         end
 
+        # Ping a URL or IP and returns the exit status. 0 = success, anything else means it failed.
+        # @return Integer
+        def self.ping(ip_or_url, verbose = true)
+            Brightpearl::Terminal::output("Checking that #{Brightpearl::Terminal::format_highlight(ip_or_url)} is reachable") if verbose == true
+            `ping -t 1 -c 1 #{ip_or_url}`
+            $?.exitstatus
+        end
+
         # Returns time ago in human readable format.
         # @string
         def self.time_passed_since(time_stamp)
@@ -50,14 +62,6 @@ module Brightpearl
             end
         end
 
-        # Returns the number of seconds that have elapsed between a timestamp (0000-00-00T00:00:00+00:00) and now
-        # @return integer
-        def self.seconds_since(time_stamp)
-            time_stamp = DateTime.strptime(time_stamp, '%Y-%m-%dT%H:%M:%S%z')
-            time_now = DateTime.now
-            ((time_now - time_stamp) * 24 * 60 * 60).to_i
-        end
-
         # Used to make sure all reports are the same width (for consistency).
         # @return void
         def self.validate_report_width(array)
@@ -73,6 +77,22 @@ module Brightpearl
             end
         end
 
+        # Returns TRUE if Mac, FALSE if Linux (or anything else for that matter)
+        # @return boolean
+        def self.this_is_a_mac
+            return Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_OS) == Brightpearl::Config::MAC
+        end
+
+        private
+
+        # Returns the number of seconds that have elapsed between a timestamp (0000-00-00T00:00:00+00:00) and now
+        # @return integer
+        def self.seconds_since(time_stamp)
+            time_stamp = DateTime.strptime(time_stamp, '%Y-%m-%dT%H:%M:%S%z')
+            time_now = DateTime.now
+            ((time_now - time_stamp) * 24 * 60 * 60).to_i
+        end
+
     end
 
 end

data/lib/routes/build.rb

@@ -7,6 +7,7 @@ module BrightpearlCommand
             @opts = command_options
             @args = arguments
             @service_dir = nil
+            @is_lib = false
             opts_validate
             opts_routing
 
@@ -18,11 +19,24 @@ module BrightpearlCommand
                 Brightpearl::Terminal::error('Must specify service name', "The script cannot build your service because you haven't told it what service to build.", true)
             end
 
+            # Set 'service only' to default.
+            if !@opts[:serviceOnly] && !@opts[:apiOnly] && !@opts[:both]
+                @opts[:serviceOnly] = true
+            end
+
+            if @options[:serviceOnly]
+                suffix = "/#{@args[0]}-service"
+            elsif @opts[:apiOnly]
+                suffix = "/#{@args[0]}-api"
+            else
+                suffix = ''
+            end
+
             service_dir = Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE)
-            dir_dev_support = "#{service_dir}/services/dev-support/#{@args[0]}/#{@args[0]}-service"
-            dir_functional = "#{service_dir}/services/functional/#{@args[0]}/#{@args[0]}-service"
-            dir_infrastructure = "#{service_dir}/services/infrastructure/#{@args[0]}/#{@args[0]}-service"
-            dir_integration = "#{service_dir}/services/integration/#{@args[0]}/#{@args[0]}-service"
+            dir_dev_support = "#{service_dir}/services/dev-support/#{@args[0]}#{suffix}"
+            dir_functional = "#{service_dir}/services/functional/#{@args[0]}#{suffix}"
+            dir_infrastructure = "#{service_dir}/services/infrastructure/#{@args[0]}#{suffix}"
+            dir_integration = "#{service_dir}/services/integration/#{@args[0]}#{suffix}"
             dir_lib = "#{service_dir}/services/lib/#{@args[0]}"
 
             if File.directory?(dir_dev_support)
@@ -39,9 +53,10 @@ module BrightpearlCommand
             end
             if File.directory?(dir_lib)
                 @service_dir = dir_lib
+                @is_lib = true
             end
             if @service_dir.nil?
-                Brightpearl::Terminal::error('Cannot find service', "The script is unable to find a service called: \x1B[38;5;202m#{@args[0].downcase.capitalize}\x1B[0m\nPlease check your spelling and try again.")
+                Brightpearl::Terminal::error('Cannot find service', "The script is unable to find a service called: \x1B[38;5;202m#{@args[0].downcase}\x1B[0m\nPlease check your spelling and try again.")
             end
 
         end
@@ -54,26 +69,84 @@ module BrightpearlCommand
 
         def build_service
 
-            commands = [
-                # 'git status'
-                'mvn clean install | grep "Building war"',
-            # 'mvn deploy'
-            ]
-            output = Brightpearl::Terminal::command_capture(commands, @service_dir)
+            Brightpearl::Tools::verify_vm_is_reachable if @is_lib == false
+
+            if Brightpearl::Tools::this_is_a_mac
+
+                args = @args.dup
+                args.shift
+
+                commands = [
+                    "mvn clean install#{@opts[:deploy] ? ' deploy' : ''}#{args.any? ? " #{args.join(' ')}" : ''}",
+                ]
+                if @is_lib == false
+
+                    output = Brightpearl::Terminal::command_capture(commands, @service_dir)
+
+                    lines = output[0].chomp
+                    lines = lines.split("\n")
+
+                    war_file_ws = nil
+                    build_failed = false
+                    build_fail_url = nil
 
-            puts output
+                    lines.each do |line|
+                        if line =~ /\A\[INFO\] Building war: (.*).war\z/
+                            war_file_ws = line
+                        end
+                        if line =~ /\A\[INFO\] BUILD FAILURE\z/
+                            build_failed = true
+                        end
+                        if line =~ /\[ERROR\] Please refer to (.*)surefire-reports/
+                            build_fail_url = line
+                            build_fail_url = build_fail_url.split('Please refer to ')
+                            build_fail_url = build_fail_url[1].split(' for the individual')
+                            build_fail_url = build_fail_url[0]
+                        end
+                    end
 
-            war_file = output[0].split('war: ')
-            war_file = war_file[1].chomp
+                    if build_failed
+                        Brightpearl::Terminal::error('Build failed', nil, false)
+                        puts output[0]
+                        puts
 
-            puts war_file
+                        # If a build fail URL was found, launch it in default browser.
+                        unless build_fail_url.nil?
+                            if Brightpearl::Terminal::prompt_yes_no("Would you like to #{Brightpearl::Terminal::format_action('open a stack-trace')} in your default browser?", build_fail_url)
+                                system("open -a Google\\ Chrome #{build_fail_url}")
+                            end
+                        end
+
+                        exit
+                    end
+
+                    war_file_ws = war_file_ws.split('war: ')
+                    war_file_ws = war_file_ws[1].chomp
+
+                    war_file_vm = war_file_ws.split('/')
+                    war_file_vm = war_file_vm[war_file_vm.length - 1]
+
+
+                    commands = [
+                        "scp #{war_file_ws} #{Brightpearl::Config.param(Brightpearl::Config::VM_USER)}@#{Brightpearl::Config.param(Brightpearl::Config::VM_IP)}:/tmp",
+                        "sshpass -p#{Brightpearl::Config.param(Brightpearl::Config::VM_USER_PASSWORD)} ssh #{Brightpearl::Config.param(Brightpearl::Config::VM_USER)}@#{Brightpearl::Config.param(Brightpearl::Config::VM_IP)} 'cd /brightpearl-source/dev-vm-control-scripts/scm && ~/generated-scripts/deploy-uploaded-service #{war_file_vm}'"
+
+                    ]
+                    Brightpearl::Terminal::command(commands)
+
+                else
+
+                    Brightpearl::Terminal::command(commands, @service_dir)
+
+                end
+
+            else
 
-            if Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_OS) == Brightpearl::Config::MAC
                 commands = [
-                    "scp #{war_file} #{Brightpearl::Config.param(Brightpearl::Config::VM_USER)}@#{Brightpearl::Config.param(Brightpearl::Config::VM_IP)}:/tmp"
+                    'mvn clean install -P deploy-service',
                 ]
-                puts commands
-                Brightpearl::Terminal::command(commands)
+                Brightpearl::Terminal::command(commands, @service_dir)
+
             end
 
         end

data/lib/routes/git_checkout.rb

@@ -7,6 +7,7 @@ module BrightpearlCommand
             @opts = command_options
             @args = arguments
             @git = Brightpearl::Git.new
+
             opts_validate
             opts_routing
 
@@ -16,7 +17,7 @@ module BrightpearlCommand
 
             unless @args.any?
                 if @opts[:branch] || @opts[:branch_origin]
-                    puts 'You must specify a branch name.'
+                    Brightpearl::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)
@@ -45,20 +46,15 @@ module BrightpearlCommand
             new_branch_name = @args[0]
             source_branch_name = @args[1].nil? ? Brightpearl::Git::MASTER : @args[1]
 
-            Brightpearl::Terminal::info("Checking that branch #{Brightpearl::Terminal::format_branch(new_branch_name)} doesn't already exist")
-            if @git.branch_exists_anywhere(new_branch_name)
-                Brightpearl::Terminal::error('Target branch already exists', "Cannot create branch because a branch named #{Brightpearl::Terminal::format_branch(new_branch_name)}\x1B[38;5;240m is already in use somewhere.", true)
-            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
-                # Check branch exists anywhere.
-                unless @git.branch_exists_anywhere(source_branch_name)
-                    Brightpearl::Terminal::error("Source branch doesn't exist", "Cannot cut from branch #{Brightpearl::Terminal::format_branch(source_branch_name)}\x1B[38;5;240m because it doesn't exist.", true)
-                end
+                @git.check_branch_exists_somewhere(source_branch_name)
             end
 
-            @git.stash_staged_changes
+            @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.' : ''}")
                 source_branch_final = []
                 source_branch_data = @git.branch_data(source_branch_name)
@@ -91,7 +87,7 @@ 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)}")
+                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)}")
             else
                 Brightpearl::Terminal::abort(nil, nil, true, false)
             end
@@ -101,10 +97,6 @@ module BrightpearlCommand
         # Checks out a branch for both /code & /db.
         # @return void
         def checkout_branch
-            # todo
-            puts
-            puts "\x1B[31mTODO!\x1B[0m Must alert user that if DB branch doesn't exist, A) Create it? and B) If not, inform you are on 2 different branches."
-            puts
             branch_to_checkout = @args[0]
             branch_data = @git.branch_data(branch_to_checkout)
             # If branch is already checked out.
@@ -116,13 +108,14 @@ module BrightpearlCommand
                 @git.check_for_stash
                 exit
             end
-            @git.stash_staged_changes
             # 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, 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)
             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
                     next
                 end
@@ -138,16 +131,17 @@ module BrightpearlCommand
                     if branch_data[count][:"#{Brightpearl::Git::BRANCH_HAS_UPSTREAM}"]
                         commands << 'git pull'
                     else
-                        Brightpearl::Terminal::warning('Branch has no upstream', ["You can push to origin by running: #{Brightpearl::Terminal::format_command("git push --set-upstream origin #{branch_data_inner[:"#{Brightpearl::Git::BRANCH_NAME}"]}")}"])
+                        @git.ask_to_setup_remote_tracking(@git.current_branch_for_repo(repo_dir), repo_dir)
                     end
                     commands << "git merge #{Brightpearl::Git::MASTER}"
                 end
                 if @opts[:updatePush]
                     commands << 'git push'
                 end
-                Brightpearl::Terminal::command(commands, branch_data_inner[:"#{Brightpearl::Git::BRANCH_LOCATION}"])
+                Brightpearl::Terminal::command(commands, repo_dir)
                 count = count + 1
             end
+            @git.check_for_same_branch
             @git.check_for_stash
         end
     end

data/lib/routes/git_delete.rb

@@ -46,11 +46,11 @@ module BrightpearlCommand
         end
 
         def delete_local
-            # todo
-            puts
-            puts "\x1B[31mTODO!\x1B[0m Must check that branch is up-to-date with it's remote counter-part, otherwise DO NOT delete!"
-            puts "\x1B[31mTODO!\x1B[0m Must check branch even exists."
-            Brightpearl::Terminal::prompt_yes("You're about to \x1B[35mLOCALLY DELETE\x1B[0m branch \x1B[32m[#{@args[0]}]\x1B[0m")
+            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]
@@ -59,14 +59,14 @@ module BrightpearlCommand
                 commands << "git branch -d #{@args[0]}"
                 Brightpearl::Terminal::command(commands, repo_dir)
             end
-            puts "\nSuccessfully \x1B[35mLOCALLY DELETED\x1B[0m branch \x1B[32m[#{@args[0]}]\x1B[0m\n\n"
+            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
-            # todo
-            puts
-            puts "\x1B[31mTODO!\x1B[0m Must check branch even exists."
-            Brightpearl::Terminal::prompt_yes("You're about to \x1B[35mREMOTELY DELETE\x1B[0m branch \x1B[32m[#{@args[0]}]\x1B[0m")
+            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."
@@ -78,41 +78,26 @@ module BrightpearlCommand
                 ]
                 Brightpearl::Terminal::command(commands, repo_dir)
             end
-
-            puts "\nSuccessfully \x1B[35mREMOTELY DELETED\x1B[0m branch \x1B[32m[#{@args[0]}]\x1B[0m\n\n"
-            new_branch_name = @args[0].split('-')
-            new_branch_name = "MERGED-#{new_branch_name[new_branch_name.count - 1]}"
-            Brightpearl::Terminal::prompt_yes("Would you like to \x1B[35mRENAME\x1B[0m \x1B[32m[#{@args[0]}]\x1B[0m to \x1B[32m[#{new_branch_name}]\x1B[0m")
-
-            @git.repo_loop.each do |repo_dir|
-                unless @git.branch_exists(@args[0], repo_dir, Brightpearl::Git::LOCAL)
-                    puts "Branch \x1B[32m[#{@args[0]}]\x1B[0m not found in: \x1B[33m#{repo_dir}\x1B[0m. Aborting \x1B[35mRENAME\x1B[0m for this repo."
-                    next
-                end
-                commands = [
-                    "git branch -m #{@args[0]} #{new_branch_name}",
-                ]
-                Brightpearl::Terminal::command(commands, repo_dir)
-            end
-            puts
+            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
-            # todo
-            puts
-            puts "\x1B[31mTODO!\x1B[0m Must check that branch is up-to-date with it's remote counter-part, otherwise DO NOT delete!"
-            puts "\x1B[31mTODO!\x1B[0m Must check branch even exists."
-            Brightpearl::Terminal::prompt_yes("You're about to \x1B[35mLOCALLY & REMOTELY DELETE\x1B[0m branch \x1B[32m[#{@args[0]}]\x1B[0m")
+            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
-            puts "\nSuccessfully \x1B[35mLOCALLY & REMOTELY DELETED\x1B[0m branch \x1B[32m[#{@args[0]}]\x1B[0m\n\n"
+            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