bumbler 0.1.1 → 0.1.2

data/bumbler.gemspec

@@ -1,6 +1,5 @@
 # -*- encoding: utf-8 -*-
-$:.unshift File.expand_path("../lib", __FILE__)
-require "bumbler/version"
+require File.expand_path("../lib/bumbler.rb", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "bumbler"

data/lib/bumbler.rb

@@ -1,4 +1,7 @@
 module Bumbler
+  # We can be required twice due to the command line require
+  VERSION = '0.1.2' unless self.const_defined? :VERSION
+  
   autoload :Hooks,    'bumbler/hooks'
   autoload :Bundler,  'bumbler/bundler'
   autoload :Progress, 'bumbler/progress'

data/lib/bumbler/bundler.rb

@@ -7,6 +7,13 @@ module Bumbler
       return @require_map[path]
     end
     
+    def self.require_started(path)
+      gem_name = self.gem_for_require(path)
+      return unless gem_name
+      
+      Bumbler::Progress.item_started(:bundler, gem_name)
+    end
+    
     def self.require_finished(path, load_time)
       self.read_bundler_environment if @gem_state.nil?
       

data/lib/bumbler/hooks.rb

@@ -54,6 +54,11 @@ module Bumbler
       gem_name = Bumbler::Bundler.gem_for_require(path)
       return yield unless gem_name
       
+      # Track load starts
+      @previous_gems ||= {}
+      Bumbler::Bundler.require_started(path) unless @previous_gems[gem_name]
+      @previous_gems[gem_name] = true
+      
       # Let's time them
       start = Time.now.to_f
       result = yield

data/lib/bumbler/progress.rb

@@ -11,19 +11,26 @@ module Bumbler
       self.registry[type][name] = {}
     end
     
+    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
       
-      time_str = ('%.2fms' % time).rjust(9)
-      self.render_progress('%s loaded %s ' % [time_str, name])
+      @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!
-      @loaded_items ||= 0
-      @item_count   ||= 0
+      # No-op for now.
     end
     
   private
@@ -36,8 +43,8 @@ module Bumbler
       `tput cols`.to_i || 80
     end
     
-    def self.bar
-      inner_size = self.tty_width - 2
+    def self.bar(width)
+      inner_size = width - 2
       
       fill_size = ((@loaded_items.to_f / @item_count.to_f) * inner_size).to_i
       fill  = '#' * fill_size
@@ -46,15 +53,43 @@ module Bumbler
       return "[#{fill}#{empty}]"
     end
     
-    def self.render_progress(message)
-      if $stdout.tty?
-        print "\r\e[A\r\e[K\r\e[A" if @outputted_once
-        @outputted_once = true
-        
-        puts self.bar
+    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
       end
       
-      puts '(%s/%d) %s' % [@loaded_items.to_s.rjust(@item_count.to_s.size), @item_count, message]
+      # 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
+      
+      @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)
+      end
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: bumbler
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Ian MacLeod
@@ -34,7 +34,6 @@ files:
 - lib/bumbler/go.rb
 - lib/bumbler/hooks.rb
 - lib/bumbler/progress.rb
-- lib/bumbler/version.rb
 has_rdoc: true
 homepage: https://github.com/nevir/Bumbler
 licenses: []

data/lib/bumbler/version.rb

@@ -1,3 +0,0 @@
-module Bumbler
-  VERSION = "0.1.1"
-end