brightpearl-cli 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 239f8202d6affc513d68106c3bdd67e6486fa229
-  data.tar.gz: f627b421f9bf49db7d6ea91116931818fcf3f559
+  metadata.gz: ae4119f560e1d2c52826ff48b55b943f5a45b2e2
+  data.tar.gz: 36e6d9e050013d1ea168c3175e86b19579047d49
 SHA512:
-  metadata.gz: c157acadce1ad0488cb11e240f8c0930bd7cc28225d51ab7562a606aefdf228f6352fc05dcb7f20a7c9ee990be773d44a71cd0e22a26a41999ee6ab3ab92038e
-  data.tar.gz: aca605539273863f19ad9a01e2b5e942232f027e4511bdcf5153f9652776cd126ac0c48437bbfde34305b83d957084907fe9ee24cafd08205aced7e8b551e899
+  metadata.gz: f46eee364d52415d3dac658306739d24632c6782e65537fdb3a3e7ce321dd997a2a1211fa5e1c1dd8ad14a0ad7b2e628417d876c98d06eab40d5ce3fa4c493db
+  data.tar.gz: b555efa6bdded5ba86e2151532985080483f8c38528979b5820ad034dbb02083f46e125ff9e06bacbc7e49a66d4a35207326a54e612841e633763fd4fa667967

data/lib/brightpearl_cli.rb

@@ -47,6 +47,7 @@ require 'core/utils_files'
 require 'core/utils_routes'
 require 'core/utils_strings'
 require 'routes/setup'
+require 'routes/ssh'
 
 module App
 
@@ -58,17 +59,17 @@ module App
                 App::Config.initialize
             end
 
-            Convoy::App.create do |brightpearl|
+            Convoy::App.create do |app|
 
                 #  COLOR OF TITLE TEXT
                 title_color = 255
 
-                brightpearl.version VERSION
-                brightpearl.summary "\x1B[38;5;166mBRIGHTPEARL-CLI\x1B[0m \x1B[38;5;240m\xe2\x80\x94 BETA\x1B[0m"
-                brightpearl.description "\x1B[38;5;#{title_color}mA command line utility for Brightpearl developers and QAs.\nUsed for automating daily work flows & completing repetitive tasks quicker with less errors.\nDesigned to work from anywhere on your workstation.\n\nUse #{App::Terminal::format_command('brightpearl')}\x1B[38;5;#{title_color}m or #{App::Terminal::format_command('bp')}\x1B[38;5;#{title_color}m to run.\x1B[0m"
+                app.version VERSION
+                app.summary "\x1B[38;5;166mBRIGHTPEARL-CLI\x1B[0m \x1B[38;5;240m\xe2\x80\x94 BETA\x1B[0m"
+                app.description "\x1B[38;5;#{title_color}mA command line utility for Brightpearl developers and QAs.\nUsed for automating daily work flows & completing repetitive tasks quicker with less errors.\nDesigned to work from anywhere on your workstation.\n\nUse #{App::Terminal::format_command('app')}\x1B[38;5;#{title_color}m or #{App::Terminal::format_command('bp')}\x1B[38;5;#{title_color}m to run.\x1B[0m"
 
                 # BUILD
-                brightpearl.command :build, :aliases => [:b] do |build|
+                app.command :build, :aliases => [:b] do |build|
                     build.summary 'Build (and deploy) Java services'
                     build.options do |opts|
                         opts.opt :serviceOnly, 'Build service only (default)', :short => '-s', :long => '--service-only', :type => :boolean
@@ -82,7 +83,7 @@ module App
                 end
 
                 # DUMMY
-                brightpearl.command :dummy, :aliases => [:d] do |dummy|
+                app.command :dummy, :aliases => [:d] do |dummy|
 
                     dummy.summary 'Insert dummy data into the App'
 
@@ -109,7 +110,7 @@ module App
                 end
 
                 # FIX
-                brightpearl.command :fix, :aliases => [:f] do |fix|
+                app.command :fix, :aliases => [:f] do |fix|
                     fix.summary 'Quick fixes for common problems'
                     fix.options do |opts|
                         opts.opt :login_sessions, 'LOGIN - Clear sessions to fix login problem(s)', :short => '-l', :long => '--login-sessions', :type => :boolean
@@ -122,7 +123,7 @@ module App
 
                 # GIT
 
-                brightpearl.command :git, :aliases => [:g] do |git|
+                app.command :git, :aliases => [:g] do |git|
 
                     git.summary 'All git related functionality'
 
@@ -198,6 +199,7 @@ module App
                             opts.opt :from_file, 'Get branch names from file (1 branch per line)', :short => '-f', :long => '--from-file', :type => :boolean
                             opts.opt :delete_source_branches_local, "Delete all source branches (locally) in #{App::Terminal::format_directory(App::Enum::GIT_MERGE_DEFAULT_FILE)}", :short => '-d', :long => '--delete-local', :type => :boolean
                             opts.opt :delete_source_branches_remote, "Delete all source branches (remotely) in #{App::Terminal::format_directory(App::Enum::GIT_MERGE_DEFAULT_FILE)}", :short => '-D', :long => '--delete-remote', :type => :boolean
+                            opts.opt :sanity_check, 'Run sanity check. Submit source/target branches same as you would during a merge.', :short => '-s', :long => '--sanity-check', :type => :boolean
                         end
                         git_merge.action do |opts, args|
                             AppCommand::GitMerge.new(opts, args).execute
@@ -247,7 +249,7 @@ module App
                 end
 
                 # JIRA
-                brightpearl.command :jira, :aliases => [:j] do |jira|
+                app.command :jira, :aliases => [:j] do |jira|
                     jira.summary 'Access the Jira API'
 
                     # JIRA CARD
@@ -265,7 +267,7 @@ module App
                 end
 
                 # RESET
-                brightpearl.command :reset, :aliases => [:R] do |reset|
+                app.command :reset, :aliases => [:R] do |reset|
                     reset.summary 'Reset various things within the App'
                     reset.options do |opts|
                         opts.opt :fitnesseDump, 'Reset the Fitnesse Dump on your VM', :short => '-f', :long => '--fitnesse-dump', :type => :boolean
@@ -276,7 +278,7 @@ module App
                 end
 
                 # PRODUCTION
-                brightpearl.command :production, :aliases => [:p] do |production|
+                app.command :production, :aliases => [:p] do |production|
 
                     production.summary 'Everything to do with production servers'
 
@@ -303,7 +305,7 @@ module App
                 end
 
                 # REVIEW
-                brightpearl.command :review, :aliases => [:r] do |review|
+                app.command :review, :aliases => [:r] do |review|
                     review.summary 'Perform a quick code review'
                     review.action do |opts, args|
                         AppCommand::Review.new(opts, args).execute
@@ -311,7 +313,7 @@ module App
                 end
 
                 # SCRIPTS
-                brightpearl.command :scripts, :aliases => [:s] do |scripts|
+                app.command :scripts, :aliases => [:s] do |scripts|
 
                     scripts.summary 'Quick & dirty scripts'
 
@@ -378,8 +380,16 @@ module App
 
                 end
 
+                # SSH - SSH
+                app.command :ssh, :aliases => [:s] do |ssh|
+                    ssh.summary 'SSH into various stuff.'
+                    ssh.action do |opts, args|
+                        AppCommand::SSH.new(opts, args).execute
+                    end
+                end
+
                 # TAIL
-                brightpearl.command :tail, :aliases => [:T] do |tail|
+                app.command :tail, :aliases => [:T] do |tail|
                     tail.summary 'Tail various logs (all catalina.out by default)'
                     tail.action do |opts, args|
                         AppCommand::Tail.new(opts, args).execute
@@ -387,7 +397,7 @@ module App
                 end
 
                 # TEST
-                brightpearl.command :test, :aliases => [:t] do |test|
+                app.command :test, :aliases => [:t] do |test|
                     test.summary 'Run various tests (PHPUnit by default)'
                     test.options do |opts|
                         opts.opt :cucumber, 'Run Cucumber tests', :short => '-c', :long => '--cucumber', :type => :boolean
@@ -402,7 +412,7 @@ module App
                 end
 
                 # UPDATE
-                brightpearl.command :update, :aliases => [:u] do |update|
+                app.command :update, :aliases => [:u] do |update|
                     update.summary 'Check for updates'
                     update.action do |opts, args|
                         AppCommand::Update.new(opts, args).execute
@@ -410,7 +420,7 @@ module App
                 end
 
                 # X - SETUP
-                brightpearl.command :setup, :aliases => [:x] do |setup|
+                app.command :setup, :aliases => [:x] do |setup|
                     setup.summary 'Setup your configuration file'
                     setup.action do |opts, args|
                         AppCommand::Setup.new(opts, args).execute
