brightpearl-cli 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4270946635291cd6218eecb1db111e4e7f5f80ea
-  data.tar.gz: 99c3dae282a3fa940dd23b908258932bb99fe458
+  metadata.gz: da7eebac2caf1baa02083c78c51c17a0a2a17467
+  data.tar.gz: b672ae93fccbb7546e4b53bf86a1a60f107bce76
 SHA512:
-  metadata.gz: d171d52f0b475e1f02949a690de03a100d5b36ccc6ef840e273b3f3dfb619e4b832bf2c38bbb99691b626aa774aaf43d46f775e57325e5274d4bac9c61ab1e5b
-  data.tar.gz: 37fdb1baaff906e229daab38e965d324d21d94b9caca37f3b8fa65759e88db0e864550b83ed927a7d8c9c99af6c8e4345d257c589231c926ab0a6f2725e19046
+  metadata.gz: e0b8d69d7314f3ee26df37522d0ad4535a085f7e926bf17051f62204d29931911bab9e19669ce6d8c2cb62067038ed50385c18770b8dd0db475f2b00dd3153ee
+  data.tar.gz: bb880740f1dbc34bb1917ef991fcbbf14ee9b5885281f16c2d7d62579eb00fb9af2993cc8f04b16f8bcd183b39ba6b6b02a4a72fdc770a7bc3c7c53057e1b95f

data/README.md

@@ -15,7 +15,9 @@ CLI stands for Command-line Interface.
 The gem lives on the RubyGems server so installation is as easy as:
 
 ```bash
-gem install columnist
+gem install brightpearl-cli
 ```
 
-### Usage
+### Usage
+
+Coming soon...

data/lib/brightpearl_cli.rb

@@ -3,6 +3,7 @@ require 'yaml'
 
 require 'core/api'
 require 'core/config'
+require 'core/encrypter'
 require 'core/enums'
 require 'core/git'
 require 'core/jira'
@@ -21,14 +22,18 @@ require 'routes/git_push'
 require 'routes/git_stash'
 require 'routes/git_update'
 require 'routes/jira'
-require 'routes/less'
+require 'routes/production_logs'
 require 'routes/reset'
 require 'routes/review'
-require 'routes/scripts_color'
+require 'routes/scripts_api_docs'
+require 'routes/scripts_branch_cleaner'
 require 'routes/scripts_code_sniffer'
+require 'routes/scripts_color'
+require 'routes/scripts_pom_fixer'
 require 'routes/setup'
 require 'routes/update'
-require 'routes/tests'
+require 'routes/tail'
+require 'routes/test'
 
 module Brightpearl
 
@@ -48,7 +53,7 @@ module Brightpearl
                 # TRUE/FALSE DEPENDING ON WHETHER USER IN ON BETA OR NOT.
                 beta_only = Brightpearl::Config.param(Brightpearl::Config::BETA) == 'true' ? true : false
 
-                brightpearl.version '1.1.0'
+                brightpearl.version '1.2.0'
                 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 #{Brightpearl::Terminal::format_command('brightpearl')}\x1B[38;5;#{title_color}m or #{Brightpearl::Terminal::format_command('bp')}\x1B[38;5;#{title_color}m to run.\x1B[0m"
 
@@ -57,6 +62,12 @@ module Brightpearl
                     # BUILD
                     brightpearl.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
+                            opts.opt :apiOnly, 'Build API only', :short => '-a', :long => '--api-only', :type => :boolean
+                            opts.opt :both, 'Build both', :short => '-b', :long => '--both', :type => :boolean
+                            opts.opt :deploy, 'Deploy to SkyFactory', :short => '-d', :long => '--deploy', :type => :boolean
+                        end
                         build.action do |opts, args|
                             BrightpearlCommand::Build.new(opts, args).execute
                         end
@@ -113,7 +124,7 @@ module Brightpearl
                     end
 
                     # GIT CHECKOUT
-                    git.command :checkout, :aliases => [:c, :co] do |git_checkout|
+                    git.command :checkout, :aliases => [:c] do |git_checkout|
                         git_checkout.summary 'Create & checkout branches'
                         git_checkout.options do |opts|
                             opts.opt :branch, 'Create a branch locally', :short => '-b', :long => '--branch', :type => :boolean
@@ -147,63 +158,62 @@ module Brightpearl
                         d << "\n"
                         d << "\nIf no secondary argument is given, target branch will be #{Brightpearl::Terminal::format_branch('current-branch')}"
                         d << "\n"
-                        d << "\n    #{Brightpearl::Terminal::format_command('bp g m')} #{Brightpearl::Terminal::format_command('source_branch')} \x1B[0m"
-                        d << "\n    #{Brightpearl::Terminal::format_command('bp g m')} #{Brightpearl::Terminal::format_command('source_branch target_branch')} \x1B[0m"
+                        d << "\n    #{Brightpearl::Terminal::format_command('bp g m source_branch')} \x1B[0m"
+                        d << "\n    #{Brightpearl::Terminal::format_command('bp g m source_branch target_branch')} \x1B[0m"
                         d << "\n"
-                        d << "\nTo merge multiple branches at once, use comma-separated string (w/out spaces) :"
+                        d << "\nTo merge multiple branches use a comma-separated string (without spaces):"
                         d << "\n"
-                        d << "\n    #{Brightpearl::Terminal::format_command('bp g m')} #{Brightpearl::Terminal::format_command('sb1,sb2,sb3')}"
-                        d << "\n    #{Brightpearl::Terminal::format_command('bp g m')} #{Brightpearl::Terminal::format_command('sb1,sb2,sb3 target_branch')}"
+                        d << "\n    #{Brightpearl::Terminal::format_command('bp g m sb1,sb2,sb3')}"
+                        d << "\n    #{Brightpearl::Terminal::format_command('bp g m sb1,sb2,sb3 target_branch')}"
                         d << "\n"
-                        d << "\nAlternatively, use the #{Brightpearl::Terminal::format_flag('f')} and specify a filename like so:"
+                        d << "\nAlternatively, use the #{Brightpearl::Terminal::format_flag('o', false)} and #{Brightpearl::Terminal::format_flag('f', false)} flags to specify your source branches using a temporary file:"
                         d << "\n"
-                        d << "\n\x1B[38;5;240m 1) Create a .txt file (IE: '/tmp/merge.txt') with names of branches you'd like to merge on separate lines."
-                        d << "\n\x1B[38;5;240m 2) Pass the file as a parameter to the script."
+                        d << "\n    #{Brightpearl::Terminal::format_flag('o', false)} opens #{Brightpearl::Terminal::format_directory(Brightpearl::Enum::GIT_MERGE_DEFAULT_FILE)}"
+                        d << "\n    #{Brightpearl::Terminal::format_flag('f', false)} parses the contents of #{Brightpearl::Terminal::format_directory(Brightpearl::Enum::GIT_MERGE_DEFAULT_FILE)} as source branches (one branch per line)"
                         d << "\n"
-                        d << "\n    #{Brightpearl::Terminal::format_command('bp g m')} #{Brightpearl::Terminal::format_command('-f /tmp/merge.txt')} \x1B[0m"
-                        d << "\n    #{Brightpearl::Terminal::format_command('bp g m')} #{Brightpearl::Terminal::format_command('-f /tmp/merge.txt target_branch')} \x1B[0m"
+                        d << "\n    #{Brightpearl::Terminal::format_command('bp g m -o')} \x1B[0m"
+                        d << "\n    #{Brightpearl::Terminal::format_command('bp g m -f')} \x1B[0m"
+                        d << "\n    #{Brightpearl::Terminal::format_command('bp g m -f target_branch')} \x1B[0m"
                         git_merge.description d
                         git_merge.options do |opts|
