metanorma-cli 1.4.11 → 1.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aeb21455a422e9fc84f03e659169cd95001d69516aada298a170cab52fac0e7c
-  data.tar.gz: 7fd3811aa62df6c6a87297688d427d43de441fca1df504e5486b38deca3ea3bb
+  metadata.gz: 9d970059361b835cee83ac9cf99d7876552536a656db299fddaab7f1b66586a4
+  data.tar.gz: f98918779ead848b3f60d683b931bb9b9b0074102aabb02aa89c9824695871d4
 SHA512:
-  metadata.gz: 06aa13679a522ba032a957a53cbd7897f47c16aa0372625c0f3594770eb2f8d8296582ce71838655d1721e552103f94dec2c6ac0d9305ed4f801b44778f2edf0
-  data.tar.gz: ae662917ddb624ba7b85924abbc11ffd5302cdcc437e77483f496b9559a24245d25c0807f7daf4d45bf074c865a0631aab2cb71504c6d0df6843fe77d2644aa3
+  metadata.gz: 662c3d0ef7dff9526feed6e91d54d79b4e1b16e12783a817ee6f42e3bd3fb1f210e9054592a59817e2b26b6919df3f2035949fc47985902e4ab588644f826658
+  data.tar.gz: 87379dc1184a7760aeac5ba59bbb8ed315973d14299262054d3588efbff6f5c3e803a362e96ae250f7f5f34008b430d79036dad23ce76a44cad87a50fba91758

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.11".freeze
+    VERSION = "1.4.13".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"
@@ -58,4 +58,6 @@ Gem::Specification.new do |spec|
   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.11
+  version: 1.4.13
 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
@@ -416,6 +416,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.2
+- !ruby/object:Gem::Dependency
+  name: socksify
+  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: Executable to process any Metanorma standard.
 email:
 - open.source@ribose.com
@@ -499,7 +513,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubyforge_project:
+rubygems_version: 2.7.7
 signing_key:
 specification_version: 4
 summary: Metanorma is the standard of standards; the metanorma gem allows you to create