multi_progress_bar 0.1.0 → 0.1.3

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:minor: 1
-:patch: 0
-:build: 
+:patch: 3
 :major: 0
+:build: 
+:minor: 1

data/examples/example.rb

@@ -10,19 +10,20 @@ begin
   MultiProgressBar.start
 
   # Demo.
-  make_machine_bar = lambda { MultiProgressBar::Bar.new("(Waiting...)", 100) }
+  make_machine_bar = lambda { MultiProgressBar::Bar.new("(Waiting...)", 0) }
   machine_bars = [make_machine_bar[], make_machine_bar[]]
   total = MultiProgressBar::TotalBar.new("-Total-")
 
   machine_names = ["bleeker", "montrose"]
 
-  until machine_bars.all? { |bar| bar.current == bar.total }
+  until machine_bars.all? { |bar| bar.title != "(Waiting...)" && bar.current == bar.total }
     sleep(0.1)
 
     # Simulate machines becoming available.
     machine_bars.each do |bar|
       if bar.title == "(Waiting...)"
         bar.title = machine_names.pop if rand(10) == 0
+        bar.total = 100
       else
         bar.inc(rand(10))
       end

data/lib/multi_progress_bar.rb

@@ -12,6 +12,9 @@ module MultiProgressBar
 
       Ncurses.initscr
       Ncurses.curs_set(0)
+      Ncurses.start_color
+
+      (0..7).each { |color_number| Ncurses.init_pair(color_number, color_number, Ncurses::COLOR_BLACK); }
 
       @bars_window = Ncurses::WINDOW.new(1, 0, Ncurses.LINES-1, 0)
       @log_window  = Ncurses::WINDOW.new(Ncurses.LINES-1, 0, 0, 0)
@@ -20,13 +23,27 @@ module MultiProgressBar
 
     # Restore the terminal to normal function.  Always call this before exiting.
     def end
+      # Give an extra line below the output for the shell to prompt on.
+      add_bar(nil)
+
       Ncurses.endwin
-      puts
     end
 
     # Write +text+ to the space above the progress bars.
     def log(text)
-      @log_window.addstr("#{text}\n")
+      text = text.to_s
+
+      # Parse ANSI escape codes.
+      text.scan(/([^\e]*)(?:\e\[(\d+.))?/) do |normal_text, code|
+        @log_window.addstr(normal_text)
+        case code
+          when /3(\d)m/
+            @log_window.attron(Ncurses.COLOR_PAIR($1.to_i))
+          when /0m/
+            @log_window.attron(Ncurses.COLOR_PAIR(7))
+        end
+      end
+      @log_window.addstr("\n")
       @log_window.refresh
     end
 
@@ -47,7 +64,9 @@ module MultiProgressBar
 
     def update_bar(bar, rendered_bar)  #:nodoc:
       @bars_window.move(bars.index(bar), 0)
+      @bars_window.attron(Ncurses.COLOR_PAIR(bar.color)) if bar.color
       @bars_window.addstr(rendered_bar)
+      @bars_window.attroff(Ncurses.COLOR_PAIR(bar.color)) if bar.color
       @bars_window.refresh
     end
   end

data/lib/multi_progress_bar/bar.rb

@@ -15,7 +15,12 @@ module MultiProgressBar
   #
   # See the +ruby-progressbar+ gem (http://0xcc.net/ruby-progressbar/index.html.en)
   # for more details.
+  #
+  # MultiProgressBar::Bar makes two additional format arguments available: :current
+  # and :total.  These display the current and total values respectively.
   class Bar < DelegateClass(BarRenderer)
+    attr_reader :color
+
     # Create a new Bar with a +title+ and a +total+ value.
     def initialize(title, total)
       MultiProgressBar.add_bar(self)
@@ -41,6 +46,17 @@ module MultiProgressBar
       notify_observers
     end
 
+    # Set the progress to 100% and display elapsed time instead of ETA.
+    def finish
+      super
+      notify_observers
+    end
+
+    def color=(color)
+      @color = color
+      show
+    end
+
     def observe(&b)  #:nodoc:
       @observers << b
     end

data/lib/multi_progress_bar/bar_renderer.rb

@@ -1,6 +1,6 @@
 module MultiProgressBar
   class BarRenderer < ProgressBar  #:nodoc:
-    attr_writer :title
+    attr_writer :total
 
     def initialize(title, total, width, &block)
       @block = block
@@ -9,14 +9,41 @@ module MultiProgressBar
       super(title, total, @buffer)
     end
 
+    def fmt_current
+      @current
+    end
+
+    def fmt_total
+      @total
+    end
+
     def show
       super
       @block.call(@buffer.string)
       @buffer.string = ""
     end
 
+    def title=(new_title)
+      @title = new_title
+      show
+    end
+
     def get_width
       @width
     end
+
+    def restart
+      set(0)
+      @start_time = Time.now
+      @previous_time = @start_time
+    end
+
+    def do_percentage
+      if @current.zero?
+        0
+      else
+        super
+      end
+    end
   end
 end

data/lib/multi_progress_bar/total_bar.rb

@@ -26,7 +26,11 @@ module MultiProgressBar
     private
     def update_total
       total_current = @bars.inject(0) { |sum, bar| sum + bar.current }
+      total_total   = @bars.inject(0) { |sum, bar| sum + bar.total }
+      finished      = @bars.all? { |bar| bar.finished? }
+      @renderer.total = total_total
       @renderer.set(total_current)
+      @renderer.finish if finished
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: multi_progress_bar
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.3
 platform: ruby
 authors: 
 - Peter Jaros
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-16 00:00:00 -05:00
+date: 2009-11-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency