lib/bumbler/progress.rb in bumbler-0.1.2 vs lib/bumbler/progress.rb in bumbler-0.1.3

@@ -1,95 +1,95 @@
 module Bumbler
-  # Singletons are fun, yay!
   module Progress
-    def self.register_item(type, name)
-      # Build a blank key for the item
-      unless self.registry[type][name]
-        @item_count ||= 0
-        @item_count  += 1
-      end
-      
-      self.registry[type][name] = {}
-    end
+    @item_count   = 0
+    @loaded_items = 0
     
-    def self.item_started(type, name)
-      @curr_item = {:type => type, :name => name}
-      
-      self.render_progress
-    end
-    
-    def self.item_finished(type, name, time)
-      self.registry[type][name] = {:time => time}
-      
-      @loaded_items ||= 0
-      @loaded_items  += 1
-      
-      @prev_item = {:type => type, :name => name, :time => time}
-      @curr_item = nil if @curr_item && @curr_item[:name] == @prev_item[:name] && @curr_item[:type] == @prev_item[:type]
-      
-      self.render_progress
-    end
-    
-    def self.start!
-      # No-op for now.
-    end
-    
-  private
     # registry[item_type][item_name] = {:time => 123.45}
-    def self.registry
-      @registry ||= Hash.new { |h,k| h[k] = {} }
-    end
+    @registry = Hash.new { |h,k| h[k] = {} }
     
-    def self.tty_width
-      `tput cols`.to_i || 80
-    end
-    
-    def self.bar(width)
-      inner_size = width - 2
+    class << self
+      def registry
+        @registry
+      end
       
-      fill_size = ((@loaded_items.to_f / @item_count.to_f) * inner_size).to_i
-      fill  = '#' * fill_size
-      empty = ' ' * (inner_size - fill_size)
+      def register_item(type, name)
+        # Build a blank key for the item
+        unless @registry[type][name]
+          @item_count  += 1
+        end
+        
+        @registry[type][name] = {}
+      end
       
-      return "[#{fill}#{empty}]"
-    end
-    
-    def self.render_progress
-      unless $stdout.tty?
-        puts '(%s/%d) %s' % [@loaded_items.to_s.rjust(@item_count.to_s.size), @item_count, message]
-        return
+      def item_started(type, name)
+        @curr_item = {:type => type, :name => name}
+        
+        self.render_progress
       end
       
-      # Do nothing if we don't have any items to load
-      return if @item_count == 0
+      def item_finished(type, name, time)
+        @registry[type][name] = {:time => time}
+        
+        @loaded_items  += 1
+        
+        @prev_item = {:type => type, :name => name, :time => time}
+        @curr_item = nil if @curr_item && @curr_item[:name] == @prev_item[:name] && @curr_item[:type] == @prev_item[:type]
+        
+        self.render_progress
+      end
       
-      width = self.tty_width
+      def start!
+        # No-op for now.
+      end
       
-      print "\r\e[A\r\e[A" if @outputted_once
-      @outputted_once = true
-      
-      @loaded_items ||= 0
-      @item_count   ||= 0
-      
-      # Output components:
-      #   [#######################################]
-      #   (##/##) <current>...   <prev> (####.##ms)
-      # 
-      # Skip the current if there isn't enough room
-      count   = '(%s/%d) ' % [@loaded_items.to_s.rjust(@item_count.to_s.size), @item_count]
-      current = @curr_item ? "#{@curr_item[:name]}... " : ''
-      prev    = @prev_item ? '%s (%sms)' % [@prev_item[:name], ('%.2f' % @prev_item[:time]).rjust(7)] : ''
-      
-      # Align the bottom row
-      space_for_current = width - (count.length + prev.length)
-      
-      # Render the progress
-      puts self.bar(width)
-      
-      if space_for_current >= current.length
-        puts count + current + prev.rjust(width - count.length - current.length)
-      else
-        puts count + prev.rjust(width - count.length)
+      def tty_width
+        `tput cols`.to_i || 80
+      end
+    
+      def bar(width)
+        inner_size = width - 2
+        
+        fill_size = ((@loaded_items.to_f / @item_count.to_f) * inner_size).to_i
+        fill  = '#' * fill_size
+        empty = ' ' * (inner_size - fill_size)
+        
+        return "[#{fill}#{empty}]"
+      end
+    
+      def render_progress
+        unless $stdout.tty?
+          puts '(%s/%d) %s' % [@loaded_items.to_s.rjust(@item_count.to_s.size), @item_count, message]
+          return
+        end
+        
+        # Do nothing if we don't have any items to load
+        return if @item_count == 0
+        
+        width = self.tty_width
+        
+        print "\r\e[A\r\e[A" if @outputted_once
+        @outputted_once = true
+        
+        # Output components:
+        #   [#######################################]
+        #   (##/##) <current>...   <prev> (####.##ms)
+        # 
+        # Skip the current if there isn't enough room
+        count   = '(%s/%d) ' % [@loaded_items.to_s.rjust(@item_count.to_s.size), @item_count]
+        current = @curr_item ? "#{@curr_item[:name]}... " : ''
+        prev    = @prev_item ? '%s (%sms)' % [@prev_item[:name], ('%.2f' % @prev_item[:time]).rjust(7)] : ''
+        
+        # Align the bottom row
+        space_for_current = width - (count.length + prev.length)
+        
+        # Render the progress
+        puts self.bar(width)
+        
+        if space_for_current >= current.length
+          puts count + current + prev.rjust(width - count.length - current.length)
+        else
+          puts count + prev.rjust(width - count.length)
+        end
       end
     end
   end
 end