progress_bar 0.3.4 → 0.4.0

data/LICENSE

@@ -0,0 +1,14 @@
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                    Version 2, December 2004
+
+ Copyright (C) 2011 Paul Sadauskas <psadauskas@gmail.com>
+
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
+
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. You just DO WHAT THE FUCK YOU WANT TO.
+

data/lib/progress_bar/version.rb

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

data/lib/progress_bar.rb

@@ -4,26 +4,30 @@ require 'highline'
 
 class ProgressBar
 
-  attr_accessor :count, :max, :start, :meters
+  attr_accessor :count, :max, :meters
 
-  def initialize(max = 100, *meters)
+  def initialize(*args)
 
-    @count  = 0
-    @max    = max
-    @start  = Time.now
+    @count      = 0
+    @max        = 100
+    @meters     = [:bar, :counter, :percentage, :elapsed, :eta, :rate]
 
-    if meters.empty?
-      @meters = [:bar, :counter, :percentage, :elapsed, :eta, :rate]
-    else
-      @meters = meters
-    end
+    @max        = args.shift if args.first.is_a? Numeric
+    @meters     = args unless args.empty?
 
-    @hl = HighLine.new
+    @last_write = Time.at(0)
+    @start      = Time.now
+
+    @hl         = HighLine.new
   end
 
   def increment!(count = 1)
     self.count += count
-    write
+    now = Time.now
+    if (now - @last_write) > 0.2 || self.count >= max
+      write
+      @last_write = now
+    end
   end
 
   def write
@@ -44,7 +48,7 @@ class ProgressBar
   end
 
   def elapsed
-    Time.now - start
+    Time.now - @start
   end
 
   def rate

data/test/arguments_test.rb

@@ -0,0 +1,34 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+
+describe 'ProgressBar arguments' do
+  before do
+    @default_max = 100
+    @default_meters = [:bar, :counter, :percentage, :elapsed, :eta, :rate]
+  end
+
+  it "should set appropriate defaults without any arguments" do
+    bar = ProgressBar.new
+    bar.max.should == @default_max
+    bar.meters.should == @default_meters
+  end
+
+  it "should allow a single argument specifying the max" do
+    bar = ProgressBar.new(123)
+    bar.max.should == 123
+    bar.meters.should == @default_meters
+  end
+
+  it "should allow specifying just the meters" do
+    bar = ProgressBar.new(:bar, :eta)
+    bar.max.should == @default_max
+    bar.meters.should == [:bar, :eta]
+  end
+
+  it "should allow specyfing the max and meters" do
+    bar = ProgressBar.new(123, :bar, :eta)
+    bar.max.should == 123
+    bar.meters.should == [:bar, :eta]
+  end
+
+end
+

metadata

@@ -1,69 +1,61 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: progress_bar
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.4.0
   prerelease: 
-  version: 0.3.4
 platform: ruby
-authors: 
+authors:
 - Paul Sadauskas
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-17 00:00:00 -06:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-07-22 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: options
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2156635980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.3.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: highline
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2156635980
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: &2156635480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.6.1
   type: :runtime
-  version_requirements: *id002
-description: "Give people feedback about long-running tasks without overloading them with information: Use a progress bar, like Curl or Wget!"
-email: 
+  prerelease: false
+  version_requirements: *2156635480
+description: ! 'Give people feedback about long-running tasks without overloading
+  them with information: Use a progress bar, like Curl or Wget!'
+email:
 - psadauskas@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - Gemfile
+- LICENSE
 - README.mkd
 - Rakefile
 - examples/simple.rb
 - lib/progress_bar.rb
-- lib/progress_bar/meters/bar.rb
-- lib/progress_bar/meters/counter.rb
-- lib/progress_bar/meters/elapsed.rb
-- lib/progress_bar/meters/eta.rb
-- lib/progress_bar/meters/percentage.rb
 - lib/progress_bar/version.rb
-- lib/progress_bar/version.rbc
 - profile/shell_every_update
 - profile/shell_every_update.gif
 - profile/shell_once
 - profile/shell_once.gif
 - progress_bar.gemspec
+- test/arguments_test.rb
 - test/bar_test.rb
 - test/counter_test.rb
 - test/elapsed_test.rb
@@ -72,35 +64,32 @@ files:
 - test/progress_bar_test.rb
 - test/rate_test.rb
 - test/spec_helper.rb
-has_rdoc: true
 homepage: http://www.github.com/paul/progress_bar
 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 
