benchmark_driver 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37efb4b8012a19e28858b7b3d34126c769fffe51a0216f167bf1b1319aa236b2
-  data.tar.gz: 535378addbcfe89f7a64897110880b6cb287ac24339eb9f163b0751362490fcb
+  metadata.gz: 93c1a2237caaf4724bad8d5d6e01594121e33c24c4d13c5a69dc538bb4c7d56a
+  data.tar.gz: f1ed23287e7b4966aeb8ed53413839362d559e929d8307af793823262ce289df
 SHA512:
-  metadata.gz: 8049e4ca621f08751de795fa936c3efa1cb351998cc81b55fc47cb832489df4a911d4ef476d01f9d90a9b140b395e64a1b87332a6519bd5c606d72b94fd5c1a7
-  data.tar.gz: 85465c2501b332474513a9b48eb3f389ed31ab00bd1fdfc363eed517864264e2126e3f5eb08fa535534ee22d08f3c0ef32507ea16f0555ead5c252f74ceaa946
+  metadata.gz: ef0c550707bae9de4611c4ee66a30da4c99baf7d511496bf59d77dc914ff6635f780ce3163d90b2c0b04d0882042fada002093b15908c098f47dfe3a1217419c
+  data.tar.gz: 2a20c835711a51424b56d70887c921cf734031260b3443454e9ab9bed53c2db62a3e11b2da56279248af606a21b10ffa61e7ee7d5a84b9b5cb5e56cdd410b0c6

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.5.0
+
+- Automatic bundle install for each Ruby executable on `--bundler` or `--bundle`
+- CLI error handling is improved for empty/invalid arguments
+
 # v0.4.5
 
 - Allow specifying arguments for ruby executables

data/exe/benchmark-driver

@@ -2,14 +2,16 @@
 $:.unshift File.expand_path('../lib', __dir__)
 
 require 'benchmark/driver'
+require 'benchmark/driver/bundle_installer'
 require 'benchmark/driver/yaml_parser'
 require 'optparse'
 require 'yaml'
 
 options = {}
-args = OptionParser.new do |o|
+parser = OptionParser.new do |o|
   o.banner = "Usage: #{File.basename($0, '.*')} [options] [YAML]"
   o.on('-e', '--executables [EXECS]', 'Ruby executables (e1::path1,arg1,...; e2::path2,arg2;...)') do |e|
+    abort '-e, --executable must take argument but not given' if e.nil?
     options[:execs] ||= []
     e.split(';').each do |name_path|
       name, path = name_path.split('::', 2)
@@ -17,6 +19,7 @@ args = OptionParser.new do |o|
     end
   end
   o.on('--rbenv [VERSIONS]', 'Ruby executables in rbenv (x.x.x,arg1,...;y.y.y,arg2,...;...)') do |r|
+    abort '--rbenv must take argument but not given' if r.nil?
     options[:execs] ||= []
     r.split(';').each do |spec|
       version, *args = spec.split(',')
@@ -39,14 +42,17 @@ args = OptionParser.new do |o|
     abort '--filter can be used only once' if options.key?(:filter)
     options[:filter] = v
   end
-  o.on('--bundler', 'Use gems specified in Gemfile (append -rbundler/setup)') do |v|
+  o.on('--bundler', 'Install and use gems specified in Gemfile') do |v|
     options[:bundler] = v
   end
   o.on('--dir', 'Override __dir__ from "/tmp" to actual directory of YAML') do |v|
     options[:dir] = v
   end
-end.parse!(ARGV)
-abort "No YAML file is specified" if args.empty?
+end
+args = parser.parse!(ARGV)
+if args.empty?
+  abort "No YAML file is specified!\n\n#{parser.help}"
+end
 
 args.each do |path|
   yaml = YAML.load(File.read(path))
@@ -70,6 +76,7 @@ args.each do |path|
     case key
     when :bundler
       config.runner_options.executables.each do |executable|
+        Benchmark::Driver::BundleInstaller.bundle_install_for(executable)
         executable.command << '-rbundler/setup'
       end
     when :compare

data/lib/benchmark/driver/bundle_installer.rb

@@ -0,0 +1,45 @@
+require 'pathname'
+
+# TODO: Support Windows... This depends on availability of which(1)
+module Benchmark::Driver::BundleInstaller
+  class << self
+    # @param [Benchmark::Driver::Configuration::Executable] executable
+    def bundle_install_for(executable)
+      ruby_path = IO.popen(['which', executable.command.first], &:read).rstrip
+      unless $?.success?
+        abort "#{executable.command.first.dump} command was not found to execute `bundle install`"
+      end
+
+      bundler_path = Pathname.new(ruby_path).dirname.join('bundle')
+      unless bundler_path.executable?
+        abort "#{bundler_path.to_s.dump} was not a bundler executable, whose path was guessed from #{ruby_path.dump}"
+      end
+      bundle = bundler_path.to_s
+
+      Bundler.with_clean_env do
+        bundle_check(bundle, ruby: executable.name) || bundle_install(bundle)
+      end
+    end
+
+    private
+
+    # @param [String] bundle - full path to bundle(1)
+    # @param [String] ruby - name of ruby
+    # @return [TrueClass,FalseClass] - true if success
+    def bundle_check(bundle, ruby:)
+      output = IO.popen([bundle, 'check'], &:read)
+      $?.success?.tap do |success|
+        unless success
+          $stderr.puts("For #{ruby}:")
+          $stderr.print(output)
+        end
+      end
+    end
+
+    # @param [String] bundle - full path to bundle(1)
+    def bundle_install(bundle)
+      pid = Process.spawn(bundle, 'install', '-j', ENV.fetch('BUNDLE_JOBS', '4'))
+      Process.wait(pid)
+    end
+  end
+end

data/lib/benchmark/driver/configuration.rb

@@ -21,7 +21,7 @@ class Benchmark::Driver::Configuration < Struct.new(:jobs, :runner_options, :out
   end
 
   # @param [String] name
-  # @param [Array<String>] command
+  # @param [Array<String>] command - ["ruby", "-w", ...]. First element should be path to ruby command
   Executable = Struct.new(:name, :command)
 
   DEFAULT_EXECUTABLES = [Executable.new(RUBY_VERSION, [RbConfig.ruby])]
@@ -32,7 +32,7 @@ class Benchmark::Driver::Configuration < Struct.new(:jobs, :runner_options, :out
   class RunnerOptions < Struct.new(:type, :executables, :repeat_count)
     def initialize(*)
       super
-      self.executables = DEFAULT_EXECUTABLES
+      self.executables ||= DEFAULT_EXECUTABLES
     end
 
     def executables_specified?

data/lib/benchmark/driver/version.rb

@@ -1,5 +1,5 @@
 module Benchmark
   module Driver
-    VERSION = '0.4.5'
+    VERSION = '0.5.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: benchmark_driver
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-05 00:00:00.000000000 Z
+date: 2017-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -77,6 +77,7 @@ files:
 - exe/benchmark-driver
 - lib/benchmark/driver.rb
 - lib/benchmark/driver/benchmark_result.rb
+- lib/benchmark/driver/bundle_installer.rb
 - lib/benchmark/driver/configuration.rb
 - lib/benchmark/driver/duration_runner.rb
 - lib/benchmark/driver/error.rb