@@ -418,7 +428,7 @@ module App
                 end
 
                 # BRIGHTPEARL/BP (DEFAULT)
-                brightpearl.action do
+                app.action do
                     system('bp -h')
                 end
 

data/lib/core/config.rb

@@ -97,6 +97,10 @@ module App
             missing_keys
         end
 
+        def self.param_exists(param_name)
+            @params.has_key?(param_name)
+        end
+
     end
 
 end

data/lib/core/config_unique.rb

@@ -32,9 +32,6 @@ module ConfigUnique
     EC2_PASS = 'ec2_pass'
 
     def param(param_name)
-        unless all_available_config_keys.include?(param_name)
-            App::Terminal::error("#{App::Terminal::format_highlight(param_name)} is not a valid config parameter", true)
-        end
         @params[param_name]
     end
 
@@ -87,27 +84,4 @@ module ConfigUnique
         ]
     end
 
-    def all_available_config_keys
-        [
-            WORKSTATION_IP,
-            WORKSTATION_OS,
-            WORKSTATION_PATH_TO_BP_CODE,
-            WORKSTATION_PATH_TO_BP_DB,
-            VM_IP,
-            VM_USER,
-            VM_USER_PASSWORD,
-            VM_ROOT,
-            VM_ROOT_PASSWORD,
-            VM_MYSQL_USER,
-            VM_MYSQL_PASSWORD,
-            PREFERRED_TEXT_EDITOR,
-            GIT_USERNAME,
-            CRYPT_KEY,
-            CRYPT_HEX,
-            EC2_HOST,
-            EC2_USER,
-            EC2_PASS
-        ]
-    end
-
 end

data/lib/core/ebay.rb

@@ -2,7 +2,43 @@ module App
 
     class Ebay
 
-        def initialize(credentials = App::Ebay)
+        SANDBOX = 'sandbox'
+        SANDBOX_URL = 'https://api.sandbox.ebay.com/ws/api.dll'
+
+        PRODUCTION = 'production'
+        PRODUCTION_URL = 'https://api.ebay.com/ws/api.dll'
+
+        def initialize(app_key, dev_key, cert_key, runame, api_url, api_token)
+
+            @app_key = app_key
+            @dev_key = dev_key
+            @cert_key = cert_key
+            @runame = runame
+            @api_url = api_url
+            @api_token = api_token
+
+        end
+
+        # findItemsByKeywordsRequest
+        def find(search_term = nil)
+
+            if search_term.nil?
+                raise RuntimeError, 'Search term cannot be nil.'
+            end
+
+            payload = "<?xml version=\"1.0\" encoding=\"utf-8\"?><findItemsByKeywordsRequest xmlns=\"http://www.ebay.com/marketplace/search/v1/services\"><keywords>#{search_term}</keywords></findItemsByKeywordsRequest>"
+            headers = {
+                'X-EBAY-SOA-SERVICE-NAME' => 'FindingService',
+                'X-EBAY-SOA-OPERATION-NAME' => 'findItemsByKeywords',
+                'X-EBAY-SOA-SERVICE-VERSION' => '1.13.0',
+                'X-EBAY-SOA-GLOBAL-ID' => 'EBAY-GB',
+                'X-EBAY-SOA-SECURITY-APPNAME' => @app_key,
+                'X-EBAY-SOA-REQUEST-DATA-FORMAT' => 'XML'
+            }
+
+            response = RestClient.post(@api_url, payload, headers)
+
+            puts response.inspect
 
         end
 

data/lib/core/ebay_factory.rb

@@ -2,30 +2,44 @@ module App
 
     class EbayFactory
 
-        DEFAULT_CREDENTIALS = 'nimzo_seller'
+        CONFIGURATION_PREFIX = 'ebay_'
 
         @credentials = {}
 
-        def self.get(credentials = DEFAULT_CREDENTIALS)
+        def self.get(sandbox_production = App::Ebay::SANDBOX, api_token = nil)
 
-            if @credentials[credentials].nil?
+            if api_token.nil?
+                raise RuntimeError, 'You must provide an API token.'
+            end
 