-                            opts.opt :from_file, 'Get branch names from file (1 branch per line)', :short => '-f', :long => '--from-file', :type => :string
+                            opts.opt :open_file, "Creates (and opens) #{Brightpearl::Terminal::format_directory(Brightpearl::Enum::GIT_MERGE_DEFAULT_FILE)}", :short => '-o', :long => '--open-file', :type => :boolean
+                            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).', :short => '-d', :long => '--delete-local', :type => :boolean
+                            opts.opt :delete_source_branches_remote, 'Delete all source branches (remotely).', :short => '-D', :long => '--delete-remote', :type => :boolean
                         end
                         git_merge.action do |opts, args|
                             BrightpearlCommand::GitMerge.new(opts, args).execute
                         end
                     end
 
-                    if beta_only
-
-                        # GIT PULL
-                        git.command :pull, :aliases => [:p] do |git_pull|
-                            git_pull.summary 'Pull from origin'
-                            git_pull.action do |opts, args|
-                                BrightpearlCommand::GitPull.new(opts, args).execute
-                            end
+                    # GIT PULL
+                    git.command :pull, :aliases => [:p] do |git_pull|
+                        git_pull.summary 'Pull from origin'
+                        git_pull.action do |opts, args|
+                            BrightpearlCommand::GitPull.new(opts, args).execute
                         end
+                    end
 
-                        # GIT PUSH
-                        git.command :push, :aliases => [:P] do |git_push|
-                            git_push.summary 'Push to origin'
-                            git_push.action do |opts, args|
-                                BrightpearlCommand::GitPush.new(opts, args).execute
-                            end
+                    # GIT PUSH
+                    git.command :push, :aliases => [:P] do |git_push|
+                        git_push.summary 'Push to origin'
+                        git_push.action do |opts, args|
+                            BrightpearlCommand::GitPush.new(opts, args).execute
                         end
+                    end
 
-                        # GIT STASH
-                        git.command :stash, :aliases => [:S] do |git_stash|
-                            git_stash.summary 'Stash/un-stash your changes'
-                            git_stash.action do |opts, args|
-                                BrightpearlCommand::GitStash.new(opts, args).execute
-                            end
+                    # GIT STASH
+                    git.command :stash, :aliases => [:S] do |git_stash|
+                        git_stash.summary 'Show your current stashes'
+                        git_stash.action do |opts, args|
+                            BrightpearlCommand::GitStash.new(opts, args).execute
                         end
-
                     end
 
                     # GIT UPDATE
                     git.command :update, :aliases => [:u] do |git_update|
                         git_update.summary 'Update branch(es)'
                         git_update.options do |opts|
-                            opts.opt :all, 'Update all local branches', :short => '-a', :long => '--all', :type => :boolean
                             opts.opt :push, 'Push updates to origin', :short => '-P', :long => '--push', :type => :boolean
                         end
                         git_update.action do |opts, args|
@@ -240,17 +250,6 @@ module Brightpearl
 
                 end
 
-                # LESS
-                brightpearl.command :less, :aliases => [:l] do |less|
-                    less.summary "Compile #{Brightpearl::Terminal::format_directory('screen.less')} file"
-                    less.options do |opts|
-                        opts.opt :skipConfirm, 'Skips confirmation. Will compile less file immediately', :short => '-K', :long => '--skip-confirmation', :type => :boolean
-                    end
-                    less.action do |opts, args|
-                        BrightpearlCommand::Less.new(opts, args).execute
-                    end
-                end
-
                 if beta_only
 
                     # RESET
@@ -266,12 +265,43 @@ module Brightpearl
 
                 end
 
