Skip to content

Commit

Permalink
change ecosystem name as name
Browse files Browse the repository at this point in the history
fix specs
  • Loading branch information
kbukum1 committed Oct 23, 2024
1 parent f8775ad commit 3979004
Show file tree
Hide file tree
Showing 8 changed files with 52 additions and 18 deletions.
5 changes: 4 additions & 1 deletion bundler/lib/dependabot/bundler/file_parser.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 10 additions & 10 deletions common/lib/dependabot/ecosystem.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion composer/lib/dependabot/composer/file_parser.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions silent/lib/dependabot/silent/file_parser.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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)
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 3979004

Please sign in to comment.