review-retrovert 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdd00a05ee2fe184542575f75ff8b5f7541ea11ead119c28b1b00e00d38aeab8
-  data.tar.gz: 6a1dcf4eedabf43d6be0b8bf7814dc11d30d8798730a95e33ed6a95cda59173d
+  metadata.gz: 978ce194146ec4de6a7ece5ac4ba182e6eff60670836f952f22578a25ec10a9e
+  data.tar.gz: 6889acc0183d72d30b7f87fdbd0fc4e5bd986b350d4c7fae8ba8e5895e7a476b
 SHA512:
-  metadata.gz: 4f3748ae4c99d94ecb773de86501b720712f25381061055d42e12186f795775ad0a359e7c901b089fa804f82e9fb3d8506a17aeb693d51d14138a80a5b3a8256
-  data.tar.gz: 7126a6536e53cceb34e41c9b606d6974b336bd6afb8d6391a279db5ba16ba3b3939aea4b9efcda8a51c0a2221ef0f1226aa4849625e90cd8e25a2e5900d2299f
+  metadata.gz: 2246191d2e227e1c8a4d322a9d9ec4f84e85904285e4952cabc6df9a87f89f1eab761edda301aca5e950494aa341e8e9ebeb4675118450082d841eea909c982e
+  data.tar.gz: c8f3757ef2da91d51c5fed0954e5ef4c710bbaee3fe014e728ae16d5f3a47bc10861910dc2d121a085e8ba14a7380ccf02e664f81ee64c582b6ba3b21e750078

data/.github/workflows/retrovert.yml

@@ -8,12 +8,22 @@ name: Retrovert
 jobs:
   review:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        review-version: [ "3.2", "4.2", "5.0" ]
+      fail-fast: false
     steps:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.6
-      - run: bundle install
+      - run: |
+          rm -f Gemfile.lock
+          cp Gemfile Gemfile-${{ matrix.review-version }}
+          echo 'gem "review", "${{ matrix.review-version }}"' >> Gemfile-${{ matrix.review-version }}
+          cat Gemfile-${{ matrix.review-version }}
+          echo "BUNDLE_GEMFILE=Gemfile-${{ matrix.review-version }}" >> $GITHUB_ENV
+      - run: bundle install --gemfile=Gemfile-${{ matrix.review-version }}
       # spec
       - name: spec
         run: bundle exec rake spec
@@ -21,19 +31,31 @@ jobs:
       - name: convert
         run: bundle exec review-retrovert convert testdata/mybook/config.yml tmp -f
       # build
-      - name: review build
-        uses: docker://srzzumix/review-retrovert
+      # - name: review build
+      #   uses: ${{ matrix.uses }}
+      #   with:
+      #     entrypoint: bash
+      #     args: -c "cd tmp; rake preproc all"
+      # docker login
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
         with:
-          entrypoint: bash
-          args: -c "cd tmp; rake preproc all"
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: build html
+        run: |
+          docker run --rm -v "$(pwd)/tmp":/work -w /work vvakame/review:${{ matrix.review-version }} rake preproc html
+      - name: build pdf
+        run: |
+          docker run --rm -v "$(pwd)/tmp":/work -w /work vvakame/review:${{ matrix.review-version }} rake preproc pdf
       # artifacts
       - name: artifacts
         uses: actions/upload-artifact@v1
         with:
           name: mybook
           path: tmp/mybook.pdf
-      - name: artifacts
-        uses: actions/upload-artifact@v1
-        with:
-          name: mybook
-          path: tmp/mybook.epub
+      # - name: artifacts
+      #   uses: actions/upload-artifact@v1
+      #   with:
+      #     name: mybook
+      #     path: tmp/mybook.epub

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM vvakame/review:3.2
+FROM vvakame/review:5.0
 
 RUN gem install review-retrovert
 

data/Gemfile

@@ -5,4 +5,4 @@ gemspec
 
 gem "rake", "~> 12.0"
 gem "rspec", "~> 3.0"
-gem 'aruba', '~> 1.0.2'
+gem 'aruba', '~> 1.0.2'

data/Gemfile.lock

@@ -1,68 +1,67 @@
 PATH
   remote: .
   specs:
-    review-retrovert (0.9.2)
-      review (>= 3.2.0, < 4.0)
+    review-retrovert (0.9.3)
+      review (>= 3.2.0)
       thor
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.2)
+    activesupport (6.1.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    aruba (1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    aruba (1.0.4)
       childprocess (>= 2.0, < 5.0)
       contracts (~> 0.16.0)
-      cucumber (>= 2.4, < 5.0)
-      ffi (~> 1.9)
+      cucumber (>= 2.4, < 6.0)
       rspec-expectations (~> 3.4)
       thor (~> 1.0)
     builder (3.2.4)
     childprocess (4.0.0)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.7)
     contracts (0.16.0)
-    cucumber (4.1.0)
-      builder (~> 3.2, >= 3.2.3)
-      cucumber-core (~> 7.1, >= 7.1.0)
-      cucumber-create-meta (~> 1.0.0, >= 1.0.0)
-      cucumber-cucumber-expressions (~> 10.1, >= 10.1.0)
-      cucumber-gherkin (~> 14.0, >= 14.0.1)
-      cucumber-html-formatter (~> 7.0, >= 7.0.0)
-      cucumber-messages (~> 12.2, >= 12.2.0)
-      cucumber-wire (~> 3.1, >= 3.1.0)
-      diff-lcs (~> 1.3, >= 1.3, < 1.4)
+    cucumber (5.2.0)
+      builder (~> 3.2, >= 3.2.4)
+      cucumber-core (~> 8.0, >= 8.0.1)
+      cucumber-create-meta (~> 2.0, >= 2.0.2)
+      cucumber-cucumber-expressions (~> 10.3, >= 10.3.0)
+      cucumber-gherkin (~> 15.0, >= 15.0.2)
+      cucumber-html-formatter (~> 9.0, >= 9.0.0)
+      cucumber-messages (~> 13.1, >= 13.1.0)
+      cucumber-wire (~> 4.0, >= 4.0.1)
+      diff-lcs (~> 1.4, >= 1.4.4)
       multi_test (~> 0.1, >= 0.1.2)
-      sys-uname (~> 1.0, >= 1.0.2)
-    cucumber-core (7.1.0)
-      cucumber-gherkin (~> 14.0, >= 14.0.1)
-      cucumber-messages (~> 12.2, >= 12.2.0)
+      sys-uname (~> 1.2, >= 1.2.1)
+    cucumber-core (8.0.1)
+      cucumber-gherkin (~> 15.0, >= 15.0.2)
+      cucumber-messages (~> 13.0, >= 13.0.1)
       cucumber-tag-expressions (~> 2.0, >= 2.0.4)
-    cucumber-create-meta (1.0.0)
-      cucumber-messages (~> 12.2, >= 12.2.0)
+    cucumber-create-meta (2.0.4)
+      cucumber-messages (~> 13.1, >= 13.1.0)
       sys-uname (~> 1.2, >= 1.2.1)
-    cucumber-cucumber-expressions (10.2.2)
-    cucumber-gherkin (14.2.0)
-      cucumber-messages (~> 12.4, >= 12.4.0)
-    cucumber-html-formatter (7.2.0)
-      cucumber-messages (~> 12.4, >= 12.4.0)
-    cucumber-messages (12.4.0)
+    cucumber-cucumber-expressions (10.3.0)
+    cucumber-gherkin (15.0.2)
+      cucumber-messages (~> 13.0, >= 13.0.1)
+    cucumber-html-formatter (9.0.0)
+      cucumber-messages (~> 13.0, >= 13.0.1)
+    cucumber-messages (13.2.1)
       protobuf-cucumber (~> 3.10, >= 3.10.8)
     cucumber-tag-expressions (2.0.4)
-    cucumber-wire (3.1.0)
-      cucumber-core (~> 7.1, >= 7.1.0)
-      cucumber-cucumber-expressions (~> 10.1, >= 10.1.0)
-      cucumber-messages (~> 12.2, >= 12.2.0)
-    diff-lcs (1.3)
-    ffi (1.13.1)
-    i18n (1.8.5)
+    cucumber-wire (4.0.1)
+      cucumber-core (~> 8.0, >= 8.0.1)
+      cucumber-cucumber-expressions (~> 10.3, >= 10.3.0)
+      cucumber-messages (~> 13.0, >= 13.0.1)
+    diff-lcs (1.4.4)
+    ffi (1.14.2)
+    i18n (1.8.7)
       concurrent-ruby (~> 1.0)
     image_size (2.1.0)
     middleware (0.1.0)
-    minitest (5.14.1)
+    minitest (5.14.3)
     multi_test (0.1.2)
     protobuf-cucumber (3.10.8)
       activesupport (>= 3.2)
@@ -70,32 +69,32 @@ GEM
       thor
       thread_safe
     rake (12.3.3)
-    review (3.2.0)
+    review (5.0.0)
       image_size
       rouge
       rubyzip
     rouge (3.26.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.1)
     rubyzip (2.3.0)
-    sys-uname (1.2.1)
-      ffi (>= 1.0.0)
+    sys-uname (1.2.2)
+      ffi (~> 1.1)
     thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    zeitwerk (2.4.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby

data/lib/review/retrovert/converter.rb

@@ -67,6 +67,9 @@ module ReVIEW
         @configs.rewrite_yml('contentdir', '.')
         @configs.rewrite_yml('hook_beforetexcompile', 'null')
         @configs.rewrite_yml('texstyle', '["reviewmacro"]')
+        @configs.rewrite_yml('chapterlink', 'null')
+        pagesize = @config['starter']['pagesize'].downcase
+        @configs.rewrite_yml_array('texdocumentclass', "[\"review-jsbook\", \"media=print,paper=#{pagesize}\"]")
       end
 
       def replace_compatible_block_command_outline(content, command, new_command, option_count)
@@ -173,17 +176,29 @@ module ReVIEW
       end
 
       def replace_block_command_nested_boxed_articles(content)
-        replace_block_command_nested_boxed_article(content, 'note')
-        replace_block_command_nested_boxed_article(content, 'memo')
-        replace_block_command_nested_boxed_article(content, 'tip')
-        replace_block_command_nested_boxed_article(content, 'info')
-        replace_block_command_nested_boxed_article(content, 'warning')
-        replace_block_command_nested_boxed_article(content, 'important')
-        replace_block_command_nested_boxed_article(content, 'caution')
-        replace_block_command_nested_boxed_article(content, 'notice')
+        unless Gem::Version.new(ReVIEW::VERSION) >= Gem::Version.new('5.0.0')
+          replace_block_command_nested_boxed_article(content, 'note')
+          replace_block_command_nested_boxed_article(content, 'memo')
+          replace_block_command_nested_boxed_article(content, 'tip')
+          replace_block_command_nested_boxed_article(content, 'info')
+          replace_block_command_nested_boxed_article(content, 'warning')
+          replace_block_command_nested_boxed_article(content, 'important')
+          replace_block_command_nested_boxed_article(content, 'caution')
+          replace_block_command_nested_boxed_article(content, 'notice')
+        end
       end
 
       def replace_block_commentout(content)
+        d = content.dup
+        d.scan(/(^#@)(\++)(.*?)(^#@)(-+)/m) { |m|
+          matched = m[0..-1].join
+          inner = m[2]
+          inner.gsub!(/(^.)/, '#@#\1')
+          content.gsub!(/#{Regexp.escape(matched)}/m, "#@##{m[1]}#{inner}#@##{m[4]}")
+        }
+      end
+
+      def replace_block_commentout_without_sampleout(content)
         d = content.dup
         d.gsub!(/(^\/\/sampleoutputbegin\[)(.*?)(\])(.*?)(^\/\/sampleoutputend)/m, '')
         d.scan(/(^#@)(\++)(.*?)(^#@)(-+)/m) { |m|
@@ -195,7 +210,7 @@ module ReVIEW
       end
 
       def replace_sampleoutput(content)
-        replace_block_commentout(content)
+        # replace_block_commentout_without_sampleout(content)
         content.dup.scan(/(^\/\/sampleoutputbegin\[)(.*?)(\].*?\R)(.*?)(^\/\/sampleoutputend)/m) { |m|
           matched = m[0..-1].join
           sampleoutputbegin = m[0..2].join
@@ -216,6 +231,12 @@ module ReVIEW
         end
       end
 
+      def fix_deprecated_list(content)
+        if Gem::Version.new(ReVIEW::VERSION) >= Gem::Version.new('4.0.0')
+          content.gsub!(/^: (.*)/, ' : \1')
+        end
+      end
+
       def remove_starter_refid(content)
         # note - noteref
         content.dup.scan(/(@<noteref>)(?:(\$)|(?:({)|(\|)))(.*?)(?(2)(\$)|(?(3)(})|(\|)))/) { |m|
@@ -289,7 +310,7 @@ module ReVIEW
             post = m[6]
             id = "link_auto_footnote#{urls.length}"
             urls[id] = url
-            content.sub!(/#{matched}$/, "#{prev}@<href>{#{url},#{text}} @<fn>{#{id}} #{post}")
+            content.sub!(/#{Regexp.escape(matched)}$/, "#{prev}@<href>{#{url},#{text}} @<fn>{#{id}} #{post}")
           end
         }
 
@@ -346,6 +367,11 @@ module ReVIEW
         # fixed lack of options
         content.gsub!(/^\/\/list{/, '//list[][]{')
 
+        if Gem::Version.new(ReVIEW::VERSION) >= Gem::Version.new('4.0.0')
+          # empty caption is not allow
+          content.gsub!(/^\/\/image\[(.*)\]\[\]{/, '//image[\1][ ]{')
+        end
+
         # special command
         replace_sampleoutput(content)
 
@@ -353,6 +379,9 @@ module ReVIEW
           add_linkurl_footnote(content)
         end
 
+        # # br to blankline
+        # content.gsub!(/(.*)@<br>{}(.*)/, '\1\n//blankline\n\2')
+
         # nested command
         replace_block_command_nested_boxed_articles(content)
 
@@ -364,6 +393,9 @@ module ReVIEW
         remove_starter_refid(content)
         remove_starter_options(content)
 
+        # replace block comment
+        replace_block_commentout(content)
+
         # special charactor
         content.gsub!('@<LaTeX>{}', 'LaTeX')
         content.gsub!('@<TeX>{}', 'TeX')
@@ -377,6 +409,9 @@ module ReVIEW
         # expand nested inline command
         expand_nested_inline_command(content)
 
+        # fix deprecated
+        fix_deprecated_list(content)
+
         File.write(contentfile, content)
         copy_embedded_contents(outdir, content)
       end
@@ -491,7 +526,10 @@ module ReVIEW
         updater = ReVIEW::Update.new
         updater.force = true
         # updater.backup = false
-        updater.execute()
+        begin
+          updater.execute()
+        rescue
+        end
         Dir.chdir(pwd)
 
         if options['preproc']

data/lib/review/retrovert/version.rb

@@ -1,5 +1,5 @@
 module ReVIEW
   module Retrovert
-    VERSION = "0.9.2"
+    VERSION = "0.9.3"
   end
 end

data/lib/review/retrovert/yamlconfig.rb

@@ -99,6 +99,18 @@ module ReVIEW
         }
       end
 
+      def rewrite_yml_array_(yamlfile, key, val)
+        content = File.read(yamlfile)
+        content.gsub!(/^(\s*)#{key}:\s*\[.*?\]/m, '\1' + "#{key}: #{val}")
+        File.write(yamlfile, content)
+      end
+
+      def rewrite_yml_array(key, val)
+        config_files.each { |current_file|
+          rewrite_yml_array_(File.join(@basedir, current_file), key, val)
+        }
+      end
+
       def rewrite_retrovert_yml()
         @retrovert_configs.each { |current_file|
           yamlfile = File.expand_path(current_file, @basedir)
@@ -127,4 +139,4 @@ module ReVIEW
 
     end
   end
-end
+end

data/review-retrovert.gemspec

@@ -29,5 +29,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "thor"
   spec.add_development_dependency "aruba"
-  spec.add_runtime_dependency "review", ['>= 3.2.0', '< 4.0']
+  spec.add_runtime_dependency "review", ['>= 3.2.0']
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: review-retrovert
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - srz_zumix
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-11 00:00:00.000000000 Z
+date: 2021-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -45,9 +45,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -55,9 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 description: Re:VIEW Starter to Re:VIEW
 email:
 - zumix.cpp@gmail.com
@@ -195,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Re:VIEW Starter to Re:VIEW