-                # REVIEW
-                brightpearl.command :review, :aliases => [:r] do |review|
-                    review.summary 'Perform a quick code review'
-                    review.action do |opts, args|
-                        BrightpearlCommand::Review.new(opts, args).execute
+                # PRODUCTION
+                brightpearl.command :production, :aliases => [:p] do |production|
+
+                    production.summary 'Everything to do with production servers'
+
+                    # PRODUCTION LOGS
+                    production.command :logs, :aliases => [:l] do |production_logs|
+                        production_logs.summary 'Scan production logs'
+                        production_logs.options do |opts|
+                            opts.opt :watchPHP, 'Watch PHP logs (default)', :short => '-p', :long => '--watch-php-logs', :type => :boolean
+                            opts.opt :watchJava, 'Watch Java logs', :short => '-j', :long => '--watch-java-logs', :type => :boolean
+                            opts.opt :skipFetch, 'Skip fetching of new logs (quicker)', :short => '-s', :long => '--skip-fetch', :type => :boolean
+                            opts.opt :compare, 'Compare logs between 2 versions (requires 2 parameters -- source & target version)', :short => '-c', :long => '--compare', :type => :boolean
+                        end
+                        production_logs.action do |opts, args|
+                            BrightpearlCommand::ProductionLogs.new(opts, args).execute
+                        end
+                    end
+
+                    # PRODUCTION (DEFAULT)
+                    production.action do
+                        system('bp p -h')
                     end
+
+
+                end
+
+                if beta_only
+
+                    # REVIEW
+                    brightpearl.command :review, :aliases => [:r] do |review|
+                        review.summary 'Perform a quick code review'
+                        review.action do |opts, args|
+                            BrightpearlCommand::Review.new(opts, args).execute
+                        end
+                    end
+
                 end
 
                 # SCRIPTS
@@ -279,19 +309,52 @@ module Brightpearl
 
                     scripts.summary 'Quick & dirty scripts'
 
+                    if beta_only
+
+                        # SCRIPTS API DOCS
+                        scripts.command :api_docs, :aliases => [:a] do |scripts_api_docs|
+                            scripts_api_docs.summary 'Build API docs'
+                            scripts_api_docs.action do |opts, args|
+                                BrightpearlCommand::ScriptsApiDocs.new(opts, args).execute
+                            end
+                        end
+
+                        # SCRIPTS BRANCH CLEANER
+                        scripts.command :branch_cleaner, :aliases => [:b] do |scripts_branch_cleaner|
+                            scripts_branch_cleaner.summary 'Identify (and remove) old branches'
+                            scripts_branch_cleaner.options do |opts|
+                                opts.opt :scanLocal, 'Find local branches to remove', :short => '-l', :long => '--scan-local', :type => :boolean
+                                opts.opt :scanRemote, 'Find remote branches to remove', :short => '-r', :long => '--scan-remote', :type => :boolean
+                                opts.opt :anyName, "Find branches with any last committer, not just: #{Brightpearl::Config.param(Brightpearl::Config::GIT_USERNAME)}", :short => '-a', :long => '--any-name', :type => :boolean
+                            end
+                            scripts_branch_cleaner.action do |opts, args|
+                                BrightpearlCommand::ScriptsBranchCleaner.new(opts, args).execute
+                            end
+                        end
+
+                        # SCRIPTS PHP CODE-SNIFFER
+                        scripts.command :code_sniffer, :aliases => [:c] do |scripts_code_sniffer|
+                            scripts_code_sniffer.summary 'Run PHP CodeSniffer'
+                            scripts_code_sniffer.action do |opts, args|
+                                BrightpearlCommand::ScriptsCodeSniffer.new(opts, args).execute
+                            end
+                        end
+
+                    end
+
                     # SCRIPTS COLOR
-                    scripts.command :color, :aliases => [:c] do |scripts_color|
+                    scripts.command :color, :aliases => [:C] do |scripts_color|
                         scripts_color.summary 'Shows a list of bash/ruby color codes (256-bit)'
                         scripts_color.action do |opts, args|
                             BrightpearlCommand::ScriptsColor.new(opts, args).execute
                         end
                     end
 
