review-retrovert 0.1.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 935ec51160017f46b8ceed226f0c1faa871f931b99b40bde3fb7d4a0b6967b65
-  data.tar.gz: 5c0aeca7c1228c2a04266b07d6386d54dd1fcb6f6672977d09a9d05002cca78a
+  metadata.gz: c9727e90e617a35a08cdbae8916f5e4cb388950fd654bb82c4c2363764850c82
+  data.tar.gz: 964388bf53220b9f6731bf60d00a1d0a27398e774f2f010c7ae2a2d008cdefa9
 SHA512:
-  metadata.gz: b1931ae7c86bd07cd1deb1f3ede33d35e4a661cdbdfaa4dea943e2bc962f2a02ee2705bca0506e593184708203db7c687b430c34b13eb34e2f64ac018d471eb8
-  data.tar.gz: 420dfc1580231b004a5de8059b495097486f051985b8fcc4130fd9acaea9c93d1682585ebcdbcadffe557c6d64cf7952bc4f8e5479d1046e62ec8dd2fe03b645
+  metadata.gz: 370fcb244a1037f52506ae4707288957553270acc96b005f02d97d8c6dd188753e3297244794b732cffd16406536879111f5787a0aa9ad199890979880c40112
+  data.tar.gz: 3dbc8982c6c904ff2e5deda893e3daa41cb6f9873c05dacb112339b4b3fca80732d122a8dd0978e05347d11dbefa9f825dc3f7add8a57e6ff0076911b9837601

data/Dockerfile

@@ -0,0 +1,5 @@
+FROM vvakame/review:3.2
+
+RUN gem install review-retrovert
+
+ENTRYPOINT [ "review-retrovert" ]

data/Gemfile.lock

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

data/README.md