-                # encrypter = Encrypter.new
-                # host = App::Config.param(App::Config::EC2_HOST)
-                # user = App::Config.param(App::Config::EC2_USER)
-                # pass = App::Config.param(App::Config::EC2_PASS)
-                # 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 = Mysql2::Client.new(
-                #     :host => encrypter.decrypt(host),
-                #     :username => encrypter.decrypt(user),
-                #     :password => encrypter.decrypt(pass),
-                #     :database => schema
-                # )
+            if api_token =~ /\Aebay_\S+\z/i
+                api_token_final = api_token
+            else
+                api_token_final = "#{CONFIGURATION_PREFIX}#{api_token}"
+            end
 
+            if api_token.nil? || App::Config::param_exists(api_token_final) == false
+                App::Terminal::error('Invalid API Token', "The #{App::Terminal::format_highlight('config parameter')} #{App::Terminal::format_invalid(api_token_final)} doesn't exist in: #{App::Terminal::format_directory(ConfigUnique::CONFIG_FILE)}", true)
             end
-            @credentials[credentials]
+
+            case sandbox_production
+                when App::Ebay::SANDBOX
+                    app_key = App::Config.param(ConfigUnique::EBAY_SANDBOX_APP)
+                    dev_key = App::Config.param(ConfigUnique::EBAY_SANDBOX_DEV)
+                    cert_key = App::Config.param(ConfigUnique::EBAY_SANDBOX_CERT)
+                    runame = App::Config.param(ConfigUnique::EBAY_SANDBOX_RUNAME)
+                    api_url = App::Ebay::SANDBOX_URL
+                when App::Ebay::PRODUCTION
+                    app_key = App::Config.param(ConfigUnique::EBAY_PRODUCTION_APP)
+                    dev_key = App::Config.param(ConfigUnique::EBAY_PRODUCTION_DEV)
+                    cert_key = App::Config.param(ConfigUnique::EBAY_PRODUCTION_CERT)
+                    runame = App::Config.param(ConfigUnique::EBAY_PRODUCTION_RUNAME)
+                    api_url = App::Ebay::PRODUCTION_URL
+                else
+                    raise RuntimeError, "Must specify either '#{App::Ebay::SANDBOX}' or '#{App::Ebay::PRODUCTION}', you passed: #{sandbox_production}"
+            end
+
+            App::Ebay.new(app_key, dev_key, cert_key, runame, api_url, api_token)
 
         end
 

data/lib/core/git.rb

@@ -597,16 +597,16 @@ module App
                 case display
                     when SAME_BRANCH_WARNING
                         App::Terminal::warning("You're 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 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
@@ -792,7 +792,7 @@ module App
             possible_branches = []
             if jira_number =~ /\A\d{4,5}\z/
                 get_all_branches_as_array.each do |possible_branch|
-                    if possible_branch =~ /(bug|bp|feature)-#{jira_number}\z/i
+                    if possible_branch =~ /#{jira_number}/i
                         # If more than one possible branch exists, IE: bug-14145 & bp-14145
                         if possible_branches.any?
                             App::Terminal::error("More than one possible branch found for jira number: #{App::Terminal::format_highlight(jira_number)}", [App::Terminal::format_branch(possible_branches[0]), App::Terminal::format_branch(possible_branch), nil, "In this case, you must specify the branch name #{App::Terminal::format_highlight('explicitly')}."], true)
@@ -824,6 +824,31 @@ module App
             changes_exist
         end
 
+        # 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 = []
+            unless additional_info.nil?
+                if additional_info.is_a? Array
+                    additional_info.each do |info|
+                        final_info << info
+                    end
+                else
+                    if additional_info.is_a? String
+                        final_info << 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?")
+                    App::Terminal::abort(nil, nil, true, false)
+                end
+            end
+        end
+
         # Get list of files that have changed between 2 branches
         # @return Array
         def get_changed_files(repo_dir, branch_to_compare_to = "origin/#{App::Git::MASTER}")

data/lib/core/terminal.rb

@@ -199,8 +199,12 @@ module App
 
         # Returns action text in consistent, uniform manner.
         # @return String
-        def self.format_highlight(highlighted_text)
-            "\x1B[38;5;117m#{highlighted_text}\x1B[0m"
+        def self.format_highlight(highlighted_text, capitalize = false)
+            if capitalize
+                return "\x1B[38;5;117m#{highlighted_text.upcase}\x1B[0m"
+            else
+                return "\x1B[38;5;117m#{highlighted_text}\x1B[0m"
+            end
         end
 
         # Returns invalid data in consistent, uniform manner.

data/lib/routes/git_checkout.rb

@@ -16,15 +16,12 @@ module AppCommand
         def opts_validate
 
             unless @args.any?
-
                 if @opts[:branch] || @opts[:branch_origin]
                     App::Terminal::error('You must specify a branch name')
                 else
                     system('bp g co -h')
                 end
-
                 exit
-
             end
 
         end
@@ -145,14 +142,21 @@ module AppCommand
                 unless branch_data_inner[:"#{App::Git::BRANCH_IS_CURRENT}"]
                     commands << "git checkout #{branch_to_checkout}"
                 end
+                App::Terminal::command(commands, repo_dir)
                 if @opts[:update] || @opts[:updatePush]
-                    commands << 'git pull'
-                    commands << "git merge #{App::Git::MASTER} --no-edit"
+                    commands = [
+                        'git pull',
+                        "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))}")
                 end
                 if @opts[:updatePush]
-                    commands << 'git push'
+                    commands =[
+                        'git push'
+                    ]
+                    App::Terminal::command(commands, repo_dir, true, false)
                 end
-                App::Terminal::command(commands, repo_dir)
                 count = count + 1
             end
             @git.check_for_same_branch

data/lib/routes/git_merge.rb

@@ -23,13 +23,13 @@ module AppCommand
             end
 
             unless @args.any?
-                unless @opts[:from_file] || @opts[:open_file] || @opts[:delete_source_branches_local] || @opts[:delete_source_branches_remote]
+                unless @opts[:from_file] || @opts[:open_file] || @opts[:delete_source_branches_local] || @opts[:delete_source_branches_remote] || @otps[:sanity_check]
                     system('bp g m -h')
                     exit
                 end
             end
 
-            if @args[0] == App::Git::MASTER
+            if @args[0] == App::Git::MASTER && !@opts[:from_file]
                 App::Terminal::error('Not allowed', "You cannot merge #{App::Terminal::format_branch(App::Git::MASTER)}\x1B[38;5;240m to #{App::Terminal::format_branch(App::Git::MASTER)}", true)
             end
 
@@ -38,9 +38,7 @@ module AppCommand
                     App::Terminal::error('Too many parameters', ["When using the #{App::Terminal::format_flag('f')}\x1B[38;5;240m the system only expects one #{App::Terminal::format_action('optional')}\x1B[38;5;240m parameter \xe2\x80\x94 the target branch.", "The amount of parameters you passed were: #{App::Terminal::format_highlight(@args.length)}"], true)
                 end
                 if @opts[:from_file] != '' && File.file?(App::Enum::GIT_MERGE_DEFAULT_FILE) == false
-                    App::Terminal::error("File not found: #{App::Terminal::format_directory(App::Enum::GIT_MERGE_DEFAULT_FILE)}", [
-                                                                                                                                    "To specify multiple #{App::Terminal::format_branch('source-branches')} try running #{App::Terminal::format_command('bp g m -o')} first."
-                                                                                                                                ], true)
+                    App::Terminal::error("File not found: #{App::Terminal::format_directory(App::Enum::GIT_MERGE_DEFAULT_FILE)}", ["To specify multiple #{App::Terminal::format_branch('source-branches')} try running #{App::Terminal::format_command('bp g m -o')} first."], true)
                 end
             end
 
@@ -51,7 +49,10 @@ module AppCommand
             retrieve_source_branches unless @opts[:open_file]
             retrieve_target_branches unless @opts[:open_file]
 
-            if @opts[:open_file]
+            if @opts[:sanity_check]
+                sanity_check
+                exit
+            elsif @opts[:open_file]
                 system("#{App::Config.param(App::Config::PREFERRED_TEXT_EDITOR)} #{App::Enum::GIT_MERGE_DEFAULT_FILE}")
                 exit
             elsif @opts[:delete_source_branches_local]
@@ -327,14 +328,7 @@ 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)}")
 
-            # SANITY CHECK SCRIPT
-            @source_branches.each do |x|
-                grep_string = x.split('-')
-                grep_string = "BP-#{grep_string[grep_string.count - 1]}"
-                puts "\x1B[38;5;39m#{x}\x1B[0m \xe2\x80\x94 (#{grep_string})"
-                system("cd #{App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE)} && git log | grep '#{grep_string}' --color=auto")
-                system("cd #{App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_DB)} && git log | grep '#{grep_string}' --color=auto")
-            end
+            sanity_check
             puts
 
             @git.check_for_stash(true)
@@ -367,6 +361,30 @@ module AppCommand
 
         end
 
