dbrady-tourbus 0.0.2 → 0.0.3

data/bin/tourbus

@@ -10,6 +10,7 @@ opts = Trollop.options do
   opt :number, "Number of times to run the tour (in each concurrent step, so -c 10 -n 10 will run the tour 100 times)", :type => :integer, :default => 1
   opt :verbose, "Run in verbose mode", :type => :boolean, :default => false
   opt :list, "List tours and runs available. If tours or runs are included, filters the list", :type => :boolean, :default => nil
+  opt :rand, "Random seed", :type => :integer, :default => nil
 end
 
 tours = if ARGV.empty?
@@ -18,12 +19,14 @@ tours = if ARGV.empty?
            ARGV
          end
 
+srand opts[:rand] || Time.now.to_i
+
 if opts[:list]
   Tour.tours(ARGV).each do |tour|
     puts tour
     puts Tour.tests(tour).map {|test| "  #{test}"}
   end
 else
-  puts Benchmark.measure { TourBus.new(opts[:host], opts[:concurrency], opts[:number], tours).run }
+  puts TourBus.new(opts[:host], opts[:concurrency], opts[:number], tours).run
 end
 

data/lib/tour_bus.rb

@@ -36,11 +36,16 @@ class TourBus < Monitor
     Dir[File.join('.', 'tours', '**', '*.rb')].map {|fn| File.basename(fn, ".rb")}.select {|fn| filter.size.zero? || filter.any?{|f| fn =~ /#{f}/}}
   end
   
+  def total_runs
+    tours.size * concurrency * number    
+  end
+  
   def run
     threads = []
+    tour_name = "#{total_runs} runs: #{concurrency}x#{number} of #{tours * ','}"
     started = Time.now.to_f
     concurrency.times do |conc|
-      log "Starting #{concurrency} runners to run #{tours.size} tours #{number} times (for a total of #{tours.size*concurrency*number} times)"
+      log "Starting #{tour_name}"
       threads << Thread.new do
         runner_id = next_runner_id
         runs,passes,fails,errors,start = 0,0,0,0,Time.now.to_f
@@ -59,6 +64,7 @@ class TourBus < Monitor
     threads.each {|t| t.join }
     finished = Time.now.to_f
     log '-' * 80
+    log tour_name
     log "All Runners finished."
     log "Total Runs: #{@runs}"
     log "Total Passes: #{@passes}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dbrady-tourbus
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - David Brady