metanorma-cli 1.3.8.1 → 1.3.9pre

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 91bf6eef03296f9d321401c0017c4b39583dea7b21de170c694f2de236106878
4
- data.tar.gz: 45cc3c9ae1e529d30f818205ef055ef10aee56c5b2280d01e9e2318ca9ab19b9
3
+ metadata.gz: 234928c265c26c0e5ac5a4d6f3c88826c485dcb56ff19821090c3ce9b6065688
4
+ data.tar.gz: 97331b9bc31a49d8589225d72de414a95205a3177a45c876f9f7c9bce7b2030d
5
5
  SHA512:
6
- metadata.gz: 9449c8bc2de3dbe5a51f5587c6c475bb0af445eb395e232b69957747123a322f0dadb19f44d8b69b372c9eb0938ac98100177b98647d4ea446183ef7ab516b5f
7
- data.tar.gz: 773578d9c862b66ee11cb67e9c6071f85f92a00ff4e31fc0b8c33f0d379a5dbd37817dad45fe439913ad6f84e0958425e6bec444f257fa8cc4652964a0c4d24c
6
+ metadata.gz: 418c7ae0f85da30ad14d4bc4ff15a7b8f5311fbde0efbb032d1eeeee37b19e02282854ab1d3b0368bdce9d90b11b00c69aba636cf8f15e8a1ebb151e754d891c
7
+ data.tar.gz: 281ad8d69a492cc9ed86f36e76ec0aa3faedc8bf52bbe96f1cfa640e6d2d77804ae0b2cc702f0772776c11ce30a07cd530a1879e34979eacea552734f645a42e
data/Gemfile CHANGED
@@ -4,6 +4,7 @@ Encoding.default_internal = Encoding::UTF_8
4
4
  source "https://rubygems.org"
5
5
  git_source(:github) { |repo| "https://github.com/#{repo}" }
6
6
 
7
+
7
8
  gemspec
8
9
 
9
10
  if File.exist? 'Gemfile.devel'
@@ -9,7 +9,7 @@ module Metanorma
9
9
  "metanorma-iso",
10
10
  "metanorma-iec",
11
11
  "metanorma-ietf",
12
- "metanorma-gb",
12
+ #"metanorma-gb",
13
13
  "metanorma-cc",
14
14
  "metanorma-csa",
15
15
  "metanorma-iho",
@@ -81,14 +81,6 @@ module Metanorma
81
81
  Pathname.new(Dir.home).join(".metanorma")
82
82
  end
83
83
 
84
- def self.fonts_directory
85
- Metanorma::Cli.home_directory.join("fonts")
86
- end
87
-
88
- def self.fonts
89
- Dir.glob(Metanorma::Cli.fonts_directory.join("**"))
90
- end
91
-
92
84
  def self.writable_templates_path?
93
85
  parent_directory = templates_path.join("..", "..")
94
86
 
@@ -1,5 +1,4 @@
1
1
  require "thor"
2
- require "metanorma/cli/setup"
3
2
  require "metanorma/cli/compiler"
4
3
  require "metanorma/cli/generator"
5
4
  require "metanorma/cli/git_template"
@@ -32,6 +31,10 @@ module Metanorma
32
31
  option :version, aliases: "-v", desc: "Print version of code (accompanied with -t)"
33
32
  option "output-dir", aliases: "-o", desc: "Directory to save compiled files"
34
33
 
34
+ option :agree_to_terms, type: :boolean, desc: "Agree / Disagree with all third-party licensing terms presented (WARNING: do know what you are agreeing with!)"
35
+ option :no_install_fonts, type: :boolean, desc: "Skip the font installation process"
36
+ option :continue_without_fonts, type: :boolean, desc: "Continue processing even when fonts are missing"
37
+
35
38
  def compile(file_name = nil)
36
39
  if file_name && !options[:version]
37
40
  Metanorma::Cli.load_flavors
@@ -89,34 +92,6 @@ module Metanorma
89
92
  desc "template-repo", "Manage metanorma templates repository"
90
93
  subcommand :template_repo, Metanorma::Cli::Commands::TemplateRepo
91
94
 
92
- desc "setup", "Initial necessary setup"
93
- option(
94
- :agree_to_terms,
95
- type: :boolean,
96
- required: false,
97
- default: false,
98
- desc: "Agree / Disagree with all third-party licensing terms presented (WARNING: do know what you are agreeing with!)",
99
- )
100
-
101
- def setup
102
- list_required_fonts.each do |font|
103
- begin
104
- Metanorma::Cli::Setup.run(
105
- font: font,
106
- term_agreement: options[:agree_to_terms],
107
- )
108
- rescue Fontist::Errors::LicensingError
109
- UI.error(
110
- "[error]: License acceptance required to install a necessary font." \
111
- "Accept required licenses with: `metanorma setup --agree-to-terms`."
112
- )
113
- return
114
- rescue Fontist::Errors::NonSupportedFontError
115
- UI.say("[info]: The font `#{font}` is not yet supported.")
116
- end
117
- end
118
- end
119
-
120
95
  private
121
96
 
122
97
  def single_type_extensions(type)
@@ -175,19 +150,6 @@ module Metanorma
175
150
  )
176
151
  end
177
152
 
178
- def list_required_fonts
179
- Metanorma::Cli.load_flavors
180
-
181
- Metanorma::Registry.instance.processors.map do |_key, processor|
182
- flavour = processor.class.to_s.gsub("::Processor", "")
183
- flavour_module = Object.const_get(flavour)
184
-
185
- if flavour_module.respond_to?(:fonts_used)
186
- flavour_module.fonts_used.map { |_, value| value }.flatten
187
- end
188
- end.compact.flatten.uniq
189
- end
190
-
191
153
  def load_flavours(type)
192
154
  Metanorma::Cli.load_flavors
193
155
  unless Metanorma::Registry.instance.find_processor(type&.to_sym)
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Cli
3
- VERSION = "1.3.8.1"
3
+ VERSION = "1.3.9pre"
4
4
  end
5
5
  end
@@ -29,7 +29,6 @@ Gem::Specification.new do |spec|
29
29
  spec.add_development_dependency "rspec", "~> 3.0"
30
30
  spec.add_development_dependency "byebug", "~> 10.0"
31
31
  spec.add_development_dependency "rspec-command", "~> 1.0.3"
32
- spec.add_development_dependency "equivalent-xml", "~> 0.6"
33
32
  spec.add_development_dependency "rspec-core", "~> 3.4"
34
33
  spec.add_development_dependency "vcr", "~> 5.0.0"
35
34
  spec.add_development_dependency "webmock"
@@ -39,24 +38,23 @@ Gem::Specification.new do |spec|
39
38
 
40
39
  spec.add_runtime_dependency "thor", "~> 1.0"
41
40
  spec.add_runtime_dependency "metanorma-iso", "~> 1.5.0"
42
- spec.add_runtime_dependency 'metanorma-ietf', "~> 2.2.0"
43
- spec.add_runtime_dependency 'metanorma-gb', "~> 1.5.0"
44
- spec.add_runtime_dependency 'metanorma-iec', "~> 1.2.0"
45
- spec.add_runtime_dependency 'metanorma-cc', "~> 1.6.0"
46
- spec.add_runtime_dependency 'metanorma-csa', "~> 1.6.0"
41
+ spec.add_runtime_dependency "metanorma-ietf", "~> 2.2.0"
42
+ #spec.add_runtime_dependency "metanorma-gb", "~> 1.5.0"
43
+ spec.add_runtime_dependency "metanorma-iec", "~> 1.2.0"
44
+ spec.add_runtime_dependency "metanorma-cc", "~> 1.6.0"
45
+ spec.add_runtime_dependency "metanorma-csa", "~> 1.6.0"
47
46
  #spec.add_runtime_dependency 'metanorma-ribose', "~> 1.6.0"
48
- spec.add_runtime_dependency 'metanorma-m3aawg', "~> 1.6.0"
49
- spec.add_runtime_dependency 'metanorma-generic', "~> 1.7.0"
50
- spec.add_runtime_dependency 'metanorma-standoc', "~> 1.6.0"
47
+ spec.add_runtime_dependency "metanorma-m3aawg", "~> 1.6.0"
48
+ spec.add_runtime_dependency "metanorma-generic", "~> 1.8.0"
49
+ spec.add_runtime_dependency "metanorma-standoc", "~> 1.6.0"
51
50
  #spec.add_runtime_dependency 'metanorma-mpfa', "~> 0.5.0"
52
- spec.add_runtime_dependency 'metanorma-un', "~> 0.5.0"
53
- spec.add_runtime_dependency 'metanorma-ogc', "~> 1.2.0"
54
- spec.add_runtime_dependency 'metanorma-nist', "~> 1.2.0"
55
- spec.add_runtime_dependency 'metanorma-itu', "~> 1.2.0"
56
- spec.add_runtime_dependency 'metanorma-iho', "~> 0.2.0"
57
- spec.add_runtime_dependency 'isodoc', ">= 1.2.0"
58
- spec.add_runtime_dependency 'metanorma', "~> 1.2.0"
51
+ spec.add_runtime_dependency "metanorma-un", "~> 0.5.0"
52
+ spec.add_runtime_dependency "metanorma-ogc", "~> 1.2.0"
53
+ spec.add_runtime_dependency "metanorma-nist", "~> 1.2.0"
54
+ spec.add_runtime_dependency "metanorma-itu", "~> 1.2.0"
55
+ spec.add_runtime_dependency "metanorma-iho", "~> 0.2.0"
56
+ spec.add_runtime_dependency "isodoc", ">= 1.3.0"
57
+ spec.add_runtime_dependency "metanorma", "~> 1.2.0"
59
58
  spec.add_runtime_dependency "git", "~> 1.5"
60
59
  spec.add_runtime_dependency "relaton-cli", ">= 0.8.2"
61
- spec.add_runtime_dependency "fontist", "~> 1.3.0"
62
60
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-cli
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.8.1
4
+ version: 1.3.9pre
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2020-11-13 00:00:00.000000000 Z
11
+ date: 2020-11-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: pry
@@ -80,20 +80,6 @@ dependencies:
80
80
  - - "~>"
81
81
  - !ruby/object:Gem::Version
82
82
  version: 1.0.3
83
- - !ruby/object:Gem::Dependency
84
- name: equivalent-xml
85
- requirement: !ruby/object:Gem::Requirement
86
- requirements:
87
- - - "~>"
88
- - !ruby/object:Gem::Version
89
- version: '0.6'
90
- type: :development
91
- prerelease: false
92
- version_requirements: !ruby/object:Gem::Requirement
93
- requirements:
94
- - - "~>"
95
- - !ruby/object:Gem::Version
96
- version: '0.6'
97
83
  - !ruby/object:Gem::Dependency
98
84
  name: rspec-core
99
85
  requirement: !ruby/object:Gem::Requirement
@@ -206,20 +192,6 @@ dependencies:
206
192
  - - "~>"
207
193
  - !ruby/object:Gem::Version
208
194
  version: 2.2.0
209
- - !ruby/object:Gem::Dependency
210
- name: metanorma-gb
211
- requirement: !ruby/object:Gem::Requirement
212
- requirements:
213
- - - "~>"
214
- - !ruby/object:Gem::Version
215
- version: 1.5.0
216
- type: :runtime
217
- prerelease: false
218
- version_requirements: !ruby/object:Gem::Requirement
219
- requirements:
220
- - - "~>"
221
- - !ruby/object:Gem::Version
222
- version: 1.5.0
223
195
  - !ruby/object:Gem::Dependency
224
196
  name: metanorma-iec
225
197
  requirement: !ruby/object:Gem::Requirement
@@ -282,14 +254,14 @@ dependencies:
282
254
  requirements:
283
255
  - - "~>"
284
256
  - !ruby/object:Gem::Version
285
- version: 1.7.0
257
+ version: 1.8.0
286
258
  type: :runtime
287
259
  prerelease: false
288
260
  version_requirements: !ruby/object:Gem::Requirement
289
261
  requirements:
290
262
  - - "~>"
291
263
  - !ruby/object:Gem::Version
292
- version: 1.7.0
264
+ version: 1.8.0
293
265
  - !ruby/object:Gem::Dependency
294
266
  name: metanorma-standoc
295
267
  requirement: !ruby/object:Gem::Requirement
@@ -380,14 +352,14 @@ dependencies:
380
352
  requirements:
381
353
  - - ">="
382
354
  - !ruby/object:Gem::Version
383
- version: 1.2.0
355
+ version: 1.3.0
384
356
  type: :runtime
385
357
  prerelease: false
