ruby-progressbar 1.4.1 → 1.4.2

data/README.md

@@ -253,6 +253,19 @@ Becomes:
 
 Notice that the absolute length doesn't get any longer, the bar just shrinks to fill the remaining space.
 
+Want to play a game of PAC-MAN while you wait for your progress?
+
+```ruby
+ProgressBar.create( :format         => '%a %bᗧ%i %p%% %t',
+                    :progress_mark  => ' ',
+                    :remainder_mark => '･',
+                    :starting_at    => 10)
+```
+
+Becomes **PAC-MAN**!
+
+    Time: --:--:--       ᗧ･････････････････････････････････････････ 10% Progress
+
 ### Overriding the Length
 
 By default, the progressbar will try to be as smart as possible about how wide it can be.  Under most Unix systems, it should be as wide as the terminal will allow while still fitting on one line.  If you wish to override this behavior, you can pass in the `:length` option when creating the bar like so:

data/lib/ruby-progressbar/components/estimated_timer.rb

@@ -32,7 +32,7 @@ class ProgressBar
 
     private
       def estimated_time
-        return '??:??:??' if progress_made.zero? || total.nil?
+        return '??:??:??' if running_average.zero? || total.nil?
 
         hours, minutes, seconds = *divide_seconds(estimated_seconds_remaining)
 
@@ -43,14 +43,8 @@ class ProgressBar
         end
       end
 
-      def average_seconds_per_each
-        return 0 if self.running_average.zero?
-
-        elapsed_whole_seconds.to_f / self.running_average
-      end
-
       def estimated_seconds_remaining
-        ((average_seconds_per_each * self.total) - elapsed_whole_seconds.to_f).floor
+        (elapsed_seconds * (self.total / self.running_average  - 1)).round
       end
 
       def out_of_bounds_time

data/lib/ruby-progressbar/version.rb

@@ -1,3 +1,3 @@
 class ProgressBar
-  VERSION = '1.4.1'
+  VERSION = '1.4.2'
 end

data/spec/lib/ruby-progressbar/base_spec.rb

@@ -654,7 +654,7 @@ describe ProgressBar::Base do
         end
 
         it 'displays the estimated time remaining when using the "%e" flag' do
-          progressbar.to_s('%e').should match /^ ETA: 01:02:02\z/
+          progressbar.to_s('%e').should match /^ ETA: 01:02:03\z/
         end
       end
 

data/spec/lib/ruby-progressbar/components/estimated_timer_spec.rb

@@ -155,11 +155,39 @@ describe ProgressBar::Components::EstimatedTimer do
           end
 
           it 'displays the correct time remaining' do
-            @estimated_time.to_s.should eql ' ETA: 105:33:19'
+            @estimated_time.to_s.should eql ' ETA: 105:33:20'
           end
         end
       end
     end
+
+    it 'displays a good estimate for regular increments' do
+      begin
+        Timecop.freeze(t = Time.now)
+        n = 10
+        estimated_time = ProgressBar::Components::EstimatedTimer.new(:total => n)
+        estimated_time.start
+        results = (1..n).map do |i|
+          Timecop.freeze(t + 0.5 * i)
+          estimated_time.increment
+          estimated_time.to_s
+        end
+        results.should == [
+          ' ETA: 00:00:05',
+          ' ETA: 00:00:04',
+          ' ETA: 00:00:04',
+          ' ETA: 00:00:03',
+          ' ETA: 00:00:03',
+          ' ETA: 00:00:02',
+          ' ETA: 00:00:02',
+          ' ETA: 00:00:01',
+          ' ETA: 00:00:01',
+          ' ETA: 00:00:00',
+        ]
+      ensure
+        Timecop.return
+      end
+    end
   end
 
   describe '#out_of_bounds_time_format=' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-progressbar
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-26 00:00:00.000000000 Z
+date: 2014-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec