ruby-progressbar 1.4.2 → 1.5.0

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rspectacular'
 
 describe ProgressBar::Components::Bar do
   context 'when a new bar is created' do
@@ -7,26 +7,26 @@ describe ProgressBar::Components::Bar do
 
       describe '#total' do
         it 'returns the default total' do
-          @progressbar.total.should eql ProgressBar::Components::Bar::DEFAULT_TOTAL
+          expect(@progressbar.total).to eql ProgressBar::Components::Bar::DEFAULT_TOTAL
         end
       end
 
       describe '#progress_mark' do
         it 'returns the default mark' do
-          @progressbar.progress_mark.should eql ProgressBar::Components::Bar::DEFAULT_PROGRESS_MARK
+          expect(@progressbar.progress_mark).to eql ProgressBar::Components::Bar::DEFAULT_PROGRESS_MARK
         end
       end
 
       describe '#remainder_mark' do
         it 'returns the default remainder mark' do
-          @progressbar.remainder_mark.should eql ProgressBar::Components::Bar::DEFAULT_REMAINDER_MARK
+          expect(@progressbar.remainder_mark).to eql ProgressBar::Components::Bar::DEFAULT_REMAINDER_MARK
         end
       end
 
       context 'and the bar has not been started' do
         describe '#progress' do
           it 'returns the default beginning position' do
-            @progressbar.progress.should be_zero
+            expect(@progressbar.progress).to be_zero
           end
         end
       end
@@ -36,7 +36,7 @@ describe ProgressBar::Components::Bar do
 
         describe '#progress' do
           it 'returns the default starting value' do
-            @progressbar.progress.should eql ProgressBar::Components::Progressable::DEFAULT_BEGINNING_POSITION
+            expect(@progressbar.progress).to eql ProgressBar::Components::Progressable::DEFAULT_BEGINNING_POSITION
           end
         end
       end
@@ -46,7 +46,7 @@ describe ProgressBar::Components::Bar do
 
         describe '#progress' do
           it 'returns the given starting value' do
-            @progressbar.progress.should eql 10
+            expect(@progressbar.progress).to eql 10
           end
         end
       end
@@ -57,19 +57,19 @@ describe ProgressBar::Components::Bar do
 
       describe '#total' do
         it 'returns the overridden total' do
-          @progressbar.total.should eql 12
+          expect(@progressbar.total).to eql 12
         end
       end
 
       describe '#progress_mark' do
         it 'returns the overridden mark' do
-          @progressbar.progress_mark.should eql 'x'
+          expect(@progressbar.progress_mark).to eql 'x'
         end
       end
 
       describe '#remainder_mark' do
         it 'returns the overridden mark' do
-          @progressbar.remainder_mark.should eql '.'
+          expect(@progressbar.remainder_mark).to eql '.'
         end
       end
     end
@@ -84,13 +84,13 @@ describe ProgressBar::Components::Bar do
 
     describe '#percentage_completed' do
       it 'calculates the amount' do
-        @progressbar.percentage_completed.should eql 0
+        expect(@progressbar.percentage_completed).to eql 0
       end
     end
 
     describe '#to_s' do
       it 'displays the bar with no indication of progress' do
-        @progressbar.to_s.should eql '                                                                                                    '
+        expect(@progressbar.to_s).to eql '                                                                                                    '
       end
     end
   end
@@ -106,31 +106,31 @@ describe ProgressBar::Components::Bar do
       before { @progressbar.increment }
 
       it 'adds to the progress amount' do
-        @progressbar.progress.should eql 1
+        expect(@progressbar.progress).to eql 1
       end
 
       describe '#percentage_completed' do
         it 'calculates the amount completed' do
-          @progressbar.percentage_completed.should eql 2
+          expect(@progressbar.percentage_completed).to eql 2
         end
       end
 
       describe '#to_s' do
         it 'displays the bar with an indication of progress' do
-          @progressbar.to_s.should eql '==                                                                                                  '
+          expect(@progressbar.to_s).to eql '==                                                                                                  '
         end
       end
     end
 
     describe '#percentage_completed' do
       it 'is zero' do
-        @progressbar.percentage_completed.should eql 0
+        expect(@progressbar.percentage_completed).to eql 0
       end
     end
 
     describe '#to_s' do
       it 'displays the bar with no indication of progress' do
-        @progressbar.to_s.should eql '                                                                                                    '
+        expect(@progressbar.to_s).to eql '                                                                                                    '
       end
     end
   end
