progress-monitor 1.8.10 → 1.9.0

data/lib/progress-monitor.rb

@@ -16,6 +16,21 @@ class Progress
     @@progress_meters
   end
 
+  def self.caller_info(callers, depth = 0)
+    return [nil, nil] if callers.length <= depth
+
+    line = callers[depth]
+    if line.match(/(.*):\d+(?::in `(.*)')/)
+      return [$1, $2]
+    end
+
+    if line.match(/(.*):\d+/)
+      return [$1, nil ]
+    end
+
+    info
+  end
+
   @@monitor = false
   @@desc = ""
   @@skip = 0
@@ -24,25 +39,31 @@ class Progress
   #
   # If a description is given as a parameter it will show at the
   # beginning of the progress report.
-  def self.monitor(desc = "", num_reports = 100, skip = 0)
+  def self.monitor(desc = "", num_reports = 100, stack_depth = nil, skip = 0)
     @@monitor = true
     @@desc = desc
     @@num_reports=num_reports
+    @@call_info = caller_info(caller)
+    @@stack_depth = stack_depth 
     @@skip = skip
   end
 
   # Returns true if next loop must be monitored.
   #
   def self.active?
-    if @@monitor
-      if @@skip > 0
-        @@skip -= 1
-        return false
-      else
-        return true
-      end
-    else
+
+    return false unless @@monitor
+
+    if @@stack_depth != nil
+      call_info = caller_info(caller, @@stack_depth + 1)
+      return false if call_info != @@call_info
+    end
+
+    if @@skip > 0
+      @@skip -= 1
       return false
+    else
+      return true
     end
   end
 

data/samples/collect.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.dirname(__FILE__)), 'lib', 'progress-monitor')
+require File.join(File.dirname(File.dirname(File.expand_path(__FILE__))), 'lib', 'progress-monitor')
 
 dc = ('a'..'z').to_a
 Progress.monitor

data/samples/depth.rb

@@ -0,0 +1,26 @@
+require File.join(File.dirname(File.dirname(File.expand_path(__FILE__))), 'lib', 'progress-monitor')
+
+def self.loop1
+  puts "not monitored"
+  100.times { 
+    sleep 0.01 
+  }
+end
+
+def self.loop2
+  loop1
+  puts "Monitored"
+  100.times { 
+    sleep 0.01 
+  }
+
+end
+
+Progress.monitor("Message", 100, 1)
+puts "not monitored"
+100.times { 
+  sleep 0.01 
+}
+
+loop2
+

data/samples/file.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.dirname(__FILE__)), 'lib', 'progress-monitor')
+require File.join(File.dirname(File.dirname(File.expand_path(__FILE__))), 'lib', 'progress-monitor')
 
 f = File.open('README.rdoc')
 Progress.monitor("File.each")

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 File.join(File.dirname(File.dirname(__FILE__)), 'lib', 'progress-monitor')
+require File.join(File.dirname(File.dirname(File.expand_path(__FILE__))), 'lib', 'progress-monitor')
 
 h = Hash.new
 

data/samples/skip.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.dirname(__FILE__)), 'lib', 'progress-monitor')
+require File.join(File.dirname(File.dirname(File.expand_path(__FILE__))), 'lib', 'progress-monitor')
 
 # Skip first loop
 puts ""

data/samples/times.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.dirname(__FILE__)), 'lib', 'progress-monitor')
+require File.join(File.dirname(File.dirname(File.expand_path(__FILE__))), 'lib', 'progress-monitor')
 
 Progress.monitor
 10.times{|i|

data/samples/two-loops.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.dirname(__FILE__)), 'lib', 'progress-monitor')
+require File.join(File.dirname(File.dirname(File.expand_path(__FILE__))), 'lib', 'progress-monitor')
 
 # Each progress meter backs up one line
 puts ""

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: progress-monitor
 version: !ruby/object:Gem::Version 
-  version: 1.8.10
+  version: 1.9.0
 platform: ruby
 authors: 
 - Miguel Vazquez
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-29 00:00:00 +01:00
+date: 2010-02-01 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -25,6 +25,7 @@ extra_rdoc_files:
 files: 
 - lib/progress-monitor.rb
 - samples/collect.rb
+- samples/depth.rb
 - samples/file.rb
 - samples/hash-loop.rb
 - samples/skip.rb