-                    # SCRIPTS PHP CODE-SNIFFER
-                    scripts.command :sniff, :aliases => [:s] do |code_sniffer|
-                        code_sniffer.summary 'Run PHP CodeSniffer'
-                        code_sniffer.action do |opts, args|
-                            BrightpearlCommand::ScriptsCodeSniffer.new(opts, args).execute
+                    # SCRIPTS POM-FIXER
+                    scripts.command :pom_fixer, :aliases => [:p] do |scripts_pom_fixer|
+                        scripts_pom_fixer.summary 'Finds and fixes feature-tagged POM files.'
+                        scripts_pom_fixer.action do |opts, args|
+                            BrightpearlCommand::ScriptsPomFixer.new(opts, args).execute
                         end
                     end
 
@@ -302,26 +365,38 @@ module Brightpearl
 
                 end
 
-                # TEST
-                brightpearl.command :tests, :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
-                        opts.opt :fitnesse, 'Run FitNesse tests', :short => '-f', :long => '--fitnesse', :type => :boolean
-                        opts.opt :php, 'Run PHPUnit tests (default)', :short => '-p', :long => '--php-unit', :type => :boolean
-                        opts.opt :ruby, 'Run Ruby UI tests', :short => '-r', :long => '--ruby-ui', :type => :boolean
+                if beta_only
+
+                    # TAIL
+                    brightpearl.command :tail, :aliases => [:T] do |tail|
+                        tail.summary 'Tail various logs (all catalina.out by default)'
+                        tail.action do |opts, args|
+                            BrightpearlCommand::Tail.new(opts, args).execute
+                        end
                     end
-                    test.action do |opts, args|
-                        BrightpearlCommand::Test.new(opts, args).execute
+
+                    # TEST
+                    brightpearl.command :tests, :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
+                            opts.opt :fitnesse, 'Run FitNesse tests', :short => '-f', :long => '--fitnesse', :type => :boolean
+                            opts.opt :php, 'Run PHPUnit tests (default)', :short => '-p', :long => '--php-unit', :type => :boolean
+                            opts.opt :ruby, 'Run Ruby UI tests', :short => '-r', :long => '--ruby-ui', :type => :boolean
+                        end
+                        test.action do |opts, args|
+                            BrightpearlCommand::Test.new(opts, args).execute
+                        end
                     end
-                end
 
-                # UPDATE
-                brightpearl.command :update, :aliases => [:u] do |update|
-                    update.summary 'Check for updates'
-                    update.action do |opts, args|
-                        BrightpearlCommand::Update.new(opts, args).execute
+                    # UPDATE
+                    brightpearl.command :update, :aliases => [:u] do |update|
+                        update.summary 'Check for updates'
+                        update.action do |opts, args|
+                            BrightpearlCommand::Update.new(opts, args).execute
+                        end
                     end
+
                 end
 
                 # X - SETUP

data/lib/core/config.rb

@@ -7,7 +7,6 @@ module Brightpearl
 
         CONFIG_FILE = '~/.brightpearlrc'
 
-        BETA = 'beta'
         MAC = 'mac'
         LINUX = 'linux'
 
@@ -23,11 +22,21 @@ module Brightpearl
         VM_MYSQL_USER = 'vm_mysql_user'
         VM_MYSQL_PASSWORD = 'vm_mysql_password'
 
+        BETA = 'beta'
+        PREFERRED_TEXT_EDITOR = 'preferred_text_editor'
+        GIT_USERNAME = 'git_username'
+
+        CRYPT_KEY = 'crypt_key'
+        CRYPT_HEX = 'crypt_hex'
+        EC2_HOST = 'ec2_host'
+        EC2_USER = 'ec2_user'
+        EC2_PASS = 'ec2_pass'
+
         @params = {}
 
         def self.param(param_name)
-            unless required_config_keys.include?(param_name) || param_name == BETA
-                raise RuntimeError, "'#{param_name}' is not a valid config parameter."
+            unless all_available_config_keys.include?(param_name)
+                Brightpearl::Terminal::error("#{Brightpearl::Terminal::format_highlight(param_name)} is not a valid config parameter", true)
             end
             @params[param_name]
         end
@@ -41,7 +50,7 @@ module Brightpearl
         end
 
         def self.config_file_exists?
