metanorma-cli 1.4.10 → 1.4.13pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79d042bac271864609cab940f9e0d1ff64f456daf08a03218cd5e92b65614558
-  data.tar.gz: 2162cb5ee8a584c0776cfb81a5e1ee7e05a9f3d0cf4c923dd0b7a2376185ab41
+  metadata.gz: 027a85f83c8fd26727b311c10cbee32620d98bd8f821bca87620c0d706cedec4
+  data.tar.gz: 298ea03653a6432b3a0a5d809c03fd86f3374a16c1da8c709a3da69976f0d0ae
 SHA512:
-  metadata.gz: 6cda26cbfca34cd73077ab3c130d6c934b99e4ed6811d26a5099ed26b30e80b345a53e8edc67637cc7eeef295c27b75b9d46617402f6cba58ced68183592dc10
-  data.tar.gz: 3f70bf7cb2fdf8beedfebbefcc426767209264634eb13148f2641b56af2024c6561564b7490c93a7fb2fb36894f1a2be2ae5b1e9638bf44c9535a1cfbcceac5d
+  metadata.gz: 1fce906910a0a4ef89c049ee941a9589354808385ccdb33cbeb9bf81ba472d4fb86b4dc1d877d58ca7fa48eaba994f8b8a2a2a837b96277021b734ad376c3646
+  data.tar.gz: 9de3e7a5747e7f4464bb4412f811c6a6285485fd15a8008af766972c39c8784c2515870b6a017bae1ec0b479b5ca67614ed47d58e436319a6cf482dc1e9d660f

data/README.adoc

@@ -185,7 +185,7 @@ are `ietf`, `iso`, `gb`, `csd`, `csand`, `m3d` and `rsd`.
 
 This functionality compiles collections of Metanorma documents. It compiles
 the individual documents comprising the collection; then it compiles a document
-acting as a container for those collections. See 
+acting as a container for those collections. See
 https://github.com/metanorma/metanorma/wiki/Metanorma-collections[],
 https://github.com/metanorma/metanorma-cli/blob/master/spec/fixtures/collection1.yml[]
 
@@ -199,7 +199,7 @@ which contains:
 * Content to put at the ending of the collection container
 
 Documents within a collection
-may cross-reference each other using the syntax 
+may cross-reference each other using the syntax
 `* [[[myanchor,repo:(current-metanorma-collection/mydoc)]]]`,
 as proposed in https://github.com/metanorma/metanorma/issues/57, where
 `mydoc` is be the value of docref/identifier corresponding to the target document,
@@ -324,6 +324,21 @@ the site generation process. You can check more details here: link:./spec/fixtur
 metanorma site generate SOURCE_PATH -o OUTPUT_PATH -c metanorma.yml
 ----
 
+=== Using with proxy
+
+The `metanorma` command can read proxy settings from the following
+environment variables:
+
+* `HTTP_PROXY` for HTTPS and HTTP proxies
+* `SOCKS_PROXY` for SOCKS proxies
+
+Please refer to our https://www.metanorma.org/blog/2021-07-20/metanorma-with-proxies/[announcement on proxy support] for details.
+
+NOTE: Since `metanorma` uses Git for templates (and fonts via Fontist, which also relies on Git),
+Git must also be configured to use proxies. Please refer to
+https://gist.github.com/evantoli/f8c23a37eb3558ab8765[this Gist by evantoli] for details.
+
+
 == Credits
 
 This gem is developed, maintained and funded by https://www.metanorma.com/docs/getting-started/[Ribose Inc.]

data/exe/metanorma

@@ -11,10 +11,31 @@ $:.unshift File.expand_path("../../lib", bin_file)
 # Fixes https://github.com/rubygems/rubygems/issues/1420
 require "rubygems/specification"
 
-class Gem::Specification
-  def this; self; end
+module Gem
+  class Specification
+    def this; self; end
+  end
 end
 
 # start up the CLI
 require "metanorma/cli"
-Metanorma::Cli.start(ARGV)
+metanorma_cli = proc { Metanorma::Cli.start(ARGV) }
+if ENV["SOCKS_PROXY"]
+  require "socksify"
+  require "uri"
+  begin
+    proxy = URI.parse(ENV["SOCKS_PROXY"])
+    if proxy.userinfo
+      user, pass = proxy.userinfo.split(":")
+      TCPSocket::socks_username = user
+      TCPSocket::socks_password = pass
+    end
+    Socksify::proxy(proxy.host, proxy.port, &metanorma_cli)
+  rescue URI::InvalidURIError
+    warn "Value of ENV.SOCKS_PROXY=#{ENV['SOCKS_PROXY']} is invalid! Droping it"
+    ENV.delete("SOCKS_PROXY")
+    metanorma_cli.call
+  end
+else
+  metanorma_cli.call
+end

data/lib/metanorma/cli/git_template.rb

@@ -10,16 +10,15 @@ module Metanorma
 
       def remove!
         remove_template
-        return true
+        true
       end
 
       def download
         remove!
         clone_git_template(options[:repo])
-
       rescue Git::GitExecuteError
         UI.say("Invalid template reoository!")
-        return nil
+        nil
       end
 
       def find_or_download
@@ -86,7 +85,7 @@ module Metanorma
           iso: "https://github.com/metanorma/mn-templates-iso",
           iec: "https://github.com/metanorma/mn-templates-iec",
           itu: "https://github.com/metanorma/mn-templates-itu",
-          ietf: "https://github.com/metanorma/mn-templates-ietf"
+          ietf: "https://github.com/metanorma/mn-templates-ietf",
         }
       end
 

data/lib/metanorma/cli/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Cli
-    VERSION = "1.4.10".freeze
+    VERSION = "1.4.13pre".freeze
   end
 end

data/metanorma-cli.gemspec

@@ -36,15 +36,15 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop", "~> 1.5.2"
   spec.add_development_dependency "sassc"
 
-  spec.add_runtime_dependency "metanorma-ietf", "~> 2.3.0"
-  spec.add_runtime_dependency "metanorma-iso", "~> 1.8.0"
+  spec.add_runtime_dependency "metanorma-ietf", "~> 2.4.0"
+  spec.add_runtime_dependency "metanorma-iso", "~> 1.9.0"
   spec.add_runtime_dependency "thor", "~> 1.0"
   # spec.add_runtime_dependency "metanorma-gb", "~> 1.5.0"
   spec.add_runtime_dependency "metanorma-cc", "~> 1.7.0"
   spec.add_runtime_dependency "metanorma-csa", "~> 1.8.0"
   spec.add_runtime_dependency "metanorma-iec", "~> 1.3.0"
   # spec.add_runtime_dependency 'metanorma-ribose', "~> 1.6.0"
-  spec.add_runtime_dependency "metanorma-bipm", "~> 1.1.0"
+  spec.add_runtime_dependency "metanorma-bipm", "~> 1.1.5"
   spec.add_runtime_dependency "metanorma-generic", "~> 1.10.2"
   spec.add_runtime_dependency "metanorma-m3aawg", "~> 1.7.0"
   spec.add_runtime_dependency "metanorma-standoc", "~> 1.10.0"
@@ -54,8 +54,10 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "metanorma", "~> 1.3.0"
   spec.add_runtime_dependency "metanorma-iho", "~> 0.3.0"
   spec.add_runtime_dependency "metanorma-itu", "~> 1.3.0"
-  spec.add_runtime_dependency "metanorma-nist", "~> 1.3.0"
+  # spec.add_runtime_dependency "metanorma-nist", "~> 1.3.0"
   spec.add_runtime_dependency "metanorma-ogc", "~> 1.3.0"
   spec.add_runtime_dependency "metanorma-un", "~> 0.6.0"
   spec.add_runtime_dependency "relaton-cli", ">= 0.8.2"
+
+  spec.add_runtime_dependency "socksify"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cli
 version: !ruby/object:Gem::Version
-  version: 1.4.10
+  version: 1.4.13pre
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-07 00:00:00.000000000 Z
+date: 2021-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -170,28 +170,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -254,14 +254,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.5
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
   requirement: !ruby/object:Gem::Requirement
@@ -375,7 +375,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: metanorma-nist
+  name: metanorma-ogc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -389,47 +389,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: metanorma-ogc
+  name: metanorma-un
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
-  name: metanorma-un
+  name: relaton-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.8.2
 - !ruby/object:Gem::Dependency
-  name: relaton-cli
+  name: socksify
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: '0'
 description: Executable to process any Metanorma standard.
 email:
 - open.source@ribose.com
@@ -509,9 +509,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.4
 signing_key: