diff --git a/bundler/lib/dependabot/bundler/file_parser.rb b/bundler/lib/dependabot/bundler/file_parser.rb index 664e5b53a53..cda1913fa53 100644 --- a/bundler/lib/dependabot/bundler/file_parser.rb +++ b/bundler/lib/dependabot/bundler/file_parser.rb @@ -35,7 +35,10 @@ def parse sig { returns(Ecosystem) } def ecosystem @ecosystem ||= T.let( - Ecosystem.new(ECOSYSTEM, PackageManager.new(bundler_version)), + Ecosystem.new( + name: ECOSYSTEM, + package_manager: PackageManager.new(bundler_version) + ), T.nilable(Ecosystem) ) end diff --git a/common/lib/dependabot/ecosystem.rb b/common/lib/dependabot/ecosystem.rb index f7caf06962f..82793f63b34 100644 --- a/common/lib/dependabot/ecosystem.rb +++ b/common/lib/dependabot/ecosystem.rb @@ -187,32 +187,32 @@ def initialize( attr_reader :req_max end - # Initialize with mandatory ecosystem and optional language information. - # @param ecosystem [String] the name of the ecosystem (e.g., "bundler", "npm_and_yarn"). + # Initialize with mandatory name and optional language information. + # @param name [String] the name of the name (e.g., "bundler", "npm_and_yarn"). # @param package_manager [VersionManager] the package manager # @param language [T.nilable(VersionManager)] optional language version information. sig do params( - ecosystem: String, + name: String, package_manager: VersionManager, language: T.nilable(VersionManager) ).void end def initialize( - ecosystem, - package_manager, - language = nil + name:, + package_manager:, + language: nil ) - @ecosystem = T.let(ecosystem, String) + @name = T.let(name, String) @package_manager = T.let(package_manager, VersionManager) @language = T.let(language, T.nilable(VersionManager)) end - # The name of the ecosystem (mandatory). + # The name of the name (mandatory). # @example - # ecosystem #=> "npm_and_yarn" + # name #=> "npm_and_yarn" sig { returns(String) } - attr_reader :ecosystem + attr_reader :name # The information related to the package manager (mandatory). # @example diff --git a/composer/lib/dependabot/composer/file_parser.rb b/composer/lib/dependabot/composer/file_parser.rb index 4445a7d09d4..e5b02c5fa77 100644 --- a/composer/lib/dependabot/composer/file_parser.rb +++ b/composer/lib/dependabot/composer/file_parser.rb @@ -38,7 +38,10 @@ def parse sig { returns(Ecosystem) } def ecosystem @ecosystem ||= T.let( - Ecosystem.new(ECOSYSTEM, PackageManager.new(composer_version)), + Ecosystem.new( + name: ECOSYSTEM, + package_manager: PackageManager.new(composer_version) + ), T.nilable(Ecosystem) ) end diff --git a/silent/lib/dependabot/silent/file_parser.rb b/silent/lib/dependabot/silent/file_parser.rb index 700b549dfbb..01b9cd679fa 100644 --- a/silent/lib/dependabot/silent/file_parser.rb +++ b/silent/lib/dependabot/silent/file_parser.rb @@ -38,8 +38,8 @@ def ecosystem end @ecosystem ||= T.let( Dependabot::Ecosystem.new( - Dependabot::Silent::ECOSYSYEM, - Dependabot::Silent::PackageManager.new(silent_version) + name: Dependabot::Silent::ECOSYSYEM, + package_manager: Dependabot::Silent::PackageManager.new(silent_version) ), T.nilable(Dependabot::Ecosystem) ) diff --git a/updater/spec/dependabot/updater/operations/create_security_update_pull_request_spec.rb b/updater/spec/dependabot/updater/operations/create_security_update_pull_request_spec.rb index 3fd645e8c9d..eea4493fe35 100644 --- a/updater/spec/dependabot/updater/operations/create_security_update_pull_request_spec.rb +++ b/updater/spec/dependabot/updater/operations/create_security_update_pull_request_spec.rb @@ -60,6 +60,13 @@ ) end + let(:ecosystem) do + Dependabot::Ecosystem.new( + name: "bundler", + package_manager: package_manager + ) + end + let(:package_manager) do DummyPkgHelpers::StubPackageManager.new( name: "bundler", @@ -218,7 +225,7 @@ allow(dependency_snapshot).to receive_messages( job_dependencies: [dependency], - package_manager: package_manager, + ecosystem: ecosystem, notices: [warning_deprecation_notice] ) allow(job).to receive(:security_fix?).and_return(true) diff --git a/updater/spec/dependabot/updater/operations/refresh_group_update_pull_request_spec.rb b/updater/spec/dependabot/updater/operations/refresh_group_update_pull_request_spec.rb index e877821b783..7ed869447ae 100644 --- a/updater/spec/dependabot/updater/operations/refresh_group_update_pull_request_spec.rb +++ b/updater/spec/dependabot/updater/operations/refresh_group_update_pull_request_spec.rb @@ -63,6 +63,13 @@ original_bundler_files end + let(:ecosystem) do + Dependabot::Ecosystem.new( + name: "bundler", + package_manager: package_manager + ) + end + let(:package_manager) do DummyPkgHelpers::StubPackageManager.new( name: "bundler", @@ -81,7 +88,7 @@ end before do - allow(dependency_snapshot).to receive(:package_manager).and_return(package_manager) + allow(dependency_snapshot).to receive(:ecosystem).and_return(ecosystem) allow(job).to receive(:package_manager).and_return("bundler") end diff --git a/updater/spec/dependabot/updater/operations/refresh_version_update_pull_request_spec.rb b/updater/spec/dependabot/updater/operations/refresh_version_update_pull_request_spec.rb index 92e3dc31a00..565ef59006e 100644 --- a/updater/spec/dependabot/updater/operations/refresh_version_update_pull_request_spec.rb +++ b/updater/spec/dependabot/updater/operations/refresh_version_update_pull_request_spec.rb @@ -54,6 +54,13 @@ ) end + let(:ecosystem) do + Dependabot::Ecosystem.new( + name: "bundler", + package_manager: package_manager + ) + end + let(:package_manager) do DummyPkgHelpers::StubPackageManager.new( name: "bundler", @@ -132,7 +139,7 @@ allow(Dependabot::DependencyChangeBuilder) .to receive(:create_from) .and_return(stub_dependency_change) - allow(dependency_snapshot).to receive(:package_manager).and_return(package_manager) + allow(dependency_snapshot).to receive(:ecosystem).and_return(ecosystem) end after do diff --git a/updater/spec/dependabot/updater/operations/update_all_versions_spec.rb b/updater/spec/dependabot/updater/operations/update_all_versions_spec.rb index f2c6556b67b..b98d18f5551 100644 --- a/updater/spec/dependabot/updater/operations/update_all_versions_spec.rb +++ b/updater/spec/dependabot/updater/operations/update_all_versions_spec.rb @@ -63,6 +63,13 @@ ) end + let(:ecosystem) do + Dependabot::Ecosystem.new( + name: "bundler", + package_manager: package_manager + ) + end + let(:package_manager) do DummyPkgHelpers::StubPackageManager.new( name: "bundler", @@ -157,7 +164,7 @@ allow(Dependabot::DependencyChangeBuilder).to receive( :create_from ).and_return(stub_dependency_change) - allow(dependency_snapshot).to receive_messages(package_manager: package_manager, notices: [ + allow(dependency_snapshot).to receive_messages(ecosystem: ecosystem, notices: [ warning_deprecation_notice ]) end