@@ -1,4 +1,8 @@
-# Review::Retrovert
+[![Gem Version](https://badge.fury.io/rb/review-retrovert.svg)](https://badge.fury.io/rb/review-retrovert)
+[![Build Status](https://travis-ci.com/srz-zumix/review-retrovert.svg?token=ArNHjRjvfZfyqQUCbXSt&branch=master)](https://travis-ci.com/srz-zumix/review-retrovert)
+[![Docker Cloud Build Status](https://img.shields.io/docker/cloud/build/srzzumix/review-retrovert.svg)](https://hub.docker.com/r/srzzumix/review-retrovert/)
+
+# ReVIEW::Retrovert
 
 ## Installation
 

data/hooks/post_push

@@ -0,0 +1,8 @@
+#!/bin/bash
+set -eu
+
+if [ "${DOCKER_TAG}" = "latest" ]; then
+  VERSION=$(docker run --rm ${IMAGE_NAME} version)
+  docker tag ${IMAGE_NAME} ${DOCKER_REPO}:${VERSION}
+  docker push ${DOCKER_REPO}:${VERSION}
+fi

data/lib/review/retrovert/cli.rb

@@ -5,19 +5,17 @@ module ReVIEW
   module Retrovert
     class CLI < Thor
       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 "force", aliases: "f", desc: 'Force output', type: :boolean
+      method_option "strict", desc: 'Only process files registered in the catalog', type: :boolean
       def convert(review_starter_configfile, outdir)
         Converter.execute(review_starter_configfile, outdir, options)
       end
 
-      desc "snake {CamelCaseString}", "convert {CamelCaseString} to {snake_case_string}"
-      def snake(str)
-        puts str
-          .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
-          .gsub(/([a-z\d])([A-Z])/, '\1_\2')
-          .tr("-", "_")
-          .downcase
+      desc "version", "show version"
+      def version()
+        puts VERSION
       end
+
     end
   end
-end
+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
@@ -102,22 +102,35 @@ module ReVIEW
       def update_content_files(outdir, contentdir, contentfiles)
         files = contentfiles.is_a?(String) ? contentfiles.split(/\R/) : contentfiles
         files.each do |content|
-          update_content(outdir, File.join(contentdir, content))
+          contentpath = File.join(contentdir, content)
+          unless File.exist?(contentpath)
+            srcpath = File.join(File.join(@basedir, @srccontentsdir), content)
+            # info srcpath
+            if File.exist?(srcpath)
+              FileUtils.cp(srcpath, contentdir)
+            end
+          end
+          update_content(outdir, contentpath)
         end
       end
 
-      def update_contents(outdir)
+      def update_contents(outdir, options)
         yamlfile = @config['catalogfile']
         abspath = File.absolute_path(outdir)
-        catalog = ReVIEW::Catalog.new(File.open(File.join(abspath, yamlfile)))
-        # contentdir = File.join(abspath, @config['contentdir'])
         contentdir = abspath
         info 'replace //sideimage to //image'
         info 'replace starter inline command'
-        update_content_files(outdir, contentdir, catalog.predef())
-        update_content_files(outdir, contentdir, catalog.chaps())
-        update_content_files(outdir, contentdir, catalog.appendix())
-        update_content_files(outdir, contentdir, catalog.postdef())
+        if options['strict']
+          catalog = ReVIEW::Catalog.new(File.open(File.join(abspath, yamlfile)))
+          update_content_files(outdir, contentdir, catalog.predef())
+          update_content_files(outdir, contentdir, catalog.chaps())
+          update_content_files(outdir, contentdir, catalog.appendix())
+          update_content_files(outdir, contentdir, catalog.postdef())
+        else
+          # copy_contents(outdir)
+          contentsfiles = Pathname.glob(File.join(File.join(@basedir, @srccontentsdir), '*.re')).map(&:basename)
+          update_content_files(outdir, contentdir, contentsfiles)
+        end
       end
 
       def clean_initial_project(outdir)
@@ -131,6 +144,7 @@ module ReVIEW
         @configs.open(yamlfile)
         @config = @configs.config
         @basedir = @configs.basedir
+        @srccontentsdir = @config['contentdir']
       end
 
       def create_initial_project(outdir, options)
@@ -145,10 +159,9 @@ module ReVIEW
 
         copy_config(outdir)
         copy_catalog(outdir)
-        copy_contents(outdir)
         copy_images(outdir)
         update_config(outdir)
-        update_contents(outdir)
+        update_contents(outdir, options)
 
         pwd = Dir.pwd
         Dir.chdir(outdir)

data/lib/review/retrovert/version.rb

@@ -1,5 +1,5 @@
 module ReVIEW
   module Retrovert
-    VERSION = "0.1.0"
+    VERSION = "0.3.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: review-retrovert
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.1
 platform: ruby
 authors:
 - srz_zumix
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-06 00:00:00.000000000 Z
+date: 2020-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -60,6 +60,7 @@ files:
 - ".rspec"
 - ".travis.yml"
 - CHANGELOG.md
+- Dockerfile
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -67,8 +68,8 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- catalog.yml
 - exe/review-retrovert
+- hooks/post_push
 - lib/review/retrovert.rb
 - lib/review/retrovert/cli.rb
 - lib/review/retrovert/converter.rb

data/catalog.yml

@@ -1,49 +0,0 @@
-PREDEF:
-  - c000-preface.re
-
-CHAPS:
-  - 無料で使える CI サービス紹介:
-    - c001-free-ci.re
-    - c010-appveyor.re
-    - c010-azure-pipelines.re
-    - c010-bitrise.re
-    - c010-buddy-works.re
-    - c010-circleci.re
-    - c010-cirrus-ci.re
-    - c010-codefresh.re
-    - c010-codeship.re
-    - c010-drone.re
-    - c010-github-actions.re
-    - c010-semaphore.re
-    - c010-shippable.re
-    - c010-travis-ci.re
-    # - c010-wercker.re
-    - c090-free-others.re
-  - 無料で使える CI サービス比較:
-    - c101-vs-env.re
-    - c102-vs-specs.re
-    - c103-vs-yaml.re
-    - c104-vs-comment-command.re
-    - c105-vs-share.re
-    - c106-vs-security.re
-    - c130-vs-badge.re
-
-APPENDIX:
-  - c200-appendix.re
-
-POSTDEF:
-
-##
-## ■Tips
-## 第I部、第II部、…のように「部」を使うには、「CHAPS:」を次のようにする。
-##
-##   CHAPS:
-##     - 部タイトル:
-##         - chap01.re
-##         - chap02.re
-##     - 部タイトル:
-##         - chap03.re
-##         - chap04.re
-##
-## 「部タイトル」の最後に半角の「:」をつけることに注意。
-##