mvn2 2.6.12 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e3b543c693c51be739469993cff696542a5e052
-  data.tar.gz: 41942ef3d73c1ec35834884a84c5989e66cfeb7c
+  metadata.gz: 71970b18bea283cc3efacc1bb4afc095a105c580
+  data.tar.gz: faf90bf62234e7b015b7cb32addd8a36c0e4a771
 SHA512:
-  metadata.gz: 6e4fd25d90cee19bd3586b685bcaaa680585ada6bb7ef7586fe3dde309f9ef59b6a02f747a9a636bdb09c1f8cac1aa6dabff85b14ce3897613fef7ad5d16dac2
-  data.tar.gz: 3ebc5795f904ba569ec0ba1be83e528290753d0045443634880d9917b453d483359d261c76aa7143559c588cbe4012f6d23503c667c0d6078ce0bc1dda8b2956
+  metadata.gz: ed967d0d8f9cb498c9ce1c20170f13ebc8d2c9da094346fab50becce3d0ba4d188c7d701a8c1ba408d939dd38c11fe782f12a119fa07389e68163ad960054682
+  data.tar.gz: b5972d34cd6516d595fbc2794abbadccb7671612cd33373f15b31afeb93e40f9513b6910394e115bf82dc566e8ce240540d8a6394a5bab818bac0c64c16065b4

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    mvn2 (2.6.10)
+    mvn2 (2.6.12)
       everyday-cli-utils (~> 1.8, >= 1.8.6)
       everyday-plugins (~> 1.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    everyday-cli-utils (1.8.6)
+    everyday-cli-utils (1.8.7.1)
     everyday-plugins (1.2.1)
       everyday-cli-utils (~> 1.8, >= 1.8.6)
     rake (10.5.0)
@@ -22,4 +22,4 @@ DEPENDENCIES
   rake (~> 10.4)
 
 BUNDLED WITH
-   1.11.2
+   1.14.3

data/bin/mvn2

@@ -54,8 +54,6 @@ Plugins.get :color_override
 
 class Mvn2Runner
   HEADLESS    = ' -Djava.awt.headless=true'
-  INFO_LINE   = '[INFO] ------------------------------------------------------------------------'
-  BUILD_REGEX = /\[INFO\] Building (?!(jar|war|zip))/
 
   def initialize(options)
     @options = options

data/lib/mvn2/plugin/filter.plugin.rb

@@ -3,7 +3,7 @@ include EverydayPlugins
 
 class String
   def start_with_any?(*strs)
-    strs.empty? ? false : strs.any? { |str| start_with?(str) }
+    strs.empty? ? false : strs.any? { |str| gsub(/\e\[.*?m/, '').start_with?(str) }
   end
 end
 
@@ -11,13 +11,15 @@ class FilterPlugin
   extend Plugin
   extend PluginType
 
-  INFO_LINE   = '[INFO] ------------------------------------------------------------------------'
-  BUILD_REGEX = /\[INFO\] Building (?!(jar|war|zip))/
+  INFO_LINE_FULL   = '[INFO] ------------------------------------------------------------------------'
+  BUILD_REGEX = /(\[(?:\e\S+)?INFO(?:\e\S+)?\] (?:\e\S+)?)Building (?!(jar|war|zip)).*(?:\e\S+)?$/
+  RESULT_REGEX = /(\[(?:\e\S+)?INFO(?:\e\S+)?\] (?:\e\S+)?)(BUILD SUCCESS|Reactor Summary:|BUILD FAILURE).*(?:\e\S+)?$/
 
   def self.def_vars
     register_variable :info_line_last, false
     register_variable :found, false
     register_variable :failures, 0
+    register_variable :info_line, ''
   end
 
   def_vars
@@ -40,9 +42,10 @@ class FilterPlugin
   def self.def_filter1
     register(:line_filter, priority: 10) { |_, line|
       info_line_last = Plugins.get_var :info_line_last
+      info_line = Plugins.get_var :info_line
       if line.start_with_any?('[INFO] BUILD SUCCESS', '[INFO] Reactor Summary:', '[INFO] BUILD FAILURE')
         str = ''
-        str << INFO_LINE << "\n" unless info_line_last
+        str << "#{info_line}\n" unless info_line_last
         str << line << "\n"
         Plugins.set_vars found: true, info_line_last: false
         str
@@ -69,7 +72,7 @@ class FilterPlugin
       found = Plugins.get_var :found
       if found
         str = line << "\n"
-        Plugins.set_vars found: true, info_line_last: line.start_with?(INFO_LINE)
+        Plugins.set_vars found: true, info_line_last: line.start_with_any?(INFO_LINE_FULL)
         str
       else
         nil
@@ -80,7 +83,7 @@ class FilterPlugin
   def self.def_filter4
     register(:line_filter, priority: 40) { |options, line|
       found = Plugins.get_var :found
-      if options[:hide_between] && found && line.start_with?('Tests run:')
+      if options[:hide_between] && found && line.start_with_any?('Tests run:')
         str = line << "\n\n"
         Plugins.set_vars found: false, info_line_last: false
         if line =~ /^.*Failures:\s+(\d+),.*$/
@@ -98,11 +101,15 @@ class FilterPlugin
   def self.def_filter5
     register(:line_filter, priority: 50) { |options, line|
       info_line_last = Plugins.get_var :info_line_last
-      if options[:show_projects] && line =~ BUILD_REGEX
+      info_line = Plugins.get_var :info_line
+      if line.gsub(/\e\[.*?m/, '').chomp == INFO_LINE_FULL
+        Plugins.set_var :info_line, line.chomp
+        nil
+      elsif options[:show_projects] && line =~ BUILD_REGEX
         str = ''
-        str << INFO_LINE << "\n" unless info_line_last
+        str << "#{info_line}\n" unless info_line_last
         str << line << "\n"
-        str << INFO_LINE << "\n"
+        str << "#{info_line}\n"
         Plugins.set_var :info_line_last, true
         str
       else

data/lib/mvn2/plugin/live_print.plugin.rb

@@ -1,3 +1,4 @@
+require 'pty'
 require 'everyday-plugins'
 include EverydayPlugins
 class LivePrintPlugin
@@ -21,12 +22,14 @@ class LivePrintPlugin
       else
         log_file = nil
       end
-      IO.popen(cmd).each do |l|
-        log_file << l unless log_file.nil?
-        output = Plugins.get :line_filter, l
-        puts "\r\e[2K#{output}" unless output.nil?
-        result = true if l.chomp.start_with?('[INFO] BUILD SUCCESS')
-      end
+      PTY.spawn("TERM='xterm-256color' #{cmd}") { |r, w, pid|
+        r.each { |l|
+          log_file << l.gsub(/\e\[.*?m/, '') unless log_file.nil?
+          output = Plugins.get :line_filter, l
+          puts "\r\e[2K#{output}" unless output.nil?
+          result = true if l.chomp.gsub(/\e\[.*?;/, '').start_with?('[INFO] BUILD SUCCESS')
+        }
+      }
     ensure
       log_file.close unless log_file.nil?
     end

data/lib/mvn2/version.rb

@@ -1,3 +1,3 @@
 module Mvn2
-  VERSION = '2.6.12'
+  VERSION = '2.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mvn2
 version: !ruby/object:Gem::Version
-  version: 2.6.12
+  version: 2.7.0
 platform: ruby
 authors:
 - Eric Henderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-15 00:00:00.000000000 Z
+date: 2017-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Maven helper