From 085ccd0d6206ca6b2871b948b47b09c7cb04d1d2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Dec 2023 15:40:23 +0000
Subject: [PATCH] Update rubocop requirement from 1.57.2 to 1.58.0 (#19)

* Update rubocop requirement from 1.57.2 to 1.58.0

Updates the requirements on [rubocop](https://github.com/rubocop/rubocop) to permit the latest version.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.57.2...v1.58.0)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* Apply latest RuboCop suggestions

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Matt Brictson <matt@mattbrictson.com>
---
 Gemfile                                         | 2 +-
 lib/nextgen/actions/git.rb                      | 4 ++--
 template/app/controllers/concerns/basic_auth.rb | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index f8ba666..5819f4c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ gemspec
 gem "minitest", "~> 5.11"
 gem "minitest-reporters", "~> 1.3"
 gem "rake", "~> 13.0"
-gem "rubocop", "1.57.2"
+gem "rubocop", "1.58.0"
 gem "rubocop-minitest", "0.33.0"
 gem "rubocop-packaging", "0.5.2"
 gem "rubocop-performance", "1.19.1"
diff --git a/lib/nextgen/actions/git.rb b/lib/nextgen/actions/git.rb
index 7eb05f4..cef6dd4 100644
--- a/lib/nextgen/actions/git.rb
+++ b/lib/nextgen/actions/git.rb
@@ -13,7 +13,7 @@ def say_git(message)
     def apply_as_git_commit(path, message: nil)
       say message, :cyan if message
       @commit_messages = []
-      initially_clean = (git_working? && git_status == :clean)
+      initially_clean = git_working? && git_status == :clean
       say_status :apply, File.basename(path)
       apply path, verbose: false
       return if !initially_clean || git_status == :clean
@@ -35,7 +35,7 @@ def git_commit_all(msg)
     def git_working?
       return @git_working if defined?(@git_working)
 
-      @git_working = (git_status != :error && git_user_configured?)
+      @git_working = git_status != :error && git_user_configured?
     end
 
     def git_user_configured?
diff --git a/template/app/controllers/concerns/basic_auth.rb b/template/app/controllers/concerns/basic_auth.rb
index 03b64f7..ced8aad 100644
--- a/template/app/controllers/concerns/basic_auth.rb
+++ b/template/app/controllers/concerns/basic_auth.rb
@@ -13,7 +13,7 @@ def require_basic_auth
     return true if expected_username.blank? || expected_password.blank?
 
     authenticate_or_request_with_http_basic do |username, password|
-      ActiveSupport::SecurityUtils.secure_compare(username, expected_username) & \
+      ActiveSupport::SecurityUtils.secure_compare(username, expected_username) &
         ActiveSupport::SecurityUtils.secure_compare(password, expected_password)
     end
   end