@@ -144,13 +144,13 @@ describe ProgressBar::Components::Bar do
 
     describe '#percentage_completed' do
       it 'always rounds down' do
-        @progressbar.percentage_completed.should eql 0
+        expect(@progressbar.percentage_completed).to eql 0
       end
     end
 
     describe '#to_s' do
       it 'displays the bar with no indication of progress' do
-        @progressbar.to_s.should eql '                                                                                                    '
+        expect(@progressbar.to_s).to eql '                                                                                                    '
       end
     end
   end
@@ -166,13 +166,13 @@ describe ProgressBar::Components::Bar do
       before { @progressbar.increment }
 
       it 'does not increment past the total' do
-        @progressbar.progress.should eql 50
-        @progressbar.percentage_completed.should eql 100
+        expect(@progressbar.progress).to eql 50
+        expect(@progressbar.percentage_completed).to eql 100
       end
 
       describe '#to_s' do
         it 'displays the bar as 100% complete' do
-          @progressbar.to_s.should eql '=' * 100
+          expect(@progressbar.to_s).to eql '=' * 100
         end
       end
     end
@@ -181,20 +181,20 @@ describe ProgressBar::Components::Bar do
       before { @progressbar.decrement }
 
       it 'removes some progress from the bar' do
-        @progressbar.progress.should eql 49
-        @progressbar.percentage_completed.should eql 98
+        expect(@progressbar.progress).to eql 49
+        expect(@progressbar.percentage_completed).to eql 98
       end
 
       describe '#to_s' do
         it 'displays the bar as 98% complete' do
-          @progressbar.to_s.should eql "#{'=' * 98}  "
+          expect(@progressbar.to_s).to eql "#{'=' * 98}  "
         end
       end
     end
 
     describe '#to_s' do
       it 'displays the bar as 100% complete' do
-        @progressbar.to_s.should eql ('=' * 100)
+        expect(@progressbar.to_s).to eql ('=' * 100)
       end
     end
   end
@@ -203,7 +203,7 @@ describe ProgressBar::Components::Bar do
     describe '#new' do
       it 'raises an error' do
         @progressbar = ProgressBar::Components::Bar.new(:total => 10)
-        lambda { @progressbar.start :at => 11 }.should raise_error(ProgressBar::InvalidProgressError, "You can't set the item's current value to be greater than the total.")
+        expect { @progressbar.start :at => 11 }.to raise_error(ProgressBar::InvalidProgressError, "You can't set the item's current value to be greater than the total.")
       end
     end
   end

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rspectacular'
 
 describe ProgressBar::Components::ElapsedTimer do
   before { @timer = ProgressBar::Components::ElapsedTimer.new }
@@ -6,14 +6,14 @@ describe ProgressBar::Components::ElapsedTimer do
   describe '#to_s' do
     context 'when the timer has not been started' do
       it 'displays "Time: --:--:--"' do
-        @timer.to_s.should eql 'Time: --:--:--'
+        expect(@timer.to_s).to eql 'Time: --:--:--'
       end
     end
 
     context 'when it has just been started' do
       it 'displays "Time: 00:00:00"' do
         @timer.start
-        @timer.to_s.should eql 'Time: 00:00:00'
+        expect(@timer.to_s).to eql 'Time: 00:00:00'
       end
     end
 
@@ -35,12 +35,12 @@ describe ProgressBar::Components::ElapsedTimer do
           before { @timer.reset }
 
           it 'displays "Time: --:--:--"' do
-            @timer.to_s.should eql 'Time: --:--:--'
+            expect(@timer.to_s).to eql 'Time: --:--:--'
           end
         end
 
         it 'displays "Time: 04:27:41"' do
-          @timer.to_s.should eql 'Time: 04:27:41'
+          expect(@timer.to_s).to eql 'Time: 04:27:41'
         end
       end
 
@@ -48,12 +48,12 @@ describe ProgressBar::Components::ElapsedTimer do
         before { @timer.reset }
 
         it 'displays "Time: --:--:--"' do
-          @timer.to_s.should eql 'Time: --:--:--'
+          expect(@timer.to_s).to eql 'Time: --:--:--'
         end
       end
 
       it 'displays "Time: 04:28:13"' do
-        @timer.to_s.should eql 'Time: 04:28:13'
+        expect(@timer.to_s).to eql 'Time: 04:28:13'
       end
     end
   end