-      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 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: progress_bar
-rubygems_version: 1.6.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Simple Progress Bar for output to a terminal
-test_files: 
+test_files:
+- test/arguments_test.rb
 - test/bar_test.rb
 - test/counter_test.rb
 - test/elapsed_test.rb

data/lib/progress_bar/meters/bar.rb

@@ -1,31 +0,0 @@
-
-class ProgressBar
-  class Bar < Meter
-
-    attr_reader :count, :max, :width
-
-    def initialize(count, max, width)
-      @count, @max, @width = count, max, width
-    end
-
-    def to_s
-      "[" +
-        "#" * progress_width +
-        " " * remaining_width +
-      "]"
-    end
-
-    def bar_width
-      width - 2
-    end
-
-    def progress_width
-      ((count.to_f / max) * bar_width).ceil
-    end
-
-    def remaining_width
-      bar_width - progress_width
-    end
-
-  end
-end

data/lib/progress_bar/meters/counter.rb

@@ -1,24 +0,0 @@
-
-class ProgressBar
-  class Counter < Meter
-
-    attr_reader :count, :max
-
-    def initialize(count, max)
-      @count, @max = count, max
-    end
-
-    def to_s
-      "[%#{max_counter_width}i/%i]" % [count, max]
-    end
-
-    def width
-      max.to_s.length * 2 + 3
-    end
-
-    def max_counter_width
-      max.to_s.length
-    end
-
-  end
-end

data/lib/progress_bar/meters/elapsed.rb

@@ -1,26 +0,0 @@
-class ProgressBar
-  class Elapsed < Meter
-
-    include TimeFormatter
-
-    attr_reader :start
-
-    def initialize start
-      @start = start
-    end
-
-    def elapsed
-      Time.now - start
-    end
-
-    def to_s
-      "[#{format_interval(elapsed)}]"
-    end
-
-    def width
-      format_interval(elapsed).length + 2
-    end
-
-  end
-end
-

data/lib/progress_bar/meters/eta.rb

@@ -1,36 +0,0 @@
-class ProgressBar
-  class ETA < Meter
-
-    include TimeFormatter
-
-    attr_reader :start, :count, :max
-
-    def initialize start, count, max
-      @start, @count, @max = start, count, max
-    end
-
-    def elapsed
-      Time.now - start
-    end
-
-    def average
-      if count == 0
-        0
-      else
-        elapsed / count
-      end
-    end
-
-    def remaining
-      (max - count) * average
-    end
-
-    def to_s
-      "[ETA: #{format_interval(remaining)}]"
-    end
-
-    def width
-      format_interval(elapsed).length + 7
-    end
-  end
-end

data/lib/progress_bar/meters/percentage.rb

@@ -1,20 +0,0 @@
-
-class ProgressBar
-  class Percentage < Meter
-
-    attr_reader :count, :max
-
-    def initialize count, max
-      @count, @max = count, max
-    end
-
-    def to_s
-      "[%6.2f%%]" % (count.to_f / max * 100)
-    end
-
-    def width
-      9
-    end
-
-  end
-end

data/lib/progress_bar/version.rbc

@@ -1,130 +0,0 @@
-!RBIX
-4271523011621227713
-x
-M
-1
-n
-n
-x
-10
-__script__
-i
-28
-99
-7
-0
-65
-49
-1
-2
-13
-99
-12
-7
-2
-12
-7
-3
-12
-65
-12
-49
-4
-4
-15
-49
-2
-0
-15
-2
-11
-I
-6
-I
-0
-I
-0
-I
-0
-n
-p
-5
-x
-11
-ProgressBar
-x
-11
-open_module
-x
-15
-__module_init__
-M
-1
-n
-n
-x
-11
-ProgressBar
-i
-12
-5
-66
-65
-7
-0
-7
-1
-64
-49
-2
-2
-11
-I
-3
-I
-0
-I
-0
-I
-0
-n
-p
-3
-x
-7
-VERSION
-s
-5
-0.2.0
-x
-9
-const_set
-p
-3
-I
-2
-I
-2
-I
-c
-x
-67
-/Users/rando/Code/personal/progress_bar/lib/progress_bar/version.rb
-p
-0
-x
-13
-attach_method
-p
-3
-I
-0
-I
-1
-I
-1c
-x
-67
-/Users/rando/Code/personal/progress_bar/lib/progress_bar/version.rb
-p
-0