progress-meter 0.0.3 → 0.0.4

data/lib/progress-meter.rb

@@ -11,6 +11,11 @@
 # already. Every now and then, it prints the progress report.
 class Progress
   
+  @@progress_meters = Array.new
+  def self.progress_meters
+    @@progress_meters
+  end
+
   @@monitor = false
   @@desc = ""
 
@@ -50,13 +55,23 @@ class Progress
 
   # Used to register a new completed loop iteration.
   #
-  def tick
-    @current += 1
+  def tick(steps = 1)
+    @current += steps
+    percent = @current.to_f/ @max.to_f
+    if percent - @last_report > 1.to_f/@num_reports.to_f then
+      report
+      @last_report=percent
+    end
+  end
+
+  def set(step)
+    @current = step
     percent = @current.to_f/ @max.to_f
     if percent - @last_report > 1.to_f/@num_reports.to_f then
       report
       @last_report=percent
     end
+ 
   end
 
   # Prints de progress report. It backs up as many lines as the meters
@@ -104,14 +119,14 @@ end
 
 
 class Array
-  @@progress_meters = Array.new
   alias :orig_each :each
 
   def each (&block)
     if Progress.active?  then
-      @@progress_meters.push(Progress.new(self.length, @@progress_meters.size ))
-      orig_each {|w|block.call(w);@@progress_meters.last.tick;}
-      @@progress_meters.pop
+      progress_meters = Progress::progress_meters
+      progress_meters.push(Progress.new(self.length, progress_meters.size ))
+      orig_each {|w|block.call(w);progress_meters.last.tick;}
+      progress_meters.pop
     else
       orig_each &block
     end
@@ -120,9 +135,10 @@ class Array
   alias :orig_collect :collect
   def collect (&block)
     if Progress.active?  then
-      @@progress_meters.push(Progress.new(self.length, @@progress_meters.size ))
-      res = orig_collect {|w| r = block.call(w);@@progress_meters.last.tick; r}
-      @@progress_meters.pop
+      progress_meters = Progress::progress_meters
+      progress_meters.push(Progress.new(self.length, progress_meters.size ))
+      res = orig_collect {|w| r = block.call(w);progress_meters.last.tick; r}
+      progress_meters.pop
       res
     else
       orig_collect &block
@@ -136,19 +152,51 @@ end
 
 
 class Hash
-  @@progress_meters = Array.new
   alias :orig_each :each
   def each (&block)
     if Progress.active?  then
-      $stderr.print "\n"
-      @@progress_meters.push(Progress.new(self.length, @@progress_meters.size ))
-      orig_each {|k,v|block.call(k,v);@@progress_meters.last.tick;}
-      @@progress_meters.pop
+      progress_meters = Progress::progress_meters
+      progress_meters.push(Progress.new(self.length, progress_meters.size ))
+      orig_each {|k,v|block.call(k,v);progress_meters.last.tick;}
+      progress_meters.pop
+    else
+      orig_each &block
+    end
+  end
+
+end
+
+
+
+
+
+class File
+  alias :orig_each :each
+  alias :orig_collect :collect
+  def each (&block)
+    if Progress.active?  then
+      progress_meters = Progress::progress_meters
+      progress_meters.push(Progress.new(self.stat.size, progress_meters.size ))
+      orig_each {|l| block.call(l);progress_meters.last.set(self.pos);}
+      progress_meters.pop
     else
       orig_each &block
     end
   end
 
+  def collect (&block)
+    if Progress.active?  then
+      progress_meters = Progress::progress_meters
+      progress_meters.push(Progress.new(self.stat.size, progress_meters.size ))
+      res = orig_collect {|l| r = block.call(l);progress_meters.last.set(self.pos); r}
+      progress_meters.pop
+      res
+    else
+      orig_collect &block
+    end
+  end
+
+
 end
 
 

data/samples/file.rb

@@ -0,0 +1,7 @@
+require 'lib/progress-meter'
+
+f = File.open('README')
+Progress.monitor("File.each")
+f.each{|l|
+  sleep(1)
+}

data/samples/hash-loop.rb

@@ -2,7 +2,7 @@
 # print stuff. In this case, we print new lines, and the progress meter
 # is always moved to the line above the last one.
 
-require 'progress-meter'
+require 'lib/progress-meter'
 
 h = Hash.new
 

data/samples/two-loops.rb

@@ -1,4 +1,4 @@
-require 'progress-meter'
+require 'lib/progress-meter'
 
 # Each progress meter backs up one line
 puts ""

metadata

@@ -1,50 +1,58 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: progress-meter
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
-date: 2008-01-18 00:00:00 +01:00
-summary: Allows to monitor the progress of some loop. Currently only Array.each, Array.collect and Hash.each
-require_paths: 
-- lib
-email: mikisvaz@yahoo.com
-homepage: 
-rubyforge_project: 
-description: 
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.0.4
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Miguel Vazquez
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-02-24 00:00:00 +01:00
+default_executable: 
+dependencies: []
+
+description: 
+email: mikisvaz@yahoo.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
 files: 
 - lib/progress-meter.rb
 - samples/two-loops.rb
 - samples/collect.rb
 - samples/hash-loop.rb
+- samples/file.rb
 - README
-test_files: []
-
+has_rdoc: true
+homepage: https://rubyforge.org/projects/progress-meter/
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: 
-- README
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
+rubyforge_project: progress-meter
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: Allows to monitor the progress of some loop. Currently only Array.each, Array.collect and Hash.each. File.each and File.collect supported too.
+test_files: []