progressbar_zobar 0.9.1.1 → 0.9.2.1

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/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    progressbar (0.9.1)
+    progressbar_zobar (0.9.2.1)
 
 GEM
   remote: http://rubygems.org/
@@ -21,7 +21,7 @@ DEPENDENCIES
   bluecloth (>= 0.3.5)
   bundler (>= 1.0.0)
   minitest
-  progressbar!
+  progressbar_zobar!
   rake
   simplecov (>= 0.3.5)
   yard

data/README.rd

@@ -76,6 +76,9 @@ The latest version of Ruby/ProgressBar is available at
     Use  :stat_for_file_transfer instead of :stat to display
     transfered bytes and transfer rate.
 
+--- ProgressBar#title=
+    Change the progress bar's title.
+
 --- ProgressBar#total=
     Change the progress bar's maximum value.
 

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
@@ -177,10 +181,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
 
@@ -228,8 +233,10 @@ class ProgressBar
   end
 
   def title= (value)
-    @title = value
-    show
+    unless @title == value
+      @title = value
+      show
+    end
   end
 
   def total= (value)
@@ -242,6 +249,7 @@ class ProgressBar
   def inspect
     "#<ProgressBar:#{@current}/#{@total}>"
   end
+
 end
 
 class ReversedProgressBar < ProgressBar

data/progressbar.gemspec

@@ -2,13 +2,13 @@
 
 Gem::Specification.new do |s|
   s.name        = "progressbar_zobar"
-  s.version     = "0.9.1.1"
+  s.version     = "0.9.2.1"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Satoru Takabayashi", "Jose Peleteiro", 'David P Kleinschmidt']
   s.email       = ["satoru@0xcc.net", "jose@peleteiro.net", 'david@kleinschmidt.name']
   s.homepage    = "http://github.com/zobar/progressbar"
-  s.summary     = "Ruby/ProgressBar is a text progress bar library for Ruby."
-  s.description = "Ruby/ProgressBar is a text progress bar library for Ruby. It can indicate progress with percentage, a progress bar, and estimated remaining time."
+  s.summary     = 'Text progress bar library for Ruby, forked from progressbar.'
+  s.description = "Fork of progressbar that allows changing the progress bar's title and total while still in progress."
 
   s.required_rubygems_version = ">= 1.3.6"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: progressbar_zobar
 version: !ruby/object:Gem::Version
-  version: 0.9.1.1
+  version: 0.9.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-16 00:00:00.000000000Z
+date: 2011-11-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2153368040 !ruby/object:Gem::Requirement
+  requirement: &2153885500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2153368040
+  version_requirements: *2153885500
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2153367580 !ruby/object:Gem::Requirement
+  requirement: &2153885040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153367580
+  version_requirements: *2153885040
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2153367120 !ruby/object:Gem::Requirement
+  requirement: &2153884580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153367120
+  version_requirements: *2153884580
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153366660 !ruby/object:Gem::Requirement
+  requirement: &2153884120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153366660
+  version_requirements: *2153884120
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2153366200 !ruby/object:Gem::Requirement
+  requirement: &2153883660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *2153366200
+  version_requirements: *2153883660
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &2153365740 !ruby/object:Gem::Requirement
+  requirement: &2153883200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,9 +78,9 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *2153365740
-description: Ruby/ProgressBar is a text progress bar library for Ruby. It can indicate
-  progress with percentage, a progress bar, and estimated remaining time.
+  version_requirements: *2153883200
+description: Fork of progressbar that allows changing the progress bar's title and
+  total while still in progress.
 email:
 - satoru@0xcc.net
 - jose@peleteiro.net
@@ -91,13 +91,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
@@ -125,5 +125,5 @@ rubyforge_project:
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Ruby/ProgressBar is a text progress bar library for Ruby.
+summary: Text progress bar library for Ruby, forked from progressbar.
 test_files: []

data/VERSION

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