review-retrovert 0.2.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebc50edd4b9d055120f8b3bf09037009c13e06fed8e12d4492290e790cf7b1b6
-  data.tar.gz: 3dfd16af4857df3826974080cb01a9dae7e0d57860d09d85991f96fbf2efb41d
+  metadata.gz: 4018ff4ea97d4ea7a151e769c871e9d1f91d6c1ce2b18a500ae68a569987d1d0
+  data.tar.gz: 862bc4e9be33d25e15a2b1b3bfac1b3f231af1568e35d320ee5458740629ac50
 SHA512:
-  metadata.gz: 424021ccdce323bf73bf19db45ddfa2519d3c4c49873560a19479f962ccab1608f64eb3aebba17faec5fb5fe17202ff7f00ec094364ec9bde6e85d84582f8015
-  data.tar.gz: 15535316f97c3f6d20e60f7ea72d721f3b03eea0f4a321db5075605522877b8e426f771a002995283b1bc7eb296e5e023da16e989f8a8ef0dbcfbbe6834bbc1c
+  metadata.gz: 4423300d41d6ba1ad911c99145fa830c8c36a9dd4a54273dda177b27bca65ae8d86bb5300382f28b5bc05abe27ce8fb12c6313fb4967f2244d0583a4c32c1bed
+  data.tar.gz: 68d804e35464032a32bc6d4b0cd45f919128fecced2bf4e8692db0e0e9e62212e64c1e4539b943f076e32ea10baf5fdb631d146eb0afaaa465375f4a67b58886

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    review-retrovert (0.2.0)
+    review-retrovert (0.3.3)
       review (>= 3.2.0, < 4.0)
       thor
 
@@ -15,7 +15,7 @@ GEM
       image_size
       rouge
       rubyzip
-    rouge (3.20.0)
+    rouge (3.21.0)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)

data/lib/review/retrovert/cli.rb

@@ -7,6 +7,8 @@ module ReVIEW
       desc "convert {review_starter_configfile} {outdir}", "convert Re:VIEW Starter project to Re:VIEW project"
       method_option "force", aliases: "f", desc: 'Force output', type: :boolean
       method_option "strict", desc: 'Only process files registered in the catalog', type: :boolean
+      method_option "table-br-replace", desc: '@<br>{} in table replace string', type: :string, default: ''
+      method_option "table-empty-replace", desc: 'empty cell(.) in table replace string', type: :string, default: '　'
       def convert(review_starter_configfile, outdir)
         Converter.execute(review_starter_configfile, outdir, options)
       end

data/lib/review/retrovert/converter.rb

@@ -9,6 +9,7 @@ module ReVIEW
 
       def initialize
         @basedir = nil
+        @srccontentsdir = nil
         @outimagedir = nil
         @logger = ReVIEW.logger
         @configs = YamlConfig.new
@@ -37,10 +38,9 @@ module ReVIEW
       end
 
       def copy_contents(outdir)
-        contentdir = @config['contentdir']
-        path = File.join(@basedir, contentdir)
-        outpath = File.join(outdir, contentdir)
-        FileUtils.mkdir_p(outpath)
+        path = File.join(@basedir, @srccontentsdir)
+        # outpath = File.join(outdir, srccontentsdir)
+        # FileUtils.mkdir_p(outpath)
         # FileUtils.cp_r(Dir.glob(File.join(path, '*.re')), outpath)
         FileUtils.cp_r(Dir.glob(File.join(path, '*.re')), outdir)
       end
@@ -52,8 +52,13 @@ module ReVIEW
         outpath = File.join(outdir, outimagedir)
         FileUtils.mkdir_p(outpath)
         image_ext = @config['image_ext']
+        srcroot = Pathname.new(srcpath)
         image_ext.each { |ext|
-          FileUtils.cp_r(Dir.glob(File.join(srcpath, "**/*.#{ext}")), outpath)
+          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)
+          }
         }
         @configs.rewrite_yml('imagedir', outimagedir)
       end
@@ -90,8 +95,13 @@ module ReVIEW
         content = File.read(contentfile)
         content.gsub!(/(\/\/sideimage\[.*?\]\[.*?\])\[.*?\]/, '\1')
         content.gsub!(/\/\/sideimage/, '//image')
+        content.gsub!(/@<href>{(.*?)#.*?,(.*?)}/, '@<href>{\1,\2}')
         content.gsub!(/@<href>{(.*?)#.*?}/, '@<href>{\1}')
-        while !content.gsub!(/(\/\/table.*)@<br>(.*?\/\/})/m, '\1\2').nil? do
+        # table 内の @ コマンドは不安定らしい
+        while !content.gsub!(/(\/\/table.*)@<br>{}(.*?\/\/})/m, "\\1#{@table_br_replace}\\2").nil? do
+        end
+        # 空セルが2行になることがあるらしい
+        while !content.gsub!(/(\/\/table.*\s)\.(\s.*?\/\/})/m, "\\1#{@table_empty_replace}\\2").nil? do
         end
         delete_inline_command(content , 'xsmall')
         delete_inline_command(content , 'weak')
@@ -104,7 +114,8 @@ module ReVIEW
         files.each do |content|
           contentpath = File.join(contentdir, content)
           unless File.exist?(contentpath)
-            srcpath = File.join(@basedir, content)
+            srcpath = File.join(File.join(@basedir, @srccontentsdir), content)
+            # info srcpath
             if File.exist?(srcpath)
               FileUtils.cp(srcpath, contentdir)
             end
@@ -116,7 +127,6 @@ module ReVIEW
       def update_contents(outdir, options)
         yamlfile = @config['catalogfile']
         abspath = File.absolute_path(outdir)
-        # contentdir = File.join(abspath, @config['contentdir'])
         contentdir = abspath
         info 'replace //sideimage to //image'
         info 'replace starter inline command'
@@ -127,8 +137,9 @@ module ReVIEW
           update_content_files(outdir, contentdir, catalog.appendix())
           update_content_files(outdir, contentdir, catalog.postdef())
         else
-          copy_contents(outdir)
-          update_content_files(outdir, contentdir, Dir.glob(File.join(abspath, '*.re')))
+          # copy_contents(outdir)
+          contentsfiles = Pathname.glob(File.join(File.join(@basedir, @srccontentsdir), '*.re')).map(&:basename)
+          update_content_files(outdir, contentdir, contentsfiles)
         end
       end
 
@@ -143,6 +154,7 @@ module ReVIEW
         @configs.open(yamlfile)
         @config = @configs.config
         @basedir = @configs.basedir
+        @srccontentsdir = @config['contentdir']
       end
 
       def create_initial_project(outdir, options)
@@ -152,6 +164,8 @@ module ReVIEW
       end
 
       def execute(yamlfile, outdir, options)
+        @table_br_replace = options['table-br-replace']
+        @table_empty_replace = options['table-empty-replace']
         load_config(yamlfile)
         create_initial_project(outdir, options)
 

data/lib/review/retrovert/version.rb

@@ -1,5 +1,5 @@
 module ReVIEW
   module Retrovert
-    VERSION = "0.2.1"
+    VERSION = "0.3.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: review-retrovert
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.3
 platform: ruby
 authors:
 - srz_zumix
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-28 00:00:00.000000000 Z
+date: 2020-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor