Merge pull request #1360 from kmuto/method-call-paren

rubocop: make `Style/MethodCallWithArgsParentheses` enable

.rubocop.yml

@@ -193,6 +193,28 @@ Style/LineEndConcatenation:
 Style/MethodCallWithoutArgsParentheses:
   Enabled: true
 
+Style/MethodCallWithArgsParentheses:
+  IgnoredMethods:
+    - 'require'
+    - 'include'
+    - 'file'
+    - 'task'
+    - 'desc'
+    - 'info'
+    - 'gem'
+    - 'exit'
+    - 'print'
+    - 'puts'
+    - 'write'
+    - 'warn'
+    - 'error'
+    - 'raise'
+    - 'yield'
+    - 'source'
+    - 'assert'
+    - 'assert_equal'
+  Enabled: true
+
 Style/MixinUsage:
   Enabled: false
 

bin/review-catalog-converter

@@ -140,7 +140,7 @@ end
 def replace_old_style_part(dir)
   catalog = ReVIEW::Catalog.new(File.open("#{dir}/catalog.yml"))
   Array.new(catalog.parts.split("\n")).each_with_index do |part, part_idx|
-    next if part.end_with? '.re'
+    next if part.end_with?('.re')
 
     allow_overwrite = true
     part_name = sprintf('part%d.re', part_idx + 1)

bin/review-check

@@ -50,7 +50,7 @@ def main
   end
   opts.on('--text', 'Check text.') do
     modes ||= []
-    modes.push :text
+    modes.push(:text)
   end
   opts.on('--help', 'print this message and quit.') do
     puts opts.help
@@ -72,7 +72,7 @@ def main
   modes.each do |mode|
     case mode
     when :text
-      check_text files
+      check_text(files)
     else
       raise 'must not happen'
     end
@@ -122,9 +122,9 @@ def words_re(rc)
     next if line[0, 1] == '#'
     if / !/ =~ line
       line, n = *line.split('!', 2)
-      nega.push n.strip
+      nega.push(n.strip)
     end
-    words.push line.strip
+    words.push(line.strip)
   end
   return Regexp.compile(words.join('|')),
          nega.empty? ? nil : Regexp.compile(nega.join('|'))
@@ -157,7 +157,7 @@ def each_paragraph(f)
         break if line.strip.empty?
         break if %r{\A(?:=|//[\w\}])} =~ line
         next if /\A\#@/ =~ line
-        buf.push line.strip
+        buf.push(line.strip)
       end
       yield buf, lineno
       @review_utils_word_ok = nil

bin/review-checkdep

@@ -28,7 +28,7 @@ def main
         @unprovided[kw] = location
       end
     when /\A\#@provide\((.*)\)/
-      provide $1
+      provide($1)
     else
       line.scan(/@<kw>\{(.*?)[,\}]/) { provide $1 }
     end

bin/review-compile

@@ -88,7 +88,7 @@ def _main
         compiler = ReVIEW::Compiler.new(load_strategy_class(@target, @check_only))
         result = compiler.compile(chap)
         if @output_filename
-          write @output_filename, result
+          write(@output_filename, result)
         else
           puts result unless @check_only
         end
@@ -99,12 +99,12 @@ def _main
       compiler = ReVIEW::Compiler.new(load_strategy_class(@target, @check_only))
       book.chapters.each do |chap|
         str = compiler.compile(chap)
-        write "#{chap.name}#{compiler.strategy.extname}", str unless @check_only
+        write("#{chap.name}#{compiler.strategy.extname}", str) unless @check_only
       end
       # PART
       book.parts_in_file.each do |part|
         str = compiler.compile(part)
-        write "#{part.name}#{compiler.strategy.extname}", str unless @check_only
+        write("#{part.name}#{compiler.strategy.extname}", str) unless @check_only
       end
     else
       raise "must not happen: #{@mode}"

bin/review-index

@@ -45,13 +45,13 @@ def _main
   opts.on('-a', '--all', 'print all chapters.') { source = book }
   opts.on('-p', '--part N', 'list only part N.') do |n|
     source = book.part(Integer(n)) or
-      error_exit "part #{n} does not exist in this book"
+      error_exit("part #{n} does not exist in this book")
   end
   opts.on('-c', '--chapter C', 'list only chapter C.') do |c|
     begin
       source = ReVIEW::Book::Part.new(nil, 1, [book.chapter(c)])
     rescue
-      error_exit "chapter #{c} does not exist in this book"
+      error_exit("chapter #{c} does not exist in this book")
     end
   end
   opts.on('-l', '--level N', 'list upto N level (1..4, default=4)') do |n|
@@ -79,7 +79,7 @@ def _main
   book.load_config(yamlfile) if yamlfile
 
   if source
-    error_exit '-a/-s option and file arguments are exclusive' unless ARGV.empty?
+    error_exit('-a/-s option and file arguments are exclusive') unless ARGV.empty?
   else
     puts opts.help
     exit 0
@@ -88,13 +88,13 @@ def _main
   begin
     printer = printer_class.new(upper, param)
     if source.is_a?(ReVIEW::Book::Part)
-      printer.print_part source
+      printer.print_part(source)
     else
-      printer.print_book source
+      printer.print_book(source)
     end
   rescue ReVIEW::Error, Errno::ENOENT => e
     raise if $DEBUG
-    error_exit e.message
+    error_exit(e.message)
   end
 end
 

bin/review-preproc

@@ -39,7 +39,7 @@ def main
     if ENV['REVIEW_SAFE_MODE'].to_i & 2 > 0
       @logger.warn 'review-preproc-ext.rb is prohibited in safe mode. ignored.'
     else
-      Kernel.load File.expand_path('review-preproc-ext.rb')
+      Kernel.load(File.expand_path('review-preproc-ext.rb'))
     end
   end
 
@@ -71,21 +71,21 @@ def main
     current_file = path
     case mode
     when :output
-      File.open(path) { |f| pp.process f, $stdout }
+      File.open(path) { |f| pp.process(f, $stdout) }
     when :replace
-      File.write "#{path}.pptmp", preproc(pp, path)
-      File.rename "#{path}.pptmp", path
+      File.write("#{path}.pptmp", preproc(pp, path))
+      File.rename("#{path}.pptmp", path)
     when :diff, :check
       tmp = '/tmp/review.pptmp'
       begin
-        File.write tmp, preproc(pp, path)
+        File.write(tmp, preproc(pp, path))
         if mode == :check
-          system "diff -qu #{path} #{tmp} >/dev/null || echo #{path}"
+          system("diff -qu #{path} #{tmp} >/dev/null || echo #{path}")
         else
-          system "diff -u #{path} #{tmp}"
+          system("diff -u #{path} #{tmp}")
         end
       ensure
-        FileUtils.rm_f tmp
+        FileUtils.rm_f(tmp)
       end
     else
       raise "must not happen: #{mode}"
@@ -99,7 +99,7 @@ end
 
 def preproc(pp, path)
   buf = StringIO.new
-  File.open(path) { |f| pp.process f, buf }
+  File.open(path) { |f| pp.process(f, buf) }
   buf.string
 end
 

bin/review-validate

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# Copyright (c) 2010-2017 Kenshi Muto
+# Copyright (c) 2010-2019 Kenshi Muto
 #
 # This program is free software
 # You can distribute or modify this program under the terms of
@@ -48,7 +48,7 @@ ARGF.each do |line|
       @logger.warn "#{ln}: found '*' without the head space. Is it correct?"
     end
   elsif line =~ /\A\s+(\d+\.)\s+/ && line =~ /\A\s+\*\s+/
-    unless Tw[list emlist listnum emlistnum cmd image table].include?(block)
+    unless %w[list emlist listnum emlistnum cmd image table].include?(block)
       @logger.warn "#{ln}: found itemized list or numbered list in #{block}. Is it correct?"
     end
   elsif block == 'table'

bin/review-vol

@@ -69,7 +69,7 @@ def main
     end
   end
   puts '============================='
-  print_volume book.volume # puts "Total #{book.volume}"
+  print_volume(book.volume) # puts "Total #{book.volume}"
 rescue ReVIEW::ApplicationError, Errno::ENOENT => e
   raise if $DEBUG
   @logger.error "#{File.basename($PROGRAM_NAME)}: #{e.message}"
@@ -79,13 +79,13 @@ end
 def print_chapter_volume(chap)
   vol = chap.volume
   title = chap.title
-  printf "%s %3dKB %6dC %5dL %3dP %s %-s\n",
+  printf("%s %3dKB %6dC %5dL %3dP %s %-s\n",
          chapnumstr(chap.number), vol.kbytes, vol.chars, vol.lines, vol.page,
-         "#{chap.name} ".ljust(25, '.'), title
+         "#{chap.name} ".ljust(25, '.'), title)
 end
 
 def print_volume(vol)
-  printf "    %3dKB %6dC %5dL %3dP\n", vol.kbytes, vol.chars, vol.lines, vol.page
+  printf("    %3dKB %6dC %5dL %3dP\n", vol.kbytes, vol.chars, vol.lines, vol.page)
 end
 
 def chapnumstr(n)

lib/review/book.rb

@@ -19,7 +19,7 @@
 module ReVIEW
   module Book
     def self.load(dir)
-      Base.load dir
+      Base.load(dir)
     end
   end
 end

lib/review/book/base.rb

@@ -189,7 +189,7 @@ def catalog
         return @catalog if @catalog.present?
 
         catalogfile_path = filename_join(@basedir, config['catalogfile'])
-        if File.file? catalogfile_path
+        if File.file?(catalogfile_path)
           @catalog = File.open(catalogfile_path, 'rt:BOM|utf-8') { |f| Catalog.new(f) }
         end
         if @catalog
@@ -300,13 +300,13 @@ def read_parts
         list = parse_chapters
         # NOTE: keep this = style to work this logic.
         if pre = prefaces
-          list.unshift pre
+          list.unshift(pre)
         end
         if app = appendix
-          list.push app
+          list.push(app)
         end
         if post = postscripts
-          list.push post
+          list.push(post)
         end
         list
       end

lib/review/book/index.rb

@@ -21,7 +21,7 @@ def self.parse(src, *args)
         seq = 1
         src.grep(%r{\A//#{item_type}}) do |line|
           if id = line.slice(/\[(.*?)\]/, 1)
-            items.push item_class.new(id, seq)
+            items.push(item_class.new(id, seq))
             seq += 1
             if id.empty?
               ReVIEW.logger.warn "warning: no ID of #{item_type} in #{line}"
@@ -144,7 +144,7 @@ def self.parse(src)
           if m = /\[(.*?)\]\[(.*)\]/.match(line)
             m1 = m[1].gsub(/\\(\])/) { $1 }
             m2 = m[2].gsub(/\\(\])/) { $1 }
-            items.push Item.new(m1, seq, m2)
+            items.push(Item.new(m1, seq, m2))
           end
           seq += 1
         end
@@ -161,9 +161,9 @@ def self.parse(src, *args)
           elements = line.split(/\[(.*?)\]/)
           if elements[1].present?
             if line =~ %r{\A//imgtable}
-              items.push item_class.new(elements[1], 0, elements[3])
+              items.push(item_class.new(elements[1], 0, elements[3]))
             else ## %r<\A//(image|graph)>
-              items.push item_class.new(elements[1], seq, elements[3])
+              items.push(item_class.new(elements[1], seq, elements[3]))
               seq += 1
             end
             if elements[1] == ''
@@ -203,7 +203,7 @@ def path
       attr_reader :image_finder
 
       def initialize(items, chapid, basedir, types, builder)
-        super items
+        super(items)
         items.each do |i|
           i.index = self
         end
@@ -237,7 +237,7 @@ def self.parse(src, *args)
         seq = 1
         src.grep(/@<icon>/) do |line|
           line.gsub(/@<icon>\{(.+?)\}/) do
-            items.push item_class.new($1, seq)
+            items.push(item_class.new($1, seq))
             seq += 1
           end
         end
@@ -255,7 +255,7 @@ def self.parse(src)
           if m = /\[(.*?)\]\[(.*)\]/.match(line)
             m1 = m[1].gsub(/\\(.)/) { $1 }
             m2 = m[2].gsub(/\\(.)/) { $1 }
-            items.push Item.new(m1, seq, m2)
+            items.push(Item.new(m1, seq, m2))
           end
           seq += 1
         end
@@ -349,11 +349,11 @@ def self.parse(src, chap)
 
           if %w[nonum notoc nodisp].include?(m[2])
             headlines[index] = m[3].present? ? m[3].strip : m[4].strip
-            items.push Item.new(headlines.join('|'), nil, m[4].strip)
+            items.push(Item.new(headlines.join('|'), nil, m[4].strip))
           else
             indexs[index] += 1
             headlines[index] = m[3].present? ? m[3].strip : m[4].strip
-            items.push Item.new(headlines.join('|'), indexs.dup, m[4].strip)
+            items.push(Item.new(headlines.join('|'), indexs.dup, m[4].strip))
           end
         end
         new(items, chap)
@@ -401,7 +401,7 @@ def self.parse(src, *_args)
           caption = m[3].strip
           id = caption if id.nil? || id.empty?
 
-          items.push item_class.new(id, seq, caption)
+          items.push(item_class.new(id, seq, caption))
           seq += 1
         end
         new(items)