(FACT-3428) Style/SoleNestedConditional

Combine conditional logic

Author: joshcooper

.rubocop_todo.yml

@@ -266,14 +266,6 @@ Style/RedundantParentheses:
   Exclude:
     - 'lib/facter/custom_facts/core/execution/posix.rb'
 
-# Offense count: 3
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowModifier.
-Style/SoleNestedConditional:
-  Exclude:
-    - 'lib/facter/framework/core/options/config_file_options.rb'
-    - 'scripts/generate_changelog.rb'
-
 # Offense count: 8
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.

lib/facter/framework/core/options/config_file_options.rb

@@ -60,10 +60,8 @@ def augment_cli(file_cli_conf)
       def augment_custom(file_global_conf)
         return unless file_global_conf
 
-        if Options.cli?
-          unless file_global_conf['no-custom-facts'].nil?
-            @options[:no_custom_facts] = file_global_conf['no-custom-facts']
-          end
+        if Options.cli? && !file_global_conf['no-custom-facts'].nil?
+          @options[:no_custom_facts] = file_global_conf['no-custom-facts']
         end
 
         @options[:custom_dir] = file_global_conf['custom-dir'] unless file_global_conf['custom-dir'].nil?
@@ -73,8 +71,8 @@ def augment_custom(file_global_conf)
       def augment_external(global_conf)
         return unless global_conf
 
-        if Options.cli?
-          @options[:no_external_facts] = global_conf['no-external-facts'] unless global_conf['no-external-facts'].nil?
+        if Options.cli? && !global_conf['no-external-facts'].nil?
+          @options[:no_external_facts] = global_conf['no-external-facts']
         end
 
         @options[:external_dir] = [global_conf['external-dir']].flatten unless global_conf['external-dir'].nil?

scripts/generate_changelog.rb

@@ -79,8 +79,8 @@ def parse_commit(commit)
     prs.each do |pr|
       next if pr[:state] != 'closed' && pr[:merged_at].nil?
 
-      if pr[:labels].nil? || pr[:labels].empty?
-        unlabeled_prs << pr[:html_url] unless unlabeled_prs.include?(pr[:html_url])
+      if (pr[:labels].nil? || pr[:labels].empty?) && !unlabeled_prs.include?(pr[:html_url])
+        unlabeled_prs << pr[:html_url]
       end
 
       pr[:labels].each do |label|