autobuild 1.14.0 → 1.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc3844e5cb144f3b3e1fda8a22ac5b6531c12439
-  data.tar.gz: ddbecdd7203bd378c2c4504d1598e8da3be460aa
+  metadata.gz: 25014dd95ce502bebe2ffe0c7e8247042d4c64c1
+  data.tar.gz: 795990e0fb678cbc772882121735c50e306a1d21
 SHA512:
-  metadata.gz: aa366e2f4f0b29e6c9f2752528fb44445cb419cc7b1e0fd697f7b4a1cf66d174d86f11e5eabc5872ba90e8f27ec0cdbcc68a1a097096fa5d3d3fc59fdf8558e3
-  data.tar.gz: 72ec8e6137f757cd13af392076b7e6b3b04af67963628e4d8a4de823fe1b631363d3b45f03dc22a69b1432a6dd198a4e51144105231b3924153928ea453b7262
+  metadata.gz: afefb1dcef0ae0ad2413715f69ec890283ed51b581dae702c1e55a9f32615527d06029c575e8c94f02f18b054c1652a8d46a39a45174c68e4a66cd98db4d4c47
+  data.tar.gz: 7663d891ffc50ad4099daecbfd6af60b2793696e64b9e5bd59aedca72cf417f03bba1cce095023dc12b01b5d9cb951bc604a02ce8bf48cdad1f9b89259720ed9

data/autobuild.gemspec

@@ -22,6 +22,8 @@ Gem::Specification.new do |s|
     s.add_runtime_dependency "rake", "~> 12.0", ">= 12.3.0"
     s.add_runtime_dependency "utilrb", "~> 3.0", ">= 3.0"
     s.add_runtime_dependency 'tty-prompt', '~> 0.15.0'
+    s.add_runtime_dependency 'tty-cursor', '~> 0.5.0'
+    s.add_runtime_dependency 'tty-screen', '~> 0.6.4'
     s.add_runtime_dependency 'pastel', '~> 0.7.0', '>= 0.7.0'
     s.add_development_dependency "flexmock", '~> 2.0', ">= 2.0.0"
     s.add_development_dependency "minitest", "~> 5.0", ">= 5.0"

data/lib/autobuild/config.rb

@@ -85,26 +85,6 @@ def full_build?
     register_utility_class 'doc', Utility, disabled_by_default: false
     register_utility_class 'test', TestUtility, disabled_by_default: true
 