-            unless File.exists? ("#{File.expand_path(CONFIG_FILE)}")
+            unless File.exists?(File.expand_path(CONFIG_FILE))
                 return false
             end
             true
@@ -62,20 +71,22 @@ module Brightpearl
 
         def self.first_journey_message
             puts
-            puts "Thank you for installing the \x1B[36mbrightpearl-cli\x1B[0m ruby gem."
+            puts "Thank you for installing the #{Brightpearl::Terminal::format_highlight('brightpearl-cli')} ruby gem."
             puts "CLI stands for 'Command Line Interface'."
             puts
-            puts 'The first thing you will need to do is setup your configuration file.'
-            puts "This file will always be located at: \x1B[33m~/.brightpearlrc\x1B[0m"
+            puts "The first thing you'll need to do is setup your configuration file."
+            puts "The file is located at: #{Brightpearl::Terminal::format_directory('~/.brightpearlrc')}"
             puts
-            puts "You probably won't have this file but this program will create it for you."
-            puts 'The next screen will open a nano text editor where you can set it up.'
-            Brightpearl::Terminal::enter_to_continue
+            puts "You probably won't have this file so the program will create it for you."
+            puts "\n"
+            unless Brightpearl::Terminal::prompt_yes_no('Create configuration file?')
+                Brightpearl::Terminal::abort
+            end
         end
 
         def self.config_file_create
             File.open("#{File.expand_path(CONFIG_FILE)}", 'w') { |file|
-                file.write("# CONFIGURATION FILE -- Make sure that ALL parameters are correct before saving.\n")
+                file.write("# CONFIGURATION FILE -- Use this file to configure brightpearl-cli\n")
                 file.write("\n")
                 file.write("#{WORKSTATION_IP}=172.27.X.X\n")
                 file.write("#{WORKSTATION_OS}=linux\n")
@@ -89,6 +100,21 @@ module Brightpearl
                 file.write("#{VM_ROOT_PASSWORD}=peXXXXXXXre\n")
                 file.write("#{VM_MYSQL_USER}=root\n")
                 file.write("#{VM_MYSQL_PASSWORD}=peXXXXXXXre\n")
+                file.write("\n")
+                file.write("# Usually vi, vim or nano\n")
+                file.write("#{PREFERRED_TEXT_EDITOR}=\n")
+                file.write("\n")
+                file.write("# Found by running $ git config user.name\n")
+                file.write("#{GIT_USERNAME}=\n")
+                file.write("\n")
+                file.write("#{CRYPT_KEY}=\n")
+                file.write("#{CRYPT_HEX}=\n")
+                file.write("#{EC2_HOST}=\n")
+                file.write("#{EC2_USER}=\n")
+                file.write("#{EC2_PASS}=\n")
+                file.write("\n")
+                file.write("# BETA FEATURES -- Set to TRUE to enable beta features -- NOT RECOMMENDED!\n")
+                file.write("#{BETA}=false\n")
             }
         end
 
@@ -119,15 +145,13 @@ module Brightpearl
                 end
                 error_text = "#{error_text}\x1B[38;5;196mThe value for \x1B[38;5;240m#{WORKSTATION_OS}\x1B[38;5;196m must be either: \x1B[38;5;84m#{MAC}\x1B[38;5;196m or \x1B[38;5;84m#{LINUX}\x1B[38;5;196m\x1B[0m\n"
             end
-            unless error_text == ''
-                show_error_message(error_text)
-            end
             code_repo = Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE)
+            db_repo = Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB)
             unless File.directory?(code_repo)
                 error_text = "#{error_text}The following is NOT a valid directory: \x1B[0m#{code_repo}\x1B[90m\n"
             end
-            unless File.directory?(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB))
-                error_text = "#{error_text}The following is NOT a valid directory: \x1B[0m#{Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_DB)}\x1B[90m\n"
+            unless File.directory?(db_repo)
+                error_text = "#{error_text}The following is NOT a valid directory: \x1B[0m#{db_repo}\x1B[90m\n"
             end
             unless error_text == ''
                 show_error_message(error_text)
