Skip to content

Add support for bundler 2.2.25+ #446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RyanBrushett merged 1 commit into from
Aug 23, 2021
Merged

Add support for bundler 2.2.25+ #446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,15 @@ jobs:
fail-fast: false
matrix:
ruby: [ 2.6, 2.7, 3.0 ]
name: Test Ruby ${{ matrix.ruby }}
bundler: [ 2.2.22, 2.2.25 ]
name: Test Ruby ${{ matrix.ruby }}, Bundler ${{ matrix.bundler }}
steps:
- uses: actions/checkout@v2
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
bundler: ${{ matrix.bundler }}
bundler-cache: true
- name: Run type check
run: bin/typecheck
Expand All @@ -27,4 +29,4 @@ jobs:
- name: Verify documentation
run: bin/docs
- name: Run tests
run: bin/test
run: bundle _${{ matrix.bundler }}_ exec rake
23 changes: 15 additions & 8 deletions lib/tapioca/gemfile.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,21 +53,28 @@ def require

sig { returns([T::Array[Gem], T::Array[String]]) }
def load_dependencies
deps = definition.locked_gems.dependencies.values

missing_specs = T::Array[String].new

dependencies = definition
.resolve
.materialize(deps, missing_specs)
materialized_dependencies, missing_specs = materialize_deps
dependencies = materialized_dependencies
.map { |spec| Gem.new(spec) }
.reject { |gem| gem.ignore?(dir) }
.uniq(&:rbi_file_name)
.sort_by(&:rbi_file_name)

[dependencies, missing_specs]
end

sig { returns([T::Array[::Gem::Specification], T::Array[String]]) }
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]) }
else
definition.resolve.materialize(deps, missing_specs)
end
[materialized_dependencies, missing_specs]
end

sig { returns(Bundler::Runtime) }
def runtime
Bundler::Runtime.new(File.dirname(gemfile.path), definition)
Expand Down