386
358
  version_requirements: !ruby/object:Gem::Requirement
387
359
  requirements:
388
360
  - - ">="
389
361
  - !ruby/object:Gem::Version
390
- version: 1.2.0
362
+ version: 1.3.0
391
363
  - !ruby/object:Gem::Dependency
392
364
  name: metanorma
393
365
  requirement: !ruby/object:Gem::Requirement
@@ -430,20 +402,6 @@ dependencies:
430
402
  - - ">="
431
403
  - !ruby/object:Gem::Version
432
404
  version: 0.8.2
433
- - !ruby/object:Gem::Dependency
434
- name: fontist
435
- requirement: !ruby/object:Gem::Requirement
436
- requirements:
437
- - - "~>"
438
- - !ruby/object:Gem::Version
439
- version: 1.3.0
440
- type: :runtime
441
- prerelease: false
442
- version_requirements: !ruby/object:Gem::Requirement
443
- requirements:
444
- - - "~>"
445
- - !ruby/object:Gem::Version
446
- version: 1.3.0
447
405
  description: Executable to process any Metanorma standard.
448
406
  email:
449
407
  - open.source@ribose.com
@@ -494,7 +452,6 @@ files:
494
452
  - lib/metanorma/cli/errors.rb
495
453
  - lib/metanorma/cli/generator.rb
496
454
  - lib/metanorma/cli/git_template.rb
497
- - lib/metanorma/cli/setup.rb
498
455
  - lib/metanorma/cli/template_repo.rb
499
456
  - lib/metanorma/cli/ui.rb
500
457
  - lib/metanorma/cli/version.rb
@@ -518,9 +475,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
518
475
  version: 2.4.0
519
476
  required_rubygems_version: !ruby/object:Gem::Requirement
520
477
  requirements:
521
- - - ">="
478
+ - - ">"
522
479
  - !ruby/object:Gem::Version
523
- version: '0'
480
+ version: 1.3.1
524
481
  requirements: []
525
482
  rubygems_version: 3.0.3
526
483
  signing_key:
@@ -1,73 +0,0 @@
1
- require "fontist"
2
- require "fileutils"
3
-
4
- module Metanorma
5
- module Cli
6
- class Setup
7
- def initialize(options)
8
- @options = options
9
- @font_name = options.fetch(:font)
10
- @term_agreement = options.fetch(:term_agreement, false)
11
-
12
- create_metanorma_fonts_directory
13
- end
14
-
15
- def self.run(options = {})
16
- new(options).run
17
- end
18
-
19
- def run
20
- font = Metanorma::Cli.fonts.grep(/#{font_name}/i)
21
-
22
- if font.empty?
23
- font_paths = download_font
24
- copy_to_fonts(font_paths)
25
- end
26
- end
27
-
28
- private
29
-
30
- attr_reader :font_name, :options, :term_agreement
31
-
32
- def create_metanorma_fonts_directory
33
- unless Metanorma::Cli.fonts_directory.exist?
34
- FileUtils.mkdir_p(Metanorma::Cli.fonts_directory)
35
- end
36
- end
37
-
38
- def metanorma_fonts_path
39
- @metanorma_fonts_path ||= Metanorma::Cli.fonts_directory
40
- end
41
-
42
- def download_font
43
- begin
44
- Fontist::Font.find(font_name)
45
- rescue Fontist::Errors::MissingFontError
46
- process_font_installation(font_name)
47
- end
48
- end
49
-
50
- def copy_to_fonts(fonts_path)
51
- fonts_path.each do |font_path|
52
- font_name = File.basename(font_path)
53
- FileUtils.copy_file(font_path, metanorma_fonts_path.join(font_name))
54
- end
55
- end
56
-
57
- def process_font_installation(font_name)
58
- accepted_agreement = term_agreement == true ? "yes" : "no"
59
-
60
- UI.say(missing_font_message) if !term_agreement
61
- Fontist::Font.install(font_name, confirmation: accepted_agreement)
62
- end
63
-
64
- def missing_font_message
65
- <<~MSG
66
- Your system does not have the necessary fonts installed for
67
- PDF generation. Without these fonts, the generated PDF will use
68
- generic fonts that may not resemble the desired styling.\n
69
- MSG
70
- end
71
- end
72
- end
73
- end