Merge pull request #1935 from kmuto/fix-ruby34

support Ruby 3.4.x
kmuto · Jan 12, 2025 · 84ffc9e · 84ffc9e
2 parents bba805e + 94382fd
commit 84ffc9e
Show file tree

Hide file tree

Showing 151 changed files with 405 additions and 84 deletions.
diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml
@@ -13,10 +13,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['3.0', '3.1', '3.2', '3.3']
+        ruby: ['3.0', '3.1', '3.2', '3.3', '3.4']
         os: [ubuntu-latest]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

diff --git a/.github/workflows/ruby-win.yml b/.github/workflows/ruby-win.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '3.3', '3.2', '3.1', '3.0' ]
+        ruby: [ '3.4', '3.3', '3.2', '3.1', '3.0' ]
 
     steps:
     - uses: actions/checkout@v2

diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
@@ -13,19 +13,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['3.0', '3.1', '3.2', '3.3']
+        ruby: ['3.0', '3.1', '3.2', '3.3', '3.4']
         os: [ubuntu-latest, macOS-latest]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
     - 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 rake test
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -94,8 +94,9 @@ Style/TernaryParentheses:
   Enabled: false
 
 Style/FrozenStringLiteralComment:
-  EnforcedStyle: never
   Enabled: true
+  Exclude:
+    - 'samples/**/*'
 
 Style/SafeNavigation:
   Enabled: false

diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in review.gemspec

diff --git a/Rakefile b/Rakefile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 begin
   require 'bundler'
   Bundler::GemHelper.install_tasks

diff --git a/bin/review b/bin/review
@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 # review: Wrapper command to call subcommand
 #

diff --git a/bin/review-catalog-converter b/bin/review-catalog-converter
@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 # Copyright (c) 2014-2019 Masanori Kado, Kenshi Muto
 #

diff --git a/bin/review-check b/bin/review-check
@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 # Copyright (c) 2010-2019 Kenshi Muto, Minero Aoki
 #               1999-2007 Minero Aoki

diff --git a/bin/review-checkdep b/bin/review-checkdep
@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 # Copyright (c) 2007-2017 Minero Aoki, Kenshi Muto
 #               1999-2007 Minero Aoki
@@ -11,7 +13,7 @@
 
 $LOAD_PATH.unshift(File.realpath('../lib', __dir__))
 
-PREDEF_FILE = 'PREDEF'.freeze
+PREDEF_FILE = 'PREDEF'
 
 def main
   @provided = parse_predefined

diff --git a/bin/review-compile b/bin/review-compile
@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 # Copyright (c) 2008-2019 Kenshi Muto, Masayoshi Takahashi, KADO Masanori, Minero Aoki
 # Copyright (c) 1999-2007 Minero Aoki
@@ -18,7 +20,7 @@ require 'yaml'
 
 include ReVIEW::Loggable
 
-DEFAULT_CONFIG_FILENAME = 'config.yml'.freeze
+DEFAULT_CONFIG_FILENAME = 'config.yml'
 
 def main
   Signal.trap(:INT) { exit 1 }

diff --git a/bin/review-epub2html b/bin/review-epub2html
@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 # Copyright (c) 2018 Kenshi Muto
 #

diff --git a/bin/review-epubmaker b/bin/review-epubmaker
@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 # Copyright (c) 2010-2019 Kenshi Muto and Masayoshi Takahashi
 #
 # This program is free software.

diff --git a/bin/review-idgxmlmaker b/bin/review-idgxmlmaker
@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 # Copyright (c) 2019 Kenshi Muto
 #
 # This program is free software.

diff --git a/bin/review-index b/bin/review-index
@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 # Copyright (c) 2008-2020 Minero Aoki, Kenshi Muto
 #               1999-2007 Minero Aoki

diff --git a/bin/review-init b/bin/review-init
@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 # Copyright (c) 2013-2017 Masanori Kado, Masayoshi Takahashi, Kenshi Muto
 #

diff --git a/bin/review-pdfmaker b/bin/review-pdfmaker
@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 # Copyright (c) 2010-2017 Kenshi Muto and Masayoshi Takahashi
 #
 # This program is free software.

diff --git a/bin/review-preproc b/bin/review-preproc
@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 # Copyright (c) 2010-2019 Minero Aoki, Kenshi Muto
 #               1999-2007 Minero Aoki

diff --git a/bin/review-textmaker b/bin/review-textmaker
@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Kenshi Muto
 #
 # This program is free software.

diff --git a/bin/review-update b/bin/review-update
@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 # Copyright (c) 2018 Kenshi Muto
 #

diff --git a/bin/review-validate b/bin/review-validate
@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 # Copyright (c) 2010-2019 Kenshi Muto
 #
 # This program is free software

diff --git a/bin/review-vol b/bin/review-vol
@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 # Copyright (c) 2014-2020 Minero Aoki, Kenshi Muto
 #               2003-2014 Minero Aoki

diff --git a/bin/review-webmaker b/bin/review-webmaker
@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of

diff --git a/lib/review.rb b/lib/review.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Dir["#{__dir__}/review/*.rb"].sort.each do |path|
   require "review/#{File.basename(path, '.rb')}"
 end
diff --git a/lib/review/book.rb b/lib/review/book.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2009-2017 Minero Aoki, Kenshi Muto
 #               2002-2008 Minero Aoki
 #

diff --git a/lib/review/book/base.rb b/lib/review/book/base.rb
@@ -1,4 +1,5 @@
-#
+# frozen_string_literal: true
+
 # Copyright (c) 2009-2023 Minero Aoki, Kenshi Muto, Masayoshi Takahashi
 #               2002-2008 Minero Aoki
 #
@@ -395,7 +396,7 @@ def read_file(filename)
             @logger.warn "!!! #{filename} is obsoleted. please use catalog.yml."
           end
         end
-        res = ''
+        res = +''
         File.open(filename_join(@basedir, filename), 'rt:BOM|utf-8') do |f|
           f.each_line do |line|
             next if line.start_with?('#')

diff --git a/lib/review/book/bib.rb b/lib/review/book/bib.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Copyright (c) 2009-2020 Minero Aoki, Kenshi Muto
 #

diff --git a/lib/review/book/book_unit.rb b/lib/review/book/book_unit.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2009-2021 Minero Aoki, Kenshi Muto
 #               2002-2008 Minero Aoki
 #

diff --git a/lib/review/book/cache.rb b/lib/review/book/cache.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Copyright (c) 2014-2024 Minero Aoki, Kenshi Muto, Masayoshi Takahashi
 #

diff --git a/lib/review/book/chapter.rb b/lib/review/book/chapter.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Copyright (c) 2009-2019 Minero Aoki, Kenshi Muto
 #               2002-2008 Minero Aoki

diff --git a/lib/review/book/image_finder.rb b/lib/review/book/image_finder.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Copyright (c) 2014-2023 Minero Aoki, Kenshi Muto, Masayoshi Takahashi
 #

diff --git a/lib/review/book/index.rb b/lib/review/book/index.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2021 Minero Aoki, Kenshi Muto
 #               2002-2007 Minero Aoki
 #

diff --git a/lib/review/book/index/item.rb b/lib/review/book/index/item.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2019 Minero Aoki, Kenshi Muto
 #
 # This program is free software.

diff --git a/lib/review/book/page_metric.rb b/lib/review/book/page_metric.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2009-2020 Minero Aoki, Kenshi Muto
 #               2002-2008 Minero Aoki
 #

diff --git a/lib/review/book/part.rb b/lib/review/book/part.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2009-2020 Minero Aoki, Kenshi Muto, Masayoshi Takahashi
 #               2002-2008 Minero Aoki
 #

diff --git a/lib/review/book/volume.rb b/lib/review/book/volume.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2007-2020 Minero Aoki, Kenshi Muto
 #               2002-2007 Minero Aoki
 #

diff --git a/lib/review/builder.rb b/lib/review/builder.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2002-2024 Minero Aoki, Kenshi Muto
 #
 # This program is free software.

diff --git a/lib/review/call_hook.rb b/lib/review/call_hook.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ReVIEW
   module CallHook
     def call_hook(hook_name, *params, base_dir: nil)

diff --git a/lib/review/catalog.rb b/lib/review/catalog.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 require 'date'
 

diff --git a/lib/review/compiler.rb b/lib/review/compiler.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2009-2024 Minero Aoki, Kenshi Muto
 # Copyright (c) 2002-2007 Minero Aoki
 #
@@ -672,7 +674,7 @@ def text(str, block_mode = false)
           error "`@<xxx>' seen but is not valid inline op: #{w}", location: location
         end
       end
-      result = ''
+      result = +''
       until words.empty?
         result << if in_non_escaped_command? && block_mode
                     revert_replace_fence(words.shift)

diff --git a/lib/review/configure.rb b/lib/review/configure.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Copyright (c) 2012-2022 Masanori Kado, Masayoshi Takahashi, Kenshi Muto
 #

diff --git a/lib/review/converter.rb b/lib/review/converter.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This program is free software.
 # You can distribute or modify this program under the terms of
 # the GNU LGPL, Lesser General Public License version 2.1.

diff --git a/lib/review/epub2html.rb b/lib/review/epub2html.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Copyright (c) 2018-2019 Kenshi Muto
 #

diff --git a/lib/review/epubbuilder.rb b/lib/review/epubbuilder.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # epubbuilder.rb
 #   just for compatibility
 #

diff --git a/lib/review/epubmaker.rb b/lib/review/epubmaker.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2010-2024 Kenshi Muto and Masayoshi Takahashi
 #
 # This program is free software.

diff --git a/lib/review/epubmaker/content.rb b/lib/review/epubmaker/content.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # = content.rb -- Content object for EPUBMaker.
 #
 # Copyright (c) 2010-2020 Kenshi Muto

diff --git a/lib/review/epubmaker/epubcommon.rb b/lib/review/epubmaker/epubcommon.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # = epubcommon.rb -- super class for EPUBv2 and EPUBv3
 #
 # Copyright (c) 2010-2024 Kenshi Muto and Masayoshi Takahashi

diff --git a/lib/review/epubmaker/epubv2.rb b/lib/review/epubmaker/epubv2.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # = epubv2.rb -- EPUB version 2 producer.
 #
 # Copyright (c) 2010-2022 Kenshi Muto and Masayoshi Takahashi

diff --git a/lib/review/epubmaker/epubv3.rb b/lib/review/epubmaker/epubv3.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # = epubv3.rb -- EPUB version 3 producer.
 #
 # Copyright (c) 2010-2023 Kenshi Muto
@@ -41,7 +43,7 @@ def opf
 
         if @opf_prefix && @opf_prefix.size > 0
           prefixes_str = @opf_prefix.map { |k, v| %Q(#{k}: #{v}) }.join(' ')
-          @package_attrs << %Q( prefix="#{prefixes_str}")
+          @package_attrs = %Q( prefix="#{prefixes_str}")
         end
 
         ReVIEW::Template.generate(path: './opf/epubv3.opf.erb', binding: binding)

diff --git a/lib/review/epubmaker/producer.rb b/lib/review/epubmaker/producer.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # = producer.rb -- EPUB producer.
 #
 # Copyright (c) 2010-2023 Kenshi Muto