progress_bar 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82c11d2f7b3d4a5da5b8cef320c69b753d1c7414
-  data.tar.gz: 90ac19a0634dfabf6a8870b078540be52f865eb7
+  metadata.gz: 63c44738d941428ab4348be03ab2f1744343fb7b
+  data.tar.gz: a78ec7e3bd7e45e56ae9fb9d07d7269d3b05dbda
 SHA512:
-  metadata.gz: 9e46bef340192719c4b09969a3e2cf9ffb973ead408a75eff11cdb9e9b05eded469760e4e9c3ad4f6abcbd2bc1981efc0a821e83ff6875e70fa9d8d544106d22
-  data.tar.gz: 824bf7576d0c6e496f17d9a7bc055dbc4d09986a14b3d6343b3452be517e2d3c9fe4bbba835d54e67a8d078e64dd19c2447450785ddc546dae5986a14f65ddce
+  metadata.gz: 913cb8e575f72ff88aaf39d32e54e67abbe83ab6aa19540295b512641c898a038ad91b1b845604bb4fd19abc5cc4436e64a63ada61faf0dbaf27b982b83863d1
+  data.tar.gz: 5a483c2f3cc1e5b41949644463c8da98ecdb9509c18ab2d117971cd72fc71589b44bdba59ec08f5c59910904e211ac66f1dd8069df9d3e17aeaf8d011d4a60d8

data/lib/progress_bar.rb

@@ -98,9 +98,11 @@ class ProgressBar
 
   def render_bar
     return '' if bar_width < 2
+    progress_width = (ratio * (bar_width - 2)).floor
+    remainder_width = bar_width - 2 - progress_width
     "[" +
-      "#" * (ratio * (bar_width - 2)).ceil +
-      " " * ((1-ratio) * (bar_width - 2)).floor +
+      "#" * progress_width +
+      " " * remainder_width +
     "]"
   end
 
@@ -127,7 +129,7 @@ class ProgressBar
 
   def terminal_width
     # HighLine check takes a long time, so only update width every second.
-    if @terminal_width.nil? || @last_width_adjustment.nil? || 
+    if @terminal_width.nil? || @last_width_adjustment.nil? ||
                                ::Time.now - @last_width_adjustment > 1
 
       @last_width_adjustment = ::Time.now

data/lib/progress_bar/version.rb

@@ -1,3 +1,3 @@
 class ProgressBar
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/spec/bar_spec.rb

@@ -1,43 +1,54 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
 
 describe 'ProgressBar bar output' do
+  let(:max) { 100 }
+  let(:terminal_width) { 12 }
+
+  let(:progress_bar) { ProgressBar.new(max, :bar) }
+
   before do
-    @progress_bar = ProgressBar.new(100, :bar)
-    @progress_bar.stub(:terminal_width) { 12 }
+    progress_bar.stub(:terminal_width) { terminal_width }
+    progress_bar.count = count
   end
 
-  subject { @progress_bar.to_s }
+  subject { progress_bar.to_s }
 
   describe 'at count=0' do
-    before do
-      @progress_bar.count = 0
-    end
+    let(:count) { 0 }
 
     it { should == "[          ]" }
   end
 
   describe 'at count=50' do
-    before do
-      @progress_bar.count = 50
-    end
+    let(:count) { 50 }
 
     it { should == "[#####     ]" }
   end
 
   describe 'at count=100' do
-    before do
-      @progress_bar.count = 100
-    end
+    let(:count) { 100 }
 
     it { should == "[##########]" }
   end
 
-  describe 'at count=25 (non-integer divide, should round up)' do
-    before do
-      @progress_bar.count = 25
-    end
+  describe 'at count=25 (non-integer divide, should round down)' do
+    let(:count) { 25 }
+
+    it { should == "[##        ]" }
+  end
 
-    it { should == "[###       ]" }
+  # https://github.com/paul/progress_bar/pull/31
+  describe "constant bar width" do
+    let(:max)            { 17 }
+    let(:count)          {  0 }
+    let(:terminal_width) { 80 }
+
+    it "has a constant bar width for all values of max and count" do
+      (count..max).each do |i|
+        progress_bar.count = i
+        expect( progress_bar.to_s.length ).to eq(80)
+      end
+    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: progress_bar
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Paul Sadauskas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-14 00:00:00.000000000 Z
+date: 2015-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: options