rubocop: Fix Style cops #180
Merged
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
ekohl
reviewed
Jun 9, 2024
|
|
||
| # Offense count: 1 | ||
| # This cop supports unsafe autocorrection (--autocorrect-all). | ||
| Style/RedundantSort: |
ekohl
reviewed
Jun 9, 2024
| @@ -379,9 +371,6 @@ def self.facter_version_to_loose_requirement_string(version) | |||
| elsif /\A[0-9]+\Z/.match?(version) | |||
| # Interpret 3 as < 4 | |||
| "< #{version.to_i + 1}" | |||
| else | |||
| # This would be the same as the strict requirement | |||
There was a problem hiding this comment.
I originally wrote this because it explicitly documents the flow. Is it worth keeping that?
ekohl
requested changes
Jun 9, 2024
| unless metadata['operatingsystem_support'].is_a? Array | ||
| fail StandardError, 'Unknown operatingsystem support in the metadata file!' | ||
| end | ||
| raise StandardError, 'Unknown operatingsystem support in the metadata file!' unless metadata['operatingsystem_support'].is_a? Array |
There was a problem hiding this comment.
I'd say this is less readable. Can we disable the guard condition cop?
| unless File.file? metadata_file | ||
| fail StandardError, "Can't find metadata.json... dunno why" | ||
| end | ||
| raise StandardError, "Can't find metadata.json... dunno why" unless File.file? metadata_file |
| @@ -397,13 +386,13 @@ def self.facter_version_for_puppet_version(puppet_version) | |||
| fd = File.open(json_path, 'rb:UTF-8') | |||
| data = JSON.parse(fd.read) | |||
|
|
|||
| version_map = data.map { |_, versions| | |||
| version_map = data.map do |_, versions| | |||
There was a problem hiding this comment.
In #183 I do more refactoring that I think helps. I'd expect .map.compact to be flagged in rubocop-performance.
| if augeas? | ||
| @common_facts[:augeasversion] = Augeas.open(nil, nil, Augeas::NO_MODL_AUTOLOAD).get('/augeas/version') | ||
| end | ||
| @common_facts[:augeasversion] = Augeas.open(nil, nil, Augeas::NO_MODL_AUTOLOAD).get('/augeas/version') if augeas? |
There was a problem hiding this comment.
I'm not happy with the condition given the line length. AFAIK the guard condition cop supports line lengths, but we disabled that cop so the guard condition cop is too trigger happy.
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.
No description provided.