brightpearl-cli 1.3.0 → 1.4.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MDFiZjAwM2JmOGQ3ODg3NGU2YjBiYzgwZDhjY2NmMDNkOWNmYmNjMg==
-  data.tar.gz: !binary |-
-    NTUyYTc5NjU3OWM4M2ZlYmI3MjZlMDRlZGFhNTQ2M2UyZWFiZTBjOQ==
+SHA1:
+  metadata.gz: 7e62f96bd62e33c685f380440bb83e2e3084dd7e
+  data.tar.gz: 27121619a930fdd47a75bc3c6a0795eafbd15a50
 SHA512:
-  metadata.gz: !binary |-
-    MDIxZjU2ZjRhZGMwOGVmNTU5NzU1YjM1NmExNjhjZjY1MTdhZDYzNGE3NGQx
-    MTY5YzNjZjg5YjcyM2NlZGNjOGU2ODdkMDgyZGE1YzZjODE3ZWZiNDk1ZWE4
-    MWIwNzM4NzdjOGZiMDhkZGJhOGVjM2ZlMjk0OTBiZDY3YmY5NmE=
-  data.tar.gz: !binary |-
-    NzhjYmM3MjM2OTE2Nzg0MDllYzAzMTU3YTg0ZWFjMWE3MjQ2OWVlZjA3OTM5
-    ODljZjJjOTQwYjcyODhhYmExZDE3MTM4ZjU5YmNiMWQxMDg4NTA4MmE5MmQ0
-    Y2ExNmM4NmMwNGQyYzJlNjQ3YzA5ZDNlZDNlYmZhYTRiZTVkNjI=
+  metadata.gz: cf9c73d3b135654e023487b8ad0981075348701406e29b59d0b657c01f539e863c0e42faeb9b4e00b381b8e4ae5d46358c42325b7b5b916fe121cf739551b7ca
+  data.tar.gz: 8c7579a8bba1cfdf2cc505f78d62363bb05eaac2ea449291fb52711999f1207ef6004817fe8c6fdade54e6c24f89ffa2bd362043c7c02b87f6e4de4e7e1df5b9

data/bin/bp

@@ -2,4 +2,4 @@
 
 require 'brightpearl_cli'
 
-Brightpearl::execute
+App::execute

data/bin/brightpearl

@@ -2,4 +2,4 @@
 
 require 'brightpearl_cli'
 
-Brightpearl::execute
+App::execute

data/lib/brightpearl_cli.rb

@@ -2,17 +2,23 @@ require 'convoy'
 require 'yaml'
 
 require 'core/api'
-require 'core/config'
-require 'core/encrypter'
+require 'core/config_unique'
 require 'core/enums'
 require 'core/git'
+require 'core/git_delete'
 require 'core/jira'
 require 'core/mysql'
-require 'core/terminal'
+require 'core/pom'
 require 'core/tools'
 require 'core/validate'
+
+require 'core/config'
+require 'core/encrypter'
+require 'core/terminal'
+
 require 'routes/build'
 require 'routes/dummy_order'
+require 'routes/fix'
 require 'routes/git_branch'
 require 'routes/git_checkout'
 require 'routes/git_delete'
@@ -27,7 +33,7 @@ require 'routes/reset'
 require 'routes/review'
 require 'routes/scripts_api_docs'
 require 'routes/scripts_branch_cleaner'
-require 'routes/scripts_code_sniffer'
+require 'routes/scripts_sonar'
 require 'routes/scripts_color'
 require 'routes/scripts_pom_fixer'
 require 'routes/setup'
@@ -35,14 +41,14 @@ require 'routes/update'
 require 'routes/tail'
 require 'routes/test'
 
-module Brightpearl
+module App
 
     def self.execute
 
         begin
 
             unless !ARGV.any? || ARGV[0] == 'setup' || ARGV[0] == 'x'
-                Brightpearl::Config.initialize
+                App::Config.initialize
             end
 
             Convoy::App.create do |brightpearl|
@@ -50,58 +56,62 @@ module Brightpearl
                 #  COLOR OF TITLE TEXT
                 title_color = 255
 
-                # 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.3.0'
+                brightpearl.version '1.4.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"
-
-                if beta_only
-
-                    # 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
+                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"
+
+                # 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|
+                        AppCommand::Build.new(opts, args).execute
                     end
+                end
 
-                    # DUMMY
-                    brightpearl.command :dummy, :aliases => [:d] do |dummy|
-
-                        dummy.summary 'Insert dummy data into the App'
-
-                        # DUMMY ORDER
-                        dummy.command :order, :aliases => [:o] do |dummy_order|
-                            dummy_order.summary 'Create dummy orders'
-                            dummy_order.options do |opts|
-                                opts.opt :salesOrder, 'Create sales order', :short => '-s', :long => '--sales-order', :type => :boolean
-                                opts.opt :salesCredit, 'Create sales credit', :short => '-S', :long => '--sales-credit', :type => :boolean
-                                opts.opt :purchaseOrder, 'Create purchase order', :short => '-p', :long => '--purchase-order', :type => :boolean
-                                opts.opt :purchaseCredit, 'Create purchase credit', :short => '-P', :long => '--purchase-credit', :type => :boolean
-                                opts.opt :times, 'Specify number of orders (maximum 50)', :short => '-x', :long => '--times', :type => :int
-                            end
-                            dummy_order.action do |opts, args|
-                                BrightpearlCommand::DummyOrder.new(opts, args).execute
-                            end
-                        end
+                # DUMMY
+                brightpearl.command :dummy, :aliases => [:d] do |dummy|
+
+                    dummy.summary 'Insert dummy data into the App'
 
-                        # CREATE (DEFAULT)
-                        dummy.action do
-                            system('bp d -h')
+                    # DUMMY ORDER
+                    dummy.command :order, :aliases => [:o] do |dummy_order|
+                        dummy_order.summary 'Create dummy orders'
+                        dummy_order.options do |opts|
+                            opts.opt :salesOrder, 'Create sales order', :short => '-s', :long => '--sales-order', :type => :boolean
+                            opts.opt :salesCredit, 'Create sales credit', :short => '-S', :long => '--sales-credit', :type => :boolean
+                            opts.opt :purchaseOrder, 'Create purchase order', :short => '-p', :long => '--purchase-order', :type => :boolean
+                            opts.opt :purchaseCredit, 'Create purchase credit', :short => '-P', :long => '--purchase-credit', :type => :boolean
+                            opts.opt :times, 'Specify number of orders (maximum 50)', :short => '-x', :long => '--times', :type => :int
                         end
+                        dummy_order.action do |opts, args|
+                            AppCommand::DummyOrder.new(opts, args).execute
+                        end
+                    end
 
+                    # CREATE (DEFAULT)
+                    dummy.action do
+                        system('bp d -h')
                     end
 
                 end
 
+                # FIX
+                brightpearl.command :fix, :aliases => [:f] do |fix|
+                    fix.summary 'Quick fixes for common problems'
+                    fix.options do |opts|
+                        opts.opt :clear_sessions, 'Clear sessions (to fix login problem)', :short => '-1', :long => '--clear-sessions', :type => :boolean
+                    end
+                    fix.action do |opts, args|
+                        AppCommand::Fix.new(opts, args).execute
+                    end
+                end
+
                 # GIT
 
                 brightpearl.command :git, :aliases => [:g] do |git|
@@ -119,12 +129,12 @@ module Brightpearl
                             opts.opt :detailed, 'Show a more detailed output w/Jira data, etc. (takes longer)', :short => '-D', :long => '--detailed', :type => :boolean
                         end
                         git_branch.action do |opts, args|
-                            BrightpearlCommand::GitBranch.new(opts, args).execute
+                            AppCommand::GitBranch.new(opts, args).execute
                         end
                     end
 
                     # GIT CHECKOUT
-                    git.command :checkout, :aliases => [:c] do |git_checkout|
+                    git.command :checkout, :aliases => [:c, :co] 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
@@ -133,7 +143,7 @@ module Brightpearl
                             opts.opt :updatePush, 'Same as --update but will also push to origin', :short => '-U', :long => '--update-push', :type => :boolean
                         end
                         git_checkout.action do |opts, args|
-                            BrightpearlCommand::GitCheckout.new(opts, args).execute
+                            AppCommand::GitCheckout.new(opts, args).execute
                         end
                     end
 
