Merge pull request #460 from Shopify/ryanb-fix-materialized-dependencies

Fix materialized deps

Author: RyanBrushett

lib/tapioca/gemfile.rb

@@ -67,8 +67,10 @@ def materialize_deps
       deps = definition.locked_gems.dependencies.values
       missing_specs = T::Array[String].new
       materialized_dependencies = if definition.resolve.method(:materialize).arity == 1 # Support bundler >= v2.2.25
-        definition.resolve.materialize(deps)
-          .tap { |md| missing_specs = T.cast(md.missing_specs, T::Array[String]) }
+        md = definition.resolve.materialize(deps)
+        missing_spec_names = md.missing_specs.map(&:name)
+        missing_specs = T.cast(md.missing_specs.map { |spec| "#{spec.name} (#{spec.version})" }, T::Array[String])
+        md.to_a.reject { |spec| missing_spec_names.include?(spec.name) }
       else
         definition.resolve.materialize(deps, missing_specs)
       end

spec/support/repo/.gitignore

@@ -1,2 +1,3 @@
 Gemfile.lock
 .bundle/
+Gemfile.lock

spec/support/repo/Gemfile

@@ -2,8 +2,6 @@
 
 source("https://rubygems.org")
 
-nokogiri_installable = Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.5")
-
 gem("foo", path: "../gems/foo")
 gem("bar", path: "../gems/bar")
 gem("baz", path: "../gems/baz")
@@ -16,10 +14,13 @@ gem("psych")
 # ensure that we don't fail.
 gem("extras")
 # Needed for DSL generation tests. The simplest
-# gem that we have a DSL generator for.
-gem("smart_properties")
-gem("activesupport")
+# gems that we have a DSL generator for.
+gem("smart_properties", "1.15.0")
+gem("activesupport", "5.2.6")
 # Needed to test Git gems
 gem("ast", git: "https://github.com/whitequark/ast", ref: "e07a4f66e05ac7972643a8841e336d327ea78ae1")
+
 # Needed to test missing gems
-gem("nokogiri", ">= 1.11.1") if nokogiri_installable
+platform :truffleruby do
+  gem "minitest-excludes"
+end

spec/tapioca/cli_spec.rb

@@ -94,7 +94,6 @@ def execute(command, args = [], flags = {})
     @repo_path = (Pathname.new(__dir__) / ".." / "support" / "repo").expand_path
     Bundler.with_unbundled_env do
       IO.popen(["bundle", "install", "--quiet"], chdir: @repo_path).read
-      IO.popen(["bundle", "lock", "--add-platform=ruby"], chdir: @repo_path).read
     end
   end
 
@@ -814,18 +813,13 @@ class Foo::Secret; end
     end
 
     it 'must not generate RBIs for missing gem specs' do
-      skip "failure is to be investigated later"
       output = execute("generate")
 
-      assert_includes(output, <<~OUTPUT.strip) if ruby_version(">= 2.5")
-        Requiring all gems to prepare for compiling...  Done
-          completed with missing specs: mini_portile2
-      OUTPUT
+      missing_spec = "  completed with missing specs: minitest-excludes (2.0.1)"
+      assert_includes(output, missing_spec)
 
-      refute_includes(output, <<~OUTPUT.strip)
-        Processing 'mini_portile2' gem:
-          Compiling mini_portile2, this may take a few seconds...   Done
-      OUTPUT
+      compiling_spec = "  Compiling minitest-excludes, this may take a few seconds"
+      refute_includes(output, compiling_spec)
     end
 
     it 'must generate git gem RBIs with source revision numbers' do