(PUP-11993) Style/RedundantCondition

This commit enables the Style/RedundantCondition cop and fixes 20
autocorrectable offenses.

Author: AriaXLi

.rubocop_todo.yml

@@ -646,23 +646,6 @@ Style/OptionalBooleanParameter:
 Style/PreferredHashMethods:
   Enabled: false
 
-# This cop supports safe auto-correction (--auto-correct).
-Style/RedundantCondition:
-  Exclude:
-    - 'ext/windows/service/daemon.rb'
-    - 'lib/puppet/application/describe.rb'
-    - 'lib/puppet/environments.rb'
-    - 'lib/puppet/external/dot.rb'
-    - 'lib/puppet/graph/simple_graph.rb'
-    - 'lib/puppet/indirector/request.rb'
-    - 'lib/puppet/parser/templatewrapper.rb'
-    - 'lib/puppet/provider/package/blastwave.rb'
-    - 'lib/puppet/provider/package/pkgutil.rb'
-    - 'lib/puppet/provider/package/portage.rb'
-    - 'lib/puppet/type.rb'
-    - 'lib/puppet/util/command_line/trollop.rb'
-    - 'lib/puppet/util/inifile.rb'
-
 # This cop supports safe auto-correction (--auto-correct).
 Style/RedundantConditional:
   Exclude:

ext/windows/service/daemon.rb

@@ -182,7 +182,7 @@ def parse_log_level(puppet_path, cmdline_debug)
       loglevel = :notice
     end
 
-    LEVELS.index(cmdline_debug ? cmdline_debug : loglevel.to_sym)
+    LEVELS.index(cmdline_debug || loglevel.to_sym)
   end
 
   private

lib/puppet/application/describe.rb

@@ -11,7 +11,7 @@ def wrap(txt, opts)
     return "" unless txt && !txt.empty?
 
     work = (opts[:scrub] ? scrub(txt) : txt)
-    indent = (opts[:indent] ? opts[:indent] : 0)
+    indent = (opts[:indent] || 0)
     textLen = @width - indent
     patt = Regexp.new("\\A(.{0,#{textLen}})[ \n]")
     prefix = " " * indent

lib/puppet/environments.rb

@@ -35,11 +35,7 @@ module EnvironmentLoader
     # @!macro loader_get_or_fail
     def get!(name)
       environment = get(name)
-      if environment
-        environment
-      else
-        raise EnvironmentNotFound, name
-      end
+      environment || raise(EnvironmentNotFound, name)
     end
 
     def clear_all

lib/puppet/external/dot.rb

@@ -119,7 +119,7 @@ class DOTSimpleElement
     attr_accessor :name
 
     def initialize(params = {})
-      @label = params['name'] ? params['name'] : ''
+      @label = params['name'] || ''
     end
 
     def to_s
@@ -135,8 +135,8 @@ class DOTElement < DOTSimpleElement
 
     def initialize(params = {}, option_list = [])
       super(params)
-      @name   = params['name']   ? params['name']   : nil
-      @parent = params['parent'] ? params['parent'] : nil
+      @name   = params['name']   || nil
+      @parent = params['parent'] || nil
       @options = {}
       option_list.each { |i|
         @options[i] = params[i] if params[i]
@@ -161,7 +161,7 @@ class DOTPort < DOTSimpleElement
 
     def initialize(params = {})
       super(params)
-      @name = params['label'] ? params['label'] : ''
+      @name = params['label'] || ''
     end
 
     def to_s
@@ -174,7 +174,7 @@ def to_s
   class DOTNode < DOTElement
     def initialize(params = {}, option_list = NODE_OPTS)
       super(params, option_list)
-      @ports = params['ports'] ? params['ports'] : []
+      @ports = params['ports'] || []
     end
 
     def each_port
@@ -233,7 +233,7 @@ def stringify(s)
   class DOTSubgraph < DOTElement
     def initialize(params = {}, option_list = GRAPH_OPTS)
       super(params, option_list)
-      @nodes      = params['nodes'] ? params['nodes'] : []
+      @nodes      = params['nodes'] || []
       @dot_string = 'graph'
     end
 
@@ -287,8 +287,8 @@ class DOTEdge < DOTElement
 
     def initialize(params = {}, option_list = EDGE_OPTS)
       super(params, option_list)
-      @from = params['from'] ? params['from'] : nil
-      @to   = params['to'] ? params['to'] : nil
+      @from = params['from'] || nil
+      @to   = params['to'] || nil
     end
 
     def edge_link

lib/puppet/graph/simple_graph.rb

@@ -449,7 +449,7 @@ def path_between(f, t)
   # which match +dot+ properties will be used as well.
   def to_dot_graph(params = {})
     params['name'] ||= self.class.name.tr(':', '_')
-    fontsize   = params['fontsize'] ? params['fontsize'] : '8'
+    fontsize   = params['fontsize'] || '8'
     graph      = (directed? ? DOT::DOTDigraph : DOT::DOTSubgraph).new(params)
     edge_klass = directed? ? DOT::DOTDirectedEdge : DOT::DOTEdge
     vertices.each do |v|

lib/puppet/indirector/request.rb

@@ -140,7 +140,7 @@ def to_hash
   end
 
   def description
-    return(uri ? uri : "/#{indirection_name}/#{key}")
+    return(uri || "/#{indirection_name}/#{key}")
   end
 
   def remote?

lib/puppet/parser/templatewrapper.rb

@@ -100,6 +100,6 @@ def result(string = nil)
   end
 
   def to_s
-    "template[#{(@__file__ ? @__file__ : "inline")}]"
+    "template[#{(@__file__ || "inline")}]"
   end
 end

lib/puppet/provider/package/blastwave.rb

@@ -95,11 +95,7 @@ def latest
 
   def query
     hash = self.class.blastlist(:justme => @resource[:name])
-    if hash
-      hash
-    else
-      { :ensure => :absent }
-    end
+    hash || { :ensure => :absent }
   end
 
   # Remove the old package, and install the new one

lib/puppet/provider/package/pkgutil.rb

@@ -172,11 +172,7 @@ def latest
 
   def query
     hash = pkgsingle(@resource)
-    if hash
-      hash
-    else
-      { :ensure => :absent }
-    end
+    hash || { :ensure => :absent }
   end
 
   def update