+        def sanity_check
+
+            App::Terminal::info("Running sanity check against: #{App::Terminal::format_branch(@target_branch)}")
+
+            @source_branches.each do |source_branch|
+
+                jira_numbers = source_branch.scan(/\d{4,5}/i)
+                if jira_numbers.any?
+                    jira_numbers.each do |jira_number|
+                        unless jira_number == ''
+                            sanity_check_grep(jira_number, source_branch, @target_branch)
+                        end
+
+                    end
+                else
+                    sanity_check_grep(source_branch, source_branch, @target_branch)
+                end
+
+            end
+
+            puts
+
+        end
+
         private
 
         def retrieve_source_branches
@@ -385,6 +403,8 @@ module AppCommand
 
             @source_branches.uniq!
 
+            return if @opts[:sanity_check]
+
             # If branch(es) was/were specified as '1234' or '12345', this code tries to resolve it automatically as bp-12345/bug-12345/feature-12345
             branches_to_resolve = {}
             @source_branches.each do |branch_name|
@@ -402,7 +422,7 @@ module AppCommand
                 end
                 @git.get_all_branches_as_array.each do |possible_branch|
                     branches_to_resolve.keys.each do |branch_to_resolve|
-                        if possible_branch =~ /(bug|bp|feature)-#{branch_to_resolve}\z/i
+                        if possible_branch =~ /#{branch_to_resolve}/i
 
                             # If more than one possible branch exists, IE: bug-14145 & bp-14145
                             unless branches_to_resolve[branch_to_resolve] == false
@@ -411,14 +431,16 @@ module AppCommand
 
                             branches_to_resolve[branch_to_resolve] = possible_branch
                             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
+                    if branch_to_resolve[1] == false && !@opts[:sanity_check]
                         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)
+                    elsif branch_to_resolve[1] != false
+                        new_source_branches << branch_to_resolve[1] unless branch_to_resolve[1] == '' || branch_to_resolve[1].nil?
                     end
-                    new_source_branches << branch_to_resolve[1] unless branch_to_resolve[1] == '' || branch_to_resolve[1].nil?
                 end
                 @source_branches = new_source_branches
             end
@@ -464,6 +486,24 @@ module AppCommand
             source_branch_text
         end
 
+        def sanity_check_grep(grep_string, source_branch, target_branch)
+
+            puts "  \x1B[38;5;39m#{source_branch}\x1B[0m \xe2\x80\x94 (#{grep_string})"
+            results_cd = App::Terminal::command_capture("git log #{target_branch} | grep '#{grep_string}' --color=auto", App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE), false, false)
+            results_db = App::Terminal::command_capture("git log #{target_branch} | grep '#{grep_string}' --color=auto", App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_DB), false, false)
+
+            results_cd.push(*results_db).each do |block|
+                block.split("\n").each do |line|
+                    if line.strip != ''
+                        if line =~ /\A\s*bp-\d{4,5}/i
+                            puts "  #{line.gsub(/#{grep_string}/i, "\x1B[38;5;196m#{grep_string}\x1B[0m")}"
+                        end
+                    end
+                end
+            end
+
+        end
+
     end
 
 end

data/lib/routes/git_update.rb

@@ -3,10 +3,14 @@ module AppCommand
     class GitUpdate < ::Convoy::ActionCommand::Base
 
         def execute
-            @git = App::Git.new
+
             @opts = command_options
+            @args = arguments
+            @git = App::Git.new
+
             opts_validate
             opts_routing
+
         end
 
         def opts_validate
@@ -39,11 +43,7 @@ module AppCommand
                     if results[3] == false
                         @git.ask_to_setup_remote_tracking(current_branch, repo_dir)
                     end
-                    if results[4] == false
-                        unless App::Terminal::prompt_yes_no('Merge conflict occurred', ["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))}", "Please #{App::Terminal::format_action('open an IDE')}\x1B[38;5;240m and resolve your conflicts as soon as this script has finished executing."])
-                            App::Terminal::abort(nil, nil, true, false)
-                        end
-                    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))}")
                 end
                 if @opts[:push] && current_branch != App::Git::MASTER
                     App::Terminal::command("git push origin #{current_branch}", repo_dir)

data/lib/routes/production_logs.rb

@@ -7,15 +7,6 @@ module AppCommand
 
         include Columnist
 
-        LOG_URI_EUW1 = 'http://ec2-54-73-66-114.eu-west-1.compute.amazonaws.com:7777/php/php.log'
-        LOG_URI_EUW2 = 'http://ec2-54-73-26-152.eu-west-1.compute.amazonaws.com:7777/php/php.log'
-        LOG_URI_USE1 = 'http://ec2-174-129-36-164.compute-1.amazonaws.com:7777/php/php.log'
-        LOG_URI_USE2 = 'http://54.235.155.6:7777/php/php.log'
-        LOG_URI_USW1 = 'http://ec2-184-72-46-73.us-west-1.compute.amazonaws.com:7777/php/php.log'
-        LOG_URI_USW2 = 'http://ec2-184-72-49-68.us-west-1.compute.amazonaws.com:7777/php/php.log'
-        LOG_URI_STG1 = 'http://ec2-54-185-160-108.us-west-2.compute.amazonaws.com:7777/php/php.log'
-        LOG_URI_STG2 = 'http://ec2-54-190-109-53.us-west-2.compute.amazonaws.com:7777/php/php.log'
-
         def execute
 
             @opts = command_options
@@ -200,16 +191,17 @@ module AppCommand
         def php_log_data
 
             raw_log_data = ''
-            raw_log_uris = [
-                LOG_URI_EUW1,
-                LOG_URI_EUW2,
-                LOG_URI_USE1,
-                LOG_URI_USE2,
-                LOG_URI_USW1,
-                LOG_URI_USW2,
-                LOG_URI_STG1,
-                LOG_URI_STG2,
-            ]
+            raw_log_uris = %w(
+                http://54.235.155.6:7777/php/php.log
+                http://ec2-174-129-36-164.compute-1.amazonaws.com:7777/php/php.log
+                http://ec2-54-185-160-108.us-west-2.compute.amazonaws.com:7777/php/php.log
+                http://ec2-54-190-109-53.us-west-2.compute.amazonaws.com:7777/php/php.log
+                http://ec2-54-73-66-114.eu-west-1.compute.amazonaws.com:7777/php/php.log
+                http://ec2-54-73-26-152.eu-west-1.compute.amazonaws.com:7777/php/php.log
+                http://ec2-54-217-40-80.eu-west-1.compute.amazonaws.com:7777/php/php.log
+                http://ec2-184-72-46-73.us-west-1.compute.amazonaws.com:7777/php/php.log
+                http://ec2-184-72-49-68.us-west-1.compute.amazonaws.com:7777/php/php.log
+            )
             raw_log_uris.each do |log_uri|
                 App::Terminal::output("Retrieving data from: #{log_uri}")
                 raw_log_data << RestClient.get(log_uri)

data/lib/routes/scripts_branch_cleaner.rb

@@ -46,14 +46,14 @@ module AppCommand
             end
 
             if atleast_one_error
-                unless App::Terminal::prompt_yes_no('Skip these branches?', ["The above branch(es) have unmerged commits and will be #{App::Terminal::format_action('skipped')} in the removal process.", "You #{App::Terminal::format_invalid('cannot delete', true)} these branches using this script, this must be done manually #{App::Terminal::format_highlight('afterwards')}."])
+                unless App::Terminal::prompt_yes_no('Continue by skipping these branches?', ["The above branch(es) have unmerged commits and will be #{App::Terminal::format_action('skipped')} in the removal process.", "You #{App::Terminal::format_invalid('cannot delete', true)} these branches using this script, this must be done manually #{App::Terminal::format_highlight('afterwards')}."])
                     App::Terminal::abort(nil, nil, true, false)
                 end
             end
 
             @git.show_branches_draw_table(fnl_branches_cd, fnl_branches_db)
 
-            unless App::Terminal::prompt_yes_no('Remove these branches?', ["By continuing, the above branches will be #{App::Terminal::format_action('removed permanently')} both #{App::Terminal::format_highlight('locally & remotely')}!"], 'Are you absolutely sure you want to continue?', false)
+            unless App::Terminal::prompt_yes_no('Remove these branches?', ["By continuing, the above branches will be #{App::Terminal::format_action('removed permanently')} both #{App::Terminal::format_highlight('locally & remotely')} (except release branches)."], 'Are you absolutely sure you want to continue?', false)
                 App::Terminal::abort(nil, nil, true, false)
             end
 

data/lib/routes/scripts_sonar.rb

@@ -56,6 +56,7 @@ module AppCommand
             end
 
             found_results = false
+            found_warnings = false
             results_output = []
 
             results.each do |result|