@@ -165,7 +189,33 @@ module Brightpearl
                 VM_ROOT,
                 VM_ROOT_PASSWORD,
                 VM_MYSQL_USER,
-                VM_MYSQL_PASSWORD
+                VM_MYSQL_PASSWORD,
+                PREFERRED_TEXT_EDITOR,
+                GIT_USERNAME
+            ]
+        end
+
+        def self.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,
+                BETA,
+                CRYPT_KEY,
+                CRYPT_HEX,
+                EC2_HOST,
+                EC2_USER,
+                EC2_PASS
             ]
         end
 

data/lib/core/encrypter.rb

@@ -0,0 +1,55 @@
+require 'openssl'
+require 'base64'
+
+module Brightpearl
+
+    class Encrypter
+
+        @key = nil
+        @hex = nil
+
+        def initialize
+
+            @key = Brightpearl::Config.param(Brightpearl::Config::CRYPT_KEY)
+            @hex = Brightpearl::Config.param(Brightpearl::Config::CRYPT_HEX)
+
+            if @key.nil? || @hex.nil?
+                Brightpearl::Terminal::error('Encryption keys not found', ["The command you're trying to run probably requires access to an EC2 database (or some other advanced feature).", "In order for this to work you will need valid #{Brightpearl::Terminal::format_highlight('encryption keys')}.", "Please speak to #{Brightpearl::Terminal::format_highlight('Albert')} (or team Raptor) for more info."], true)
+            end
+
+        end
+
+        def encrypt(string)
+
+            c = OpenSSL::Cipher::Cipher.new('aes-256-cbc')
+            c.encrypt
+            c.key = @key = Digest::SHA1.hexdigest(@hex)
+            begin
+                e = c.update(string)
+                e << c.final
+                return Base64.encode64(e)
+            rescue
+                Brightpearl::Terminal::error('Encryption failed', "Could not encrypt string #{string == '' ? '[blank]' : Brightpearl::Terminal::format_highlight(string)} using crypt_key #{Brightpearl::Terminal::format_highlight(Brightpearl::Config.param(Brightpearl::Config::CRYPT_KEY) == '' ? '[blank]' : Brightpearl::Config.param(Brightpearl::Config::CRYPT_KEY))} and crypt_hex #{Brightpearl::Terminal::format_highlight(Brightpearl::Config.param(Brightpearl::Config::CRYPT_HEX) == '' ? '[blank]' : Brightpearl::Config.param(Brightpearl::Config::CRYPT_HEX))}")
+            end
+
+        end
+
+        def decrypt(string)
+
+            string_decoded = Base64.decode64(string)
+            c = OpenSSL::Cipher::Cipher.new('aes-256-cbc')
+            c.decrypt
+            c.key = @key = Digest::SHA1.hexdigest(@hex)
+            begin
+                d = c.update(string_decoded)
+                d << c.final
+                return d
+            rescue
+                Brightpearl::Terminal::error('Decryption failed', "Could not decrypt string #{string == '' ? '[blank]' : Brightpearl::Terminal::format_highlight(string)} using crypt_key #{Brightpearl::Terminal::format_highlight(Brightpearl::Config.param(Brightpearl::Config::CRYPT_KEY) == '' ? '[blank]' : Brightpearl::Config.param(Brightpearl::Config::CRYPT_KEY))} and crypt_hex #{Brightpearl::Terminal::format_highlight(Brightpearl::Config.param(Brightpearl::Config::CRYPT_HEX) == '' ? '[blank]' : Brightpearl::Config.param(Brightpearl::Config::CRYPT_HEX))}")
+            end
+
+        end
+
+    end
+
+end

data/lib/core/enums.rb

@@ -4,6 +4,8 @@ module Brightpearl
 
         PORT_ORDER_SERVICE = '9240'
 
+        GIT_MERGE_DEFAULT_FILE = '/tmp/merge.txt'
+
     end
 
 end