benchmark_driver 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '033899ee04ec2e6a43a6a3e0ad48a247eaac2bc53ac44f43108c5f63445fa94c'
-  data.tar.gz: ebfaab011a5b94652a5d3c86083410028b5860c3dacdc5acdd0f6f268f1e89e6
+  metadata.gz: 2cb04d95b9ea0dbd94d39fd405b9f0c3eb564b858dafa440cdac4166591c898b
+  data.tar.gz: 532e0afcfce2eae4e7ada1541da6b2177c9b977d6c554036cef31745888aceb7
 SHA512:
-  metadata.gz: 5b0a51f1ee90a99f5d5fba584dc5d41227dcd5891d8e74b0abada6e17b8f8bce36ac6a3746c8acaa3925de7c02e66366e4ef5299ec2917ee5587dc8a76c72026
-  data.tar.gz: 5c3ef3270c05b23c10e16074e6e8c78e2c54259072398152e4c48a377bc2a84a3a91250676a170c2dedb9a1c05b69b8f3a10a109278c69732fbb3f81f7c9817f
+  metadata.gz: 8092ecb340ba7078548a0dc77b4b16e4d01dceef20f6151b05b48be086ca7cde011b2595253377cb273a26494fc6f489b1eccf0ee23de799d617f9a78f565e31
+  data.tar.gz: fc28493442f8d45ed310a80cd7f5b594825789189de5a716ab2e87be08f80b644bec633590b4b52ad28d3a1d98989ddca4e7319e6f9bf5de1411f1e959c734c6

data/.travis.yml

@@ -2,14 +2,12 @@ language: ruby
 rvm:
   - 2.1.10
   - 2.2.8
-  - 2.3.5
-  - 2.4.2
-  - ruby-head
-cache: bundler
+  - 2.3.6
+  - 2.4.3
+  - 2.5.0
 branches:
   only:
     - master
-before_install: gem install bundler -v 1.15.4
 script:
   - bundle exec rake ruby_examples
   - bundle exec rake yaml_examples

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.8.3
+
+- Make benchmark\_driver runnable when Bundler is not installed
+
 # v0.8.2
 
 - Fix bug on showing error message in `benchmark-driver` command

data/lib/benchmark/driver/bundler.rb

@@ -0,0 +1,12 @@
+# This module can be transparently run even if Bundler is not installed
+module Benchmark::Driver::Bundler
+  def self.with_clean_env(&block)
+    begin
+      require 'bundler'
+    rescue LoadError
+      block.call # probably bundler is not used
+    else
+      ::Bundler.with_clean_env { block.call }
+    end
+  end
+end

data/lib/benchmark/driver/version.rb

@@ -1,5 +1,5 @@
 module Benchmark
   module Driver
-    VERSION = '0.8.2'
+    VERSION = '0.8.3'
   end
 end

data/lib/benchmark/runner/exec.rb

@@ -1,7 +1,7 @@
-require 'bundler'
 require 'tempfile'
 require 'shellwords'
 require 'benchmark/driver/benchmark_result'
+require 'benchmark/driver/bundler'
 require 'benchmark/driver/duration_runner'
 require 'benchmark/driver/repeatable_runner'
 require 'benchmark/driver/error'
@@ -79,7 +79,7 @@ class Benchmark::Runner::Exec
 
       script = BenchmarkScript.new(job.prelude, job.script).full_script(job.loop_count)
       with_file(script) do |script_path|
-        out = Bundler.with_clean_env { IO.popen(['/usr/bin/time', *executable.command, script_path], err: [:child, :out], &:read) }
+        out = Benchmark::Driver::Bundler.with_clean_env { IO.popen(['/usr/bin/time', *executable.command, script_path], err: [:child, :out], &:read) }
         match_data = /^(?<user>\d+.\d+)user\s+(?<system>\d+.\d+)system\s+(?<elapsed1>\d+):(?<elapsed2>\d+.\d+)elapsed.+\([^\s]+\s+(?<maxresident>\d+)maxresident\)k$/.match(out)
         raise "Unexpected format given from /usr/bin/time:\n#{out}" unless match_data[:maxresident]
 
@@ -153,7 +153,7 @@ class Benchmark::Runner::Exec
     with_file(script) do |path|
       cmd = [*command, path].shelljoin
 
-      Bundler.with_clean_env do
+      Benchmark::Driver::Bundler.with_clean_env do
         before = Benchmark::Driver::Time.now
         system(cmd, out: File::NULL)
         after = Benchmark::Driver::Time.now

metadata

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