@@ -69,7 +69,7 @@ describe ProgressBar::Components::ElapsedTimer do
           before { @timer.start }
 
           it 'is false' do
-            @timer.should_not be_stopped
+            expect(@timer).not_to be_stopped
           end
         end
       end
@@ -77,14 +77,14 @@ describe ProgressBar::Components::ElapsedTimer do
 
     context "when the timer has yet to be started" do
       it 'is false' do
-        @timer.should_not be_stopped
+        expect(@timer).not_to be_stopped
       end
     end
 
     context "when the timer is stopped without having been started" do
       before { @timer.stop }
       it 'is false' do
-        @timer.should_not be_stopped
+        expect(@timer).not_to be_stopped
       end
     end
   end

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

@@ -1,10 +1,11 @@
-require 'spec_helper'
+require 'rspectacular'
+require 'support/time'
 
 describe ProgressBar::Components::EstimatedTimer do
   describe '#progress=' do
     it 'raises an error when passed a number larger than the total' do
       @estimated_time = ProgressBar::Components::EstimatedTimer.new(:total => 100)
-      lambda{ @estimated_time.progress = 101 }.should raise_error(ProgressBar::InvalidProgressError, "You can't set the item's current value to be greater than the total.")
+      expect { @estimated_time.progress = 101 }.to raise_error(ProgressBar::InvalidProgressError, "You can't set the item's current value to be greater than the total.")
     end
   end
 
@@ -16,13 +17,13 @@ describe ProgressBar::Components::EstimatedTimer do
       end
 
       it 'displays an unknown time remaining' do
-        @estimated_time.to_s.should eql ' ETA: ??:??:??'
+        expect(@estimated_time.to_s).to eql ' ETA: ??:??:??'
       end
 
       context 'and it is incremented' do
         it 'should not display unknown time remaining' do
           @estimated_time.increment
-          @estimated_time.to_s.should_not eql ' ETA: ??:??:??'
+          expect(@estimated_time.to_s).not_to eql ' ETA: ??:??:??'
         end
       end
     end
@@ -45,7 +46,7 @@ describe ProgressBar::Components::EstimatedTimer do
             before { 20.times { @estimated_time.decrement } }
 
             it 'displays the correct time remaining' do
-              @estimated_time.to_s.should eql ' ETA: 08:38:28'
+              expect(@estimated_time.to_s).to eql ' ETA: 08:38:28'
             end
           end
 
@@ -53,12 +54,12 @@ describe ProgressBar::Components::EstimatedTimer do
             before { @estimated_time.reset }
 
             it 'displays unknown time remaining' do
-              @estimated_time.to_s.should eql ' ETA: ??:??:??'
+              expect(@estimated_time.to_s).to eql ' ETA: ??:??:??'
             end
           end
 
           it 'displays the correct time remaining' do
-            @estimated_time.to_s.should eql ' ETA: 03:42:12'
+            expect(@estimated_time.to_s).to eql ' ETA: 03:42:12'
           end
         end
 
@@ -76,7 +77,7 @@ describe ProgressBar::Components::EstimatedTimer do
             before { @estimated_time.out_of_bounds_time_format = :friendly }
 
             it 'displays "> 4 Days" remaining' do
-              @estimated_time.to_s.should eql ' ETA: > 4 Days'
+              expect(@estimated_time.to_s).to eql ' ETA: > 4 Days'
             end
           end
 
@@ -84,12 +85,12 @@ describe ProgressBar::Components::EstimatedTimer do
             before { @estimated_time.out_of_bounds_time_format = :unknown }
 
             it 'displays "??:??:??" remaining' do
-              @estimated_time.to_s.should eql ' ETA: ??:??:??'
+              expect(@estimated_time.to_s).to eql ' ETA: ??:??:??'
             end
           end
 
           it 'displays the correct time remaining' do
-            @estimated_time.to_s.should eql ' ETA: 100:00:00'
+            expect(@estimated_time.to_s).to eql ' ETA: 100:00:00'
           end
         end
       end
@@ -111,7 +112,7 @@ describe ProgressBar::Components::EstimatedTimer do
             before { 20.times { @estimated_time.decrement } }
 
             it 'displays the correct time remaining' do
-              @estimated_time.to_s.should eql ' ETA: 08:14:34'
+              expect(@estimated_time.to_s).to eql ' ETA: 08:14:34'
             end
           end
 
