progressbar 0.9.1 → 0.9.2

data/.travis.yml

@@ -0,0 +1,8 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - rbx-2.0
+  - jruby
+  - ruby-head
+  - ree

data/lib/progressbar.rb

@@ -29,13 +29,15 @@ class ProgressBar
     clear
     show
   end
+
   attr_reader   :title
   attr_reader   :current
   attr_reader   :total
   attr_accessor :start_time
   attr_writer   :bar_mark
 
-  private
+private
+
   def fmt_bar
     bar_width = do_percentage * @terminal_width / 100
     sprintf("|%s%s|",
@@ -120,21 +122,23 @@ class ProgressBar
     end
   end
 
-  def get_width
-    # FIXME: I don't know how portable it is.
-    default_width = 80
-    begin
-      tiocgwinsz = 0x5413
-      data = [0, 0, 0, 0].pack("SSSS")
-      if @out.ioctl(tiocgwinsz, data) >= 0 then
-        rows, cols, xpixels, ypixels = data.unpack("SSSS")
-        if cols >= 0 then cols else default_width end
-      else
-        default_width
-      end
-    rescue Exception
-      default_width
+  DEFAULT_WIDTH = 80
+  def get_term_width
+    if ENV['COLUMNS'] =~ /^\d+$/
+      ENV['COLUMNS'].to_i
+    elsif (RUBY_PLATFORM =~ /java/ || (!STDIN.tty? && ENV['TERM'])) && shell_command_exists?('tput')
+      `tput cols`.to_i
+    elsif STDIN.tty? && shell_command_exists?('stty')
+      `stty size`.scan(/\d+/).map { |s| s.to_i }[1]
+    else
+      DEFAULT_WIDTH
     end
+  rescue
+    DEFAULT_WIDTH
+  end
+
+  def shell_command_exists?(command)
+    ENV['PATH'].split(File::PATH_SEPARATOR).any?{|d| File.exists? File.join(d, command) }
   end
 
   def show
@@ -144,7 +148,7 @@ class ProgressBar
     }
     line = sprintf(@format, *arguments)
 
-    width = get_width
+    width = get_term_width
     if line.length == width - 1
       @out.print(line + eol)
       @out.flush
@@ -174,10 +178,11 @@ class ProgressBar
     end
   end
 
-  public
+public
+
   def clear
     @out.print "\r"
-    @out.print(" " * (get_width - 1))
+    @out.print(" " * (get_term_width - 1))
     @out.print "\r"
   end
 
@@ -227,6 +232,7 @@ class ProgressBar
   def inspect
     "#<ProgressBar:#{@current}/#{@total}>"
   end
+
 end
 
 class ReversedProgressBar < ProgressBar

data/progressbar.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "progressbar"
-  s.version     = "0.9.1"
+  s.version     = "0.9.2"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Satoru Takabayashi", "Jose Peleteiro"]
   s.email       = ["satoru@0xcc.net", "jose@peleteiro.net"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: progressbar
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-08 00:00:00.000000000 -07:00
+date: 2011-11-22 00:00:00.000000000 -02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2157497740 !ruby/object:Gem::Requirement
+  requirement: &70165027226020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2157497740
+  version_requirements: *70165027226020
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2157497280 !ruby/object:Gem::Requirement
+  requirement: &70165027225560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157497280
+  version_requirements: *70165027225560
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2157496820 !ruby/object:Gem::Requirement
+  requirement: &70165027225100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157496820
+  version_requirements: *70165027225100
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2157496360 !ruby/object:Gem::Requirement
+  requirement: &70165027256880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157496360
+  version_requirements: *70165027256880
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2157495900 !ruby/object:Gem::Requirement
+  requirement: &70165027256420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *2157495900
+  version_requirements: *70165027256420
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &2157495440 !ruby/object:Gem::Requirement
+  requirement: &70165027255960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,7 +78,7 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *2157495440
+  version_requirements: *70165027255960
 description: Ruby/ProgressBar is a text progress bar library for Ruby. It can indicate
   progress with percentage, a progress bar, and estimated remaining time.
 email:
@@ -90,13 +90,13 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc
+- .travis.yml
 - ChangeLog
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.rd
 - Rakefile
-- VERSION
 - lib/progressbar.rb
 - progressbar.gemspec
 - test/test.rb

data/VERSION

@@ -1 +0,0 @@
-0.9.0