progress_bar 0.4.0 → 0.4.1

data/Gemfile

@@ -5,6 +5,7 @@ gem "highline"
 gem "options"
 
 group :development, :test do
+  gem "rake"
   gem "rspec"
   gem "timecop"
   gem "perftools.rb"

data/lib/progress_bar/version.rb

@@ -1,3 +1,3 @@
 class ProgressBar
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/lib/progress_bar.rb

@@ -68,6 +68,7 @@ class ProgressBar
   end
 
   def to_s
+    self.count = max if count > max
     meters.inject("") do |text, meter|
       text << render(meter) + " "
     end.strip
@@ -92,6 +93,7 @@ class ProgressBar
   end
 
   def render_bar
+    return '' if bar_width < 2
     "[" +
       "#" * (ratio * (bar_width - 2)).ceil +
       " " * ((1-ratio) * (bar_width - 2)).floor +
@@ -120,7 +122,17 @@ class ProgressBar
   end
 
   def terminal_width
-    @terminal_width ||= @hl.output_cols.to_i
+    # HighLine check takes a long time, so only update width every second.
+    if @last_width_adjustment.nil? || Time.now - @last_width_adjustment > 1
+      @last_width_adjustment = Time.now
+      @terminal_width = @hl.output_cols.to_i
+      if @terminal_width < 1
+        @terminal_width = 80
+      end
+      @terminal_width
+    else
+      @terminal_width
+    end
   end
 
   def bar_width

data/test/progress_bar_test.rb

@@ -34,6 +34,14 @@ describe 'ProgressBar bar output' do
     it { should == "[##############] [100/100] [100%] [00:10] [00:00] [ 10.00/s]" }
   end
 
+  describe 'at count=105' do
+    before do
+      @progress_bar.count = 105
+    end
+
+    it { should == "[##############] [100/100] [100%] [00:10] [00:00] [ 10.00/s]" }
+  end
+
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: progress_bar
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-22 00:00:00.000000000Z
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: options
-  requirement: &2156635980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156635980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2156635480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +37,12 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156635480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.1
 description: ! 'Give people feedback about long-running tasks without overloading
   them with information: Use a progress bar, like Curl or Wget!'
 email:
@@ -76,6 +86,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -672631073319406219
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -84,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: progress_bar
-rubygems_version: 1.8.5
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Simple Progress Bar for output to a terminal