@@ -119,12 +120,12 @@ describe ProgressBar::Components::EstimatedTimer do
             before { @estimated_time.reset }
 
             it 'displays unknown time remaining' do
-              @estimated_time.to_s.should eql ' ETA: ??:??:??'
+              expect(@estimated_time.to_s).to eql ' ETA: ??:??:??'
             end
           end
 
           it 'displays the correct time remaining' do
-            @estimated_time.to_s.should eql ' ETA: 03:51:16'
+            expect(@estimated_time.to_s).to eql ' ETA: 03:51:16'
           end
         end
 
@@ -142,7 +143,7 @@ describe ProgressBar::Components::EstimatedTimer do
             before { @estimated_time.out_of_bounds_time_format = :friendly }
 
             it 'displays "> 4 Days" remaining' do
-              @estimated_time.to_s.should eql ' ETA: > 4 Days'
+              expect(@estimated_time.to_s).to eql ' ETA: > 4 Days'
             end
           end
 
@@ -150,12 +151,12 @@ describe ProgressBar::Components::EstimatedTimer do
             before { @estimated_time.out_of_bounds_time_format = :unknown }
 
             it 'displays "??:??:??" remaining' do
-              @estimated_time.to_s.should eql ' ETA: ??:??:??'
+              expect(@estimated_time.to_s).to eql ' ETA: ??:??:??'
             end
           end
 
           it 'displays the correct time remaining' do
-            @estimated_time.to_s.should eql ' ETA: 105:33:20'
+            expect(@estimated_time.to_s).to eql ' ETA: 105:33:20'
           end
         end
       end
@@ -172,7 +173,8 @@ describe ProgressBar::Components::EstimatedTimer do
           estimated_time.increment
           estimated_time.to_s
         end
-        results.should == [
+
+        expect(results).to eql([
           ' ETA: 00:00:05',
           ' ETA: 00:00:04',
           ' ETA: 00:00:04',
@@ -183,7 +185,7 @@ describe ProgressBar::Components::EstimatedTimer do
           ' ETA: 00:00:01',
           ' ETA: 00:00:01',
           ' ETA: 00:00:00',
-        ]
+        ])
       ensure
         Timecop.return
       end
@@ -194,7 +196,7 @@ describe ProgressBar::Components::EstimatedTimer do
     context 'when set to an invalid format' do
       it 'raises an exception' do
         @estimated_time = ProgressBar::Components::EstimatedTimer.new(:total => 100)
-        lambda{ @estimated_time.out_of_bounds_time_format = :foo }.should raise_error('Invalid Out Of Bounds time format.  Valid formats are [:unknown, :friendly, nil]')
+        expect { @estimated_time.out_of_bounds_time_format = :foo }.to raise_error('Invalid Out Of Bounds time format.  Valid formats are [:unknown, :friendly, nil]')
       end
     end
   end

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rspectacular'
 
 class ProgressableClass
   include ProgressBar::Components::Progressable
@@ -8,23 +8,32 @@ describe ProgressBar::Components::Progressable do
   subject { ProgressableClass.new }
 
   describe '#running_average' do
+    it 'is properly calculated when progress has been made' do
+      subject.running_average = 10
+      subject.start :at => 0
+      expect(subject.running_average).to be_zero
+
+      subject.progress += 40
+      expect(subject.running_average).to eql 36.0
+    end
+
     it 'is always reset when the progressable is started' do
       subject.running_average = 10
       subject.start :at => 0
-      subject.running_average.should be_zero
+      expect(subject.running_average).to be_zero
 
       subject.start :at => 40
-      subject.running_average.should eql 36.0
+      expect(subject.running_average).to eql 0.0
     end
   end
 
   describe '#smoothing' do
     it 'can be passed in as an option to the initializer' do
-      ProgressableClass.new(:smoothing => 0.3).smoothing.should eql 0.3
+      expect(ProgressableClass.new(:smoothing => 0.3).smoothing).to eql 0.3
     end
 
     it 'does not have to be passed in as an option to the initializer' do
-      ProgressableClass.new.smoothing.should eql 0.1
+      expect(ProgressableClass.new.smoothing).to eql 0.1
     end
   end
 
@@ -32,7 +41,7 @@ describe ProgressBar::Components::Progressable do
     it 'returns the default total if total is zero' do
       subject.total = 0
 
-      subject.percentage_completed.should eql 100
+      expect(subject.percentage_completed).to eql 100
     end
   end
 end