lib/benchmark/driver.rb in benchmark_driver-0.6.1 vs lib/benchmark/driver.rb in benchmark_driver-0.6.2

@@ -1,12 +1,25 @@
 module Benchmark
+  # RubyDriver entrypoint.
+  def self.driver(*args, &block)
+    dsl = Driver::RubyDslParser.new(*args)
+    block.call(dsl)
+
+    Driver.run(dsl.configuration)
+  end
+
   module Driver
+    class InvalidConfig < StandardError; end
+
     class << self
-      # Main function which is used by exe/benchmark-driver.
+      # Main function which is used by both RubyDriver and YamlDriver.
       # @param [Benchmark::Driver::Configuration] config
       def run(config)
         validate_config(config)
+        if config.runner_options.type.nil?
+          config.runner_options.type = runner_type_for(config)
+        end
 
         runner_class = Runner.find(config.runner_options.type)
         output_class = Output.find(config.output_options.type)
 
         missing_fields = output_class::REQUIRED_FIELDS - runner_class::SUPPORTED_FIELDS
@@ -34,13 +47,25 @@
       end
 
       private
 
       def validate_config(config)
-        # TODO: make sure all scripts are the same class
+        if config.jobs.empty?
+          raise InvalidConfig.new('No benchmark script is specified')
+        end
+
+        script_class = config.jobs.first.script.class
+        unless config.jobs.all? { |j| j.script.is_a?(script_class) }
+          raise InvalidConfig.new('Benchmark scripts include both String and Proc. Only either of them should be specified.')
+        end
       end
 
+      def runner_type_for(config)
+        script_class = config.jobs.first.script.class
+        script_class == Proc ? :call : :exec
+      end
+
       # benchmark_driver ouputs logs ASAP. This enables sync flag for it.
       #
       # Currently benchmark_driver supports only output to stdout.
       # In future exetension, this may be included in Output plugins.
       def without_stdout_buffering
@@ -54,6 +79,7 @@
 end
 
 require 'benchmark/output'
 require 'benchmark/runner'
 require 'benchmark/driver/error'
+require 'benchmark/driver/ruby_dsl_parser'
 require 'benchmark/driver/version'