mbt-gen 0.0.3 → 0.0.5

data/lib/progress.rb

@@ -1,9 +1,14 @@
 #!/usr/bin/ruby
 
+require 'fileutils'
+
 class Progress
     
-    def initialize()
+    def initialize(logfilename)
         @last_line = ""
+        dir = File.dirname(logfilename)
+        FileUtils.mkdir_p(dir) unless Dir.exist?(dir)
+        @logfile = File.open(logfilename, "w")
     end
 
     def update_last_line(last_line)
@@ -13,27 +18,70 @@ class Progress
     end
 
     def print_line(line)
+       @logfile.puts(line)
+       @logfile.flush()
        print "\033[M#{line}\n#{@last_line}"
        $stdout.flush()
     end
 end
 
+class VoidProgress < Progress
+  def initialize()
+    super("tmp.log")
+  end
+end
+
 class ProgressBar < Progress
-    def initialize(max)
+    def initialize(max, logfilename)
+        super(logfilename)
         @max = max.to_f
     end
 
+    def set_max(value)
+      @max = value.to_f
+    end
+
     def render_bar(current, length)
         bars = (current.to_f * length.to_f).floor
         "=" * bars + ">" + " " * (length - bars)
     end
 
-    def report_progress(progress)
+    def processing_time(start_time, prior_processessing_time)
+      total_sec = prior_processessing_time + (Time.now().to_i - start_time)
+      sec = total_sec
+      days = sec / (3600*24)
+      sec -= days * (3600*24)
+      hours = sec / 3600
+      sec -= hours * 3600
+      min = sec / 60
+      sec -= min * 60
+      if days > 0 then
+        return format("%d:%02d:%02d:%02d", days, hours, min, sec)
+      else
+        if hours > 0 then
+          return format("%02d:%02d:%02d", hours, min, sec)
+        else
+          return format("%02d:%02d", min, sec)
+        end
+      end
+    end
+
+    def report_progress(progress, start_time, prior_processessing_time, num_docs)
+      time_str = processing_time(start_time, prior_processessing_time)
       if progress then
         current = (progress.to_f / @max)
-        update_last_line("[#{render_bar(current, 40)}] combinations covered: #{progress}/#{@max} (#{format("%.8f", current * 100.0)}%)")
+        update_last_line("#{time_str} [#{render_bar(current, 40)}] combinations covered: #{progress}/#{@max} (#{format("%.8f", current * 100.0)}%), docs generated: #{num_docs}")
       else
-        update_last_line("[... ? ... ? ... ? ...] combinations covered: ?/∞ (?%)")
+        update_last_line("#{time_str} [... ? ... ? ... ? ...] combinations covered: ?/∞ (?%), docs generated: #{num_docs}")
+      end
+    end
+
+    def self.logging(max, logfile, &block)
+      progress = ProgressBar.new(max, logfile)
+      begin
+        block.call(progress)
+      ensure
+        progress.print_line("Output written to #{logfile}")
       end
     end
 end