(PUP-11993) Style/WhileUntilDo

This commit enables the Style/WhileUntilDo cop and fixes 24
autocorrectable offenses.

Author: AriaXLi

.rubocop_todo.yml

@@ -766,10 +766,6 @@ Style/TrivialAccessors:
 Style/WhenThen:
   Enabled: false
 
-# This cop supports safe auto-correction (--auto-correct).
-Style/WhileUntilDo:
-  Enabled: false
-
 # This cop supports safe auto-correction (--auto-correct).
 Style/WhileUntilModifier:
   Exclude:

ext/windows/service/daemon.rb

@@ -75,7 +75,7 @@ def service_main(*argsv)
 
     service = self
     @run_thread = Thread.new do
-      while service.running? do
+      while service.running?
         runinterval = service.parse_runinterval(ruby_puppet_cmd)
 
         if service.state == RUNNING or service.state == IDLE

lib/puppet/application/face_base.rb

@@ -74,7 +74,7 @@ def parse_options
     # non-option word to use as the action.
     action_name = nil
     index       = -1
-    until action_name or (index += 1) >= command_line.args.length do
+    until action_name or (index += 1) >= command_line.args.length
       item = command_line.args[index]
       if item =~ /^-/
         option = @face.options.find do |name|

lib/puppet/face/help.rb

@@ -207,7 +207,7 @@ def horribly_extract_summary_from(appname)
     # depends on the implementation coincidence of how our pages are
     # formatted.  If we can't match the pattern we expect we return the empty
     # string to ensure we don't blow up in the summary. --daniel 2011-04-11
-    while line = help.shift do # rubocop:disable Lint/AssignmentInCondition
+    while line = help.shift # rubocop:disable Lint/AssignmentInCondition
       md = /^puppet-#{appname}\([^)]+\) -- (.*)$/.match(line)
       if md
         return md[1]

lib/puppet/graph/simple_graph.rb

@@ -106,7 +106,7 @@ def tarjan(root, s)
     # decent Ruby stack.
     recur = [{ :node => root }]
 
-    until recur.empty? do
+    until recur.empty?
       frame = recur.last
       vertex = frame[:node]
 
@@ -210,7 +210,7 @@ def paths_in_cycle(cycle, max_paths = 1)
 
     # frame struct is vertex, [path]
     stack = [[cycle.first, []]]
-    while frame = stack.shift do # rubocop:disable Lint/AssignmentInCondition
+    while frame = stack.shift # rubocop:disable Lint/AssignmentInCondition
       if frame[1].member?(frame[0]) then
         found << frame[1] + [frame[0]]
         break if found.length >= max_paths

lib/puppet/http/client.rb

@@ -365,7 +365,7 @@ def execute_streaming(request, options: {}, &block)
     response = nil
     done = false
 
-    until done do
+    until done
       connect(request.uri, options: options) do |http|
         apply_auth(request, basic_auth) if redirects.zero?
 

lib/puppet/pops/parser/epp_support.rb

@@ -44,7 +44,7 @@ def scan_epp
     interpolate_epp
 
     # This is the lexer's main loop
-    until queue.empty? && scn.eos? do
+    until queue.empty? && scn.eos?
       token = queue.shift || lex_token
       if token
         yield [ctx[:after] = token[0], token[1]]

lib/puppet/pops/parser/heredoc_support.rb

@@ -83,7 +83,7 @@ def heredoc
     # (Endline in EBNF form): WS* ('|' WS*)? ('-' WS*)? endtag WS* \r? (\n|$)
     endline_pattern = /([[:blank:]]*)(?:([|])[[:blank:]]*)?(?:(-)[[:blank:]]*)?#{Regexp.escape(endtag)}[[:blank:]]*\r?(?:\n|\z)/
     lines = []
-    until scn.eos? do
+    until scn.eos?
       one_line = scn.scan_until(/(?:\n|\z)/)
       raise eof_error unless one_line
 

lib/puppet/pops/parser/interpolation_support.rb

@@ -194,7 +194,7 @@ def enqueue_until brace_count
 
     scn.skip(self.class::PATTERN_WS)
     queue_size = queue.size
-    until scn.eos? do
+    until scn.eos?
       token = lex_token
       if token
         if token.equal?(queue_base)
@@ -242,7 +242,7 @@ def transform_to_variable(token)
   def interpolate_uq_to(lexer)
     interpolate_uq
     queue = @token_queue
-    until queue.empty? do
+    until queue.empty?
       lexer.enqueue(queue.shift)
     end
   end

lib/puppet/pops/parser/lexer2.rb

@@ -714,7 +714,7 @@ def scan
     scn.skip(PATTERN_WS)
 
     # This is the lexer's main loop
-    until queue.empty? && scn.eos? do
+    until queue.empty? && scn.eos?
       token = queue.shift || selector[scn.peek(1)].call
       if token
         ctx[:after] = token[0]