Update to Rubocop 1.45.1

.github/workflows/rubocop.yml

@@ -0,0 +1,31 @@
+name: Lint by RuboCop
+
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+
+jobs:
+  build:
+
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ['2.7', '3.0', '3.1', '3.2']
+        os: [ubuntu-latest]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: fix ImageMagick policy.xml on Linux
+      if: runner.os == 'Linux'
+      run: sudo sed -i 's/none/read|write/g' /etc/ImageMagick-6/policy.xml
+    - name: Build and test with Rake
+      run: |
+        gem install bundler --no-document
+        bundle install --retry 3
+        bundle exec rubocop -P

.github/workflows/ruby.yml

@@ -28,4 +28,4 @@ jobs:
       run: |
         gem install bundler --no-document
         bundle install --retry 3
-        bundle exec rake
+        bundle exec rake test

.rubocop.yml

@@ -5,7 +5,7 @@ AllCops:
     - tmp/*
   DisplayCopNames: true
   NewCops: enable
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.7
 
 require:
   - rubocop-performance
@@ -38,6 +38,9 @@ Performance/StringInclude:
 Performance/CollectionLiteralInLoop:
   Enabled: false
 
+Performance/MapCompact:
+  Enabled: false
+
 #### Style
 
 Style/AsciiComments:
@@ -109,7 +112,7 @@ Style/LineEndConcatenation:
   Enabled: false
 
 Style/MethodCallWithArgsParentheses:
-  IgnoredMethods:
+  AllowedMethods:
     - 'require'
     - 'include'
     - 'file'
@@ -194,6 +197,9 @@ Style/OptionalBooleanParameter:
 Style/CombinableLoops:
   Enabled: false
 
+Style/FetchEnvVar:
+  Enabled: false
+
 ### Layout
 
 Layout/BlockAlignment:
@@ -296,3 +302,8 @@ Naming/VariableNumber:
 
 Gemspec/RequiredRubyVersion:
   Enabled: false
+
+Gemspec/DevelopmentDependencies:
+  EnforcedStyle: gemspec
+  Exclude:
+    - samples/syntax-book/Gemfile

lib/review/book/base.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009-2022 Minero Aoki, Kenshi Muto, Masayoshi Takahashi
+# Copyright (c) 2009-2023 Minero Aoki, Kenshi Muto, Masayoshi Takahashi
 #               2002-2008 Minero Aoki
 #
 # This program is free software.

lib/review/builder.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2002-2022 Minero Aoki, Kenshi Muto
+# Copyright (c) 2002-2023 Minero Aoki, Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -234,7 +234,8 @@ def parse_table_rows(lines)
       sepidx = nil
       rows = []
       lines.each_with_index do |line, idx|
-        if /\A[=\-]{12}/ =~ line || /\A[={\-}]{12}/ =~ line
+        # {} is for LaTeX
+        if /\A[=-]{12}/ =~ line || /\A[={}-]{12}/ =~ line
           sepidx ||= idx
           next
         end
@@ -512,12 +513,7 @@ def inline_w(s)
     end
 
     def inline_wb(s)
-      translated = @dictionary[s]
-      if translated
-        inline_b(translated)
-      else
-        inline_b("[missing word: #{s}]")
-      end
+      inline_b(@dictionary[s] || "[missing word: #{s}]")
     end
 
     def raw(str)

lib/review/epubmaker.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2022 Kenshi Muto and Masayoshi Takahashi
+# Copyright (c) 2010-2023 Kenshi Muto and Masayoshi Takahashi
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -106,9 +106,7 @@ def update_log_level
     def build_path
       if @config['debug']
         path = File.expand_path("#{@config['bookname']}-epub", Dir.pwd)
-        if File.exist?(path)
-          FileUtils.rm_rf(path, secure: true)
-        end
+        FileUtils.rm_rf(path, secure: true)
         Dir.mkdir(path)
         path
       else

lib/review/epubmaker/epubv2.rb

@@ -22,11 +22,6 @@ class EPUBv2 < EPUBCommon
       CREATOR_ATTRIBUTES = %w[aut a-adp a-ann a-arr a-art a-asn a-aqt a-aft a-aui a-ant a-bkp a-clb a-cmm a-dsr a-edt a-ill a-lyr a-mdc a-mus a-nrt a-oth a-pht a-prt a-red a-rev a-spn a-ths a-trc a-trl]
       CONTRIBUTER_ATTRIBUTES = %w[adp ann arr art asn aqt aft aui ant bkp clb cmm dsr edt ill lyr mdc mus nrt oth pht prt red rev spn ths trc trl]
 
-      # Construct object with parameter hash +config+ and message resource hash +res+.
-      def initialize(producer) # rubocop:disable Lint/UselessMethodDefinition
-        super
-      end
-
       # Return opf file content.
       def opf
         @opf_metainfo = opf_metainfo

lib/review/epubmaker/producer.rb

@@ -1,6 +1,6 @@
 # = producer.rb -- EPUB producer.
 #
-# Copyright (c) 2010-2021 Kenshi Muto
+# Copyright (c) 2010-2023 Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -119,8 +119,7 @@ def produce(epubfile, work_dir, tmpdir = nil, base_dir: nil)
           epubfile = "#{current}/#{epubfile}"
         end
 
-        # FIXME: error check
-        File.unlink(epubfile) if File.exist?(epubfile)
+        FileUtils.rm_f(epubfile)
 
         begin
           @epub.produce(epubfile, work_dir, new_tmpdir, base_dir: base_dir)

lib/review/idgxmlbuilder.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2008-2022 Minero Aoki, Kenshi Muto
+# Copyright (c) 2008-2023 Minero Aoki, Kenshi Muto
 #               2002-2007 Minero Aoki
 #
 # This program is free software.
@@ -136,7 +136,8 @@ def headline(level, label, caption)
       when 5
         @subsubsubsection += 1
         print %Q(<sect4 id="sect:#{@chapter.number}.#{@section}.#{@subsection}.#{@subsubsection}.#{@subsubsubsection}">) if @secttags
-      when 6 # rubocop:disable Lint/EmptyWhen
+      when 6
+        # ignore
       else
         raise "caption level too deep or unsupported: #{level}"
       end
@@ -526,7 +527,7 @@ def parse_table_rows(lines)
       sepidx = nil
       rows = []
       lines.each_with_index do |line, idx|
-        if /\A[=\-]{12}/.match?(line)
+        if /\A[=-]{12}/.match?(line)
           sepidx ||= idx
           next
         end

lib/review/img_math.rb

@@ -1,3 +1,10 @@
+#
+# Copyright (c) 2021-2023 Masayoshi Takahashi, Kenshi Muto
+#
+# This program is free software.
+# You can distribute/modify this program under the terms of
+# the GNU LGPL, Lesser General Public License version 2.1.
+#
 require 'fileutils'
 require 'shellwords'
 require 'review/loggable'
@@ -29,7 +36,7 @@ def make_math_image(str, key, fontsize = 12)
       # Re:VIEW 2 compatibility
 
       img_path = File.join(@math_dir, "_gen_#{key}.#{@config['imgmath_options']['format']}")
-      Dir.mkdir(@math_dir) unless Dir.exist?(@math_dir)
+      FileUtils.mkdir_p(@math_dir)
       fontsize2 = (fontsize * 1.2).round.to_i
       texsrc = <<-EOB
 \\documentclass[12pt]{article}
@@ -63,7 +70,7 @@ def make_math_image(str, key, fontsize = 12)
     def make_math_images
       return if @math_maps.empty?
 
-      Dir.mkdir(@math_dir) unless Dir.exist?(@math_dir)
+      FileUtils.mkdir_p(@math_dir)
       fontsize = @config['imgmath_options']['fontsize'].to_f
       lineheight = @config['imgmath_options']['lineheight'].to_f
 

lib/review/lineinput.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2002-2020 Minero Aoki, Masayoshi Takahashi, Kenshi Muto
+# Copyright (c) 2002-2023 Minero Aoki, Masayoshi Takahashi, Kenshi Muto
 #
 # This program is free software.
 # You can distribute/modify this program under the terms of
@@ -21,7 +21,7 @@ def initialize(f)
     end
 
     def inspect
-      "\#<#{self.class} file=#{@input.inspect} line=#{lineno}>"
+      "#<#{self.class} file=#{@input.inspect} line=#{lineno}>"
     end
 
     def eof?

lib/review/makerhelper.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2012-2020 Yuto HAYAMIZU, Kenshi Muto
+# Copyright (c) 2012-2023 Yuto HAYAMIZU, Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -48,7 +48,7 @@ def copy_images_to_dir(from_dir, to_dir, options = {})
           if FileTest.directory?("#{from_dir}/#{fname}")
             image_files += copy_images_to_dir("#{from_dir}/#{fname}", "#{to_dir}/#{fname}", options)
           else
-            FileUtils.mkdir_p(to_dir) unless File.exist?(to_dir)
+            FileUtils.mkdir_p(to_dir)
 
             is_converted = false
             (options[:convert] || {}).each do |orig_type, conv_type|

lib/review/pdfmaker.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2022 Kenshi Muto and Masayoshi Takahashi
+# Copyright (c) 2010-2023 Kenshi Muto and Masayoshi Takahashi
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -69,9 +69,7 @@ def remove_old_file
     def build_path
       if @config['debug']
         path = "#{@config['bookname']}-pdf"
-        if File.exist?(path)
-          FileUtils.rm_rf(path, secure: true)
-        end
+        FileUtils.rm_rf(path, secure: true)
         Dir.mkdir(path)
         path
       else
@@ -517,7 +515,7 @@ def copy_sty(dirname, copybase, extname = 'sty')
         dir.sort.each do |fname|
           next unless File.extname(fname).downcase == '.' + extname
 
-          FileUtils.mkdir_p(copybase) unless Dir.exist?(copybase)
+          FileUtils.mkdir_p(copybase)
           if extname == 'erb'
             File.open(File.join(copybase, fname.sub(/\.erb\Z/, '')), 'w') do |f|
               f.print erb_content(File.join(dirname, fname))

lib/review/update.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018-2022 Kenshi Muto
+# Copyright (c) 2018-2023 Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -258,9 +258,7 @@ def update_version
 
     def update_rakefile(dir)
       taskdir = File.join(dir, 'lib/tasks')
-      unless File.exist?(taskdir)
-        FileUtils.mkdir_p(taskdir)
-      end
+      FileUtils.mkdir_p(taskdir)
 
       master_rakefile = File.join(@review_dir, 'samples/sample-book/src/Rakefile')
 
@@ -474,9 +472,7 @@ def convert_documentclass_opts(yml, cls, prev_opts)
 
     def update_tex_stys(template, dir)
       texmacrodir = File.join(dir, 'sty')
-      unless File.exist?(texmacrodir)
-        FileUtils.mkdir(texmacrodir)
-      end
+      FileUtils.mkdir_p(texmacrodir)
 
       tdir = File.join(@review_dir, 'templates/latex', template)
       Dir.glob(File.join(tdir, '*.*')).each do |master_styfile|

lib/review/yamlloader.rb

@@ -36,9 +36,6 @@ def self.safe_load(s)
       end
     end
 
-    def initialize
-    end
-
     # load YAML files
     #
     # `inherit: [3.yml, 6.yml]` in 7.yml; `inherit: [1.yml, 2.yml]` in 3.yml; `inherit: [4.yml, 5.yml]` in 6.yml

review.gemspec

@@ -14,8 +14,7 @@ Gem::Specification.new do |gem|
   gem.required_rubygems_version = Gem::Requirement.new('>= 0') if gem.respond_to?(:required_rubygems_version=)
   gem.metadata = { 'rubygems_mfa_required' => 'true' }
 
-  gem.files         = `git ls-files`.split("\n")
-  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.files         = `git ls-files`.split("\n").reject { |f| f.match(/^test/) }
   gem.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   gem.extra_rdoc_files = []
   gem.require_paths = ['lib']
@@ -28,7 +27,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('mini_magick')
   gem.add_development_dependency('pygments.rb')
   gem.add_development_dependency('rake')
-  gem.add_development_dependency('rubocop', '~> 1.12.0')
+  gem.add_development_dependency('rubocop', '~> 1.45.1')
   gem.add_development_dependency('rubocop-performance')
   gem.add_development_dependency('rubocop-rake')
   gem.add_development_dependency('simplecov')

samples/syntax-book/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
 gem 'rake'
-gem 'review', '4.2.0'
+gem 'review', '~> 5.3.0'