Use setup Gemfile for setup script

bmarkons · bmarkons · commit c96b7d40b9e9 · 2017-07-03T11:13:12.000Z
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,5 @@ rails/log/
 Gemfile.lock
 sequel/vendor/
 sequel/log/
+support/setup/vendor
 
diff --git a/sequel/.bundle/config b/sequel/.bundle/config
@@ -1,3 +1,3 @@
 ---
-BUNDLE_PATH: vendor/bundle
-BUNDLE_DISABLE_SHARED_GEMS: true
+BUNDLE_PATH: "vendor/bundle"
+BUNDLE_DISABLE_SHARED_GEMS: "true"
diff --git a/sequel/benchmarks/support/benchmark_sequel.rb b/sequel/benchmarks/support/benchmark_sequel.rb
@@ -1,5 +1,5 @@
 require_relative '../../../support/benchmark_runner'
-require_relative '../../../support/helpers.rb'
+require_relative '../../../support/helpers'
 
 module Benchmark
   module Sequel
diff --git a/support/helpers.rb b/support/helpers.rb
@@ -3,5 +3,7 @@ def db_adapter
 end
 
 def db_setup(script:)
-  `cd ../support/setup && DATABASE_URL=#{ENV.fetch("DATABASE_URL")} ruby #{script}`
+  Dir.chdir("../support/setup") do
+    p `DATABASE_URL=#{ENV.fetch("DATABASE_URL")} BUNDLE_GEMFILE=Gemfile ruby #{script}`
+  end
 end
diff --git a/support/setup/.bundle/config b/support/setup/.bundle/config
@@ -0,0 +1,3 @@
+---
+BUNDLE_DISABLE_SHARED_GEMS: "true"
+BUNDLE_PATH: "vendor/bundle"

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+---`
	`2`	`+BUNDLE_DISABLE_SHARED_GEMS: "true"`
	`3`	`+BUNDLE_PATH: "vendor/bundle"`