review-retrovert 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1800fdc491a64bc922e8164e966bf6f84c4c2c2439a2330e106398ea97c55cc8
-  data.tar.gz: 3b1c672c1c85dc6ec2ca28628c64b4ba0f14263eacdc1952d4ca9427644446bf
+  metadata.gz: 02507e93743d82045d68c54d9aa2acec9666def48b1187b7577e1e70ade8a4f5
+  data.tar.gz: f2121fe5b228534e7f1ada87cbce40d35674cc7f1b92f2de14d04e500ef5b640
 SHA512:
-  metadata.gz: acf0b640bb8ebb2e3f4549103dd73be14e2258f85a720580d8cb0bdb31d5f150e3ffde958dd77672ba16fd3a9b1f5a99e87d65927dfe9277186e529b89298c57
-  data.tar.gz: 5c16364152fc108a2214f1126f3583435dba1eafb080e6c07c3fc20a3de8d7702921e8a89143ce6577323182e10df3da50f9b3f08e07115203e1cbcb6d07a319
+  metadata.gz: edcf427bdad063863a08aff465863a8a6f6f0fc626b8491aab77df8902b46439239298fe21e220b2a7e8e712f93367267ae3a7a7a3a67eb89780a56f3e72ab03
+  data.tar.gz: 66b55029a3127ad59626c8852c883a9c1d264be675686d4562d56ec9e58ee41458aa89e9a6a49e9a506684902256f18924b68f0a68bafa7fd53de37af1088f13

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    review-retrovert (0.9.5)
+    review-retrovert (0.9.6)
       review (>= 3.0.0)
       thor
 

data/README.md

@@ -21,6 +21,12 @@ And then execute:
 Or install it yourself as:
 
     $ gem install review-retrovert
+    
+## Use Docker
+
+```
+docker run -v "$(pwd):/work" -w /work srzzumix/review-retrovert convert target/config.yml outdir
+```
 
 ## Commands
 
@@ -33,16 +39,16 @@ Commands:
 
 ### Convert
 
-e.g.
+#### e.g.
 
 ```sh
 review-retrovert convert /path/to/dir/review-starter/config.yml <output directory>
 ```
 
-Options
+#### Options
 
 ```sh
-Usage:
+sage:
   review-retrovert convert {review_starter_configfile} {outdir}
 
 Options:
@@ -54,6 +60,8 @@ Options:
       [--table-br-replace=TABLE-BR-REPLACE]        # @<br>{} in table replace string (Default: empty)
       [--table-empty-replace=TABLE-EMPTY-REPLACE]  # empty cell(.) in table replace string (Default full-width space)
                                                    # Default: 　
+      [--ird], [--no-ird]                          # for IRD
+      [--no-image]                                 # donot copy image
 
 convert Re:VIEW Starter project to Re:VIEW project
 ```

data/lib/review/retrovert/cli.rb

@@ -11,6 +11,8 @@ module ReVIEW
       method_option "tabwidth", desc: 'Preproc tabwidth option value', type: :numeric, default: 0
       method_option "table-br-replace", desc: '@<br>{} in table replace string (Default: empty)', type: :string, default: ''
       method_option "table-empty-replace", desc: 'empty cell(.) in table replace string (Default full-width space)', type: :string, default: '　'
+      method_option "ird", desc: 'for IRD', type: :boolean
+      method_option "no-image", desc: 'donot copy image', type: :boolean
       def convert(review_starter_configfile, outdir)
         Converter.execute(review_starter_configfile, outdir, options)
       end

data/lib/review/retrovert/converter.rb

@@ -1,5 +1,6 @@
 require "review"
 require 'fileutils'
+require 'tmpdir'
 require "review/retrovert/yamlconfig"
 
 module ReVIEW
@@ -15,6 +16,7 @@ module ReVIEW
         @configs = YamlConfig.new
         @embeded_contents = []
         @catalog_contents = []
+        @ird = false
       end
 
       def error(msg)
@@ -47,21 +49,50 @@ module ReVIEW
         FileUtils.cp_r(Dir.glob(File.join(path, '*.re')), outdir)
       end
 
-      def copy_images(outdir)
+      def get_out_imagedir(outdir)
         imagedir = @config['imagedir']
-        srcpath = File.join(@basedir, imagedir)
         outimagedir = File.basename(imagedir) # Re:VIEW not support sub-directory
         outpath = File.join(outdir, outimagedir)
