simple_progressbar 0.1.3 → 0.1.4

data/Gemfile

@@ -0,0 +1,7 @@
+#encoding: utf-8
+source 'http://rubygems.org'
+
+group :development do
+  gem 'jeweler'
+  gem 'rake'
+end

data/Gemfile.lock

@@ -0,0 +1,20 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    git (1.2.5)
+    jeweler (1.8.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+      rdoc
+    json (1.8.0)
+    rake (10.0.4)
+    rdoc (4.0.1)
+      json (~> 1.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jeweler
+  rake

data/Rakefile

@@ -42,7 +42,7 @@ task :test => :check_dependencies
 
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/simple_progressbar.rb

@@ -1,7 +1,13 @@
 class SimpleProgressbar
+  def initialize
+    @last_length = 0
+    @title = ""
+    @progress = 0
+  end
 
   def show(title, &block)
-    print title + " "
+    @title = title
+    print @title + " "
     start_progress
     # thanks to http://www.dcmanges.com/blog/ruby-dsls-instance-eval-with-delegation
     @self_before_instance_eval = eval "self", block.binding
@@ -9,8 +15,20 @@ class SimpleProgressbar
     finish_progress
   end
 
+  def interrupt
+    # TODO: Make some of the strings constants so we don't have to use a magic number here.
+    progressbar_length = 16 + @last_length + @title.length
+    move_cursor = "\e[#{progressbar_length}D"
+    print move_cursor + (" " * progressbar_length) + move_cursor
+    STDOUT.flush
+    yield
+    puts
+    print @title + " "
+    render_progress(@progress)
+  end
+
   def progress(percent)
-    print "\e[18D"
+    print "\e[#{15 + @last_length}D"
     render_progress(percent)
   end
 
@@ -21,15 +39,28 @@ class SimpleProgressbar
   private
 
   def render_progress(percent)
+    @progress = percent
     print "["
 
-    (percent/10).to_i.times do 
-      print "*" 
+    print "*" * [(percent/10).to_i, 10].min
+    print " " * [10 - (percent/10).to_i, 0].max
+
+    if percent.class != Float
+      printable_percent = "%3s" % percent
+    else
+      non_decimal_digits = (Math.log(percent) / Math.log(10)).truncate + 1
+      printable_percent = (non_decimal_digits < 3 ? " " * (3 - non_decimal_digits) : "") + percent.to_s
     end
-    (10 - (percent/10).to_i).times do 
-      print " " 
+
+    print "]\e[32m #{printable_percent}\e[0m %"
+
+    new_length = printable_percent.length
+    if @last_length > new_length
+      print " " * (@last_length - new_length)
+      print "\e[#{@last_length - new_length}D"
     end
-    print "]\e[32m#{'%4s' % percent}\e[0m %"
+    @last_length = new_length
+
     STDOUT.flush
   end
 

data/simple_progressbar.gemspec

@@ -4,20 +4,22 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{simple_progressbar}
-  s.version = "0.1.3"
+  s.name = "simple_progressbar"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bodo Tasche"]
-  s.date = %q{2010-12-30}
-  s.description = %q{A progressbar for the terminal. Handy for little scripts.}
-  s.email = %q{bodo@bitboxer.de}
+  s.date = "2013-05-27"
+  s.description = "A progressbar for the terminal. Handy for little scripts."
+  s.email = "bodo@bitboxer.de"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
   ]
   s.files = [
     ".document",
+    "Gemfile",
+    "Gemfile.lock",
     "LICENSE",
     "README.rdoc",
     "Rakefile",
@@ -27,25 +29,26 @@ Gem::Specification.new do |s|
     "test/helper.rb",
     "test/test_simple_progressbar.rb"
   ]
-  s.homepage = %q{http://github.com/bitboxer/simple_progressbar}
+  s.homepage = "http://github.com/bitboxer/simple_progressbar"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{A simple progressbar}
-  s.test_files = [
-    "test/helper.rb",
-    "test/test_simple_progressbar.rb"
-  ]
+  s.rubygems_version = "1.8.23"
+  s.summary = "A simple progressbar"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     else
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     end
   else
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
   end
 end

metadata

@@ -1,46 +1,75 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: simple_progressbar
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
+version: !ruby/object:Gem::Version
+  version: 0.1.4
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Bodo Tasche
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-12-30 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
+date: 2013-05-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: thoughtbot-shoulda
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A progressbar for the terminal. Handy for little scripts.
 email: bodo@bitboxer.de
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .document
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -49,38 +78,28 @@ files:
 - simple_progressbar.gemspec
 - test/helper.rb
 - test/test_simple_progressbar.rb
-has_rdoc: true
 homepage: http://github.com/bitboxer/simple_progressbar
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A simple progressbar
-test_files: 
-- test/helper.rb
-- test/test_simple_progressbar.rb
+test_files: []