brightpearl-cli 1.3.0 → 1.4.0

data/lib/routes/scripts_pom_fixer.rb

@@ -1,4 +1,4 @@
-module BrightpearlCommand
+module AppCommand
 
     class ScriptsPomFixer < ::Convoy::ActionCommand::Base
 
@@ -6,7 +6,7 @@ module BrightpearlCommand
 
             @opts = command_options
             @args = arguments
-            @git = Brightpearl::Git.new
+            @git = App::Git.new
             opts_validate
             opts_routing
 
@@ -24,69 +24,12 @@ module BrightpearlCommand
 
         def fix_poms
 
-            command = "find #{ Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE)} -name 'pom.xml'"
-            files = Brightpearl::Terminal::command_capture(command)
-            files = files[0].split("\n")
-
-            unless files.any?
-                Brightpearl::Terminal::error('No files found', ["The command: #{Brightpearl::Terminal::format_command(command)} didn't return any files.", 'It might be possible that the directory structure of our codebase has changed and this script needs to be updated.', nil, "Speak to #{Brightpearl::Terminal::format_highlight('Albert')}."], true)
-            end
-
-            files_to_change = []
-            files.each do |filename|
-                file_lines = File.open(filename, 'rb').read
-                file_lines.split("\n").each do |line|
-                    if line.match(/<version>\d+\.\d+\.\d+-(.*)-(snapshot)<\/version>/i)
-                        files_to_change << filename
-                    end
-                end
-            end
-
-            unless files_to_change.any?
-                Brightpearl::Terminal::info('No feature-tagged POMs found', 'Nothing to un-snapshot.')
-                exit
-            end
-
-            unless Brightpearl::Terminal::prompt_yes_no('Un-snapshot POMs', generate_confirmation_text(files_to_change))
-                Brightpearl::Terminal::abort(nil, nil, true, false)
-            end
-
-            files_to_change.each do |filename|
-                Brightpearl::Terminal::output("Un-snapshotting: #{Brightpearl::Terminal::format_directory(filename)}")
-                contents = File.read(filename)
-                contents_new = contents.gsub(/-(.*)-SNAPSHOT/, '-SNAPSHOT')
-                File.open(filename, 'w') { |file| file.puts contents_new }
-            end
-
-            Brightpearl::Terminal::command('git status', Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE))
-
-            commit_message = "BP-0000 Un-snapshotted POMs on #{@git.current_branch_for_repo(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE))}."
-
-            if Brightpearl::Terminal::prompt_yes_no('Commit to GIT', ["This will commit your changes to GIT with message: #{Brightpearl::Terminal::format_highlight(commit_message)}"])
-                Brightpearl::Terminal::command(['git add .', "git commit -m '#{commit_message.gsub("'", "\\'")}'"], Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE))
-            else
-                Brightpearl::Terminal::info('Un-snapshotting complete', "Please note that your changes #{Brightpearl::Terminal::format_highlight('HAVE NOT')} been #{Brightpearl::Terminal::format_action('committed')} to Git.", false)
-                exit
-            end
-
-            if Brightpearl::Terminal::prompt_yes_no('Push changes to origin')
-                Brightpearl::Terminal::command('git push', Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE))
-                Brightpearl::Terminal::info('Un-snapshotting complete', "Your POMs have been un-snapshotted, the changes #{Brightpearl::Terminal::format_action('committed')} to Git and #{Brightpearl::Terminal::format_action('pushed')} to origin.")
-            else
-                Brightpearl::Terminal::info('Un-snapshotting complete', ["Your POMs have been un-snapshotted and the changes #{Brightpearl::Terminal::format_action('committed')} to Git.", 'However, nothing has been pushed to origin. You will need to do this manually.'], false)
-            end
+            current_branch_code_repo = @git.current_branch_for_repo(App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE))
 
-        end
+            files_to_change = App::Pom::get_files_to_change
 
-        private
+            App::Pom::unsnapshot_files(files_to_change,  (@opts[:forMaster] ? App::Git::MASTER : current_branch_code_repo))
 
-        def generate_confirmation_text(files_to_change)
-            confirmation_text = ['The following files will have their branch tags removed:', nil]
-            files_to_change.each do |file_name|
-                confirmation_text << Brightpearl::Terminal::format_directory(file_name)
-            end
-            confirmation_text
-            confirmation_text
         end
 
     end

data/lib/routes/scripts_sonar.rb

@@ -0,0 +1,82 @@
+module AppCommand
+
+    class ScriptsSonar < ::Convoy::ActionCommand::Base
+
+        def execute
+
+            @opts = command_options
+            @args = arguments
+
+            @git = App::Git.new
+
+            opts_validate
+            opts_routing
+
+        end
+
+        def opts_validate
+
+        end
+
+        def opts_routing
+
+            run_sonar
+
+        end
+
+        def run_sonar
+
+            App::Terminal::info('Running PHP Sonar (CodeSniffer)')
+            space_inserted = false
+            file_found_to_scan = false
+
+            results = []
+            changed_files = @git.get_changed_files(App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE))
+
+            changed_files[0].split("\n").each do |changed_file|
+                if changed_file =~ /\Abrightpearl\/private\/library\/Lib\/(.*)/i
+                    file_found_to_scan = true
+                    unless space_inserted
+                        puts
+                        space_inserted = true
+                    end
+                    App::Terminal::output("Scanning: #{App::Terminal::format_directory(changed_file)}")
+                    command = "phpcs --report=full --standard=#{App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE)}/brightpearl/private/tests/phpcs/phpcs.xml #{App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE)}/#{changed_file}"
+                    results << App::Terminal::command_capture(command, App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE), false, false)
+                end
+            end
+
+            unless file_found_to_scan
+                App::Terminal::info("No files to scan. The only files which #{App::Terminal::format_highlight('changed')} between #{App::Terminal::format_branch(@git.current_branch_for_repo(App::Config.param(App::Config::WORKSTATION_PATH_TO_BP_CODE)))} and #{App::Terminal::format_branch("origin/#{App::Git::MASTER}")} are:", changed_files[0].split("\n"))
+            end
+
+            found_results = false
+            results_output = []
+
+            results.each do |result|
+                if result.any?
+                    unless result[0] == ''
+                        result[0].split("\n").each do |line|
+                            if line =~ /\AFILE:\s(.*).\w{3,5}/i
+                                found_results = true
+                                results_output << "\x1B[38;5;196m#{line}\x1B[0m"
+                            else
+                                results_output << "\x1B[38;5;250m#{line}\x1B[0m"
+                            end
+                        end
+                    end
+                end
+            end
+
+            if found_results
+                App::Terminal::error('Found errors!', results_output)
+            else
+                App::Terminal::success('No errors found.', nil, file_found_to_scan ? true : false)
+                exit
+            end
+
+        end
+
+    end
+
+end

data/lib/routes/setup.rb

@@ -1,18 +1,18 @@
-module BrightpearlCommand
+module AppCommand
 
     class Setup < ::Convoy::ActionCommand::Base
 
         def execute
 
-            if File.exists?(File.expand_path(Brightpearl::Config::CONFIG_FILE))
+            if File.exists?(File.expand_path(App::Config::CONFIG_FILE))
 
-                Brightpearl::Config::config_file_edit
-                Brightpearl::Config::config_params_get
-                Brightpearl::Config::config_params_validate(true)
+                App::Config::config_file_edit
+                App::Config::config_params_get
+                App::Config::config_params_validate(true)
 
             else
 
-                Brightpearl::Config.initialize
+                App::Config.initialize
 
             end
 

data/lib/routes/tail.rb

@@ -1,4 +1,4 @@
-module BrightpearlCommand
+module AppCommand
 
     class Tail < ::Convoy::ActionCommand::Base
 
@@ -23,19 +23,19 @@ module BrightpearlCommand
 
         def tail_all_catalina_out
 
-            if Brightpearl::Tools::this_is_a_mac
+            if App::Tools::this_is_a_mac
 
                 begin
                     system('clear')
-                    Brightpearl::Terminal::info("Tailing #{Brightpearl::Terminal::format_action('all')} Java logs", ['tail -f /var/log/tomcat/*/catalina.out | grep -v "scheduling\|/var/log\|rabbitmq\|Clearing app version/service version cache\|^$"', nil, "Press '#{Brightpearl::Terminal::format_command('CTRL + C')}\x1B[38;5;240m' to quit."])
-                    system("sshpass -p#{Brightpearl::Config.param(Brightpearl::Config::VM_USER_PASSWORD)} ssh #{Brightpearl::Config.param(Brightpearl::Config::VM_USER)}@#{Brightpearl::Config.param(Brightpearl::Config::VM_IP)} 'tail -f /var/log/tomcat/*/catalina.out | grep -v \"scheduling\\|/var/log\\|rabbitmq\\|Clearing app version/service version cache\\|^$\"'")
+                    App::Terminal::info("Tailing #{App::Terminal::format_action('all')} Java logs", ['tail -f /var/log/tomcat/*/catalina.out | grep -v "scheduling\|/var/log\|rabbitmq\|Clearing app version/service version cache\|^$"', nil, "Press '#{App::Terminal::format_command('CTRL + C')}\x1B[38;5;240m' to quit."])
+                    system("sshpass -p#{App::Config.param(App::Config::VM_USER_PASSWORD)} ssh #{App::Config.param(App::Config::VM_USER)}@#{App::Config.param(App::Config::VM_IP)} 'tail -f /var/log/tomcat/*/catalina.out | grep -v \"scheduling\\|/var/log\\|rabbitmq\\|Clearing app version/service version cache\\|^$\"'")
                 ensure
                     exit
                 end
 
             else
 
-                Brightpearl::Terminal::info('This functionality has not yet been implemented on your OS', ["Currently only works on #{Brightpearl::Terminal::format_action(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_OS))}", nil, "You are on #{Brightpearl::Terminal::format_action(Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_OS))}"])
+                App::Terminal::info('This functionality has not yet been implemented on your OS', ["Currently only works on #{App::Terminal::format_action(App::Config.param(App::Config::WORKSTATION_OS))}", nil, "You are on #{App::Terminal::format_action(App::Config.param(App::Config::WORKSTATION_OS))}"])
 
             end
 

data/lib/routes/test.rb

@@ -1,4 +1,4 @@
-module BrightpearlCommand
+module AppCommand
 
     class Test < ::Convoy::ActionCommand::Base
 
@@ -54,9 +54,9 @@ module BrightpearlCommand
         def run_php
 
             commands = [
-                "sshpass -p#{Brightpearl::Config.param(Brightpearl::Config::VM_USER_PASSWORD)} ssh #{Brightpearl::Config.param(Brightpearl::Config::VM_USER)}@#{Brightpearl::Config.param(Brightpearl::Config::VM_IP)} 'cd /brightpearl-source/brightpearl-code/brightpearl/private/tests/ && ./phpunit.sh #{@args.join(' ')}'"
+                "sshpass -p#{App::Config.param(App::Config::VM_USER_PASSWORD)} ssh #{App::Config.param(App::Config::VM_USER)}@#{App::Config.param(App::Config::VM_IP)} 'cd /brightpearl-source/brightpearl-code/brightpearl/private/tests/ && ./phpunit.sh #{@args.join(' ')}'"
             ]
-            Brightpearl::Terminal::command(commands, nil, false)
+            App::Terminal::command(commands, nil, false)
 
         end
 

data/lib/routes/update.rb

@@ -1,4 +1,4 @@
-module BrightpearlCommand
+module AppCommand
 
     class Update < ::Convoy::ActionCommand::Base
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brightpearl-cli
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Albert Rannetsperger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2015-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: columnist
@@ -59,7 +59,7 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.9.1
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.9.1
   type: :runtime
@@ -69,7 +69,7 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.9.1
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.9.1
 - !ruby/object:Gem::Dependency
@@ -114,16 +114,23 @@ files:
 - lib/brightpearl_cli.rb
 - lib/core/api.rb
 - lib/core/config.rb
+- lib/core/config_unique.rb
 - lib/core/encrypter.rb
 - lib/core/enums.rb
 - lib/core/git.rb
+- lib/core/git_delete.rb
 - lib/core/jira.rb
 - lib/core/mysql.rb
+- lib/core/pom.rb
 - lib/core/terminal.rb
 - lib/core/tools.rb
+- lib/core/utils_files.rb
+- lib/core/utils_routes.rb
+- lib/core/utils_strings.rb
 - lib/core/validate.rb
 - lib/routes/build.rb
 - lib/routes/dummy_order.rb
+- lib/routes/fix.rb
 - lib/routes/git_branch.rb
 - lib/routes/git_checkout.rb
 - lib/routes/git_delete.rb
@@ -138,9 +145,9 @@ files:
 - lib/routes/review.rb
 - lib/routes/scripts_api_docs.rb
 - lib/routes/scripts_branch_cleaner.rb
-- lib/routes/scripts_code_sniffer.rb
 - lib/routes/scripts_color.rb
 - lib/routes/scripts_pom_fixer.rb
+- lib/routes/scripts_sonar.rb
 - lib/routes/setup.rb
 - lib/routes/tail.rb
 - lib/routes/test.rb
@@ -157,17 +164,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ~>
     - !ruby/object:Gem::Version
-      version: '1.9'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Brightpearl (Command Line Interface)

data/lib/routes/scripts_code_sniffer.rb

@@ -1,36 +0,0 @@
-module BrightpearlCommand
-
-    class ScriptsCodeSniffer < ::Convoy::ActionCommand::Base
-
-        def execute
-
-            @opts = command_options
-            @args = arguments
-            opts_validate
-            opts_routing
-
-        end
-
-        def opts_validate
-
-        end
-
-        def opts_routing
-
-            run_code_sniffer
-
-        end
-
-        def run_code_sniffer
-
-            @todo
-            command = "phpcs --report=full --standard=#{Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE)}/brightpearl/private/tests/phpcs/phpcs.xml #{Brightpearl::Config.param(Brightpearl::Config::WORKSTATION_PATH_TO_BP_CODE)}/brightpearl/private/library/Lib/#{@args[0]}"
-            puts command
-            exit
-            system(command)
-
-        end
-
-    end
-
-end