@@ -65,6 +66,9 @@ module AppCommand
                             if line =~ /\AFILE:\s(.*).\w{3,5}/i
                                 found_results = true
                                 results_output << "\x1B[38;5;196m#{line}\x1B[0m"
+                            elsif line =~ /fatal error: (.*) on line \d+/i || line =~ /warning: (.*) on line \d+/i
+                                found_warnings = true
+                                results_output << "\x1B[38;5;250m#{line}\x1B[0m"
                             else
                                 results_output << "\x1B[38;5;250m#{line}\x1B[0m"
                             end
@@ -75,6 +79,8 @@ module AppCommand
 
             if found_results
                 App::Terminal::error('Found errors!', results_output)
+            elsif found_warnings
+                App::Terminal::warning('Found warnings!', results_output)
             else
                 App::Terminal::success('No errors found.', nil, file_found_to_scan ? true : false)
             end

data/lib/routes/ssh.rb

@@ -0,0 +1,80 @@
+module AppCommand
+
+    class SSH < ::Convoy::ActionCommand::Base
+
+        CONFIGURATION_PREFIX = 'ssh_'
+
+        def execute
+
+            @opts = command_options
+            @args = arguments
+
+            opts_validate
+            opts_routing
+
+        end
+
+        def opts_validate
+
+            if @args[0].nil?
+                App::Terminal::error('You must specify what server you want to SSH into', "This must be specified in: #{App::Terminal::format_directory(ConfigUnique::CONFIG_FILE)}", true)
+            end
+
+            if @args[0] =~ /\Assh_\S+\z/i
+                config_param = @args[0]
+            else
+                config_param = "#{CONFIGURATION_PREFIX}#{@args[0]}"
+            end
+
+            unless App::Config::param_exists(config_param)
+                App::Terminal::error('Invalid Config Parameter', "The #{App::Terminal::format_highlight('config parameter')} #{App::Terminal::format_invalid(config_param)} doesn't exist in: #{App::Terminal::format_directory(ConfigUnique::CONFIG_FILE)}", true)
+            end
+
+            ssh_parts = App::Config.param(config_param).split('|')
+
+            @ssh_user = ssh_parts[0]
+            @ssh_host = ssh_parts[1]
+            @ssh_cert = ssh_parts[2].to_s.strip.length == 0 ? nil : ssh_parts[2]
+
+            help_message = [
+                "The file: #{App::Terminal::format_directory(ConfigUnique::CONFIG_FILE)} must contain a line similar to the following:",
+                nil,
+                'ssh_ec2=ec2-user|ec2-XX-XX-XX-XX.eu-west-1.compute.amazonaws.com|~/.ssh/pem-key.pem',
+                'ssh_ec2=ec2-user|ec2-XX-XX-XX-XX.eu-west-1.compute.amazonaws.com',
+            ]
+
+            if @ssh_user.nil? || @ssh_user == ''
+                App::Terminal::error("SSH #{App::Terminal::format_highlight('user')} required", help_message, true)
+            end
+
+            if @ssh_host.nil? || @ssh_host == ''
+                App::Terminal::error("SSH #{App::Terminal::format_highlight('host')} required", help_message, true)
+            end
+
+            unless @ssh_cert.nil?
+                unless App::UtilsFiles::file_exists(File.expand_path(@ssh_cert))
+                    App::Terminal::error("PEM key not found: #{App::Terminal::format_directory(@ssh_cert)}")
+                end
+            end
+
+        end
+
+        def opts_routing
+
+            ssh_into_server
+
+        end
+
+        def ssh_into_server
+
+            if @ssh_cert.nil?
+                App::Terminal::command("ssh #{@ssh_user}@#{@ssh_host}", nil, false, false)
+            else
+                App::Terminal::command("ssh -i #{@ssh_cert} #{@ssh_user}@#{@ssh_host}", nil, false, false)
+            end
+
+        end
+
+    end
+
+end

data/lib/version.rb

@@ -1 +1 @@
-VERSION = '1.9.0'
+VERSION = '1.10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brightpearl-cli
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Albert Rannetsperger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-29 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: columnist
@@ -157,6 +157,7 @@ files:
 - lib/routes/scripts_sonar.rb
 - lib/routes/scripts_sql_update.rb
 - lib/routes/setup.rb
+- lib/routes/ssh.rb
 - lib/routes/tail.rb
 - lib/routes/test.rb
 - lib/routes/update.rb
@@ -174,9 +175,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ~>
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='