-    @colorizer = Pastel.new
-    class << self
-        def color=(flag)
-            @colorizer =
-                if flag.nil?
-                    Pastel.new
-                else
-                    Pastel.new(enabled: flag)
-                end
-        end
-
-        def color?
-            @colorizer.enabled?
-        end
-    end
-
-    def self.color(message, *style)
-        @colorizer.decorate(message, *style)
-    end
-
     DEFAULT_OPTIONS = { :nice => nil,
         :srcdir => Dir.pwd, :prefix => Dir.pwd, :logdir => nil,
         :verbose => false, :debug => false, :do_build => true, :do_forced_build => false, :do_rebuild => false, :do_update => true, 

data/lib/autobuild/package.rb

@@ -485,17 +485,13 @@ def message(*args)
             Autobuild.message(*args)
         end
 
-        def progress_start(*args, &block)
+        def progress_start(*args, done_message: nil, **raw_options, &block)
             args[0] = process_formatting_string(args[0], :bold)
-            if args.last.kind_of?(Hash)
-                options, raw_options = Kernel.filter_options args.last, :done_message
-                if options[:done_message]
-                    options[:done_message] = process_formatting_string(options[:done_message])
-                end
-                args[-1] = options.merge(raw_options)
+            if done_message
+                done_message = process_formatting_string(done_message)
             end
-                
-            Autobuild.progress_start(self, *args, &block)
+            Autobuild.progress_start(self, *args,
+                done_message: done_message, **raw_options, &block)
         end
 
         def progress(*args)
@@ -504,10 +500,8 @@ def progress(*args)
         end
 
         def progress_done(done_message = nil)
-            if done_message && Autobuild.has_progress_for?(self)
-                progress(process_formatting_string(done_message))
-            end
-            Autobuild.progress_done(self)
+            done_message = process_formatting_string(done_message) if done_message
+            Autobuild.progress_done(self, message: done_message)
         end
 
         def apply_post_install

data/lib/autobuild/progress_display.rb

@@ -0,0 +1,209 @@
+module Autobuild
+    # Management of the progress display
+    class ProgressDisplay
+        def initialize(io, color: ::Autobuild.method(:color))
+            @io = io
+            #@cursor = Blank.new
+            @cursor = TTY::Cursor
+            @last_formatted_progress = []
+            @progress_messages = []
+
+            @silent = false
+            @color = color
+            @progress_enabled = true
+            @display_lock = Mutex.new
+        end
+
+        attr_writer :silent
+
+        def silent?
+            @silent
+        end
+
+        def silent
+            @silent, silent = true, @silent
+            yield
+        ensure
+            @silent = silent
+        end
+
+        attr_writer :progress_enabled
+
+        def progress_enabled?
+            !@silent && @progress_enabled
+        end
+
+        def message(message, *args, io: @io)
+            return if silent?
+
+            if args.last.respond_to?(:to_io)
+                io = args.pop
+            end
+
+            @display_lock.synchronize do
+                io.print "#{@cursor.clear_screen_down}#{@color.call(message, *args)}\n"
+                io.flush if @io != io
+                display_progress
+                @io.flush
+            end
+        end
+
+        def progress_start(key, *args, done_message: nil)
+            progress_done(key)
+
+            formatted_message = @color.call(*args)
+            @progress_messages << [key, formatted_message]
+            if progress_enabled?
+                @display_lock.synchronize do
+                    display_progress
+                end
+            else
+                message "  #{formatted_message}"
+            end
+
+            if block_given?
+                begin
+                    result = yield
+                    progress_done(key, message: done_message)
+                    result
+                rescue Exception
+                    progress_done(key)
+                    raise
+                end
+            end
+        end
+
+        def progress(key, *args)
+            @display_lock.synchronize do
+                found = false
+                @progress_messages.map! do |msg_key, msg|
+                    if msg_key == key
+                        found = true
+                        [msg_key, @color.call(*args)]
+                    else
+                        [msg_key, msg]
+                    end
+                end
+                @progress_messages << [key, @color.call(*args)] unless found
+                display_progress
+            end
+        end
+
+        def progress_done(key, display_last = true, message: nil)
+            changed = @display_lock.synchronize do
+                current_size = @progress_messages.size
+                @progress_messages.delete_if do |msg_key, msg|
+                    if msg_key == key
+                        if display_last && !message
+                            message = msg
+                        end
+                        true
+                    end
+                end
+                current_size != @progress_messages.size
+            end
+
+            if changed
+                if message
+                    message("  #{message}")
+                    # Note: message calls display_progress already
+                else
+                    @display_lock.synchronize do
+                        display_progress
+                    end
+                end
+                true
+            end
+        end
+
+
+        def display_progress
+            return unless progress_enabled?
+            
+            formatted = format_grouped_messages(@progress_messages.map(&:last), indent: "  ")
+            @io.print @cursor.clear_screen_down
+            @io.print formatted.join("\n")
+            if formatted.size > 1
+                @io.print "#{@cursor.up(formatted.size - 1)}#{@cursor.column(0)}"
+            else
+                @io.print @cursor.column(0)
+            end
+            @io.flush
+        end
+
+        def find_common_prefix(msg, other_msg)
+            msg = msg.split(" ")
+            other_msg = other_msg.split(" ")
+            msg.each_with_index do |token, idx|
+                if other_msg[idx] != token
+                    prefix = msg[0..(idx - 1)].join(" ")
+                    if !prefix.empty?
+                        prefix << " "
+                    end
+                    return prefix
+                end
+            end
+            return msg.join(" ")
+        end
+
+        def group_messages(messages)
+            messages = messages.sort
+
+            groups = Array.new
+            groups << ["", (0...messages.size)]
+            messages.each_with_index do |msg, idx|
+                prefix, grouping = nil, false
+                messages[(idx + 1)..-1].each_with_index do |other_msg, other_idx|
+                    other_idx += idx + 1
+                    prefix ||= find_common_prefix(msg, other_msg)
+                    break if !other_msg.start_with?(prefix)
+
+                    if grouping
+                        break if prefix != groups.last[0]
+                        groups.last[1] << other_idx
+                    else
+                        current_prefix, current_group = groups.last
+                        if prefix.size > current_prefix.size # create a new group from there
+                            groups.last[1] = (current_group.first..[idx-1,current_group.last].min)
+                            groups << [prefix, [idx, other_idx]]
+                            grouping = true
+                        else break
+                        end
+                    end
+                end
+            end
+            if groups.last.last.last < messages.size
+                groups << ["", (groups.last.last.last + 1)...(messages.size)]
+            end
+
+            groups.map do |prefix, indexes|
+                indexes = indexes.to_a
+                next if indexes.empty?
+                range = (prefix.size)..-1
+                [prefix, indexes.map { |i| messages[i][range] }]
+            end.compact
+        end
+
+        def format_grouped_messages(messages, indent: "  ")
+            terminal_w = TTY::Screen.width
+            groups = group_messages(messages)
+            groups.each_with_object([]) do |(prefix, messages), lines|
+                if prefix.empty?
+                    lines << "#{indent}#{messages.shift}"
+                else
+                    lines << "#{indent}#{prefix.dup.strip} #{messages.shift}"
+                end
+                until messages.empty?
+                    msg = messages.shift.strip
+                    if lines.last.size + 2 + msg.size > terminal_w
+                        lines << "#{indent}  #{msg}"
+                    else
+                        lines.last << ", #{msg}"
+                    end
+                end
+                lines
+            end
+        end
+    end
+end
+

data/lib/autobuild/reporting.rb

@@ -1,245 +1,78 @@
 require 'autobuild/exceptions'
+require 'pastel'
+
 module Autobuild
+    @colorizer = Pastel.new
     class << self
-        attr_reader :display_lock
-        def silent?
-            @silent
+        def color=(flag)
+            @colorizer =
+                if flag.nil?
+                    Pastel.new
+                else
+                    Pastel.new(enabled: flag)
+                end
         end
-        attr_writer :silent
-    end
-    @display_lock = Mutex.new
-    @silent = false
 
-    def self.silent
-        Autobuild.silent, silent = true, Autobuild.silent?
-        yield
-    ensure
-        Autobuild.silent = silent
-    end
-
-    def self.progress_display_enabled?
-        @progress_display_enabled
-    end
-
-    def self.progress_display_enabled=(value)
-        @progress_display_enabled = value
+        def color?
+            @colorizer.enabled?
+        end
+        def color(message, *style)
+            @colorizer.decorate(message, *style)
+        end
     end
+end
 
-    @progress_display_enabled = true
-    @last_progress_msg = nil
+require 'tty/cursor'
+require 'tty/screen'
+require 'autobuild/progress_display'
 
-    def self.message(*args)
-        return if silent?
-        display_lock.synchronize do
-            display_message(*args)
+module Autobuild
+    class << self
+        def silent?
+            @display.silent?
+        end
+        def silent=(flag)
+            @display.silent = flag
         end
     end
+    @display = ProgressDisplay.new(STDOUT)
 
-    def self.display_message(*args)
-        io = STDOUT
-        if args.last.kind_of?(IO)
-            io = args.pop
-        end
-        msg =
-            if args.empty? then ""
-            else "#{color(*args)}"
-            end
+    def self.silent(&block)
+        @display.silent(&block)
+    end
 
-        if !Autobuild.progress_display_enabled?
-            if !silent?
-                io.puts msg
-            end
-            return
-        end
+    def self.progress_display_enabled?
+        @display.progress_enabled?
+    end
 
-        if !silent?
-            io.puts "#{clear_line}#{msg}"
-            if @last_progress_msg
-                io.print @last_progress_msg
-            end
-        end
+    def self.progress_display_enabled=(value)
+        @display.progress_enabled = value
     end
 
-    class << self
-        attr_reader :progress_messages
+    def self.message(*args, **options)
+        @display.message(*args, **options)
     end
-    @progress_messages = Array.new
 
     # Displays an error message
     def self.error(message = "")
-        message("  ERROR: #{message}", :red, :bold, STDERR)
+        message("  ERROR: #{message}", :red, :bold, io: STDERR)
     end
 
     # Displays a warning message
     def self.warn(message = "", *style)
-        message("  WARN: #{message}", :magenta, *style, STDERR)
+        message("  WARN: #{message}", :magenta, *style, io: STDERR)
     end
 
-    # @return [Boolean] true if there is some progress messages for the given
-    #   key
-    def self.has_progress_for?(key)
-        progress_messages.any? { |msg_key, _| msg_key == key }
+    def self.progress_start(key, *args, **options, &block)
+        @display.progress_start(key, *args, **options, &block)
     end
 
-    def self.clear_line
-        "\e[2K\e[1G"
-    end
-
-    def self.progress_start(key, *args)
-        if args.last.kind_of?(Hash)
-            options = Kernel.validate_options args.pop, :done_message => nil
-        else
-            options = Hash.new
-        end
-
-        progress_done(key)
-        display_lock.synchronize do
-            progress_messages << [key, color(*args)]
-            if Autobuild.progress_display_enabled?
-                display_progress
-            else
-                display_message("  " + color(*args))
-            end
-        end
-
-        if block_given?
-            begin
-                result = yield
-                if options[:done_message] && has_progress_for?(key)
-                    progress(key, *options[:done_message])
-                end
-                progress_done(key, true)
-                result
-            rescue Exception
-                progress_done(key, false)
-                raise
-            end
-        end
-    end
     def self.progress(key, *args)
-        found = false
-        display_lock.synchronize do
-            progress_messages.map! do |msg_key, msg|
-                if msg_key == key
-                    found = true
-                    [msg_key, color(*args)]
-                else
-                    [msg_key, msg]
-                end
-            end
-            if !found
-                progress_messages << [key, color(*args)]
-            end
-
-            return if !Autobuild.progress_display_enabled?
-
-            display_progress
-        end
+        @display.progress(key, *args)
     end
 
-    def self.progress_done(key, display_last = true)
-        found = false
-        display_lock.synchronize do
-            last_msg = nil
-            progress_messages.delete_if do |msg_key, msg|
-                if msg_key == key
-                    found = true
-                    last_msg = msg
-                end
-            end
-            if found
-                if display_last
-                    display_message("  #{last_msg}")
-                end
-                if @last_progress_msg
-                    display_progress
-                end
-            end
-        end
-        found
-    end
-
-    def self.find_common_prefix(msg, other_msg)
-        msg = msg.split(" ")
-        other_msg = other_msg.split(" ")
-        msg.each_with_index do |token, idx|
-            if other_msg[idx] != token
-                prefix = msg[0..(idx - 1)].join(" ")
-                if !prefix.empty?
-                    prefix << " "
-                end
-                return prefix
-            end
-        end
-        return msg.join(" ")
-    end
-
-    def self.format_progress_message(messages)
-        messages = messages.sort
-
-        groups = Array.new
-        groups << ["", (0...messages.size)]
-        messages.each_with_index do |msg, idx|
-            prefix, grouping = nil, false
-            messages[(idx + 1)..-1].each_with_index do |other_msg, other_idx|
-                other_idx += idx + 1
-                prefix ||= find_common_prefix(msg, other_msg)
-                break if !other_msg.start_with?(prefix)
-
-                if grouping
-                    break if prefix != groups.last[0]
-                    groups.last[1] << other_idx
-                else
-                    current_prefix, current_group = groups.last
-                    if prefix.size > current_prefix.size # create a new group from there
-                        groups.last[1] = (current_group.first..[idx-1,current_group.last].min)
-                        groups << [prefix, [idx, other_idx]]
-                        grouping = true
-                    else break
-                    end
-                end
-            end
-        end
-        if groups.last.last.last < messages.size
-            groups << ["", (groups.last.last.last + 1)...(messages.size)]
-        end
-
-        result = []
-        groups.each do |prefix, indexes|
-            if prefix.empty?
-                indexes.each do |index|
-                    result << messages[index]
-                end
-            else
-                grouped_messages = []
-                indexes.each do |index|
-                    grouped_messages << messages[index][(prefix.size)..-1]
-                end
-                if !grouped_messages.empty?
-                    result << "#{prefix}#{grouped_messages.uniq.join(", ")}"
-                end
-            end
-        end
-        result.join(" | ")
-    end
-
-    def self.display_progress
-        msg = format_progress_message(progress_messages.map(&:last))
-
-        if msg.empty?
-            @last_progress_msg = nil
-        else
-            msg = "  #{msg}"
-            @last_progress_msg = msg
-        end
-
-        if !silent?
-            if Autobuild.progress_display_enabled?
-                print "#{clear_line}#{msg}"
-            elsif @last_progress_msg
-                puts msg
-            end
-        end
+    def self.progress_done(key, display_last = true, message: nil)
+        @display.progress_done(key, display_last, message: message)
     end
 
     ## The reporting module provides the framework # to run commands in
@@ -289,6 +122,9 @@ def self.default_report_on_package_failures
         # @param [Symbol] on_package_failures how does the reporting should behave.
         #
         def self.report_finish_on_error(errors, on_package_failures: default_report_on_package_failures, interrupted_by: nil)
+            if not_package_error = errors.find { |e| !e.respond_to?(:fatal?) }
+                raise not_package_error
+            end
             if ![:raise, :report_silent, :exit_silent].include?(on_package_failures)
                 errors.each { |e| error(e) }
             end

data/lib/autobuild/version.rb

@@ -1,3 +1,3 @@
 module Autobuild
-    VERSION = "1.14.0" unless defined? Autobuild::VERSION
+    VERSION = "1.14.1" unless defined? Autobuild::VERSION
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.14.1
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-27 00:00:00.000000000 Z
+date: 2018-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -64,6 +64,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.15.0
+- !ruby/object:Gem::Dependency
+  name: tty-cursor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: tty-screen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.4
 - !ruby/object:Gem::Dependency
   name: pastel
   requirement: !ruby/object:Gem::Requirement
@@ -200,6 +228,7 @@ files:
 - lib/autobuild/packages/ruby.rb
 - lib/autobuild/parallel.rb
 - lib/autobuild/pkgconfig.rb
+- lib/autobuild/progress_display.rb
 - lib/autobuild/rake_task_extension.rb
 - lib/autobuild/reporting.rb
 - lib/autobuild/subcommand.rb