relaton-cli 1.7.pre3 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6c0e11fa51a48417dd591d2835b2637a79f9a021e58f1f1fb6e818d12e90ac3
-  data.tar.gz: da5753170d30401fab1a0b013a338ee3cd48da9d209a5ee17e83700f0999e59d
+  metadata.gz: 117244541f4bff6b5e41ede9703dc58814cab590af276879ef90dddf1d10358e
+  data.tar.gz: 60102f93d726c6e5aa4d23faa0808c1b149648815d72773631df45c7736ff569
 SHA512:
-  metadata.gz: cee2b8248080c68d64cc58e780e0aa77ba0ad9bd06d6e42ce4e8eda81c639bb2e5dd301e177cad0bdc12f3bd7d588a7f2b7f1eab9c426d1c81e6ef53e66e61a4
-  data.tar.gz: ed00bade15a250b8dcaa6d531c58ca1b979ad5a73175eb97a63593f1525ae62c4002f477e3bd84a717fdc571919e43f8021980c40d0e6dc9aba1282b050c6a51
+  metadata.gz: 94dfb0dfcdc1091cb83145c5454fde257d34c69b5e4bf8f1399666bc45b3998f6419b068e4ba75fbf615ce4298537c522f2176f95dffeb6e1bccb73a4d9c869a
+  data.tar.gz: aa63575174009b87161354f447b4de6c3c1715d1bdd44d69ec43b53d5d849a7e9c69bdf6638df6a7383409b42d464517ee59ce79509a2429c7c96bc9573ba8f5

data/docs/README.adoc

@@ -10,6 +10,7 @@ Please refer to https://github.com/relaton/relaton.
 
 == Commands
 
+Each command has an option `--verbose` (short form is `-v`). Use the option to get warnings in the commands outpput.
 The following commands are provided.
 
 === relaton concatenate
@@ -311,7 +312,7 @@ Import document or collection from XML `FILE` into `COLLECTION`.
 
 === Cache DB manipulation
 
-==== Create caache DB
+==== Create cache DB
 
 ----
 $ relaton db create DIR

data/lib/relaton/cli.rb

@@ -1,4 +1,5 @@
 require "thor"
+require "thor/hollaback"
 require "relaton"
 require_relative "cli/command"
 

data/lib/relaton/cli/command.rb

@@ -9,6 +9,8 @@ module Relaton
   module Cli
     class Command < Thor
       include Relaton::Cli
+      class_before :relaton_config
+      class_option :verbose, aliases: :v, type: :boolean, desc: "Output warnings"
 
       desc "fetch CODE", "Fetch Relaton XML for Standard identifier CODE"
       option :type, aliases: :t, desc: "Type of standard to "\
@@ -24,7 +26,6 @@ module Relaton
         "retries. Default 1."
 
       def fetch(code)
-        # Relaton.db
         io = IO.new(STDOUT.fcntl(::Fcntl::F_DUPFD), mode: "w:UTF-8")
         io.puts(fetch_document(code, options) || supported_type_message)
       end
@@ -43,8 +44,6 @@ module Relaton
       option :title, aliases: :t,  desc: "Title of resulting Relaton collection"
       option :organization, aliases: :g, desc: "Organization owner of Relaton "\
         "collection"
-      # option :new, aliases: :n, type: :boolean, desc: "Use the new Relaton "\
-      #   "YAML format"
       option :extension, aliases: :x, desc: "File extension of destination "\
         "Relaton file, defaults to 'rxl'"
 
@@ -56,8 +55,6 @@ module Relaton
         "Relaton Collection into multiple files"
       option :extension, aliases: :x, default: "rxl", desc: "File extension "\
         "of Relaton XML files, defaults to 'rxl'"
-      # option :new, aliases: :n, type: :boolean, desc: "Use the new Relaton "\
-      #   "YAML format"
 
       def split(source, outdir)
         Relaton::Cli::RelatonFile.split(source, outdir, options)
@@ -149,6 +146,16 @@ module Relaton
 
       desc "db SUBCOMMAND", "Cache DB manipulation"
       subcommand "db", SubcommandDb
+
+      no_commands do
+        def relaton_config
+          log_types = %i[info error]
+          log_types << :warning if options[:verbose]
+          Relaton.configure do |conf|
+            conf.logs = log_types
+          end
+        end
+      end
     end
 
     private

data/lib/relaton/cli/subcommand_collection.rb

@@ -3,6 +3,9 @@ require "relaton/cli/full_text_search"
 module Relaton
   module Cli
     class SubcommandCollection < Thor
+      include Relaton::Cli
+      class_option :verbose, aliases: :v, type: :boolean, desc: "Output warnings"
+
       desc "create COLLECTION", "Create collection"
       option :dir, aliases: :d, desc: "Directory to store collection. Default "\
         "is $HOME/.relaton/collections."
@@ -104,7 +107,7 @@ module Relaton
       option :dir, aliases: :d, desc: "Directory with collections. Default is "\
         "$HOME/.relaton/collections."
 
-      def fetch(code)
+      def fetch(code) # rubocop:disable Metrics/AbcSize
         doc = Relaton.db.fetch(code, options[:year]&.to_s)
         if doc
           colfile = File.join directory, options[:collection]
@@ -117,8 +120,8 @@ module Relaton
 
       desc "import FILE", "Import document or collection from an XML file "\
         "into another collection"
-      option :collection, aliases: :c, required: true, desc: "Collection "\
-        "to store a document. If collection doesn't exist then it'll be created."
+      option :collection, aliases: :c, required: true, desc: "Collection to "\
+        "store a document. If collection doesn't exist then it'll be created."
       option :dir, aliases: :d, desc: "Directory with collections. Default is "\
         "$HOME/.relaton/collections."
 

data/lib/relaton/cli/subcommand_db.rb

@@ -2,6 +2,7 @@ module Relaton
   module Cli
     class SubcommandDb < Thor
       include Relaton::Cli
+      class_option :verbose, aliases: :v, type: :boolean, desc: "Output warnings"
 
       desc "create DIR", "Create new cache DB. Default DIR is "\
         "/home/user/.relaon/cache/"

data/lib/relaton/cli/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Cli
-    VERSION = "1.7.pre3".freeze
+    VERSION = "1.7.4".freeze
   end
 end

data/relaton-cli.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock"
 
   spec.add_runtime_dependency "liquid", "~> 4"
-  spec.add_runtime_dependency "relaton", "1.7.pre7"
+  spec.add_runtime_dependency "relaton", ">=1.7.7"
   spec.add_runtime_dependency "thor"
+  spec.add_runtime_dependency "thor-hollaback"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-cli
 version: !ruby/object:Gem::Version
-  version: 1.7.pre3
+  version: 1.7.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-01 00:00:00.000000000 Z
+date: 2021-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -168,16 +168,16 @@ dependencies:
   name: relaton
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.pre7
+        version: 1.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.pre7
+        version: 1.7.7
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor-hollaback
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Relaton Command-line Interface
 email:
 - open.source@ribose.com
@@ -251,11 +265,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
 summary: Relaton Command-line Interface