Chore: Shore Up Tests

Author: jfelchner

lib/ruby-progressbar/base.rb

@@ -33,8 +33,8 @@ def initialize(options = {}) # rubocop:disable Metrics/AbcSize
     self.timer        = Timer.new(options)
     self.progressable = Progress.new(options)
 
-    options           = options.merge(:progress => progressable,
-                                      :timer    => timer)
+    options = options.merge(:progress => progressable,
+                            :timer    => timer)
 
     self.title_component      = Components::Title.new(options)
     self.bar_component        = Components::Bar.new(options)

lib/ruby-progressbar/components/bar.rb

@@ -32,22 +32,6 @@ def to_s(options = { :format => :standard })
     end
   end
 
-  private
-
-  def integrated_percentage_complete_string
-    return standard_complete_string if completed_length < 5
-
-    " #{progress.percentage_completed} ".to_s.center(completed_length, progress_mark)
-  end
-
-  def standard_complete_string
-    progress_mark * completed_length
-  end
-
-  def incomplete_string
-    remainder_mark * (length - completed_length)
-  end
-
   def bar(length)
     self.length = length
 
@@ -66,12 +50,6 @@ def complete_bar_with_percentage(length)
     to_s(:format => :integrated_percentage)
   end
 
-  def unknown_string
-    unknown_frame_string = unknown_progress_frame * ((length / upa_steps.size) + 2)
-
-    unknown_frame_string[0, length]
-  end
-
   def incomplete_space(length)
     self.length = length
 
@@ -88,6 +66,28 @@ def bar_with_percentage(length)
     integrated_percentage_complete_string
   end
 
+  private
+
+  def integrated_percentage_complete_string
+    return standard_complete_string if completed_length < 5
+
+    " #{progress.percentage_completed} ".to_s.center(completed_length, progress_mark)
+  end
+
+  def standard_complete_string
+    progress_mark * completed_length
+  end
+
+  def incomplete_string
+    remainder_mark * (length - completed_length)
+  end
+
+  def unknown_string
+    unknown_frame_string = unknown_progress_frame * ((length / upa_steps.size) + 2)
+
+    unknown_frame_string[0, length]
+  end
+
   def completed_length
     (length * progress.percentage_completed / 100).floor
   end

lib/ruby-progressbar/components/percentage.rb

@@ -7,10 +7,8 @@ def initialize(options = {})
     self.progress = options[:progress]
   end
 
-  private
-
   def percentage
-    progress.percentage_completed
+    progress.percentage_completed.to_s
   end
 
   def justified_percentage

lib/ruby-progressbar/components/rate.rb

@@ -2,23 +2,17 @@ class   ProgressBar
 module  Components
 class   Rate
   attr_accessor :rate_scale,
-                :started_at,
-                :stopped_at,
                 :timer,
                 :progress
 
   def initialize(options = {})
     self.rate_scale = options[:rate_scale] || lambda { |x| x }
-    self.started_at = nil
-    self.stopped_at = nil
     self.timer      = options[:timer]
     self.progress   = options[:progress]
   end
 
-  private
-
   def rate_of_change(format_string = '%i')
-    return 0 if elapsed_seconds <= 0
+    return '0' if elapsed_seconds <= 0
 
     format_string % scaled_rate
   end
@@ -27,6 +21,8 @@ def rate_of_change_with_precision
     rate_of_change('%.2f')
   end
 
+  private
+
   def scaled_rate
     rate_scale.call(base_rate)
   end

lib/ruby-progressbar/components/time.rb

@@ -31,8 +31,6 @@ def elapsed_with_label
     "#{ELAPSED_LABEL}: #{elapsed}"
   end
 
-  protected
-
   def estimated_with_no_oob
     estimated_with_elapsed_fallback(nil)
   end
@@ -56,6 +54,8 @@ def estimated_wall_clock
       strftime(WALL_CLOCK_FORMAT)
   end
 
+  protected
+
   attr_accessor :timer,
                 :progress
 
@@ -84,7 +84,9 @@ def elapsed
   end
 
   def estimated_with_elapsed_fallback(out_of_bounds_time_format)
-    progress.finished? ? elapsed_with_label : estimated_with_label(out_of_bounds_time_format)
+    return elapsed_with_label if progress.finished?
+
+    estimated_with_label(out_of_bounds_time_format)
   end
 
   def estimated_seconds_remaining

spec/errors/invalid_progress_error_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+require 'ruby-progressbar/errors/invalid_progress_error'
+
+class    ProgressBar
+describe InvalidProgressError do
+end
+end

spec/lib/ruby-progressbar/base_spec.rb

@@ -605,7 +605,9 @@ class    ProgressBar
     end
   end
 
-  it 'can be converted into a hash', :time_mock => ::Time.utc(2012, 7, 26, 18, 0, 0) do
+  it 'can be converted into a hash' do
+    ::Timecop.freeze(::Time.utc(2012, 7, 26, 18, 0, 0))
+
     progressbar = ProgressBar::Base.new(:output         => output,
                                         :total          => 33,
                                         :title          => 'My Title',
@@ -646,6 +648,8 @@ class    ProgressBar
         'stopped?'                            => false,
         'finished?'                           => false
     )
+
+    ::Timecop.return
   end
 end
 end