dbrady-tourbus 0.0.3 → 0.0.4

data/bin/tourbus

@@ -1,16 +1,27 @@
 #!/usr/bin/env ruby
-
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'common'))
 require 'trollop'
 require_all_files_in_folder 'tours'
 
+# load config file, we'll use these as defaults
+config_file = ["./tourbus.yml", "./tours/tourbus.yml", "./config/tourbus.yml", "~/tourbus.yml"].map {|p| File.expand_path(p)}.find {|p| File.exists? p}
+config = config_file ? YAML::load_file(config_file).symbolize_keys : {}
+
+config_map = { :host => :to_s, :concurrency => :to_i, :number => :to_i, :rand => :to_i }
+config_map.each {|key,conv| config[key] = config[key].send(conv) if config.key? key }
+
+# defaults
+config[:host] ||= "localhost:3000"
+config[:concurrency] ||= 1
+config[:number] ||= 1
+config[:rand] ||= nil
+
 opts = Trollop.options do
-  opt :host, "Remote hostname to test", :default => "localhost:3000"
-  opt :concurrency, "Number of simultaneous runs to perform", :type => :integer, :default => 1
-  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 :host, "Remote hostname to test", :default => config[:host]
+  opt :concurrency, "Number of simultaneous runs to perform", :type => :integer, :default => config[:concurrency]
+  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 => config[:number]
   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
+  opt :rand, "Random seed", :type => :integer, :default => config[:rand]
 end
 
 tours = if ARGV.empty?
@@ -21,6 +32,11 @@ tours = if ARGV.empty?
 
 srand opts[:rand] || Time.now.to_i
 
+require 'pp'
+pp config
+puts '----'
+pp opts
+exit
 if opts[:list]
   Tour.tours(ARGV).each do |tour|
     puts tour

data/lib/common.rb

@@ -21,7 +21,6 @@ require 'tour_bus'
 require 'runner'
 require 'tour'
 
-
 class TourBusException < Exception; end
 
 def require_all_files_in_folder(folder, extension = "*.rb")
@@ -29,3 +28,4 @@ def require_all_files_in_folder(folder, extension = "*.rb")
     require file
   end
 end
+

data/lib/tour.rb

@@ -28,15 +28,24 @@ class Tour
   def self.tours(filter=[])
     filter = [filter].flatten
     # All files in tours folder, stripped to basename, that match any item in filter
-    Dir[File.join('.', 'tours', '**', '*.rb')].map {|fn| File.basename(fn, ".rb")}.select {|fn| filter.size.zero? || filter.any?{|f| fn =~ /#{f}/}}
+    # I do loves me a long chain. This returns an array containing
+    # 1. All *.rb files in tour folder (recursive)
+    # 2. Each filename stripped to its basename
+    # 3. If you passed in any filters, these basenames are rejected unless they match at least one filter
+    # 4. The filenames remaining are then checked to see if they define a class of the same name that inherits from Tour
+    Dir[File.join('.', 'tours', '**', '*.rb')].map {|fn| File.basename(fn, ".rb")}.select {|fn| filter.size.zero? || filter.any?{|f| fn =~ /#{f}/}}.select {|tour| Tour.tour? tour }
   end 
   
   def self.tests(tour_name)
-    Tour.make_tour.tests
+    Tour.make_tour(tour_name).tests
+  end
+  
+  def self.tour?(tour_name)
+    Object.const_defined?(tour_name.classify) && tour_name.classify.constantize.ancestors.include?(Tour)
   end
   
   # Factory method, creates the named child class instance
-  def self.make_tour(tour_name,host,tours,number,tour_id)
+  def self.make_tour(tour_name,host="localhost:3000",tours=[],number=1,tour_id=nil)
     tour_name.classify.constantize.new(host,tours,number,tour_id)
   end
   

metadata

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