Skip to content

Commit 72ae626

Browse files
authored
Merge pull request #5959 from dependabot/dependabot/bundler/common/rubocop-tw-1.37.1
Update rubocop requirement from ~> 1.36.0 to ~> 1.37.1 in /common
2 parents 28689c4 + bdff698 commit 72ae626

File tree

9 files changed

+12
-9
lines changed

9 files changed

+12
-9
lines changed

common/dependabot-common.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Gem::Specification.new do |spec|
4141
spec.add_development_dependency "rake", "~> 13"
4242
spec.add_development_dependency "rspec", "~> 3.8"
4343
spec.add_development_dependency "rspec-its", "~> 1.2"
44-
spec.add_development_dependency "rubocop", "~> 1.36.0"
44+
spec.add_development_dependency "rubocop", "~> 1.37.1"
4545
spec.add_development_dependency "rubocop-performance", "~> 1.15.0"
4646
spec.add_development_dependency "simplecov", "~> 0.21.0"
4747
spec.add_development_dependency "simplecov-console", "~> 0.9.1"

common/lib/dependabot/errors.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def sanitize_message(message)
1818
return message unless message.is_a?(String)
1919

2020
path_regex =
21-
Regexp.escape(Utils::BUMP_TMP_DIR_PATH) + "\/" +
21+
Regexp.escape(Utils::BUMP_TMP_DIR_PATH) + "\\/" +
2222
Regexp.escape(Utils::BUMP_TMP_FILE_PREFIX) + "[a-zA-Z0-9-]*"
2323

2424
message = message.gsub(/#{path_regex}/, "dependabot_tmp_dir").strip

common/lib/dependabot/pull_request_creator/message_builder/metadata_presenter.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ def build_details_tag(summary:, body:)
153153
msg += body
154154
msg + "</details>\n"
155155
else
156-
"\n\##{summary}\n\n#{body}"
156+
"\n##{summary}\n\n#{body}"
157157
end
158158
end
159159

common/spec/dependabot/pull_request_creator/message_builder/link_and_mention_sanitizer_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@
300300
it do
301301
is_expected.to eq(
302302
"<p>{Issue 111}[https://github-redirect.com/dependabot/" \
303-
"dependabot-core/issues/111\]</p>\n"
303+
"dependabot-core/issues/111]</p>\n"
304304
)
305305
end
306306
end

elm/lib/dependabot/elm/version.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
module Dependabot
1010
module Elm
1111
class Version < Gem::Version
12-
VERSION_PATTERN = "[0-9]+\.[0-9]+\.[0-9]+"
12+
VERSION_PATTERN = "[0-9]+\\.[0-9]+\\.[0-9]+"
1313
VERSION_PATTERN_REGEX = /\A#{VERSION_PATTERN}\Z/
1414

1515
def self.correct?(version)

hex/spec/dependabot/hex/update_checker/file_preparer_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@
210210
it "updates the pin" do
211211
expect(prepared_mixfile.content).to include(
212212
'{:phoenix, ">= 0", github: "dependabot-fixtures/phoenix", ' \
213-
"ref: \'v1.2.1\'}"
213+
"ref: 'v1.2.1'}"
214214
)
215215
end
216216
end

python/lib/dependabot/python/file_updater/pip_compile_file_updater.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,8 @@ def write_updated_dependency_files
213213
end
214214

215215
def install_required_python
216-
return if run_command("pyenv versions").include?("\ #{python_version}")
216+
# The leading space is important
217+
return if run_command("pyenv versions").include?(" #{python_version}")
217218

218219
run_command("pyenv install -s #{python_version}")
219220
run_command("pyenv exec pip install --upgrade pip")

python/lib/dependabot/python/update_checker/pip_compile_version_resolver.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,8 @@ def write_original_manifest_files
320320
end
321321

322322
def install_required_python
323-
return if run_command("pyenv versions").include?("\ #{python_version}")
323+
# The leading space is important
324+
return if run_command("pyenv versions").include?(" #{python_version}")
324325

325326
run_command("pyenv install -s #{python_version}")
326327
run_command("pyenv exec pip install --upgrade pip")

python/lib/dependabot/python/update_checker/pipenv_version_resolver.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,8 @@ def install_required_python
320320
nil
321321
end
322322

323-
return if run_command("pyenv versions").include?("\ #{python_version}")
323+
# The leading space is important
324+
return if run_command("pyenv versions").include?(" #{python_version}")
324325

325326
requirements_path = NativeHelpers.python_requirements_path
326327
run_command("pyenv install -s #{python_version}")

0 commit comments

Comments
 (0)