@@ -146,43 +156,43 @@ module Brightpearl
                             opts.opt :delete_both, 'Delete both local & remote branches', :short => '-b', :long => '--delete-both', :type => :boolean
                         end
                         git_delete.action do |opts, args|
-                            BrightpearlCommand::GitDelete.new(opts, args).execute
+                            AppCommand::GitDelete.new(opts, args).execute
                         end
                     end
 
                     # GIT MERGE
                     git.command :merge, :aliases => [:m] do |git_merge|
                         git_merge.summary 'Merge branch(es)'
-                        d = "Accepts one #{Brightpearl::Terminal::format_action('mandatory')} primary argument \xe2\x80\x94 the name of the source branch."
-                        d << "\nAccepts one #{Brightpearl::Terminal::format_action('optional')} secondary argument \xe2\x80\x94 the name of the target branch."
+                        d = "Accepts one #{App::Terminal::format_action('mandatory')} primary argument \xe2\x80\x94 the name of the source branch."
+                        d << "\nAccepts one #{App::Terminal::format_action('optional')} secondary argument \xe2\x80\x94 the name of the target branch."
                         d << "\n"
-                        d << "\nIf no secondary argument is given, target branch will be #{Brightpearl::Terminal::format_branch('current-branch')}"
+                        d << "\nIf no secondary argument is given, target branch will be #{App::Terminal::format_branch('current-branch')}"
                         d << "\n"
-                        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    #{App::Terminal::format_command('bp g m source_branch')} \x1B[0m"
+                        d << "\n    #{App::Terminal::format_command('bp g m source_branch target_branch')} \x1B[0m"
                         d << "\n"
                         d << "\nTo merge multiple branches use a comma-separated string (without spaces):"
                         d << "\n"
-                        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    #{App::Terminal::format_command('bp g m sb1,sb2,sb3')}"
+                        d << "\n    #{App::Terminal::format_command('bp g m sb1,sb2,sb3 target_branch')}"
                         d << "\n"
-                        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 << "\nAlternatively, use the #{App::Terminal::format_flag('o', false)} and #{App::Terminal::format_flag('f', false)} flags to specify your source branches using a temporary file:"
                         d << "\n"
-                        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    #{App::Terminal::format_flag('o', false)} opens #{App::Terminal::format_directory(App::Enum::GIT_MERGE_DEFAULT_FILE)}"
+                        d << "\n    #{App::Terminal::format_flag('f', false)} parses the contents of #{App::Terminal::format_directory(App::Enum::GIT_MERGE_DEFAULT_FILE)} as source branches (one branch per line)"
                         d << "\n"
-                        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"
+                        d << "\n    #{App::Terminal::format_command('bp g m -o')} \x1B[0m"
+                        d << "\n    #{App::Terminal::format_command('bp g m -f')} \x1B[0m"
+                        d << "\n    #{App::Terminal::format_command('bp g m -f target_branch')} \x1B[0m"
                         git_merge.description d
                         git_merge.options do |opts|
-                            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 :open_file, "Creates (and opens) #{App::Terminal::format_directory(App::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
+                            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
                         end
                         git_merge.action do |opts, args|
-                            BrightpearlCommand::GitMerge.new(opts, args).execute
+                            AppCommand::GitMerge.new(opts, args).execute
                         end
                     end
 
@@ -190,7 +200,7 @@ module Brightpearl
                     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
+                            AppCommand::GitPull.new(opts, args).execute
                         end
                     end
 
@@ -198,7 +208,7 @@ module Brightpearl
                     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
+                            AppCommand::GitPush.new(opts, args).execute
                         end
                     end
 
@@ -206,7 +216,7 @@ module Brightpearl
                     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
+                            AppCommand::GitStash.new(opts, args).execute
                         end
                     end
 
@@ -217,7 +227,7 @@ module Brightpearl
                             opts.opt :push, 'Push updates to origin', :short => '-P', :long => '--push', :type => :boolean
                         end
                         git_update.action do |opts, args|
-                            BrightpearlCommand::GitUpdate.new(opts, args).execute
+                            AppCommand::GitUpdate.new(opts, args).execute
                         end
                     end
 
@@ -228,41 +238,33 @@ module Brightpearl
 
                 end
 
