ruby-progressbar 1.4.2 → 1.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 35cb162ef6a48d988df23e47ffe815580cb6258a
+  data.tar.gz: bf2ed1a84e032ebde941494682375c05da9117f2
+SHA512:
+  metadata.gz: 12c2dfc60bd0339e7b643fc68e67018a5f9281a3bd719a4df0197fd0ec639e31c84d2108ddad0516b9df5eaf6ee8f35a303c65159f59dfc931cbecd97928cf38
+  data.tar.gz: d87e233863403cabd91c47eb73d20ab8e03250048638ba2042d50480ceb89b49a384fdb7c570b948941427785354d0d65b033db579633ea92bdfb6e00fa69c8a

data/README.md

@@ -1,5 +1,6 @@
 Ruby/ProgressBar: A Text Progress Bar Library for Ruby
 ================================
+[![Build Status](https://secure.travis-ci.org/jfelchner/ruby-progressbar.png?branch=master)](http://travis-ci.org/jfelchner/ruby-progressbar) [![Code Climate](https://codeclimate.com/github/jfelchner/ruby-progressbar.png)](https://codeclimate.com/github/jfelchner/ruby-progressbar) [![Code Climate](https://codeclimate.com/github/jfelchner/ruby-progressbar/coverage.png)](https://codeclimate.com/github/jfelchner/ruby-progressbar)
 
 The **ultimate** text progress bar library for Ruby!  It'll **SMASH YOU OVER THE HEAD** with a **PURE RUSH** of progress bar excitement!
 
@@ -18,7 +19,7 @@ Supported Rubies
 
 It's Better Than The Other 186,312 Progress Bar Libraries Because...
 --------------------------------
-* Full test suite [![Build Status](https://secure.travis-ci.org/jfelchner/ruby-progressbar.png?branch=master)](http://travis-ci.org/jfelchner/ruby-progressbar)
+* Full test suite [![Code Climate](https://codeclimate.com/github/jfelchner/ruby-progressbar/coverage.png)](https://codeclimate.com/github/jfelchner/ruby-progressbar)
 * _**ZERO**_ dependencies
 * Used by tons of other open source projects (which means we find out about bugs quickly)
 * It's pretty [freakin' sweet](https://www.youtube.com/watch?v=On3IoVhf_GM)
@@ -63,7 +64,7 @@ It's simple to get started:
 ProgressBar.create
 ```
 
-Creates a basic progress bar beginning at `0`, a total capacity of `100` and tells it to start.
+Creates a basic progress bar beginning at `0`, a maximum capacity of `100` and tells it to start.
 
     Progress: |                                                                       |
 
@@ -90,7 +91,7 @@ If you would like to customize your prompt, you can pass options when you call `
 ProgressBar.create(:title => "Items", :starting_at => 20, :total => 200)
 ```
 
-Will output:
+This will output:
 
     Items: |=======                                                                |
 
@@ -114,7 +115,7 @@ The following are the list of options you can use:
 * `#decrement`: Will retract the bar's progress by `1` unit.
 * `#progress +=`: Will allow you to increment by a relative amount.
 * `#progress -=`: Will allow you to decrement by a relative amount.
-* `#progress=`: Will allow you to jump the amount of progress directly to whatever value you would like. _Note: This will almost always mess up your estimated time if you're using it._
+* `#progress=`: Will set the bar's progress to whatever value you would like. _Note: This will likely mess up your estimated time if you're using it._
 * `#total=`: Will change the total number of items being processed by the bar. This can be anything (even nil) but cannot be less than the amount of progress already accumulated by the bar.
 
 ### Stopping
@@ -123,7 +124,7 @@ The bar can be stopped in four ways:
 
 * `#finish`: Will stop the bar by completing it immediately.  The current position will be advanced to the total.
 * `#stop`: Will stop the bar by immediately cancelling it.  The current position will remain where it is.
-* `#pause`: Will stop the bar similar to `#stop` but will allow it to be restarted where it previously left off by calling `#resume`. _Note: Elapsed Time and Estimated Time will stop being affected while the bar is paused._
+* `#pause`: Will stop the bar like `#stop` but will allow it to be restarted from where it previously left off by calling `#resume`. _Note: Elapsed Time and Estimated Time will stop being affected while the bar is paused._
 * `#reset`: Will stop the bar by resetting all information.  The current position of the bar will be reset to where it began when it was created. _(eg if you passed `:starting_at => 5` when you created the bar, it would reset to `5` and not `0`)_
 
 ### Finishing
@@ -134,11 +135,11 @@ _Note: The bar will be finished automatically if the current value ever becomes
 
 ### Refreshing
 
-* If you need to have the bar be redisplayed to give your users more of a "real-time" feel, you can call `#refresh` which will not affect the current position but will update the elapsed and estimated timers.
+* If you need to redisplay the progress bar to give your users  a "real-time" feel, you can call `#refresh`. `#refresh` will not affect the current position but will update the elapsed and estimated timers.
 
 ### Unknown Progress
 
-Sometimes when processing work, you don't know at the beginning of the job exactly how many items you will be processing.  Maybe this might be because you're downloading a chunked file or processing a set of jobs that hasn't fully loaded yet.
+Sometimes when processing work, you don't know exactly how many items you will need to process.  This might be because you're downloading a chunked file or because you're processing a set of jobs that hasn't been fully loaded yet.
 
 In times like these, you can set total to `nil` and continue to increment the bar as usual.  The bar will display an 'unknown' animation which will change every time you increment.  This will give the appearance (by default) that the bar is processing work even though there is no "progress".
 
@@ -174,12 +175,12 @@ And the bar will magically transform into its typical state:
 
 ### Logging
 
-Many times while using the progress bar, you may wish to log some output for the user.  If you attempt to do this using a standard `puts` statement, you'll find that the text will overwrite that which makes up the bar.  For example if you were to `puts "hello"` after progress has already begun, you may get something like this:
+While using the progress bar, you may wish to log some output for the user.  If you attempt to do this using a standard `puts` statement, you'll find that the text will overwrite the bar.  For example if you were to `puts "hello"` after progress has already begun, you may get something like this:
 
     helloess: |=======                                                             |
     Progress: |========                                                            |
 
-The reason is that ruby-progressbar has to keep redrawing itself every time you change the progress.  It's a limitation of terminal output.  Using `puts` messes that up because `puts` adds a newline which moves the cursor to the next line, then when ruby-progressbar updates, it does so on the following line.
+This happens because the ruby-progressbar has to keep redrawing itself every time you change the progress.  It's a limitation of terminal output.  Using `puts` messes that up because `puts` adds a newline which moves the cursor to the next line, then when ruby-progressbar updates, it does so on the following line.
 
 To circumvent this, use `#log` instead.
 
@@ -192,7 +193,7 @@ progressbar.log 'hello'
     hello
     Progress: |=============                                                       |
 
-`#log` will automatically clear the bar, print your desired text and then redraw the bar on the following line.  Notice that we did not get a bar **above** the logged output.  If you consistently use `#log`, you should only every see one bar on the screen at any time.
+`#log` will automatically clear the bar, print your desired text and then redraw the bar on the following line.  Notice that we did not get a bar **above** the logged output.  If you consistently use `#log`, you should only ever see one bar on the screen at any time.
 
 Formatting
 --------------------------------
@@ -213,6 +214,8 @@ The flags you can use in the format string are as follows:
 * `%B`: The full progress bar including 'incomplete' space (eg: `==========    `)
 * `%b`: Progress bar only (eg: `==========`)
 * `%w`: Bar With Integrated Percentage (eg: `==== 75 ====`)
+* `%r`: Rate of Progress as a whole number (eg: `13`)
+* `%R`: Rate of Progress as a decimal number (eg: `13.67`)
 * `%i`: Display the incomplete space of the bar (this string will only contain whitespace eg: `    `)
 * `%%`: A literal percent sign `%`
 
@@ -268,13 +271,13 @@ Becomes **PAC-MAN**!
 
 ### 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:
+By default, the progress bar 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:
 
 ```ruby
 ProgressBar.create(:length => 40)
 ```
 
-Additionally, if you don't have access to the code calling the progressbar itself (say if you're using a gem like Fuubar), you can set the `RUBY_PROGRESS_BAR_LENGTH` environment variable and it will always override any other setting.
+If you don't have access to the code calling the progress bar itself (say if you're using a gem like Fuubar), you can set the `RUBY_PROGRESS_BAR_LENGTH` environment variable and it will override any other setting.
 
 _Note: If the terminal width is less than 20 characters or ruby-progressbar is being used on a non-*nix system, the bar will default to an 80 character width._
 
@@ -287,6 +290,27 @@ The following items can be set at any time.  Changes cause an immediate bar refr
 * `#title=`: Sets the string used to represent the items the bar is tracking (or I guess whatever else you want it to be).
 * `#format(format_string)`: If you need to adjust the format that the bar uses when rendering itself, just pass in a string in the same format as describe [above](#formatting).
 
+### Rate Scaling
+
+By default the rate shown on the progress bar is shown as the number of items
+processed per second.  Often times, you won't want to display the literal number
+of items, but rather scale it in some way.  For example, if you're displaying
+the progress of a file being transferred, and you are representing the bar as
+the number of bytes in the file, by default the `%r` formatter will show the
+number of bytes per second.
+
+If instead of the bytes per second you wanted to show the user the number of
+kilobytes per second, you can do that like so:
+
+```ruby
+ProgressBar.create(:format     => '%a %B %p%% %r KB/sec',
+                   :rate_scale => lambda { |rate| rate / 1024 })
+```
+
+Now, when the bar is displayed it will look something like so:
+
+    Time: --:--:-- ===============                                40% - 102 KB/sec
+
 ## In The Weeds
 
 This is some stuff that makes ruby-progressbar extra awesome, but for the most part it "Just Works" and you won't have to even know it's there, but if you're curious like us, here it is.
@@ -295,11 +319,11 @@ This is some stuff that makes ruby-progressbar extra awesome, but for the most p
 
 #### Smoothing Out Estimated Time Jitters
 
-Sometimes when you're tracking progress, you could have some items which take significantly longer than others.  When this is the case, the ETA gauge can vary wildly from increment to increment.
+Sometimes when you're tracking progress, you might have some items which take significantly longer than others to complete.  When this is the case, the ETA gauge can vary wildly from increment to increment.
 
 __RUBY PROGRESS BAR TO THE RESCUE!__
 
-Thanks to [@L2G](https://github.com/L2G) and 'the maths' you can pass the `:smoothing` option when creating a new bar and it will use an exponentially smoothed average rather than a linear one.  A value of `0.0` means no smoothing and is equivalent to the classic behavior.  A value of `1.0` is the maximum amount of smoothing.  Any values between those two are valid. `0.1` is the default.
+Thanks to [@L2G](https://github.com/L2G) and 'the maths' you can pass the `:smoothing` option when creating a new bar.  Your progress bar will then use an exponentially smoothed average rather than a linear one.  A value of `0.0` means no smoothing and is equivalent to the classic behavior.  A value of `1.0` is the maximum amount of smoothing.  Any values between those two are valid. The default value is `0.1`.
 
 ```ruby
 ProgressBar.create(:smoothing => 0.6)
@@ -307,7 +331,7 @@ ProgressBar.create(:smoothing => 0.6)
 
 #### Time Mocking Support
 
-When mocking time, the concept of when `now` is becomes distorted.  You can imagine that because ruby-progressbar tracks elapsed and estimated times, if it used the mocked version of `now` the results would be very undesirable.  Fortunately, if you use one of our supported Ruby time mocking libraries, your elapsed and estimated times will appear correctly no matter when your 'now' is.  Currently supported are:
+When mocking time, the concept of when `now` is becomes distorted.  You can imagine that because ruby-progressbar tracks elapsed and estimated times, if it used the mocked version of `now` the results would be very undesirable.  But, if you use one of our supported Ruby time mocking libraries, your elapsed and estimated times will always appear correctly.  Currently supported are:
 
   * [Timecop](https://github.com/jtrupiano/timecop)
   * [Delorean](https://github.com/bebanjo/delorean)
@@ -316,17 +340,19 @@ When mocking time, the concept of when `now` is becomes distorted.  You can imag
 
 When reporting progress of large amounts of very fast operations, whose duration is comparable to the output time of a progress bar, it becomes desirable to throttle output to the console and only perform it once in a set period. ProgressBar supports throttling if given `:throttle_rate` option:
 
-    ProgressBar.create(:throttle_rate => 0.1)
+```ruby
+ProgressBar.create(:throttle_rate => 0.1)
+```
 
 The above progress bar will output at most 10 times a second.
 
-The default throttling rate if none is specified is 100 times per second (or 0.01)
+The default throttling rate is 100 times per second (or 0.01)
 
 ### Custom Unknown Progress Animations
 
 Following up on [unknown progress](#unknown-progress), you may wish to update the unknown progress animation to suit your specific needs.  This can be easily done by passing in the `:unknown_progress_animation_steps` option.
 
-This item should be an array of strings representing each step of the animation. The specific step used for a given progress is determined by the current progress of the bar.  For example:
+This item should be an array of strings that represent each step of the animation. The specific step used for a given progress is determined by the current progress of the bar.  For example:
 
 ```ruby
 progressbar = ProgressBar.create(:unknown_progress_animation_steps => ['==>', '>==', '=>='])
@@ -340,21 +366,23 @@ Whatever element is chosen is repeated along the entire 'incomplete' portion of
 
 ### Non-TTY Output
 
-Typically, when the progress bar is updated, the entire previous bar is 'overwritten' with the updated information.  Unfortunately when the bar is being output on a non-TTY enabled output stream (such as a file or pipe), that standard behavior of outputting the progress bar will not work.  This is mainly due to the fact that we can't easily go back and replace the content that the bar had previously written.
+Normally, when the progress bar is updated, the entire previous bar is 'overwritten' with the updated information.  However when the bar is being output on a non-TTY enabled output stream (such as a file or pipe), that standard behavior of outputting the progress bar will not work.  This is mainly due to the fact that we can't easily go back and replace the content that the bar had previously written.
 
-To try to solve this, ruby-progressbar, when it determines that it is being used on a non-TTY device, will override any format which was set in the initializer to something which more closely resembles this:
+To try to solve this problem, ruby-progressbar, when it determines that it is being used on a non-TTY device, will override any format which was set in the initializer to something which more closely resembles this:
 
     Progress: |=============
 
-Notice that there are no dynamically updating segments like counters or ETA.  Dynamic segments are not compatible with non-TTY devices because, by their very nature, they must be updated on each refresh of the bar and as stated previously, that is not possible in non-TTY mode.
+Notice that there are no dynamically updating segments like counters or ETA.  Dynamic segments are incompatible with non-TTY devices. This is because dynamic segments need to be updated on each refresh of the bar, which is impossible in non-TTY mode.
 
 Also notice that there is no end cap on the righthand side of the bar.  Again, we cannot output something which is past the point at which we next need to output text.  If we added an end cap, that would mean that any additional progress text would be placed _after_ the end cap.  Definitely not what we want.
 
-So how does it work?  First we output the title and the first end cap:
+So how does it work?
+
+First we output the title and the first end cap:
 
     Progress: |
 
-Next, every time we increment the bar, we check whether the progress bar has grown.  If it has, we output _only the additional portion_ of the bar to the output.
+Next, every time we increment the bar, we check whether the progress bar has grown.  If it has, we _only output the additional portion_ of the bar to the output.
 
 For example, given the previous title output, if we increment the bar once, we would get:
 
@@ -362,7 +390,7 @@ For example, given the previous title output, if we increment the bar once, we w
 
 But in this case, only one `=` was output.  Not the entire `Progress: |=`.
 
-Once the bar gets to be completely finished though:
+However when the bar is completed:
 
     Progress: |====================================================================|
 

data/lib/ruby-progressbar/base.rb

@@ -12,6 +12,7 @@ class ProgressBar
       super(options)
 
       @bar              = Components::Bar.new(options)
+      @rate             = Components::Rate.new(options)
       @estimated_time   = Components::EstimatedTimer.new(options)
       @elapsed_time     = Components::ElapsedTimer.new
       @throttle         = Components::Throttle.new(options)
@@ -155,11 +156,13 @@ class ProgressBar
     def with_progressables(*args)
       @bar.send(*args)
       @estimated_time.send(*args)
+      @rate.send(*args)
     end
 
     def with_timers(*args)
       @estimated_time.send(*args)
       @elapsed_time.send(*args)
+      @rate.send(*args)
     end
 
     def update_progress(*args)

data/lib/ruby-progressbar/components.rb

@@ -4,3 +4,4 @@ require 'ruby-progressbar/components/bar'
 require 'ruby-progressbar/components/estimated_timer'
 require 'ruby-progressbar/components/elapsed_timer'
 require 'ruby-progressbar/components/throttle'
+require 'ruby-progressbar/components/rate'

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

@@ -84,6 +84,10 @@ class ProgressBar
         format('%5.2f', (progress.to_f * 100.0 / total * 100.0).floor / 100.0)
       end
 
+      def progress_made
+        started? ? self.progress - self.starting_position : 0
+      end
+
     private
       def validate_total(new_total)
         (progress.nil? || new_total.nil? || new_total >= progress) || raise(ProgressBar::InvalidProgressError, "You can't set the item's total value to be less than the current progress.")
@@ -93,12 +97,8 @@ class ProgressBar
         (total.nil? || new_progress <= total) || raise(ProgressBar::InvalidProgressError, "You can't set the item's current value to be greater than the total.")
       end
 
-      def progress_made
-        started? ? self.progress - self.starting_position : 0
-      end
-
       def update_running_average
-        self.running_average = RunningAverageCalculator.calculate(self.running_average, self.progress, self.smoothing)
+        self.running_average = RunningAverageCalculator.calculate(self.running_average, self.progress_made, self.smoothing)
       end
     end
   end

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

@@ -0,0 +1,69 @@
+class ProgressBar
+  module Components
+    class Rate
+      include Timer
+      include Progressable
+
+      attr_accessor :rate_scale
+
+      def initialize(options = {})
+        self.rate_scale = options[:rate_scale]
+
+        super
+      end
+
+      def start(options = {})
+        as(Timer).start
+        as(Progressable).start(options)
+      end
+
+      def reset
+        as(Timer).reset
+        as(Progressable).reset
+      end
+
+      def to_s(format_string = "%i")
+        elapsed = elapsed_whole_seconds.to_f
+        return 0 unless elapsed > 0
+
+        base_rate   = (progress_made / elapsed)
+
+        if rate_scale
+          scaled_rate = rate_scale.call(base_rate)
+        else
+          scaled_rate = base_rate
+        end
+
+        format_string % scaled_rate
+      end
+
+    private
+
+      def as(ancestor, &blk)
+        @__as ||= {}
+        unless r = @__as[ancestor]
+          r = (@__as[ancestor] = As.new(self, ancestor))
+        end
+        r.instance_eval(&blk) if block_given?
+        r
+      end
+
+      class As
+        private *instance_methods.select { |m| m !~ /(^__|^\W|^binding$)/ }
+
+        def initialize(subject, ancestor)
+          @subject = subject
+          @ancestor = ancestor
+        end
+
+        def start(*args, &blk)
+          @ancestor.instance_method(:start).bind(@subject).call(*args,&blk)
+        end
+
+        def method_missing(sym, *args, &blk)
+          @ancestor.instance_method(sym).bind(@subject).call(*args,&blk)
+        end
+      end
+    end
+  end
+end

data/lib/ruby-progressbar/format/molecule.rb

@@ -2,31 +2,32 @@ class ProgressBar
   module Format
     class Molecule
       MOLECULES = {
-        :t => [:left_justified_title,               :title],
-        :T => [:right_justified_title,              :title],
-        :c => [:current_progress,                   :progress],
-        :C => [:total_capacity,                     :total],
-        :p => [:percentage_complete_as_integer,     :percentage],
-        :P => [:percentage_complete_as_float,       :percentage_with_precision],
-        :a => [:elapsed_time,                       :elapsed_time],
-        :e => [:estimated_time_with_unknown,        :estimated_time_with_unknown_oob],
-        :E => [:estimated_time_with_greater_than,   :estimated_time_with_friendly_oob],
-        :f => [:force_estimated_time,               :estimated_time_with_no_oob],
-        :B => [:complete_bar,                       :complete_bar],
-        :b => [:bar,                                :bar],
-        :w => [:bar_with_percentage,                :bar_with_percentage],
-        :i => [:incomplete_space,                   :incomplete_space]
+        :t => :title,
+        :T => :title,
+        :c => :progress,
+        :C => :total,
+        :p => :percentage,
+        :P => :percentage_with_precision,
+        :a => :elapsed_time,
+        :e => :estimated_time_with_unknown_oob,
+        :E => :estimated_time_with_friendly_oob,
+        :f => :estimated_time_with_no_oob,
+        :B => :complete_bar,
+        :b => :bar,
+        :w => :bar_with_percentage,
+        :i => :incomplete_space,
+        :r => :rate_of_change,
+        :R => :rate_of_change_with_precision,
       }
 
       BAR_MOLECULES     = %w{w B b i}
 
       attr_reader   :key
       attr_reader   :method_name
-      attr_reader   :method_arguments
 
       def initialize(letter)
-        @key                                          = letter
-        @description, @method_name, @method_arguments = MOLECULES.fetch(@key.to_sym)
+        @key         = letter
+        @method_name = MOLECULES.fetch(@key.to_sym)
       end
 
       def bar_molecule?

data/lib/ruby-progressbar/formatter.rb

@@ -91,5 +91,13 @@ class ProgressBar
     def estimated_time
       finished? ? @elapsed_time : @estimated_time
     end
+
+    def rate_of_change
+      @rate.to_s
+    end
+
+    def rate_of_change_with_precision
+      @rate.to_s("%.2f")
+    end
   end
 end

data/lib/ruby-progressbar/version.rb

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

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

@@ -1,16 +1,17 @@
-require 'spec_helper'
+require 'rspectacular'
+require 'support/time'
 require 'stringio'
 
 describe ProgressBar::Base do
   let(:output) do
     StringIO.new('', 'w+').tap do |io|
-      io.stub(:tty?).and_return true
+      allow(io).to receive(:tty?).and_return true
     end
   end
 
   let(:non_tty_output) do
     StringIO.new('', 'w+').tap do |io|
-      io.stub(:tty?).and_return false
+      allow(io).to receive(:tty?).and_return false
     end
   end
 
@@ -31,7 +32,7 @@ describe ProgressBar::Base do
       progressbar.increment
 
       output.rewind
-      output.read.should match /\raaaaaaaaaaaaaaaaaaaaaaaaa     \r\s+\raaaaaaaaaaaaaaaaaaaaaaaaa\r\z/
+      expect(output.read).to match /\raaaaaaaaaaaaaaaaaaaaaaaaa     \r\s+\raaaaaaaaaaaaaaaaaaaaaaaaa\r\z/
     end
 
     context 'and the bar length is calculated' do
@@ -41,7 +42,7 @@ describe ProgressBar::Base do
         allow(progressbar).to receive(:terminal_width).
                               and_return 20
 
-        progressbar.to_s('%t%w').should eql '*********************'
+        expect(progressbar.to_s('%t%w')).to eql '*********************'
       end
     end
 
@@ -52,7 +53,7 @@ describe ProgressBar::Base do
         allow(progressbar).to receive(:terminal_width).
                               and_return 20
 
-        progressbar.to_s('%t%i').should eql '*********************'
+        expect(progressbar.to_s('%t%i')).to eql '*********************'
       end
 
       it 'returns the proper string' do
@@ -61,7 +62,7 @@ describe ProgressBar::Base do
         allow(progressbar).to receive(:terminal_width).
                               and_return 20
 
-        progressbar.to_s('%t%i').should eql '*********************'
+        expect(progressbar.to_s('%t%i')).to eql '*********************'
       end
     end
 
@@ -72,7 +73,7 @@ describe ProgressBar::Base do
         allow(progressbar).to receive(:terminal_width).
                               and_return 20
 
-        progressbar.to_s('%t%B').should eql '******************* '
+        expect(progressbar.to_s('%t%B')).to eql '******************* '
       end
 
       it 'returns the proper string' do
@@ -81,7 +82,7 @@ describe ProgressBar::Base do
         allow(progressbar).to receive(:terminal_width).
                               and_return 20
 
-        progressbar.to_s('%t%w%i').should eql '******************* '
+        expect(progressbar.to_s('%t%w%i')).to eql '******************* '
       end
     end
   end
@@ -92,13 +93,13 @@ describe ProgressBar::Base do
 
       describe '#title' do
         it 'returns the default title' do
-          progressbar.send(:title).to_s.should eql ProgressBar::Base::DEFAULT_TITLE
+          expect(progressbar.send(:title).to_s).to eql ProgressBar::Base::DEFAULT_TITLE
         end
       end
 
       describe '#output' do
         it 'returns the default output stream' do
-          progressbar.send(:output).should eql ProgressBar::Base::DEFAULT_OUTPUT_STREAM
+          expect(progressbar.send(:output)).to eql ProgressBar::Base::DEFAULT_OUTPUT_STREAM
         end
       end
 
@@ -109,7 +110,7 @@ describe ProgressBar::Base do
 
           it 'returns the length of the environment variable as an integer' do
             progressbar = ProgressBar::Base.new
-            progressbar.send(:length).should eql 44
+            expect(progressbar.send(:length)).to eql 44
           end
         end
 
@@ -119,21 +120,21 @@ describe ProgressBar::Base do
           context 'but the length option was passed in' do
             it 'returns the length specified in the option' do
               progressbar = ProgressBar::Base.new(:length => 88)
-              progressbar.send(:length).should eql 88
+              expect(progressbar.send(:length)).to eql 88
             end
           end
 
           context 'and no length option was passed in' do
             it 'returns the width of the terminal if it is a Unix environment' do
-              progressbar.stub(:terminal_width).and_return(99)
+              allow(progressbar).to receive(:terminal_width).and_return(99)
               progressbar.send(:reset_length)
-              progressbar.send(:length).should eql 99
+              expect(progressbar.send(:length)).to eql 99
             end
 
             it 'returns 80 if it is not a Unix environment' do
-              progressbar.stub(:unix?).and_return(false)
+              allow(progressbar).to receive(:unix?).and_return(false)
               progressbar.send(:reset_length)
-              progressbar.send(:length).should eql 80
+              expect(progressbar.send(:length)).to eql 80
             end
           end
         end
@@ -145,19 +146,19 @@ describe ProgressBar::Base do
 
       describe '#title' do
         it 'returns the overridden title' do
-          progressbar.send(:title).to_s.should eql 'We All Float'
+          expect(progressbar.send(:title).to_s).to eql 'We All Float'
         end
       end
 
       describe '#output' do
         it 'returns the overridden output stream' do
-          progressbar.send(:output).should eql STDOUT
+          expect(progressbar.send(:output)).to eql STDOUT
         end
       end
 
       describe '#length' do
         it 'returns the overridden length' do
-          progressbar.send(:length).should eql 88
+          expect(progressbar.send(:length)).to eql 88
         end
       end
     end
@@ -185,15 +186,15 @@ describe ProgressBar::Base do
 
           it 'completes the bar' do
             output.rewind
-            output.read.should match /Progress: \|#{'=' * 68}\|\n/
+            expect(output.read).to match /Progress: \|#{'=' * 68}\|\n/
           end
 
           it 'shows the elapsed time instead of the estimated time since the bar is completed' do
-            progressbar.to_s('%e').should eql 'Time: 00:02:00'
+            expect(progressbar.to_s('%e')).to eql 'Time: 00:02:00'
           end
 
           it 'calculates the elapsed time to 00:02:00' do
-            progressbar.to_s('%a').should eql 'Time: 00:02:00'
+            expect(progressbar.to_s('%a')).to eql 'Time: 00:02:00'
           end
         end
       end
@@ -216,7 +217,7 @@ describe ProgressBar::Base do
         progressbar.increment
 
         output.rewind
-        output.read.should include "#{@color_code}Processing... #{@progress_mark * 3}#{' ' * 3}#{@reset_code}#{@color_code} 50%#{@reset_code}\r#{@color_code}Processing... #{@progress_mark * 3}#{' ' * 3}#{@reset_code}#{@color_code} 66%#{@reset_code}\r#{@color_code}Processing... #{@progress_mark * 4}#{' ' * 2}#{@reset_code}#{@color_code} 83%#{@reset_code}\r"
+        expect(output.read).to include "#{@color_code}Processing... #{@progress_mark * 3}#{' ' * 3}#{@reset_code}#{@color_code} 50%#{@reset_code}\r#{@color_code}Processing... #{@progress_mark * 3}#{' ' * 3}#{@reset_code}#{@color_code} 66%#{@reset_code}\r#{@color_code}Processing... #{@progress_mark * 4}#{' ' * 2}#{@reset_code}#{@color_code} 83%#{@reset_code}\r"
       end
 
       it 'properly calculates the length of the bar by removing the short version of the ANSI codes from the calculated length' do
@@ -235,7 +236,7 @@ describe ProgressBar::Base do
         progressbar.increment
 
         output.rewind
-        output.read.should include "#{@color_code}Processing... #{@progress_mark * 3}#{' ' * 3}#{@reset_code}#{@color_code} 50%#{@reset_code}\r#{@color_code}Processing... #{@progress_mark * 3}#{' ' * 3}#{@reset_code}#{@color_code} 66%#{@reset_code}\r#{@color_code}Processing... #{@progress_mark * 4}#{' ' * 2}#{@reset_code}#{@color_code} 83%#{@reset_code}\r"
+        expect(output.read).to include "#{@color_code}Processing... #{@progress_mark * 3}#{' ' * 3}#{@reset_code}#{@color_code} 50%#{@reset_code}\r#{@color_code}Processing... #{@progress_mark * 3}#{' ' * 3}#{@reset_code}#{@color_code} 66%#{@reset_code}\r#{@color_code}Processing... #{@progress_mark * 4}#{' ' * 2}#{@reset_code}#{@color_code} 83%#{@reset_code}\r"
       end
     end
 
@@ -247,7 +248,7 @@ describe ProgressBar::Base do
         progressbar.increment
 
         output.rewind
-        output.read.should include "Progress: |====    |\rProgress: |=====   |\r                    \rWe All Float\nProgress: |=====   |\rProgress: |======  |\r"
+        expect(output.read).to include "Progress: |====    |\rProgress: |=====   |\r                    \rWe All Float\nProgress: |=====   |\rProgress: |======  |\r"
       end
     end
 
@@ -260,7 +261,7 @@ describe ProgressBar::Base do
         progressbar.finish
 
         non_tty_output.rewind
-        non_tty_output.read.should include "We All Float\nProgress: |========|\n"
+        expect(non_tty_output.read).to include "We All Float\nProgress: |========|\n"
       end
 
       it 'can output the bar properly so that it does not spam the screen' do
@@ -269,7 +270,7 @@ describe ProgressBar::Base do
         6.times { progressbar.increment }
 
         non_tty_output.rewind
-        non_tty_output.read.should eql "\n\nProgress: |========|\n"
+        expect(non_tty_output.read).to eql "\n\nProgress: |========|\n"
       end
 
       it 'can output the bar properly if finished in the middle of its progress' do
@@ -280,7 +281,7 @@ describe ProgressBar::Base do
         progressbar.finish
 
         non_tty_output.rewind
-        non_tty_output.read.should eql "\n\nProgress: |========|\n"
+        expect(non_tty_output.read).to eql "\n\nProgress: |========|\n"
       end
 
       it 'can output the bar properly if stopped in the middle of its progress' do
@@ -291,7 +292,7 @@ describe ProgressBar::Base do
         progressbar.stop
 
         non_tty_output.rewind
-        non_tty_output.read.should eql "\n\nProgress: |====\n"
+        expect(non_tty_output.read).to eql "\n\nProgress: |====\n"
       end
     end
   end
@@ -303,19 +304,19 @@ describe ProgressBar::Base do
       before { progressbar.increment }
 
       it 'registers as being "finished"' do
-        progressbar.should be_finished
+        expect(progressbar).to be_finished
       end
 
       it 'prints a new line' do
         output.rewind
-        output.read.end_with?("\n").should be_true
+        expect(output.read.end_with?("\n")).to eql true
       end
 
       it 'does not continue to print bars if finish is subsequently called' do
         progressbar.finish
 
         output.rewind
-        output.read.should end_with "                    \rProgress: |======  |\rProgress: |========|\n"
+        expect(output.read).to end_with "                    \rProgress: |======  |\rProgress: |========|\n"
       end
     end
   end
@@ -324,25 +325,25 @@ describe ProgressBar::Base do
     let(:progressbar) { ProgressBar::Base.new(:total => nil, :output => output, :length => 80, :unknown_progress_animation_steps => ['=--', '-=-', '--=']) }
 
     it 'is represented correctly' do
-      progressbar.to_s('%i').should eql '=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=-'
+      expect(progressbar.to_s('%i')).to eql '=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=-'
     end
 
     it 'is represented after being incremented once' do
       progressbar.increment
-      progressbar.to_s('%i').should eql '-=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--='
+      expect(progressbar.to_s('%i')).to eql '-=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--='
     end
 
     it 'is represented after being incremented twice' do
       progressbar.increment
       progressbar.increment
-      progressbar.to_s('%i').should eql '--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--'
+      expect(progressbar.to_s('%i')).to eql '--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--'
     end
 
     it 'displays the proper ETA' do
       progressbar.increment
 
-      progressbar.to_s('%i%e').should eql '-=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=- ETA: ??:??:??'
-      progressbar.to_s('%i%E').should eql '-=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=- ETA: ??:??:??'
+      expect(progressbar.to_s('%i%e')).to eql '-=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=- ETA: ??:??:??'
+      expect(progressbar.to_s('%i%E')).to eql '-=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=- ETA: ??:??:??'
     end
   end
 
@@ -357,7 +358,7 @@ describe ProgressBar::Base do
           progressbar.progress_mark = 'x'
 
           output.rewind
-          output.read.should match /\rProgress: \|xxxxxx#{' ' * 62}\|\r\z/
+          expect(output.read).to match /\rProgress: \|xxxxxx#{' ' * 62}\|\r\z/
         end
       end
 
@@ -366,7 +367,7 @@ describe ProgressBar::Base do
           progressbar.remainder_mark = 'x'
 
           output.rewind
-          output.read.should match /\rProgress: \|======#{'x' * 62}\|\r\z/
+          expect(output.read).to match /\rProgress: \|======#{'x' * 62}\|\r\z/
         end
       end
 
@@ -375,7 +376,7 @@ describe ProgressBar::Base do
           progressbar.title = 'Items'
 
           output.rewind
-          output.read.should match /\rItems: \|=======#{' ' * 64}\|\r\z/
+          expect(output.read).to match /\rItems: \|=======#{' ' * 64}\|\r\z/
         end
       end
 
@@ -384,7 +385,7 @@ describe ProgressBar::Base do
 
         it 'resets the bar back to the starting value' do
           output.rewind
-          output.read.should match /\rProgress: \|#{' ' * 68}\|\r\z/
+          expect(output.read).to match /\rProgress: \|#{' ' * 68}\|\r\z/
         end
       end
 
@@ -393,7 +394,7 @@ describe ProgressBar::Base do
 
         it 'forcibly halts the bar wherever it is and cancels it' do
           output.rewind
-          output.read.should match /\rProgress: \|======#{' ' * 62}\|\n\z/
+          expect(output.read).to match /\rProgress: \|======#{' ' * 62}\|\n\z/
         end
 
         it 'does not output the bar multiple times if the bar is already stopped' do
@@ -401,7 +402,7 @@ describe ProgressBar::Base do
           progressbar.stop
           output.rewind
 
-          output.read.should_not start_with "Progress: |======#{' ' * 62}|"
+          expect(output.read).to start_with "#{' ' * 80}"
         end
       end
 
@@ -411,7 +412,7 @@ describe ProgressBar::Base do
           progressbar.resume
           output.rewind
 
-          output.read.should_not start_with "Progress: |======#{' ' * 62}|"
+          expect(output.read).to start_with "#{' ' * 80}"
         end
       end
     end
@@ -428,7 +429,7 @@ describe ProgressBar::Base do
 
         it 'resets the bar back to the starting value' do
           output.rewind
-          output.read.should match /\rProgress: \|==========#{' ' * 90}\|\r\z/
+          expect(output.read).to match /\rProgress: \|==========#{' ' * 90}\|\r\z/
         end
       end
     end
@@ -439,7 +440,7 @@ describe ProgressBar::Base do
       progressbar.clear
 
       output.rewind
-      output.read.should match /^#{progressbar.send(:clear_string)}/
+      expect(output.read).to match /^#{progressbar.send(:clear_string)}/
     end
   end
 
@@ -448,21 +449,21 @@ describe ProgressBar::Base do
       progressbar.start
 
       output.rewind
-      output.read.should match /^#{progressbar.send(:clear_string)}/
+      expect(output.read).to match /^#{progressbar.send(:clear_string)}/
     end
 
     it 'prints the bar for the first time' do
       progressbar.start
 
       output.rewind
-      output.read.should match /Progress: \|                                                                    \|\r\z/
+      expect(output.read).to match /Progress: \|                                                                    \|\r\z/
     end
 
     it 'prints correctly if passed a position to start at' do
       progressbar.start(:at => 20)
 
       output.rewind
-      output.read.should match /Progress: \|=============                                                       \|\r\z/
+      expect(output.read).to match /Progress: \|=============                                                       \|\r\z/
     end
   end
 
@@ -474,7 +475,7 @@ describe ProgressBar::Base do
 
       it 'displays the bar with the correct formatting' do
         output.rewind
-        output.read.should match /Progress: \|==                                                                                                  \|\r\z/
+        expect(output.read).to match /Progress: \|==                                                                                                  \|\r\z/
       end
     end
   end
@@ -487,7 +488,7 @@ describe ProgressBar::Base do
         before { progressbar.format }
 
         it 'resets the format back to the default' do
-          progressbar.to_s.should match /^Progress: \|\s+\|\z/
+          expect(progressbar.to_s).to match /^Progress: \|\s+\|\z/
         end
       end
 
@@ -495,116 +496,260 @@ describe ProgressBar::Base do
         before { progressbar.format '%t' }
 
         it 'sets it as the new format for the bar' do
-          progressbar.to_s.should match /^Progress\z/
+          expect(progressbar.to_s).to match /^Progress\z/
         end
       end
     end
 
     context '#to_s' do
+      context 'when no time has elapsed' do
+        it 'displays zero for the rate' do
+          Timecop.freeze do
+            progressbar = ProgressBar::Base.new(:length => 100, :starting_at => 0)
+
+            expect(progressbar.to_s('%r')).to match /^0\z/
+          end
+        end
+      end
+
+      context 'when any time has elasped' do
+        context 'and the standard rate is applied' do
+          it 'displays zero for %r if no progress has been made' do
+            progressbar = ProgressBar::Base.new(:length => 100, :starting_at => 20)
+
+            Timecop.travel(2) do
+              expect(progressbar.to_s('%r')).to match /^0\z/
+            end
+          end
+
+          it 'displays zero for %R if no progress has been made' do
+            progressbar = ProgressBar::Base.new(:length => 100, :starting_at => 20)
+
+            Timecop.travel(2) do
+              expect(progressbar.to_s('%R')).to match /^0.00\z/
+            end
+          end
+
+          it 'takes into account the starting position when calculating %r' do
+            Timecop.freeze do
+              progressbar = ProgressBar::Base.new(:length => 100, :starting_at => 20)
+              progressbar.start
+              progressbar.progress += 20
+
+              Timecop.travel(2) do
+                expect(progressbar.to_s('%r')).to match /^10\z/
+              end
+            end
+          end
+
+          it 'takes into account the starting position when calculating %R' do
+            Timecop.freeze do
+              progressbar = ProgressBar::Base.new(:length => 100, :starting_at => 20)
+              progressbar.start
+              progressbar.progress += 13
+
+              Timecop.travel(2) do
+                expect(progressbar.to_s('%R')).to match /^6.50\z/
+              end
+            end
+          end
+
+          it 'displays the rate when passed the "%r" format flag' do
+            Timecop.freeze do
+              progressbar = ProgressBar::Base.new(:length => 100, :starting_at => 0)
+              progressbar.start
+              progressbar.progress += 20
+
+              Timecop.travel(2) do
+                expect(progressbar.to_s('%r')).to match /^10\z/
+              end
+            end
+          end
+
+          it 'displays the rate when passed the "%R" format flag' do
+            Timecop.freeze do
+              progressbar = ProgressBar::Base.new(:length => 100, :starting_at => 0)
+              progressbar.start
+              progressbar.progress += 10
+
+              Timecop.travel(6) do
+                expect(progressbar.to_s('%R')).to match /^1.67\z/
+              end
+            end
+          end
+        end
+
+        context 'and the a custom rate is applied' do
+          it 'displays zero for %r if no progress has been made' do
+            progressbar = ProgressBar::Base.new(:length => 100, :starting_at => 20, :rate_scale => lambda { |rate| rate / 2 })
+
+            Timecop.travel(2) do
+              expect(progressbar.to_s('%r')).to match /^0\z/
+            end
+          end
+
+          it 'displays zero for %R if no progress has been made' do
+            progressbar = ProgressBar::Base.new(:length => 100, :starting_at => 20, :rate_scale => lambda { |rate| rate / 2 })
+
+            Timecop.travel(2) do
+              expect(progressbar.to_s('%R')).to match /^0.00\z/
+            end
+          end
+
+          it 'takes into account the starting position when calculating %r' do
+            Timecop.freeze do
+              progressbar = ProgressBar::Base.new(:length => 100, :starting_at => 20, :rate_scale => lambda { |rate| rate / 2 })
+              progressbar.start
+              progressbar.progress += 20
+
+              Timecop.travel(2) do
+                expect(progressbar.to_s('%r')).to match /^5\z/
+              end
+            end
+          end
+
+          it 'takes into account the starting position when calculating %R' do
+            Timecop.freeze do
+              progressbar = ProgressBar::Base.new(:length => 100, :starting_at => 20, :rate_scale => lambda { |rate| rate / 2 })
+              progressbar.start
+              progressbar.progress += 13
+
+              Timecop.travel(2) do
+                expect(progressbar.to_s('%R')).to match /^3.25\z/
+              end
+            end
+          end
+
+          it 'displays the rate when passed the "%r" format flag' do
+            Timecop.freeze do
+              progressbar = ProgressBar::Base.new(:length => 100, :starting_at => 0, :rate_scale => lambda { |rate| rate / 2 })
+              progressbar.start
+              progressbar.progress += 20
+
+              Timecop.travel(2) do
+                expect(progressbar.to_s('%r')).to match /^5\z/
+              end
+            end
+          end
+
+          it 'displays the rate when passed the "%R" format flag' do
+            Timecop.freeze do
+              progressbar = ProgressBar::Base.new(:length => 100, :starting_at => 0, :rate_scale => lambda { |rate| rate / 2 })
+              progressbar.start
+              progressbar.progress += 10
+
+              Timecop.travel(6) do
+                expect(progressbar.to_s('%R')).to match /^0.83\z/
+              end
+            end
+          end
+        end
+      end
+
       it 'displays the title when passed the "%t" format flag' do
-        progressbar.to_s('%t').should match /^Progress\z/
+        expect(progressbar.to_s('%t')).to match /^Progress\z/
       end
 
       it 'displays the title when passed the "%T" format flag' do
-        progressbar.to_s('%T').should match /^Progress\z/
+        expect(progressbar.to_s('%T')).to match /^Progress\z/
       end
 
       it 'displays the bar when passed the "%B" format flag (including empty space)' do
         progressbar = ProgressBar::Base.new(:length => 100, :starting_at => 20)
-        progressbar.to_s('%B').should match /^#{'=' * 20}#{' ' * 80}\z/
+        expect(progressbar.to_s('%B')).to match /^#{'=' * 20}#{' ' * 80}\z/
       end
 
       it 'displays the bar when passed the combined "%b%i" format flags' do
         progressbar = ProgressBar::Base.new(:length => 100, :starting_at => 20)
-        progressbar.to_s('%b%i').should match /^#{'=' * 20}#{' ' * 80}\z/
+        expect(progressbar.to_s('%b%i')).to match /^#{'=' * 20}#{' ' * 80}\z/
       end
 
       it 'displays the bar when passed the "%b" format flag (excluding empty space)' do
         progressbar = ProgressBar::Base.new(:length => 100, :starting_at => 20)
-        progressbar.to_s('%b').should match /^#{'=' * 20}\z/
+        expect(progressbar.to_s('%b')).to match /^#{'=' * 20}\z/
       end
 
       it 'displays the incomplete space when passed the "%i" format flag' do
         progressbar = ProgressBar::Base.new(:length => 100, :starting_at => 20)
-        progressbar.to_s('%i').should match /^#{' ' * 80}\z/
+        expect(progressbar.to_s('%i')).to match /^#{' ' * 80}\z/
       end
 
       it 'displays the bar when passed the "%w" format flag' do
         progressbar = ProgressBar::Base.new(:output => output, :length => 100, :starting_at => 0)
 
-        progressbar.to_s('%w').should match /^\z/
+        expect(progressbar.to_s('%w')).to match /^\z/
         4.times { progressbar.increment }
-        progressbar.to_s('%w').should match /^====\z/
+        expect(progressbar.to_s('%w')).to match /^====\z/
         progressbar.increment
-        progressbar.to_s('%w').should match /^= 5 =\z/
+        expect(progressbar.to_s('%w')).to match /^= 5 =\z/
         5.times { progressbar.increment }
-        progressbar.to_s('%w').should match /^=== 10 ===\z/
+        expect(progressbar.to_s('%w')).to match /^=== 10 ===\z/
         progressbar.decrement
-        progressbar.to_s('%w').should match /^=== 9 ===\z/
+        expect(progressbar.to_s('%w')).to match /^=== 9 ===\z/
         91.times { progressbar.increment }
-        progressbar.to_s('%w').should match /^#{'=' * 47} 100 #{'=' * 48}\z/
+        expect(progressbar.to_s('%w')).to match /^#{'=' * 47} 100 #{'=' * 48}\z/
       end
 
       it 'calculates the remaining negative space properly with an integrated percentage bar of 0 percent' do
         progressbar = ProgressBar::Base.new(:output => output, :length => 100, :total => 200, :starting_at => 0)
 
-        progressbar.to_s('%w%i').should match /^\s{100}\z/
+        expect(progressbar.to_s('%w%i')).to match /^\s{100}\z/
         9.times { progressbar.increment }
-        progressbar.to_s('%w%i').should match /^====\s{96}\z/
+        expect(progressbar.to_s('%w%i')).to match /^====\s{96}\z/
         progressbar.increment
-        progressbar.to_s('%w%i').should match /^= 5 =\s{95}\z/
+        expect(progressbar.to_s('%w%i')).to match /^= 5 =\s{95}\z/
       end
 
       it 'displays the current capacity when passed the "%c" format flag' do
         progressbar = ProgressBar::Base.new(:output => output, :starting_at => 0)
 
-        progressbar.to_s('%c').should match /^0\z/
+        expect(progressbar.to_s('%c')).to match /^0\z/
         progressbar.increment
-        progressbar.to_s('%c').should match /^1\z/
+        expect(progressbar.to_s('%c')).to match /^1\z/
         progressbar.decrement
-        progressbar.to_s('%c').should match /^0\z/
+        expect(progressbar.to_s('%c')).to match /^0\z/
       end
 
       it 'displays the total capacity when passed the "%C" format flag' do
         progressbar = ProgressBar::Base.new(:total => 100)
 
-        progressbar.to_s('%C').should match /^100\z/
+        expect(progressbar.to_s('%C')).to match /^100\z/
       end
 
       it 'displays the percentage complete when passed the "%p" format flag' do
         progressbar = ProgressBar::Base.new(:starting_at => 33, :total => 200)
 
-        progressbar.to_s('%p').should match /^16\z/
+        expect(progressbar.to_s('%p')).to match /^16\z/
       end
 
       it 'displays the percentage complete when passed the "%P" format flag' do
         progressbar = ProgressBar::Base.new(:starting_at => 33, :total => 200)
 
-        progressbar.to_s('%P').should match /^16.50\z/
+        expect(progressbar.to_s('%P')).to match /^16.50\z/
       end
 
       it 'displays only up to 2 decimal places when using the "%P" flag' do
         progressbar = ProgressBar::Base.new(:starting_at => 66, :total => 99)
 
-        progressbar.to_s('%P').should match /^66.66\z/
+        expect(progressbar.to_s('%P')).to match /^66.66\z/
       end
 
       it 'displays a literal percent sign when using the "%%" flag' do
         progressbar = ProgressBar::Base.new(:starting_at => 66, :total => 99)
 
-        progressbar.to_s('%%').should match /^%\z/
+        expect(progressbar.to_s('%%')).to match /^%\z/
       end
 
       it 'displays a literal percent sign when using the "%%" flag' do
         progressbar = ProgressBar::Base.new(:starting_at => 66, :total => 99)
 
-        progressbar.to_s('%%').should match /^%\z/
+        expect(progressbar.to_s('%%')).to match /^%\z/
       end
 
       # Autostarting for now.  This will be applicable later.
       # context "when called before #start" do
         # it "displays unknown time elapsed when using the %a flag" do
-          # progressbar.to_s('%a').should match /^Time: --:--:--\z/
+        # expect(progressbar.to_s('%a')).to match /^Time: --:--:--\z/
         # end
       # end
 
@@ -619,19 +764,19 @@ describe ProgressBar::Base do
           before { progressbar.reset }
 
           it 'displays "??:??:??" until finished when passed the %e flag' do
-            progressbar.to_s('%a').should match /^Time: --:--:--\z/
+            expect(progressbar.to_s('%a')).to match /^Time: --:--:--\z/
           end
         end
 
         it 'displays the time elapsed when using the "%a" flag' do
-          progressbar.to_s('%a').should match /^Time: 01:02:03\z/
+          expect(progressbar.to_s('%a')).to match /^Time: 01:02:03\z/
         end
       end
 
       context 'when called before #start' do
         it 'displays unknown time until finished when passed the "%e" flag' do
           progressbar = ProgressBar::Base.new
-          progressbar.to_s('%e').should match /^ ETA: \?\?:\?\?:\?\?\z/
+          expect(progressbar.to_s('%e')).to match /^ ETA: \?\?:\?\?:\?\?\z/
         end
       end
 
@@ -649,12 +794,12 @@ describe ProgressBar::Base do
           before { progressbar.reset }
 
           it 'displays "??:??:??" until finished when passed the "%e" flag' do
-            progressbar.to_s('%e').should match /^ ETA: \?\?:\?\?:\?\?\z/
+            expect(progressbar.to_s('%e')).to match /^ ETA: \?\?:\?\?:\?\?\z/
           end
         end
 
         it 'displays the estimated time remaining when using the "%e" flag' do
-          progressbar.to_s('%e').should match /^ ETA: 01:02:03\z/
+          expect(progressbar.to_s('%e')).to match /^ ETA: 01:02:03\z/
         end
       end
 
@@ -669,15 +814,15 @@ describe ProgressBar::Base do
         end
 
         it 'displays "> 4 Days" until finished when passed the "%E" flag' do
-          progressbar.to_s('%E').should match /^ ETA: > 4 Days\z/
+          expect(progressbar.to_s('%E')).to match /^ ETA: > 4 Days\z/
         end
 
         it 'displays "??:??:??" until finished when passed the "%e" flag' do
-          progressbar.to_s('%e').should match /^ ETA: \?\?:\?\?:\?\?\z/
+          expect(progressbar.to_s('%e')).to match /^ ETA: \?\?:\?\?:\?\?\z/
         end
 
         it 'displays the exact estimated time until finished when passed the "%f" flag' do
-          progressbar.to_s('%f').should match /^ ETA: 100:00:00\z/
+          expect(progressbar.to_s('%f')).to match /^ ETA: 100:00:00\z/
         end
       end
     end