diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock index 37da4fce00..74849d0e38 100644 --- a/Library/Homebrew/Gemfile.lock +++ b/Library/Homebrew/Gemfile.lock @@ -157,7 +157,7 @@ GEM rubocop-sorbet (0.7.0) rubocop (>= 0.90.0) ruby-macho (3.0.0) - ruby-progressbar (1.11.0) + ruby-progressbar (1.12.0) rubyntlm (0.6.3) simplecov (0.22.0) docile (~> 1.1) diff --git a/Library/Homebrew/sorbet/rbi/gems/ruby-progressbar@1.11.0.rbi b/Library/Homebrew/sorbet/rbi/gems/ruby-progressbar@1.12.0.rbi similarity index 89% rename from Library/Homebrew/sorbet/rbi/gems/ruby-progressbar@1.11.0.rbi rename to Library/Homebrew/sorbet/rbi/gems/ruby-progressbar@1.12.0.rbi index 5d5a84fe10..32b5f855de 100644 --- a/Library/Homebrew/sorbet/rbi/gems/ruby-progressbar@1.11.0.rbi +++ b/Library/Homebrew/sorbet/rbi/gems/ruby-progressbar@1.12.0.rbi @@ -50,24 +50,24 @@ class ProgressBar::Base def autofinish=(_arg0); end def autostart; end def autostart=(_arg0); end - def bar; end - def bar=(_arg0); end + def bar_component; end + def bar_component=(_arg0); end def finished; end def finished=(_arg0); end def output; end def output=(_arg0); end - def percentage; end - def percentage=(_arg0); end + def percentage_component; end + def percentage_component=(_arg0); end def progressable; end def progressable=(_arg0); end - def rate; end - def rate=(_arg0); end - def time; end - def time=(_arg0); end + def rate_component; end + def rate_component=(_arg0); end + def time_component; end + def time_component=(_arg0); end def timer; end def timer=(_arg0); end - def title_comp; end - def title_comp=(_arg0); end + def title_component; end + def title_component=(_arg0); end def update_progress(*args); end end @@ -99,9 +99,9 @@ class ProgressBar::Calculators::Length def unix?; end end -class ProgressBar::Calculators::RunningAverage +class ProgressBar::Calculators::SmoothedAverage class << self - def calculate(current_average, new_value_to_average, smoothing_factor); end + def calculate(current_average, new_value_to_average, rate); end end end @@ -110,6 +110,11 @@ module ProgressBar::Components; end class ProgressBar::Components::Bar def initialize(options = T.unsafe(nil)); end + def bar(length); end + def bar_with_percentage(length); end + def complete_bar(length); end + def complete_bar_with_percentage(length); end + def incomplete_space(length); end def length; end def length=(_arg0); end def progress; end @@ -124,12 +129,7 @@ class ProgressBar::Components::Bar private - def bar(length); end - def bar_with_percentage(length); end - def complete_bar(length); end - def complete_bar_with_percentage(length); end def completed_length; end - def incomplete_space(length); end def incomplete_string; end def integrated_percentage_complete_string; end def standard_complete_string; end @@ -144,15 +144,12 @@ ProgressBar::Components::Bar::DEFAULT_UPA_STEPS = T.let(T.unsafe(nil), Array) class ProgressBar::Components::Percentage def initialize(options = T.unsafe(nil)); end - def progress; end - def progress=(_arg0); end - - private - def justified_percentage; end def justified_percentage_with_precision; end def percentage; end def percentage_with_precision; end + def progress; end + def progress=(_arg0); end end class ProgressBar::Components::Rate @@ -160,12 +157,10 @@ class ProgressBar::Components::Rate def progress; end def progress=(_arg0); end + def rate_of_change(format_string = T.unsafe(nil)); end + def rate_of_change_with_precision; end def rate_scale; end def rate_scale=(_arg0); end - def started_at; end - def started_at=(_arg0); end - def stopped_at; end - def stopped_at=(_arg0); end def timer; end def timer=(_arg0); end @@ -173,8 +168,6 @@ class ProgressBar::Components::Rate def base_rate; end def elapsed_seconds; end - def rate_of_change(format_string = T.unsafe(nil)); end - def rate_of_change_with_precision; end def scaled_rate; end end @@ -182,15 +175,14 @@ class ProgressBar::Components::Time def initialize(options = T.unsafe(nil)); end def elapsed_with_label; end - def estimated_with_label; end + def estimated_wall_clock; end + def estimated_with_friendly_oob; end + def estimated_with_label(out_of_bounds_time_format = T.unsafe(nil)); end + def estimated_with_no_oob; end + def estimated_with_unknown_oob; end protected - def estimated_with_friendly_oob; end - def estimated_with_no_oob; end - def estimated_with_unknown_oob; end - def out_of_bounds_time_format; end - def out_of_bounds_time_format=(format); end def progress; end def progress=(_arg0); end def timer; end @@ -199,9 +191,9 @@ class ProgressBar::Components::Time private def elapsed; end - def estimated; end + def estimated(out_of_bounds_time_format); end def estimated_seconds_remaining; end - def estimated_with_elapsed_fallback; end + def estimated_with_elapsed_fallback(out_of_bounds_time_format); end end ProgressBar::Components::Time::ELAPSED_LABEL = T.let(T.unsafe(nil), String) @@ -213,6 +205,7 @@ ProgressBar::Components::Time::OOB_TEXT_TO_FORMAT = T.let(T.unsafe(nil), Hash) ProgressBar::Components::Time::OOB_TIME_FORMATS = T.let(T.unsafe(nil), Array) ProgressBar::Components::Time::OOB_UNKNOWN_TIME_TEXT = T.let(T.unsafe(nil), String) ProgressBar::Components::Time::TIME_FORMAT = T.let(T.unsafe(nil), String) +ProgressBar::Components::Time::WALL_CLOCK_FORMAT = T.let(T.unsafe(nil), String) class ProgressBar::Components::Title def initialize(options = T.unsafe(nil)); end @@ -333,8 +326,10 @@ class ProgressBar::Progress def reset; end def running_average; end def running_average=(_arg0); end - def smoothing; end - def smoothing=(_arg0); end + def running_average_calculator; end + def running_average_calculator=(_arg0); end + def running_average_rate; end + def running_average_rate=(_arg0); end def start(options = T.unsafe(nil)); end def starting_position; end def starting_position=(_arg0); end @@ -345,8 +340,10 @@ class ProgressBar::Progress end ProgressBar::Progress::DEFAULT_BEGINNING_POSITION = T.let(T.unsafe(nil), Integer) -ProgressBar::Progress::DEFAULT_SMOOTHING = T.let(T.unsafe(nil), Float) +ProgressBar::Progress::DEFAULT_RUNNING_AVERAGE_CALCULATOR = ProgressBar::Calculators::SmoothedAverage +ProgressBar::Progress::DEFAULT_RUNNING_AVERAGE_RATE = T.let(T.unsafe(nil), Float) ProgressBar::Progress::DEFAULT_TOTAL = T.let(T.unsafe(nil), Integer) +ProgressBar::Progress::RUNNING_AVERAGE_CALCULATOR_MAP = T.let(T.unsafe(nil), Hash) module ProgressBar::Refinements; end module ProgressBar::Refinements::Enumerator; end @@ -384,6 +381,7 @@ class ProgressBar::Timer def divide_seconds(seconds); end def elapsed_seconds; end def elapsed_whole_seconds; end + def now; end def pause; end def reset; end def reset?; end diff --git a/Library/Homebrew/vendor/bundle/bundler/setup.rb b/Library/Homebrew/vendor/bundle/bundler/setup.rb index 1085caed17..c0d59e2a1a 100644 --- a/Library/Homebrew/vendor/bundle/bundler/setup.rb +++ b/Library/Homebrew/vendor/bundle/bundler/setup.rb @@ -101,7 +101,7 @@ $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rspec-sorbet-1.9.1/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rspec_junit_formatter-0.6.0/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rubocop-ast-1.27.0/lib") -$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/ruby-progressbar-1.11.0/lib") +$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/ruby-progressbar-1.12.0/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/unicode-display_width-2.4.2/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rubocop-1.46.0/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rubocop-capybara-2.17.1/lib") diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar.rb deleted file mode 100644 index 48962f2578..0000000000 --- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar.rb +++ /dev/null @@ -1,22 +0,0 @@ -# frozen_string_literal: true - -require 'ruby-progressbar/output' -require 'ruby-progressbar/outputs/tty' -require 'ruby-progressbar/outputs/non_tty' -require 'ruby-progressbar/timer' -require 'ruby-progressbar/progress' -require 'ruby-progressbar/throttle' -require 'ruby-progressbar/calculators/length' -require 'ruby-progressbar/calculators/running_average' -require 'ruby-progressbar/components' -require 'ruby-progressbar/format' -require 'ruby-progressbar/base' -require 'ruby-progressbar/refinements' if Module. - private_instance_methods. - include?(:using) - -class ProgressBar - def self.create(*args) - ProgressBar::Base.new(*args) - end -end diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/calculators/running_average.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/calculators/running_average.rb deleted file mode 100644 index 45fae7238b..0000000000 --- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/calculators/running_average.rb +++ /dev/null @@ -1,9 +0,0 @@ -class ProgressBar -module Calculators -class RunningAverage - def self.calculate(current_average, new_value_to_average, smoothing_factor) - new_value_to_average * (1.0 - smoothing_factor) + current_average * smoothing_factor - end -end -end -end diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/components.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/components.rb deleted file mode 100644 index 20ee0595df..0000000000 --- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/components.rb +++ /dev/null @@ -1,5 +0,0 @@ -require 'ruby-progressbar/components/bar' -require 'ruby-progressbar/components/percentage' -require 'ruby-progressbar/components/rate' -require 'ruby-progressbar/components/time' -require 'ruby-progressbar/components/title' diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/format.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/format.rb deleted file mode 100644 index 28fcb2cddf..0000000000 --- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/format.rb +++ /dev/null @@ -1,3 +0,0 @@ -require 'ruby-progressbar/format/molecule' -require 'ruby-progressbar/format/formatter' -require 'ruby-progressbar/format/string' diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/format/molecule.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/format/molecule.rb deleted file mode 100644 index 95d18e11d7..0000000000 --- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/format/molecule.rb +++ /dev/null @@ -1,60 +0,0 @@ -class ProgressBar -module Format -class Molecule - MOLECULES = { - :t => [:title_comp, :title], - :T => [:title_comp, :title], - :c => [:progressable, :progress], - :C => [:progressable, :total], - :u => [:progressable, :total_with_unknown_indicator], - :p => [:percentage, :percentage], - :P => [:percentage, :percentage_with_precision], - :j => [:percentage, :justified_percentage], - :J => [:percentage, :justified_percentage_with_precision], - :a => [:time, :elapsed_with_label], - :e => [:time, :estimated_with_unknown_oob], - :E => [:time, :estimated_with_friendly_oob], - :f => [:time, :estimated_with_no_oob], - :B => [:bar, :complete_bar], - :b => [:bar, :bar], - :W => [:bar, :complete_bar_with_percentage], - :w => [:bar, :bar_with_percentage], - :i => [:bar, :incomplete_space], - :r => [:rate, :rate_of_change], - :R => [:rate, :rate_of_change_with_precision] - }.freeze - - BAR_MOLECULES = %w{W w B b i}.freeze - - attr_accessor :key, - :method_name - - def initialize(letter) - self.key = letter - self.method_name = MOLECULES.fetch(key.to_sym) - end - - def bar_molecule? - BAR_MOLECULES.include? key - end - - def non_bar_molecule? - !bar_molecule? - end - - def full_key - "%#{key}" - end - - def lookup_value(environment, length = 0) - component = environment.__send__(method_name[0]) - - if bar_molecule? - component.__send__(method_name[1], length).to_s - else - component.__send__(method_name[1]).to_s - end - end -end -end -end diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/version.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/version.rb deleted file mode 100644 index 6a0ebac276..0000000000 --- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/version.rb +++ /dev/null @@ -1,3 +0,0 @@ -class ProgressBar - VERSION = '1.11.0'.freeze -end diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar.rb new file mode 100644 index 0000000000..08f3792e61 --- /dev/null +++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar.rb @@ -0,0 +1,12 @@ +# frozen_string_literal: true + +require 'ruby-progressbar/base' +require 'ruby-progressbar/refinements' if Module. + private_instance_methods. + include?(:using) + +class ProgressBar + def self.create(*args) + ProgressBar::Base.new(*args) + end +end diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/base.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/base.rb similarity index 63% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/base.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/base.rb index 3afb728f65..a2fdf920a4 100644 --- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/base.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/base.rb @@ -1,5 +1,17 @@ require 'forwardable' +require 'ruby-progressbar/components/bar' +require 'ruby-progressbar/components/percentage' +require 'ruby-progressbar/components/rate' +require 'ruby-progressbar/components/time' +require 'ruby-progressbar/components/title' +require 'ruby-progressbar/format/formatter' +require 'ruby-progressbar/format/string' +require 'ruby-progressbar/outputs/non_tty' +require 'ruby-progressbar/outputs/tty' +require 'ruby-progressbar/progress' +require 'ruby-progressbar/timer' + class ProgressBar class Base extend Forwardable @@ -21,14 +33,14 @@ class Base self.timer = Timer.new(options) self.progressable = Progress.new(options) - options = options.merge(:timer => timer, - :progress => progressable) + options = options.merge(:progress => progressable, + :timer => timer) - self.title_comp = Components::Title.new(options) - self.bar = Components::Bar.new(options) - self.percentage = Components::Percentage.new(options) - self.rate = Components::Rate.new(options) - self.time = Components::Time.new(options) + self.title_component = Components::Title.new(options) + self.bar_component = Components::Bar.new(options) + self.percentage_component = Components::Percentage.new(options) + self.rate_component = Components::Rate.new(options) + self.time_component = Components::Time.new(options) self.output = Output.detect(options.merge(:bar => self)) @format = Format::String.new(output.resolve_format(options[:format])) @@ -102,19 +114,19 @@ class Base end def progress_mark=(mark) - output.refresh_with_format_change { bar.progress_mark = mark } + output.refresh_with_format_change { bar_component.progress_mark = mark } end def remainder_mark=(mark) - output.refresh_with_format_change { bar.remainder_mark = mark } + output.refresh_with_format_change { bar_component.remainder_mark = mark } end def title - title_comp.title + title_component.title end def title=(title) - output.refresh_with_format_change { title_comp.title = title } + output.refresh_with_format_change { title_component.title = title } end def to_s(new_format = nil) @@ -128,17 +140,17 @@ class Base { 'output_stream' => output.__send__(:stream), 'length' => output.length, - 'title' => title_comp.title, - 'progress_mark' => bar.progress_mark, - 'remainder_mark' => bar.remainder_mark, + 'title' => title_component.title, + 'progress_mark' => bar_component.progress_mark, + 'remainder_mark' => bar_component.remainder_mark, 'progress' => progressable.progress, 'total' => progressable.total, 'percentage' => progressable.percentage_completed_with_precision.to_f, - 'elapsed_time_in_seconds' => time.__send__(:timer).elapsed_seconds, - 'estimated_time_remaining_in_seconds' => time.__send__(:estimated_seconds_remaining), - 'base_rate_of_change' => rate.__send__(:base_rate), - 'scaled_rate_of_change' => rate.__send__(:scaled_rate), - 'unknown_progress_animation_steps' => bar.upa_steps, + 'elapsed_time_in_seconds' => time_component.__send__(:timer).elapsed_seconds, + 'estimated_time_remaining_in_seconds' => time_component.__send__(:estimated_seconds_remaining), + 'base_rate_of_change' => rate_component.__send__(:base_rate), + 'scaled_rate_of_change' => rate_component.__send__(:scaled_rate), + 'unknown_progress_animation_steps' => bar_component.upa_steps, 'throttle_rate' => output.__send__(:throttle).rate, 'started?' => started?, 'stopped?' => stopped?, @@ -164,11 +176,11 @@ class Base attr_accessor :output, :timer, :progressable, - :title_comp, - :bar, - :percentage, - :rate, - :time, + :title_component, + :bar_component, + :percentage_component, + :rate_component, + :time_component, :autostart, :autofinish, :finished diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/calculators/length.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/calculators/length.rb similarity index 96% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/calculators/length.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/calculators/length.rb index 8ff6e38b14..3a48055238 100644 --- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/calculators/length.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/calculators/length.rb @@ -50,7 +50,6 @@ class Length end # rubocop:enable Style/RescueStandardError - # rubocop:disable Lint/DuplicateMethods begin require 'io/console' @@ -68,7 +67,6 @@ class Length dynamic_width_via_system_calls end end - # rubocop:enable Lint/DuplicateMethods def dynamic_width_via_output_stream_object _rows, columns = output.winsize diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/calculators/smoothed_average.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/calculators/smoothed_average.rb new file mode 100644 index 0000000000..5e74a1759e --- /dev/null +++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/calculators/smoothed_average.rb @@ -0,0 +1,9 @@ +class ProgressBar +module Calculators +class SmoothedAverage + def self.calculate(current_average, new_value_to_average, rate) + (new_value_to_average * (1.0 - rate)) + (current_average * rate) + end +end +end +end diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/components/bar.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/components/bar.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/components/bar.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/components/bar.rb index c409bbf8ae..21ad63d519 100644 --- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/components/bar.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/components/bar.rb @@ -32,22 +32,6 @@ class Bar end end - private - - def integrated_percentage_complete_string - return standard_complete_string if completed_length < 5 - - " #{progress.percentage_completed} ".to_s.center(completed_length, progress_mark) - end - - def standard_complete_string - progress_mark * completed_length - end - - def incomplete_string - remainder_mark * (length - completed_length) - end - def bar(length) self.length = length @@ -66,12 +50,6 @@ class Bar to_s(:format => :integrated_percentage) end - def unknown_string - unknown_frame_string = unknown_progress_frame * ((length / upa_steps.size) + 2) - - unknown_frame_string[0, length] - end - def incomplete_space(length) self.length = length @@ -88,6 +66,28 @@ class Bar integrated_percentage_complete_string end + private + + def integrated_percentage_complete_string + return standard_complete_string if completed_length < 5 + + " #{progress.percentage_completed} ".to_s.center(completed_length, progress_mark) + end + + def standard_complete_string + progress_mark * completed_length + end + + def incomplete_string + remainder_mark * (length - completed_length) + end + + def unknown_string + unknown_frame_string = unknown_progress_frame * ((length / upa_steps.size) + 2) + + unknown_frame_string[0, length] + end + def completed_length (length * progress.percentage_completed / 100).floor end diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/components/percentage.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/components/percentage.rb similarity index 91% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/components/percentage.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/components/percentage.rb index aef34d9385..1d8419e2b6 100644 --- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/components/percentage.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/components/percentage.rb @@ -7,10 +7,8 @@ class Percentage self.progress = options[:progress] end - private - def percentage - progress.percentage_completed + progress.percentage_completed.to_s end def justified_percentage diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/components/rate.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/components/rate.rb similarity index 81% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/components/rate.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/components/rate.rb index 28b4eda86a..0d8b9ed6f2 100644 --- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/components/rate.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/components/rate.rb @@ -2,23 +2,17 @@ class ProgressBar module Components class Rate attr_accessor :rate_scale, - :started_at, - :stopped_at, :timer, :progress def initialize(options = {}) self.rate_scale = options[:rate_scale] || lambda { |x| x } - self.started_at = nil - self.stopped_at = nil self.timer = options[:timer] self.progress = options[:progress] end - private - def rate_of_change(format_string = '%i') - return 0 unless elapsed_seconds > 0 + return '0' if elapsed_seconds <= 0 format_string % scaled_rate end @@ -27,6 +21,8 @@ class Rate rate_of_change('%.2f') end + private + def scaled_rate rate_scale.call(base_rate) end diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/components/time.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/components/time.rb similarity index 58% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/components/time.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/components/time.rb index e29d20dc3f..98751f5798 100644 --- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/components/time.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/components/time.rb @@ -12,60 +12,56 @@ class Time NO_TIME_ELAPSED_TEXT = '--:--:--'.freeze ESTIMATED_LABEL = ' ETA'.freeze ELAPSED_LABEL = 'Time'.freeze + WALL_CLOCK_FORMAT = '%H:%M:%S'.freeze OOB_TEXT_TO_FORMAT = { :unknown => OOB_UNKNOWN_TIME_TEXT, :friendly => OOB_FRIENDLY_TIME_TEXT }.freeze def initialize(options = {}) - self.out_of_bounds_time_format = options[:out_of_bounds_time_format] - self.timer = options[:timer] - self.progress = options[:progress] + self.timer = options[:timer] + self.progress = options[:progress] end - def estimated_with_label - "#{ESTIMATED_LABEL}: #{estimated}" + def estimated_with_label(out_of_bounds_time_format = nil) + "#{ESTIMATED_LABEL}: #{estimated(out_of_bounds_time_format)}" end def elapsed_with_label "#{ELAPSED_LABEL}: #{elapsed}" end - protected - def estimated_with_no_oob - self.out_of_bounds_time_format = nil - - estimated_with_elapsed_fallback + estimated_with_elapsed_fallback(nil) end def estimated_with_unknown_oob - self.out_of_bounds_time_format = :unknown - - estimated_with_elapsed_fallback + estimated_with_elapsed_fallback(:unknown) end def estimated_with_friendly_oob - self.out_of_bounds_time_format = :friendly - - estimated_with_elapsed_fallback + estimated_with_elapsed_fallback(:friendly) end - attr_reader :out_of_bounds_time_format + def estimated_wall_clock + return timer.stopped_at.strftime(WALL_CLOCK_FORMAT) if progress.finished? + return NO_TIME_ELAPSED_TEXT unless timer.started? + + memo_estimated_seconds_remaining = estimated_seconds_remaining + return NO_TIME_ELAPSED_TEXT unless memo_estimated_seconds_remaining + + (timer.now + memo_estimated_seconds_remaining). + strftime(WALL_CLOCK_FORMAT) + end + + protected + attr_accessor :timer, :progress - def out_of_bounds_time_format=(format) - unless OOB_TIME_FORMATS.include? format - fail StandardError, "Invalid Out Of Bounds time format. Valid formats are #{OOB_TIME_FORMATS.inspect}" - end - - @out_of_bounds_time_format = format - end - private - def estimated + def estimated(out_of_bounds_time_format) memo_estimated_seconds_remaining = estimated_seconds_remaining return OOB_UNKNOWN_TIME_TEXT unless memo_estimated_seconds_remaining @@ -73,7 +69,7 @@ class Time hours, minutes, seconds = timer.divide_seconds(memo_estimated_seconds_remaining) if hours > OOB_LIMIT_IN_HOURS && out_of_bounds_time_format - OOB_TEXT_TO_FORMAT[out_of_bounds_time_format] + OOB_TEXT_TO_FORMAT.fetch(out_of_bounds_time_format) else TIME_FORMAT % [hours, minutes, seconds] end @@ -87,14 +83,16 @@ class Time TIME_FORMAT % [hours, minutes, seconds] end - def estimated_with_elapsed_fallback - progress.finished? ? elapsed_with_label : estimated_with_label + def estimated_with_elapsed_fallback(out_of_bounds_time_format) + return elapsed_with_label if progress.finished? + + estimated_with_label(out_of_bounds_time_format) end def estimated_seconds_remaining return if progress.unknown? || progress.none? || timer.stopped? || timer.reset? - (timer.elapsed_seconds * (progress.total / progress.running_average - 1)).round + (timer.elapsed_seconds * ((progress.total / progress.running_average) - 1)).round end end end diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/components/title.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/components/title.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/components/title.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/components/title.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/errors/invalid_progress_error.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/errors/invalid_progress_error.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/errors/invalid_progress_error.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/errors/invalid_progress_error.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/format/formatter.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/format/formatter.rb similarity index 92% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/format/formatter.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/format/formatter.rb index a7179ebf0f..f1e943d7df 100644 --- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/format/formatter.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/format/formatter.rb @@ -13,7 +13,7 @@ class Formatter bar_length = max_length - processed_string.displayable_length + format_string.bar_molecule_placeholder_length - bar_length = (bar_length < 0) ? 0 : bar_length + bar_length = 0 if bar_length < 0 format_string.bar_molecules.each do |molecule| processed_string.gsub!(molecule.full_key, diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/format/molecule.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/format/molecule.rb new file mode 100644 index 0000000000..3357264188 --- /dev/null +++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/format/molecule.rb @@ -0,0 +1,61 @@ +class ProgressBar +module Format +class Molecule + MOLECULES = { + :t => [:title_component, :title], + :T => [:title_component, :title], + :c => [:progressable, :progress], + :C => [:progressable, :total], + :u => [:progressable, :total_with_unknown_indicator], + :p => [:percentage_component, :percentage], + :P => [:percentage_component, :percentage_with_precision], + :j => [:percentage_component, :justified_percentage], + :J => [:percentage_component, :justified_percentage_with_precision], + :a => [:time_component, :elapsed_with_label], + :e => [:time_component, :estimated_with_unknown_oob], + :E => [:time_component, :estimated_with_friendly_oob], + :f => [:time_component, :estimated_with_no_oob], + :l => [:time_component, :estimated_wall_clock], + :B => [:bar_component, :complete_bar], + :b => [:bar_component, :bar], + :W => [:bar_component, :complete_bar_with_percentage], + :w => [:bar_component, :bar_with_percentage], + :i => [:bar_component, :incomplete_space], + :r => [:rate_component, :rate_of_change], + :R => [:rate_component, :rate_of_change_with_precision] + }.freeze + + BAR_MOLECULES = %w{W w B b i}.freeze + + attr_accessor :key, + :method_name + + def initialize(letter) + self.key = letter + self.method_name = MOLECULES.fetch(key.to_sym) + end + + def bar_molecule? + BAR_MOLECULES.include? key + end + + def non_bar_molecule? + !bar_molecule? + end + + def full_key + "%#{key}" + end + + def lookup_value(environment, length = 0) + component = environment.__send__(method_name[0]) + + if bar_molecule? + component.__send__(method_name[1], length).to_s + else + component.__send__(method_name[1]).to_s + end + end +end +end +end diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/format/string.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/format/string.rb similarity index 94% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/format/string.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/format/string.rb index e0f1ea413d..8f82213a49 100644 --- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/format/string.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/format/string.rb @@ -1,3 +1,5 @@ +require 'ruby-progressbar/format/molecule' + class ProgressBar module Format class String < ::String diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/output.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/output.rb similarity index 94% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/output.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/output.rb index 2096892fda..f57e5eb63e 100644 --- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/output.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/output.rb @@ -1,3 +1,6 @@ +require 'ruby-progressbar/calculators/length' +require 'ruby-progressbar/throttle' + class ProgressBar class Output DEFAULT_OUTPUT_STREAM = $stdout diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/outputs/non_tty.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/outputs/non_tty.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/outputs/non_tty.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/outputs/non_tty.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/outputs/null.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/outputs/null.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/outputs/null.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/outputs/null.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/outputs/tty.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/outputs/tty.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/outputs/tty.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/outputs/tty.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/progress.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/progress.rb similarity index 70% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/progress.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/progress.rb index 44941c9137..9162af3c46 100644 --- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/progress.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/progress.rb @@ -1,21 +1,33 @@ require 'ruby-progressbar/errors/invalid_progress_error' +require 'ruby-progressbar/calculators/smoothed_average' class ProgressBar class Progress - DEFAULT_TOTAL = 100 - DEFAULT_BEGINNING_POSITION = 0 - DEFAULT_SMOOTHING = 0.1 + DEFAULT_TOTAL = 100 + DEFAULT_BEGINNING_POSITION = 0 + DEFAULT_RUNNING_AVERAGE_RATE = 0.1 + DEFAULT_RUNNING_AVERAGE_CALCULATOR = ProgressBar::Calculators::SmoothedAverage + + RUNNING_AVERAGE_CALCULATOR_MAP = { + 'smoothing' => ProgressBar::Calculators::SmoothedAverage + }.freeze attr_reader :total, :progress attr_accessor :starting_position, :running_average, - :smoothing + :running_average_calculator, + :running_average_rate def initialize(options = {}) - self.total = options.fetch(:total, DEFAULT_TOTAL) - self.smoothing = options[:smoothing] || DEFAULT_SMOOTHING + self.total = options.fetch(:total, DEFAULT_TOTAL) + self.running_average_rate = options[:smoothing] || + options[:running_average_rate] || + DEFAULT_RUNNING_AVERAGE_RATE + self.running_average_calculator = RUNNING_AVERAGE_CALCULATOR_MAP. + fetch(options[:running_average_calculator], + DEFAULT_RUNNING_AVERAGE_CALCULATOR) start :at => DEFAULT_BEGINNING_POSITION end @@ -66,9 +78,9 @@ class Progress @progress = new_progress - self.running_average = Calculators::RunningAverage.calculate(running_average, - absolute, - smoothing) + self.running_average = running_average_calculator.calculate(running_average, + absolute, + running_average_rate) end def total=(new_total) diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/refinements.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/refinements.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/refinements.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/refinements.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/refinements/enumerator.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/refinements/enumerator.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/refinements/enumerator.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/refinements/enumerator.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/throttle.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/throttle.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/throttle.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/throttle.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/time.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/time.rb similarity index 73% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/time.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/time.rb index 63c8c0e16b..bd78667b87 100644 --- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/time.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/time.rb @@ -17,11 +17,9 @@ class Time end def unmocked_time_method - @unmocked_time_method ||= begin - TIME_MOCKING_LIBRARY_METHODS.find do |method| - time.respond_to? method - end - end + @unmocked_time_method ||= TIME_MOCKING_LIBRARY_METHODS.find do |method| + time.respond_to? method + end end protected diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/timer.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/timer.rb similarity index 94% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/timer.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/timer.rb index d21a0d2318..21888b90fd 100644 --- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.11.0/lib/ruby-progressbar/timer.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/timer.rb @@ -28,6 +28,10 @@ class Timer start end + def now + time.now + end + def started? started_at end @@ -51,6 +55,8 @@ class Timer end def elapsed_seconds + return 0 unless started? + ((stopped_at || time.now) - started_at) end diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/version.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/version.rb new file mode 100644 index 0000000000..a9b47f0081 --- /dev/null +++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/ruby-progressbar-1.12.0/lib/ruby-progressbar/version.rb @@ -0,0 +1,3 @@ +class ProgressBar + VERSION = '1.12.0'.freeze +end