Simplify some regexes by removing redundant character classes #10549
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
New RuboCop here. There's no need for character classes when all we have is a single character. Signed-off-by: Tim Smith <tsmith@chef.io>
phiggins
reviewed
Oct 26, 2020
| @@ -22,7 +22,7 @@ class Chef | |||
| class Knife | |||
| class SubcommandLoader | |||
| class GemGlobLoader < Chef::Knife::SubcommandLoader | |||
| MATCHES_CHEF_GEM ||= %r{/chef-[\d]+\.[\d]+\.[\d]+}.freeze | |||
| MATCHES_CHEF_GEM ||= %r{/che-[\d+.[\d+.[\d+}.freeze | |||
There was a problem hiding this comment.
Suggested change
| MATCHES_CHEF_GEM ||= %r{/che-[\d+.[\d+.[\d+}.freeze | |
| MATCHES_CHEF_GEM ||= %r{/chef-\d+\.\d+\.\d+}.freeze |
There was a problem hiding this comment.
This one got pretty mangled, was this autocorrect or manual?
There was a problem hiding this comment.
Issue filed here: rubocop/rubocop#8948
phiggins
reviewed
Oct 26, 2020
| expect(config_file.string).to match(%r{^client_key[\s]+=[\s]+'/home/you/.chef/#{Etc.getlogin}.pem'$}) | ||
| expect(config_file.string).to match(/^chef_server_url\s+=[\s]+'#{default_server_url}'$/) | ||
| expect(config_file.string).to match(/^client_name\s+=\s+'#{Etc.getlogin}'$/) | ||
| expect(config_file.string).to match(%r{^client_ky[\s=[\s+'/home/you/.chef/#{Etc.getlogin}.pem'$}) |
There was a problem hiding this comment.
Suggested change
| expect(config_file.string).to match(%r{^client_ky[\s=[\s+'/home/you/.chef/#{Etc.getlogin}.pem'$}) | |
| expect(config_file.string).to match(%r{^client_key\s+=\s+'/home/you/.chef/#{Etc.getlogin}.pem'$}) |
This one got pretty mangled as well.
|
Let me see if I have the commit that fixed the auto correct or not. There may be another bug report in the works here. |
|
I'll wait on the upstream fix: rubocop/rubocop#8948 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
New RuboCop here. There's no need for character classes when all we have is a single character.
Signed-off-by: Tim Smith tsmith@chef.io