Fix the ability to override Gemfile

Shopify · Jun 5, 2019 · e864294 · e864294
1 parent a5511c9
commit e864294
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 22 deletions.
diff --git a/lib/tapioca/gemfile.rb b/lib/tapioca/gemfile.rb
@@ -16,15 +16,15 @@ def initialize(gemfile:)
       @gemfile = T.let(File.new(gemfile.to_s), File)
       @lockfile = T.let(File.new(lockfile.to_s), File)
       @dependencies = T.let(nil, T.nilable(T::Array[Gem]))
+      @definition = T.let(nil, T.nilable(Bundler::Definition))
     end
 
     sig { returns(T::Array[Gem]) }
     def dependencies
       @dependencies ||= begin
-        bundler = Bundler::Dsl.evaluate(gemfile, lockfile, {})
-        specs = bundler.specs.to_a
+        specs = definition.specs.to_a
 
-        bundler
+        definition
           .resolve
           .materialize(specs)
           .reject { |spec| ignore_gem_spec?(spec) }
@@ -43,7 +43,6 @@ def gem(gem_name)
     def require_bundle(initialize_file, require_file)
       require(initialize_file) if initialize_file && File.exist?(initialize_file)
 
-      definition = Bundler::Dsl.evaluate(gemfile, lockfile, {})
       runtime = Bundler::Runtime.new(File.dirname(gemfile.path), definition)
       groups = Bundler.definition.groups
       runtime.setup(*groups).require(*groups)
@@ -58,6 +57,14 @@ def require_bundle(initialize_file, require_file)
     sig { returns(File) }
     attr_reader(:gemfile, :lockfile)
 
+    sig { returns(Bundler::Definition) }
+    def definition
+      @definition ||= begin
+        ENV["BUNDLE_GEMFILE"] = gemfile.path
+        Bundler::Dsl.evaluate(gemfile, lockfile, {})
+      end
+    end
+
     sig { params(spec: Spec).returns(T::Boolean) }
     def ignore_gem_spec?(spec)
       spec.name == "sorbet" ||

diff --git a/spec/support/repo/Gemfile.lock b/spec/support/repo/Gemfile.lock
@@ -1,15 +1,15 @@
 PATH
-  remote: ../gems/bar
+  remote: spec/support/gems/bar
   specs:
     bar (0.3.0)
 
 PATH
-  remote: ../gems/baz
+  remote: spec/support/gems/baz
   specs:
     baz (0.0.2)
 
 PATH
-  remote: ../gems/foo
+  remote: spec/support/gems/foo
   specs:
     foo (0.0.1)
 

diff --git a/spec/tapioca/cli_spec.rb b/spec/tapioca/cli_spec.rb
@@ -7,24 +7,25 @@
 RSpec.describe(Tapioca::Cli) do
   let(:outdir) { @outdir }
   let(:repo_path) { Pathname.new(__dir__) / ".." / "support" / "repo" }
-  let(:exe_path) { Pathname.new(__dir__) / ".." / ".." / "exe" }
   let(:exec_command) { @exec_command.join(" ") }
 
   def run(command, args = [], flags = {})
-    Dir.chdir(exe_path) do
-      flags = {
-        outdir: outdir,
-        gemfile: (repo_path / "Gemfile").to_s,
-      }.merge(flags)
-
-      @exec_command = [
-        "tapioca",
-        command,
-        *flags.flat_map { |k, v| ["--#{k}", v] },
-        *args,
-      ]
-      IO.popen(@exec_command).read
-    end
+    flags = {
+      outdir: outdir,
+      gemfile: (repo_path / "Gemfile").to_s,
+    }.merge(flags).flat_map { |k, v| ["--#{k}", v] }
+
+    @exec_command = [
+      "tapioca",
+      command,
+      *flags,
+      *args,
+    ]
+
+    IO.popen(
+      @exec_command,
+      chdir: Pathname.new(__dir__) / ".." / ".." / "exe"
+    ).read
   end
 
   around(:each) do |example|