-                if beta_only
-
-                    # JIRA
-                    brightpearl.command :jira, :aliases => [:j] do |jira|
-                        jira.summary 'Access the Jira API'
-
-                        # JIRA CARD
-                        jira.command :card, :aliases => [:c] do |jira_card|
-                            jira_card.summary 'Get detailed information about a card'
-                            jira_card.action do |opts, args|
-                                BrightpearlCommand::JiraCard.new(opts, args).execute
-                            end
-                        end
+                # JIRA
+                brightpearl.command :jira, :aliases => [:j] do |jira|
+                    jira.summary 'Access the Jira API'
 
-                        # JIRA (DEFAULT)
-                        jira.action do
-                            system('bp j -h')
+                    # JIRA CARD
+                    jira.command :card, :aliases => [:c] do |jira_card|
+                        jira_card.summary 'Get detailed information about a card'
+                        jira_card.action do |opts, args|
+                            AppCommand::JiraCard.new(opts, args).execute
                         end
                     end
 
+                    # JIRA (DEFAULT)
+                    jira.action do
+                        system('bp j -h')
+                    end
                 end
 
-                if beta_only
-
-                    # RESET
-                    brightpearl.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
-                        end
-                        reset.action do |opts, args|
-                            BrightpearlCommand::Reset.new(opts, args).execute
-                        end
+                # RESET
+                brightpearl.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
+                    end
+                    reset.action do |opts, args|
+                        AppCommand::Reset.new(opts, args).execute
                     end
-
                 end
 
                 # PRODUCTION
@@ -280,7 +282,7 @@ module Brightpearl
                             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
+                            AppCommand::ProductionLogs.new(opts, args).execute
                         end
                     end
 
@@ -292,16 +294,12 @@ module Brightpearl
 
                 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
+                # REVIEW
+                brightpearl.command :review, :aliases => [:r] do |review|
+                    review.summary 'Perform a quick code review'
+                    review.action do |opts, args|
+                        AppCommand::Review.new(opts, args).execute
                     end
-
                 end
 
                 # SCRIPTS
@@ -309,52 +307,51 @@ 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
+                    # 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|
+                            AppCommand::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
+                    # 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: #{App::Config.param(App::Config::GIT_USERNAME)}", :short => '-a', :long => '--any-name', :type => :boolean
                         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
+                        scripts_branch_cleaner.action do |opts, args|
+                            AppCommand::ScriptsBranchCleaner.new(opts, args).execute
                         end
+                    end
 
+                    # SCRIPTS PHP SONAR
+                    scripts.command :sonar, :aliases => [:s] do |scripts_sonar|
+                        scripts_sonar.summary 'Run PHP Sonar (CodeSniffer)'
+                        scripts_sonar.action do |opts, args|
+                            AppCommand::ScriptsSonar.new(opts, args).execute
+                        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
+                            AppCommand::ScriptsColor.new(opts, args).execute
                         end
                     end
 
                     # 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.options do |opts|
+                            opts.opt :forMaster, 'Remove branch tags completely (do before merging to master)', :short => '-m', :long => '--for-master', :type => :boolean
+                        end
                         scripts_pom_fixer.action do |opts, args|
-                            BrightpearlCommand::ScriptsPomFixer.new(opts, args).execute
+                            AppCommand::ScriptsPomFixer.new(opts, args).execute
                         end
                     end
 
@@ -365,45 +362,41 @@ module Brightpearl
 
                 end
 
-                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
+                # TAIL
+                brightpearl.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
                     end
+                end
 
-                    # TEST
-                    brightpearl.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
-                            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
+                # TEST
+                brightpearl.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
+                        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
-
-                    # 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
+                    test.action do |opts, args|
+                        AppCommand::Test.new(opts, args).execute
                     end
+                end
 
+                # UPDATE
+                brightpearl.command :update, :aliases => [:u] do |update|
+                    update.summary 'Check for updates'
+                    update.action do |opts, args|
+                        AppCommand::Update.new(opts, args).execute
+                    end
                 end
 
                 # X - SETUP
                 brightpearl.command :setup, :aliases => [:x] do |setup|
                     setup.summary 'Setup your configuration file'
                     setup.action do |opts, args|
-                        BrightpearlCommand::Setup.new(opts, args).execute
+                        AppCommand::Setup.new(opts, args).execute
                     end
                 end
 

data/lib/core/api.rb

@@ -1,4 +1,4 @@
-module Brightpearl
+module App
 
     class API