diff --git a/.rubocop.yml b/.rubocop.yml index e0845f3e7c64..c063b51bada3 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -13,6 +13,8 @@ AllCops: SuggestExtensions: false Gemspec/DeprecatedAttributeAssignment: Enabled: true +Gemspec/DevelopmentDependencies: + Enabled: false Gemspec/RequireMFA: Enabled: false Layout/DotPosition: diff --git a/bundler/helpers/v1/lib/functions.rb b/bundler/helpers/v1/lib/functions.rb index c6c37f04387d..9abf2372d1a9 100644 --- a/bundler/helpers/v1/lib/functions.rb +++ b/bundler/helpers/v1/lib/functions.rb @@ -127,7 +127,7 @@ def self.conflicting_dependencies(**args) end def self.set_bundler_flags_and_credentials(dir:, credentials:) - dir = dir ? Pathname.new(dir) : dir + dir = Pathname.new(dir) if dir Bundler.instance_variable_set(:@root, dir) # Remove installed gems from the default Rubygems index diff --git a/bundler/helpers/v1/monkey_patches/resolver_spec_group_sane_eql.rb b/bundler/helpers/v1/monkey_patches/resolver_spec_group_sane_eql.rb index 3fbb29a4ae1a..16f4a323abb0 100644 --- a/bundler/helpers/v1/monkey_patches/resolver_spec_group_sane_eql.rb +++ b/bundler/helpers/v1/monkey_patches/resolver_spec_group_sane_eql.rb @@ -8,7 +8,7 @@ module BundlerResolverSpecGroupSaneEql def eql?(other) - return unless other.is_a?(self.class) + return false unless other.is_a?(self.class) super(other) end diff --git a/bundler/helpers/v2/lib/functions.rb b/bundler/helpers/v2/lib/functions.rb index 58b2b00513be..d87bfc37bd04 100644 --- a/bundler/helpers/v2/lib/functions.rb +++ b/bundler/helpers/v2/lib/functions.rb @@ -129,7 +129,7 @@ def self.conflicting_dependencies(**args) end def self.set_bundler_flags_and_credentials(dir:, credentials:) - dir = dir ? Pathname.new(dir) : dir + dir = Pathname.new(dir) if dir Bundler.instance_variable_set(:@root, dir) # Remove installed gems from the default Rubygems index diff --git a/cargo/lib/dependabot/cargo/file_parser.rb b/cargo/lib/dependabot/cargo/file_parser.rb index e29ffb73f4f0..0eaaa2104fc8 100644 --- a/cargo/lib/dependabot/cargo/file_parser.rb +++ b/cargo/lib/dependabot/cargo/file_parser.rb @@ -161,7 +161,8 @@ def source_from_declaration(declaration) raise "Unexpected dependency declaration: #{declaration}" unless declaration.is_a?(Hash) return git_source_details(declaration) if declaration["git"] - return { type: "path" } if declaration["path"] + + { type: "path" } if declaration["path"] end def version_from_lockfile(name, declaration) diff --git a/cargo/lib/dependabot/cargo/update_checker/version_resolver.rb b/cargo/lib/dependabot/cargo/update_checker/version_resolver.rb index 1258d0122c89..a51a17a5d8bb 100644 --- a/cargo/lib/dependabot/cargo/update_checker/version_resolver.rb +++ b/cargo/lib/dependabot/cargo/update_checker/version_resolver.rb @@ -319,7 +319,7 @@ def original_requirements_resolvable? end def workspace_native_library_update_error?(message) - return unless message.include?("native library") + return false unless message.include?("native library") library_count = prepared_manifest_files.count do |file| package_name = TomlRB.parse(file.content).dig("package", "name") diff --git a/cargo/spec/dependabot/cargo/file_fetcher_spec.rb b/cargo/spec/dependabot/cargo/file_fetcher_spec.rb index 4038c06eedcd..9552f4fbb398 100644 --- a/cargo/spec/dependabot/cargo/file_fetcher_spec.rb +++ b/cargo/spec/dependabot/cargo/file_fetcher_spec.rb @@ -125,7 +125,7 @@ with(headers: { "Authorization" => "token token" }). to_return( status: 200, - body: fixture("github", "contents_cargo_with_toolchain.json").gsub(/rust-toolchain/, "rust-toolchain.toml"), + body: fixture("github", "contents_cargo_with_toolchain.json").gsub("rust-toolchain", "rust-toolchain.toml"), headers: json_header ) diff --git a/cargo/spec/dependabot/cargo/file_updater/lockfile_updater_spec.rb b/cargo/spec/dependabot/cargo/file_updater/lockfile_updater_spec.rb index 4b6e3a649812..a8fbfb8365e5 100644 --- a/cargo/spec/dependabot/cargo/file_updater/lockfile_updater_spec.rb +++ b/cargo/spec/dependabot/cargo/file_updater/lockfile_updater_spec.rb @@ -326,7 +326,7 @@ expect(updated_lockfile_content).to_not include("git+https://") content = updated_lockfile_content - expect(content.scan(/name = "utf8-ranges"/).count).to eq(1) + expect(content.scan('name = "utf8-ranges"').count).to eq(1) end end diff --git a/common/dependabot-common.gemspec b/common/dependabot-common.gemspec index 6a2a5bc519eb..a7bd368edc7f 100644 --- a/common/dependabot-common.gemspec +++ b/common/dependabot-common.gemspec @@ -47,7 +47,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "rake", "~> 13" spec.add_development_dependency "rspec", "~> 3.12" spec.add_development_dependency "rspec-its", "~> 1.3" - spec.add_development_dependency "rubocop", "~> 1.50.0" + spec.add_development_dependency "rubocop", "~> 1.56.0" spec.add_development_dependency "rubocop-performance", "~> 1.19.0" spec.add_development_dependency "stackprof", "~> 0.2.16" spec.add_development_dependency "vcr", "~> 6.1" diff --git a/common/lib/dependabot/clients/azure.rb b/common/lib/dependabot/clients/azure.rb index 27bc596b8d93..e12a3725fbf2 100644 --- a/common/lib/dependabot/clients/azure.rb +++ b/common/lib/dependabot/clients/azure.rb @@ -373,7 +373,7 @@ def auth_header_for(token) end def tags_creation_forbidden?(response) - return if response.body.empty? + return false if response.body.empty? message = JSON.parse(response.body).fetch("message", nil) message&.include?("TF401289") diff --git a/common/lib/dependabot/dependency.rb b/common/lib/dependabot/dependency.rb index d89826cfc1fd..e6ca8a4f5caa 100644 --- a/common/lib/dependabot/dependency.rb +++ b/common/lib/dependabot/dependency.rb @@ -157,14 +157,14 @@ def previous_ref previous_refs = previous_requirements.filter_map do |r| r.dig(:source, "ref") || r.dig(:source, :ref) end.uniq - return previous_refs.first if previous_refs.count == 1 + previous_refs.first if previous_refs.count == 1 end def new_ref new_refs = requirements.filter_map do |r| r.dig(:source, "ref") || r.dig(:source, :ref) end.uniq - return new_refs.first if new_refs.count == 1 + new_refs.first if new_refs.count == 1 end def ref_changed? diff --git a/common/lib/dependabot/metadata_finders/base/changelog_finder.rb b/common/lib/dependabot/metadata_finders/base/changelog_finder.rb index 8e8815b99778..7ac10200b4c6 100644 --- a/common/lib/dependabot/metadata_finders/base/changelog_finder.rb +++ b/common/lib/dependabot/metadata_finders/base/changelog_finder.rb @@ -333,14 +333,14 @@ def previous_ref previous_refs = dependency.previous_requirements.filter_map do |r| r.dig(:source, "ref") || r.dig(:source, :ref) end.uniq - return previous_refs.first if previous_refs.count == 1 + previous_refs.first if previous_refs.count == 1 end def new_ref new_refs = dependency.requirements.filter_map do |r| r.dig(:source, "ref") || r.dig(:source, :ref) end.uniq - return new_refs.first if new_refs.count == 1 + new_refs.first if new_refs.count == 1 end def ref_changed? diff --git a/common/lib/dependabot/metadata_finders/base/changelog_pruner.rb b/common/lib/dependabot/metadata_finders/base/changelog_pruner.rb index 1ffcc6e2c39e..1683d5ae2f6e 100644 --- a/common/lib/dependabot/metadata_finders/base/changelog_pruner.rb +++ b/common/lib/dependabot/metadata_finders/base/changelog_pruner.rb @@ -140,14 +140,14 @@ def previous_ref previous_refs = dependency.previous_requirements.filter_map do |r| r.dig(:source, "ref") || r.dig(:source, :ref) end.uniq - return previous_refs.first if previous_refs.count == 1 + previous_refs.first if previous_refs.count == 1 end def new_ref new_refs = dependency.requirements.filter_map do |r| r.dig(:source, "ref") || r.dig(:source, :ref) end.uniq - return new_refs.first if new_refs.count == 1 + new_refs.first if new_refs.count == 1 end # TODO: Refactor me so that Composer doesn't need to be special cased diff --git a/common/lib/dependabot/metadata_finders/base/commits_finder.rb b/common/lib/dependabot/metadata_finders/base/commits_finder.rb index a44d643f294f..ab9958df1e41 100644 --- a/common/lib/dependabot/metadata_finders/base/commits_finder.rb +++ b/common/lib/dependabot/metadata_finders/base/commits_finder.rb @@ -139,7 +139,7 @@ def previous_ref previous_refs = dependency.previous_requirements.filter_map do |r| r.dig(:source, "ref") || r.dig(:source, :ref) end.uniq - return previous_refs.first if previous_refs.count == 1 + previous_refs.first if previous_refs.count == 1 end def new_ref @@ -148,7 +148,7 @@ def new_ref new_refs = dependency.requirements.filter_map do |r| r.dig(:source, "ref") || r.dig(:source, :ref) end.uniq - return new_refs.first if new_refs.count == 1 + new_refs.first if new_refs.count == 1 end def tag_matches_version?(tag, version) diff --git a/common/lib/dependabot/metadata_finders/base/release_finder.rb b/common/lib/dependabot/metadata_finders/base/release_finder.rb index 7eb6bfd1983f..06fb0d07be51 100644 --- a/common/lib/dependabot/metadata_finders/base/release_finder.rb +++ b/common/lib/dependabot/metadata_finders/base/release_finder.rb @@ -189,7 +189,7 @@ def release_body_includes_title?(release) end def version_regex(version) - /(?:[^0-9\.]|\A)#{Regexp.escape(version || "unknown")}\z/ + /(?:[^0-9\.]|\A)#{Regexp.escape(version || 'unknown')}\z/ end def version_class @@ -285,14 +285,14 @@ def previous_ref previous_refs = dependency.previous_requirements.filter_map do |r| r.dig(:source, "ref") || r.dig(:source, :ref) end.uniq - return previous_refs.first if previous_refs.count == 1 + previous_refs.first if previous_refs.count == 1 end def new_ref new_refs = dependency.requirements.filter_map do |r| r.dig(:source, "ref") || r.dig(:source, :ref) end.uniq - return new_refs.first if new_refs.count == 1 + new_refs.first if new_refs.count == 1 end def ref_changed? diff --git a/common/lib/dependabot/pull_request_creator/branch_namer/solo_strategy.rb b/common/lib/dependabot/pull_request_creator/branch_namer/solo_strategy.rb index b87f434bdb66..8c99d6bd4afa 100644 --- a/common/lib/dependabot/pull_request_creator/branch_namer/solo_strategy.rb +++ b/common/lib/dependabot/pull_request_creator/branch_namer/solo_strategy.rb @@ -131,14 +131,14 @@ def previous_ref(dependency) previous_refs = dependency.previous_requirements.filter_map do |r| r.dig(:source, "ref") || r.dig(:source, :ref) end.uniq - return previous_refs.first if previous_refs.count == 1 + previous_refs.first if previous_refs.count == 1 end def new_ref(dependency) new_refs = dependency.requirements.filter_map do |r| r.dig(:source, "ref") || r.dig(:source, :ref) end.uniq - return new_refs.first if new_refs.count == 1 + new_refs.first if new_refs.count == 1 end def ref_changed?(dependency) diff --git a/common/lib/dependabot/pull_request_creator/message_builder.rb b/common/lib/dependabot/pull_request_creator/message_builder.rb index 7d3bfee9d90a..d55b192363ea 100644 --- a/common/lib/dependabot/pull_request_creator/message_builder.rb +++ b/common/lib/dependabot/pull_request_creator/message_builder.rb @@ -622,7 +622,8 @@ def old_library_requirement(dependency) req = old_reqs.first.fetch(:requirement) return req if req - return dependency.previous_ref if dependency.ref_changed? + + dependency.previous_ref if dependency.ref_changed? end def new_library_requirement(dependency) @@ -649,7 +650,7 @@ def library? # Reject any nested child gemspecs/vendored git dependencies root_files = files.map(&:name). select { |p| Pathname.new(p).dirname.to_s == "." } - return true if root_files.select { |nm| nm.end_with?(".gemspec") }.any? + return true if root_files.any? { |nm| nm.end_with?(".gemspec") } dependencies.any? { |d| d.humanized_previous_version.nil? } end diff --git a/docker/lib/dependabot/docker/tag.rb b/docker/lib/dependabot/docker/tag.rb index 72011dea3da1..dfbd7db0bd57 100644 --- a/docker/lib/dependabot/docker/tag.rb +++ b/docker/lib/dependabot/docker/tag.rb @@ -100,7 +100,7 @@ def format # candidate for "21-ea-32", since it's the only one that respects that # format. if version.match?(WORDS_WITH_BUILD) - return :"#{version.match(WORDS_WITH_BUILD).to_s.gsub(/-[0-9]+/, "-")}" + return :"#{version.match(WORDS_WITH_BUILD).to_s.gsub(/-[0-9]+/, '-')}" end :normal diff --git a/docker/lib/dependabot/docker/update_checker.rb b/docker/lib/dependabot/docker/update_checker.rb index f8da4e513417..db806b3d08c9 100644 --- a/docker/lib/dependabot/docker/update_checker.rb +++ b/docker/lib/dependabot/docker/update_checker.rb @@ -76,7 +76,7 @@ def version_up_to_date? def version_tag_up_to_date? version = dependency.version - return unless version + return false unless version return true unless version_tag.comparable? diff --git a/gradle/lib/dependabot/gradle/metadata_finder.rb b/gradle/lib/dependabot/gradle/metadata_finder.rb index 3744ddb1f651..e4896b0614ec 100644 --- a/gradle/lib/dependabot/gradle/metadata_finder.rb +++ b/gradle/lib/dependabot/gradle/metadata_finder.rb @@ -28,7 +28,8 @@ def look_up_source artifact = dependency.name.split(":").last return tmp_source if tmp_source.repo.end_with?(artifact) - return tmp_source if repo_has_subdir_for_dep?(tmp_source) + + tmp_source if repo_has_subdir_for_dep?(tmp_source) end def repo_has_subdir_for_dep?(tmp_source) diff --git a/hex/lib/dependabot/hex/file_fetcher.rb b/hex/lib/dependabot/hex/file_fetcher.rb index cb737baa21e9..e48ba1819edb 100644 --- a/hex/lib/dependabot/hex/file_fetcher.rb +++ b/hex/lib/dependabot/hex/file_fetcher.rb @@ -86,7 +86,7 @@ def support_files mixfiles.flat_map do |mixfile| mixfile_dir = mixfile.path.to_s.delete_prefix("/").delete_suffix("/mix.exs") - mixfile.content.gsub(/__DIR__/, "\"#{mixfile_dir}\"").scan(SUPPORT_FILE).map do |support_file_args| + mixfile.content.gsub("__DIR__", "\"#{mixfile_dir}\"").scan(SUPPORT_FILE).map do |support_file_args| path = Pathname.new(File.join(*support_file_args.compact.reverse)). cleanpath.to_path fetch_file_from_host(path).tap { |f| f.support_file = true } diff --git a/hex/lib/dependabot/hex/file_updater/lockfile_updater.rb b/hex/lib/dependabot/hex/file_updater/lockfile_updater.rb index e6f8cff7d083..08b21ebe34f1 100644 --- a/hex/lib/dependabot/hex/file_updater/lockfile_updater.rb +++ b/hex/lib/dependabot/hex/file_updater/lockfile_updater.rb @@ -52,7 +52,7 @@ def post_process_lockfile(content) return content if content.start_with?("%{\"") # Substitute back old file beginning and ending - content.sub(/\A%\{\n "/, "%{\"").sub(/\},\n\}/, "}}") + content.sub(/\A%\{\n "/, "%{\"").sub("},\n}", "}}") end def write_temporary_dependency_files diff --git a/maven/lib/dependabot/maven/file_parser.rb b/maven/lib/dependabot/maven/file_parser.rb index b53729123bac..43fa15d0e99c 100644 --- a/maven/lib/dependabot/maven/file_parser.rb +++ b/maven/lib/dependabot/maven/file_parser.rb @@ -90,7 +90,7 @@ def dependency_from_dependency_node(pom, dependency_node) return if internal_dependency_names.include?(name) classifier = dependency_classifier(dependency_node, pom) - name = classifier ? "#{name}:#{classifier}" : name + name = "#{name}:#{classifier}" if classifier build_dependency(pom, dependency_node, name) end diff --git a/maven/lib/dependabot/maven/file_parser/property_value_finder.rb b/maven/lib/dependabot/maven/file_parser/property_value_finder.rb index 13ffe7bf8a2e..9ac4ab2db70a 100644 --- a/maven/lib/dependabot/maven/file_parser/property_value_finder.rb +++ b/maven/lib/dependabot/maven/file_parser/property_value_finder.rb @@ -42,7 +42,6 @@ def property_details(property_name:, callsite_pom:) break unless nm.match?(DOT_SEPARATOR_REGEX) nm = nm.sub(DOT_SEPARATOR_REGEX, "/") - rescue Nokogiri::XML::XPath::SyntaxError => e raise DependencyFileNotEvaluatable, e.message end diff --git a/maven/lib/dependabot/maven/metadata_finder.rb b/maven/lib/dependabot/maven/metadata_finder.rb index a3fff8dfc16d..e1322fe439c6 100644 --- a/maven/lib/dependabot/maven/metadata_finder.rb +++ b/maven/lib/dependabot/maven/metadata_finder.rb @@ -26,7 +26,8 @@ def look_up_source return unless tmp_source return tmp_source if tmp_source.repo.end_with?(dependency_artifact_id) - return tmp_source if repo_has_subdir_for_dep?(tmp_source) + + tmp_source if repo_has_subdir_for_dep?(tmp_source) end def repo_has_subdir_for_dep?(tmp_source) diff --git a/npm_and_yarn/lib/dependabot/npm_and_yarn/file_updater.rb b/npm_and_yarn/lib/dependabot/npm_and_yarn/file_updater.rb index ac44e3f7c7e6..1943289783a9 100644 --- a/npm_and_yarn/lib/dependabot/npm_and_yarn/file_updater.rb +++ b/npm_and_yarn/lib/dependabot/npm_and_yarn/file_updater.rb @@ -111,7 +111,7 @@ def pnp_updater def filtered_dependency_files @filtered_dependency_files ||= - if dependencies.select(&:top_level?).any? + if dependencies.any?(&:top_level?) DependencyFilesFilterer.new( dependency_files: dependency_files, updated_dependencies: dependencies diff --git a/npm_and_yarn/lib/dependabot/npm_and_yarn/file_updater/npm_lockfile_updater.rb b/npm_and_yarn/lib/dependabot/npm_and_yarn/file_updater/npm_lockfile_updater.rb index 2f380b875b8f..95f232cd206a 100644 --- a/npm_and_yarn/lib/dependabot/npm_and_yarn/file_updater/npm_lockfile_updater.rb +++ b/npm_and_yarn/lib/dependabot/npm_and_yarn/file_updater/npm_lockfile_updater.rb @@ -552,7 +552,7 @@ def detect_indentation(json) return "" if indentation.nil? # let npm set the default if we can't detect any indentation indentation_size = indentation.length - indentation_type = indentation.scan(/\t/).any? ? "\t" : " " + indentation_type = indentation.scan("\t").any? ? "\t" : " " indentation_type * indentation_size end diff --git a/npm_and_yarn/lib/dependabot/npm_and_yarn/file_updater/package_json_updater.rb b/npm_and_yarn/lib/dependabot/npm_and_yarn/file_updater/package_json_updater.rb index 78751a1b596b..28eab9a3d798 100644 --- a/npm_and_yarn/lib/dependabot/npm_and_yarn/file_updater/package_json_updater.rb +++ b/npm_and_yarn/lib/dependabot/npm_and_yarn/file_updater/package_json_updater.rb @@ -214,7 +214,7 @@ def update_package_json_sections(sections, content, old_line, # # TODO: Move this logic to the UpdateChecker (and parse peer deps) sections += ["peerDependencies"] - sections_regex = /#{sections.join("|")}/ + sections_regex = /#{sections.join('|')}/ declaration_blocks = [] diff --git a/nuget/lib/dependabot/nuget/metadata_finder.rb b/nuget/lib/dependabot/nuget/metadata_finder.rb index 77c12ce02912..9b124f3e4d08 100644 --- a/nuget/lib/dependabot/nuget/metadata_finder.rb +++ b/nuget/lib/dependabot/nuget/metadata_finder.rb @@ -121,7 +121,7 @@ def dependency_nuspec_url source = dependency.requirements. find { |r| r&.fetch(:source) }&.fetch(:source) - return source.fetch(:nuspec_url) if source&.key?(:nuspec_url) + source.fetch(:nuspec_url) if source&.key?(:nuspec_url) end def dependency_source_url diff --git a/python/lib/dependabot/python/file_parser/pyproject_files_parser.rb b/python/lib/dependabot/python/file_parser/pyproject_files_parser.rb index 052466deaf86..cff713078064 100644 --- a/python/lib/dependabot/python/file_parser/pyproject_files_parser.rb +++ b/python/lib/dependabot/python/file_parser/pyproject_files_parser.rb @@ -228,7 +228,7 @@ def write_temporary_pyproject end def parsed_lockfile - return parsed_poetry_lock if poetry_lock + parsed_poetry_lock if poetry_lock end def poetry_lock diff --git a/python/lib/dependabot/python/update_checker.rb b/python/lib/dependabot/python/update_checker.rb index 4ebd4b1709b8..0e3562dd2d99 100644 --- a/python/lib/dependabot/python/update_checker.rb +++ b/python/lib/dependabot/python/update_checker.rb @@ -257,7 +257,7 @@ def poetry_based? end def library? - return unless updating_pyproject? + return false unless updating_pyproject? # Hit PyPi and check whether there are details for a library with a # matching name and description diff --git a/python/lib/dependabot/python/update_checker/pipenv_version_resolver.rb b/python/lib/dependabot/python/update_checker/pipenv_version_resolver.rb index 634082668c01..60b2adbc9e81 100644 --- a/python/lib/dependabot/python/update_checker/pipenv_version_resolver.rb +++ b/python/lib/dependabot/python/update_checker/pipenv_version_resolver.rb @@ -39,7 +39,7 @@ class PipenvVersionResolver UNSUPPORTED_DEPS = %w(pyobjc).freeze UNSUPPORTED_DEP_REGEX = - /Could not find a version that satisfies the requirement.*(?:#{UNSUPPORTED_DEPS.join("|")})/ + /Could not find a version that satisfies the requirement.*(?:#{UNSUPPORTED_DEPS.join('|')})/ PIPENV_RANGE_WARNING = /Warning:\sPython\s[<>].* was not found/ # rubocop:enable Layout/LineLength diff --git a/python/spec/dependabot/python/update_checker/poetry_version_resolver_spec.rb b/python/spec/dependabot/python/update_checker/poetry_version_resolver_spec.rb index caff3a515bf4..1cac7671eea9 100644 --- a/python/spec/dependabot/python/update_checker/poetry_version_resolver_spec.rb +++ b/python/spec/dependabot/python/update_checker/poetry_version_resolver_spec.rb @@ -71,7 +71,7 @@ context "with a dependency defined under dev-dependencies" do let(:pyproject_content) do - super().gsub(/\[tool\.poetry\.dependencies\]/, "[tool.poetry.dev-dependencies]") + super().gsub("[tool.poetry.dependencies]", "[tool.poetry.dev-dependencies]") end it { is_expected.to eq(Gem::Version.new("2.18.4")) } @@ -79,7 +79,7 @@ context "with a dependency defined under a group" do let(:pyproject_content) do - super().gsub(/\[tool\.poetry\.dependencies\]/, "[tool.poetry.group.dev.dependencies]") + super().gsub("[tool.poetry.dependencies]", "[tool.poetry.group.dev.dependencies]") end it { is_expected.to eq(Gem::Version.new("2.18.4")) } @@ -87,7 +87,7 @@ context "with a dependency defined under a non-dev group" do let(:pyproject_content) do - super().gsub(/\[tool\.poetry\.dependencies\]/, "[tool.poetry.group.docs.dependencies]") + super().gsub("[tool.poetry.dependencies]", "[tool.poetry.group.docs.dependencies]") end it { is_expected.to eq(Gem::Version.new("2.18.4")) } diff --git a/terraform/lib/dependabot/terraform/update_checker.rb b/terraform/lib/dependabot/terraform/update_checker.rb index 838d82d8c5ab..984d01037b9c 100644 --- a/terraform/lib/dependabot/terraform/update_checker.rb +++ b/terraform/lib/dependabot/terraform/update_checker.rb @@ -16,7 +16,8 @@ class UpdateChecker < Dependabot::UpdateCheckers::Base def latest_version return latest_version_for_git_dependency if git_dependency? return latest_version_for_registry_dependency if registry_dependency? - return latest_version_for_provider_dependency if provider_dependency? + + latest_version_for_provider_dependency if provider_dependency? # Other sources (mercurial, path dependencies) just return `nil` end diff --git a/updater/Gemfile.lock b/updater/Gemfile.lock index b59d55f07cc6..8af4338d0794 100644 --- a/updater/Gemfile.lock +++ b/updater/Gemfile.lock @@ -142,6 +142,7 @@ GEM aws-sigv4 (~> 1.1) aws-sigv4 (1.6.0) aws-eventstream (~> 1, >= 1.0.2) + base64 (0.1.1) citrus (3.0.2) commonmarker (0.23.10) crack (0.4.5) @@ -187,6 +188,7 @@ GEM reline (>= 0.3.0) jmespath (1.6.2) json (2.6.3) + language_server-protocol (3.17.0.3) licensed (4.4.0) json (~> 2.6) licensee (~> 9.16) @@ -254,14 +256,16 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) rspec-support (3.12.0) - rubocop (1.50.2) + rubocop (1.56.0) + base64 (~> 0.1.1) json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.0.0) + parser (>= 3.2.2.3) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.0, < 2.0) + rubocop-ast (>= 1.28.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.29.0) @@ -322,7 +326,7 @@ DEPENDENCIES licensed (~> 4.4) octokit (= 6.1.1) rspec (~> 3.12) - rubocop (~> 1.50.0) + rubocop (~> 1.56.0) rubocop-performance (~> 1.19.0) sentry-raven (~> 3.1) terminal-table (~> 3.0.2)