+        return outpath
+      end
+
+      def store_out_image(outdir)
+        outpath = get_out_imagedir(outdir)
+        if File.exist?(outpath)
+          dir = Dir.mktmpdir('review-retrovert')
+          FileUtils.mv(Dir.glob(File.join(outpath, "**/*")), dir)
+          return dir
+        end
+        return nil
+      end
+
+      def restore_out_image(outpath, tmpdir)
+        if File.exist?(tmpdir)
+          FileUtils.mkdir_p(outpath)
+          FileUtils.mv(Dir.glob(File.join(tmpdir, "**/*")), outpath)
+          FileUtils.rm_rf(tmpdir)
+        end
+      end
+
+      def copy_images(outdir, store_image_dir)
+        imagedir = @config['imagedir']
+        outimagedir = File.basename(imagedir) # Re:VIEW not support sub-directory
+        outpath = get_out_imagedir(outdir)
         FileUtils.mkdir_p(outpath)
-        image_ext = @config['image_ext']
-        srcroot = Pathname.new(srcpath)
-        image_ext.each { |ext|
-          Dir.glob(File.join(srcpath, "**/*.#{ext}")).each { |srcimg|
-            outimg = File.join(outpath, Pathname.new(srcimg).relative_path_from(srcroot))
-            FileUtils.makedirs(File.dirname(outimg))
-            FileUtils.cp(srcimg, outimg)
+        if store_image_dir
+          restore_out_image(outpath, store_image_dir)
+        else
+          srcpath = File.join(@basedir, imagedir)
+          image_ext = @config['image_ext']
+          srcroot = Pathname.new(srcpath)
+          image_ext.each { |ext|
+            Dir.glob(File.join(srcpath, "**/*.#{ext}")).each { |srcimg|
+              outimg = File.join(outpath, Pathname.new(srcimg).relative_path_from(srcroot))
+              FileUtils.makedirs(File.dirname(outimg))
+              FileUtils.cp(srcimg, outimg)
+            }
           }
-        }
+        end
         @configs.rewrite_yml('imagedir', outimagedir)
       end
 
@@ -69,7 +100,6 @@ 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}\"]")
         @config['retrovert'].each{ |k,v|
@@ -77,6 +107,9 @@ module ReVIEW
             @configs.commentout_root_yml(k)
           end
         }
+        if @ird
+          @configs.rewrite_yml('chapterlink', 'null')
+        end
       end
 
       def replace_compatible_block_command_outline(content, command, new_command, option_count)
@@ -359,9 +392,13 @@ module ReVIEW
         delete_block_command(content, 'clearpage')
         delete_block_command(content, 'flushright')
         delete_block_command(content, 'centering')
-        delete_block_command(content, 'noindent')
         delete_block_command(content, 'paragraphend')
 
+        # delete IRD unsupported commands
+        if @ird
+          delete_block_command(content, 'noindent')
+        end
+
         replace_inline_command(content, 'secref', 'hd')
         replace_inline_command(content, 'file', 'kw')
         replace_inline_command(content, 'hlink', 'href')
@@ -394,9 +431,6 @@ module ReVIEW
           add_linkurl_footnote(content, filename)
         end
 
-        # # br to blankline
-        # content.gsub!(/(.*)@<br>{}(.*)/, '\1\n//blankline\n\2')
-
         # nested command
         replace_block_command_nested_boxed_articles(content)
 
@@ -427,6 +461,12 @@ module ReVIEW
         # fix deprecated
         fix_deprecated_list(content)
 
+        if @ird
+          # br to blankline
+          content.gsub!(/(.*)@<br>{}$/, "\\1\n\n")
+          content.gsub!(/(.*)@<br>{}(.*)$/, "\\1\n\n\\2")
+        end
+
         File.write(contentfile, content)
         copy_embedded_contents(outdir, content)
       end
@@ -536,12 +576,14 @@ module ReVIEW
       def execute(yamlfile, outdir, options)
         @table_br_replace = options['table-br-replace']
         @table_empty_replace = options['table-empty-replace']
+        @ird = options['ird']
         load_config(yamlfile)
+        store_image_dir = store_out_image(outdir) if options['no-image']
         create_initial_project(outdir, options)
 
         copy_config(outdir)
         copy_catalog(outdir)
-        copy_images(outdir)
+        copy_images(outdir, store_image_dir)
         update_config(outdir)
         update_contents(outdir, options)
 

data/lib/review/retrovert/version.rb

@@ -1,5 +1,5 @@
 module ReVIEW
   module Retrovert
-    VERSION = "0.9.5"
+    VERSION = "0.9.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: review-retrovert
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - srz_zumix
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-16 00:00:00.000000000 Z
+date: 2021-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Re:VIEW Starter to Re:VIEW