relaton-cli 1.11.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 129088bf6b85735509a4a0c61d37a29e335d0ea17e882f6d805c4a479db7f4ac
-  data.tar.gz: 36e75a4ed206eecc11de6281441e998ddb24436c8d941a0747ddc9d4e9ae3c8e
+  metadata.gz: 67074e0aa3fa8c3f3badfa9cd924ff0f861aaf14fb456f7a051668be827f5f78
+  data.tar.gz: b01b4c8710566bbffaa64ffd16ac3ce2f4e5a0d1fa24b1f8924b1d2ada4321db
 SHA512:
-  metadata.gz: c644b905064d58cb44fdafb52a424ad4df0e52fe30cb36cf01634e23d33a74d5a1cb629a7f2ccec171490e665c0d24f26dbdee74a6cfd563f7af5829dcbc18cc
-  data.tar.gz: 3d954f0a0e9df9740612a754233be15a382460927540834d4719299317e29fb03743448dd292167ab573200f5dcfdc717033c20e59fc4e59a2168a56f658f309
+  metadata.gz: f2e2eff22baaca6079ffd6ce9fa07abac954db8bbb16138e740c910ccf8f5b5fada43c3809616e2f810fdc0f6eb54e281eff95d29d7b417ec888e6cf778053e1
+  data.tar.gz: dcaf6f5e5fe0d708ee02b0671beb0906f6173e8e69e9334f77b41526b3c2ec0c6a5cd506d17226cc15080ee038cc6d7cdac5264b1c7fb3a32c954f70e158ab5f

data/.github/workflows/rake.yml

@@ -10,27 +10,4 @@ on:
 
 jobs:
   rake:
-    name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '3.0', '2.7', '2.6', '2.5' ]
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
-        experimental: [ false ]
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: true
-
-      # https://github.com/ruby-debug/debase/issues/89#issuecomment-686827382
-      - if: matrix.os == 'macos-latest' && matrix.ruby == '2.5'
-        run: echo BUNDLE_BUILD__DEBASE="--with-cflags=\"-Wno-error=implicit-function-declaration\"" >> $GITHUB_ENV
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-
-      - run: bundle exec rake
+    uses: relaton/support/.github/workflows/rake.yml@master

data/.rubocop.yml

@@ -7,6 +7,6 @@ require: rubocop-rails
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.6
 Rails:
   Enabled: true

data/Gemfile

@@ -1,6 +1,3 @@
-Encoding.default_external = Encoding::UTF_8
-Encoding.default_internal = Encoding::UTF_8
-
 source "https://rubygems.org"
 
 # Specify your gem's dependencies in gemspec

data/docs/README.adoc

@@ -71,12 +71,15 @@ Foloowing datasets are availabe:
 * `ogc-naming-authority` - https://raw.githubusercontent.com/opengeospatial/NamingAuthority/master/incubation/bibliography/bibliography.json
 * `ieee-rawbib` - looks for the IEEE dataset in local `./ieee-rawbib` directory. The dataset could be downloaded from https://github.com/ietf-ribose/ieee-rawbib repository
 * `w3c-rdf` - http://www.w3.org/2002/01/tr-automation/tr.rdf
+* `w3c-tr-archive` - looks for the W3C archive dataset in local `./w3c-tr-archive` directory. The dataset could be downloaded from https://github.com/relaton/w3c-tr-archive repository
 * `iana-registries` - https://github.com/ietf-ribose/iana-registries
 * `status-smg-3GPP` - ftp://www.3gpp.org/Information/Databases/Spec_Status/
 * `ietf-rfcsubseries` - https://www.rfc-editor.org/rfc-index.xml (`<bcp-entry>`, `<fyi-entry>`, `<std-entry>`)
 * `ietf-internet-drafts` - looks for the Internet-Drafts dataset in local `./bibxml-ids` directory. The dataset could be downloaded using `rsync -avcizxL rsync.ietf.org::bibxml-ids ./bibxml-ids` command.
 * `ietf-rfc-entries` - https://www.rfc-editor.org/rfc-index.xml (`<rfc-entry>`)
 * `oasis-open` - https://www.oasis-open.org/standards/
+* `bipm-data-outcomes` - looks for the BIPM dataset in local `./bipm-data-outcomes` directory. The dataset could be downloaded from https://github.com/metanorma/bipm-data-outcomes repository
+* `si-brochure` - looks for the SI-Brochure dataset in local `./bipm-si-brocure` directory. The dataset could be downloaded from https://github.com/metanorma/bipm-si-brochure repository
 
 Options:
 
@@ -195,6 +198,7 @@ root:
       docid:
         type: CC
         id: CC 36000
+        primary: true
       type: standard
       title:
         type: main
@@ -208,6 +212,7 @@ root:
       docid:
         type: CC
         id: CC 34000
+        primary: true
       type: standard
       title:
         type: main
@@ -421,7 +426,7 @@ $ relaton db fetch_all -e 8 -y 2018
   <fetched>2021-04-01</fetched>
   <title type="title-main" format="text/plain" language="en" script="Latn">Principles and rules for the structure and drafting of ISO and IEC documents</title>
   <uri type="obp">https://www.iec.ch/members_experts/refdocs/iec/isoiecdir2%7Bed8.0.RLV%7Den.pdf</uri>
-  <docidentifier type="ISO">ISO/IEC DIR 2 IEC</docidentifier>
+  <docidentifier type="ISO" primary="true">ISO/IEC DIR 2 IEC</docidentifier>
   <date type="published">
     <on>2018-05-01</on>
   </date>

data/exe/relaton

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # encoding: UTF-8
-#
+
 # resolve bin path, ignoring symlinks
 require "pathname"
 bin_file = Pathname.new(__FILE__).realpath

data/lib/relaton/bibdata.rb

@@ -44,9 +44,9 @@ module Relaton
 
     def to_xml(opts = {})
       options = { bibdata: true, date_format: :full }.merge(
-        opts.select { |k, _v| k.is_a? Symbol }
+        opts.select { |k, _v| k.is_a? Symbol },
       )
-      @bibitem.to_xml **options
+      @bibitem.to_xml(**options)
     end
 
     def to_h
@@ -69,13 +69,13 @@ module Relaton
         @bibitem.send meth, *args
       elsif URL_TYPES.include? meth
         link = @bibitem.link.detect do |l|
-          l.type == meth.to_s || meth == :uri && l.type.nil?
+          l.type == meth.to_s || (meth == :uri && l.type.nil?)
         end
         link&.content&.to_s
       elsif URL_TYPES.include? meth.match(/^\w+(?==)/).to_s.to_sym
         /^(?<type>\w+)/ =~ meth
         link = @bibitem.link.detect do |l|
-          l.type == type || type == "uri" && l.type.nil?
+          l.type == type || (type == "uri" && l.type.nil?)
         end
         if link
           link.content = args[0]

data/lib/relaton/cli/command.rb

@@ -196,7 +196,7 @@ module Relaton
       case format
       when "yaml", "yml" then doc.to_hash.to_yaml
       when "bibtex" then doc.to_bibtex
-      else doc.to_xml
+      else doc.to_xml bibdata: true
       end
     end
 

data/lib/relaton/cli/data_fetcher.rb

@@ -3,6 +3,11 @@ module Relaton
     module DataFetcher
       def fetch(source, options)
         processor = Relaton::Registry.instance.find_processor_by_dataset source
+        unless processor
+          warn "[relaton-cli] WARNING: no processor found for #{source}"
+          return
+        end
+
         opts = {}
         opts[:output] = options[:output] if options[:output]
         opts[:format] = options[:format] if options[:format]

data/lib/relaton/cli/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Cli
-    VERSION = "1.11.0".freeze
+    VERSION = "1.13.0".freeze
   end
 end

data/relaton-cli.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = ">= 2.5.0"
+  spec.required_ruby_version = ">= 2.6.0"
 
   spec.add_development_dependency "byebug", "~> 11.0"
   # spec.add_development_dependency "debase"
@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock"
 
   spec.add_runtime_dependency "liquid", "~> 4"
-  spec.add_runtime_dependency "relaton", "~> 1.11.0"
+  spec.add_runtime_dependency "relaton", "~> 1.13.0"
   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.11.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-10 00:00:00.000000000 Z
+date: 2022-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -264,7 +264,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="