metanorma-cli 1.2.12 → 1.3.1

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.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +131 -118
  3. data/a +4 -1
  4. data/a.json +33 -0
  5. data/lib/metanorma/cli.rb +3 -16
  6. data/lib/metanorma/cli/command.rb +25 -6
  7. data/lib/metanorma/cli/compiler.rb +6 -1
  8. data/lib/metanorma/cli/setup.rb +15 -6
  9. data/lib/metanorma/cli/version.rb +1 -1
  10. data/metanorma-cli.gemspec +19 -19
  11. metadata +43 -49
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: d1509db5c1126e1ca24e22b22128df8e27f99eac3a3e72084d167d169cf2ce08
4
- data.tar.gz: 34f03e9cf1dd0b3a30431ad892a3341a58d433ebb3760c7ec13976266ce16401
3
+ metadata.gz: 370299374d6064f4be2b1bce3ffe74d816a3221a197e85189e2d076173f4d843
4
+ data.tar.gz: 2a1a633b009ec2e34c809405d7d07f747a598f7a6eaa5d9d7be772d7a53811c0
5
5
  SHA512:
6
- metadata.gz: 8c068a0d288f8648264126dec89bc49f797eb8fc13a5e8ad94386cc6e4ca145cf289517fba41b1742b6887298433ca9a7fe08ffee2e5f95afd5c1f8bf3124760
7
- data.tar.gz: 63c5b9715078c9783773cb069aa7b110854a8be81f73f29ace39de2acce93df471e9144f7b13f8579054daa223c3bf0249eddd8643dfaf8f41100cad0cf9ed9e
6
+ metadata.gz: 503038584c4e2e3e869c00225439da73b93427f95a8f3ec3fe93b22c58c703483a4a980be0ae4cd2d9c97aa954db335b5762bc28d82ab9534d8e214894e95f75
7
+ data.tar.gz: bf08778ca3688e38f8df865daf162a02b008530faf2dfb14294609c6d1f329631df721e22b6b220c636aed6084b400bcd6c668dab4616a9a092f5ee7abf9832b
data/Gemfile.lock CHANGED
@@ -1,25 +1,25 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- metanorma-cli (1.2.12)
5
- fontist (~> 0.2.0)
4
+ metanorma-cli (1.3.1)
5
+ fontist (~> 1.0.0)
6
6
  git (~> 1.5)
7
- isodoc (~> 1.0.0)
8
- metanorma (~> 1.0.0)
9
- metanorma-csa (~> 1.4.0)
10
- metanorma-csd (~> 1.3.0)
11
- metanorma-gb (~> 1.3.0)
12
- metanorma-generic (~> 1.4.0)
13
- metanorma-iec (~> 1.0.0)
14
- metanorma-ietf (~> 2.0.0)
15
- metanorma-iho (~> 0.0.1)
16
- metanorma-iso (~> 1.3.0)
17
- metanorma-itu (~> 1.0.0)
18
- metanorma-m3d (~> 1.3.0)
19
- metanorma-nist (~> 1.0.0)
20
- metanorma-ogc (~> 1.0.0)
21
- metanorma-standoc (~> 1.3.0, >= 1.3.18)
22
- metanorma-un (~> 0.3.1)
7
+ isodoc (~> 1.1.0)
8
+ metanorma (~> 1.1.0)
9
+ metanorma-cc (~> 1.4.0)
10
+ metanorma-csa (~> 1.5.0)
11
+ metanorma-gb (~> 1.4.0)
12
+ metanorma-generic (~> 1.5.0)
13
+ metanorma-iec (~> 1.1.0)
14
+ metanorma-ietf (~> 2.1.0)
15
+ metanorma-iho (~> 0.1.0)
16
+ metanorma-iso (~> 1.4.0)
17
+ metanorma-itu (~> 1.1.0)
18
+ metanorma-m3aawg (~> 1.4.0)
19
+ metanorma-nist (~> 1.1.0)
20
+ metanorma-ogc (~> 1.1.0)
21
+ metanorma-standoc (~> 1.4.0)
22
+ metanorma-un (~> 0.4.0)
23
23
  relaton-cli (>= 0.8.2)
24
24
  thor (~> 0.20.3)
25
25
 
@@ -29,16 +29,16 @@ GEM
29
29
  addressable (2.7.0)
30
30
  public_suffix (>= 2.0.2, < 5.0)
31
31
  asciidoctor (2.0.10)
32
- asciimath (1.0.9)
32
+ asciimath (2.0.0)
33
33
  bibtex-ruby (5.1.4)
34
34
  latex-decode (~> 0.0)
35
35
  byebug (10.0.2)
36
36
  camertron-eprun (1.1.1)
37
37
  cldr-plurals-runtime-rb (1.0.1)
38
- cnccs (0.1.5)
39
- coderay (1.1.2)
38
+ cnccs (0.1.6)
39
+ coderay (1.1.3)
40
40
  concurrent-ruby (1.1.6)
41
- diff-lcs (1.3)
41
+ diff-lcs (1.4.2)
42
42
  domain_name (0.5.20190701)
43
43
  unf (>= 0.0.5, < 1.0.0)
44
44
  down (5.1.1)
@@ -47,18 +47,19 @@ GEM
47
47
  nokogiri (>= 1.4.3)
48
48
  faraday (1.0.1)
49
49
  multipart-post (>= 1.2, < 3)
50
- ffi (1.12.2)
50
+ ffi (1.13.1)
51
51
  ffi-compiler2 (2.0.0)
52
52
  ffi (>= 1.0.0)
53
53
  rake
54
- fontist (0.2.0)
54
+ fontist (1.0.0)
55
55
  down (~> 5.0)
56
56
  libmspack (~> 0.1.0)
57
+ rubyzip (~> 2.3.0)
57
58
  gb-agencies (0.0.6)
58
59
  git (1.7.0)
59
60
  rchardet (~> 1.8)
60
- html2doc (1.0.1)
61
- asciimath (~> 1.0.9)
61
+ html2doc (1.0.3)
62
+ asciimath (~> 2.0.0)
62
63
  htmlentities (~> 4.3.4)
63
64
  image_size
64
65
  mime-types
@@ -73,16 +74,16 @@ GEM
73
74
  image_size (2.0.2)
74
75
  iso-639 (0.3.5)
75
76
  iso639 (1.3.2)
76
- isodoc (1.0.26)
77
+ isodoc (1.1.0)
77
78
  asciimath
78
79
  html2doc (~> 1.0.0)
79
80
  htmlentities (~> 4.3.4)
80
81
  liquid
81
- metanorma (~> 1.0.0)
82
+ metanorma (~> 1.1.0)
82
83
  nokogiri (>= 1.10.4)
83
84
  rake (~> 12.0)
84
85
  roman-numerals
85
- sassc (~> 2.2.1)
86
+ sassc (~> 2.4.0)
86
87
  thread_safe
87
88
  uuidtools
88
89
  isoics (0.1.8)
@@ -94,96 +95,99 @@ GEM
94
95
  mathml2asciimath (0.0.10)
95
96
  htmlentities (~> 4.3.4)
96
97
  nokogiri (>= 1.10.4)
97
- metanorma (1.0.5)
98
+ metanorma (1.1.0)
98
99
  asciidoctor
99
100
  htmlentities
100
- mn2pdf (~> 1.13)
101
+ mn2pdf (~> 1)
101
102
  nokogiri
102
- metanorma-csa (1.4.10)
103
+ metanorma-cc (1.4.0)
104
+ isodoc (~> 1.1.0)
105
+ metanorma-standoc (~> 1.4.0)
106
+ metanorma-csa (1.5.0)
103
107
  htmlentities (~> 4.3.4)
104
108
  image_size
105
- isodoc (~> 1.0.0)
106
- metanorma-standoc (~> 1.3.0)
109
+ isodoc (~> 1.1.0)
110
+ metanorma-standoc (~> 1.4.0)
107
111
  mime-types
108
112
  ruby-jing
109
113
  thread_safe
110
114
  uuidtools
111
- metanorma-csd (1.3.21)
112
- isodoc (~> 1.0.0)
113
- metanorma-standoc (~> 1.3.0)
114
- metanorma-gb (1.3.23)
115
+ metanorma-gb (1.4.0)
115
116
  gb-agencies (~> 0.0.4)
116
117
  htmlentities (~> 4.3.4)
117
- isodoc (~> 1.0.0)
118
- metanorma-iso (~> 1.3.0)
118
+ isodoc (~> 1.1.0)
119
+ metanorma-iso (~> 1.4.0)
119
120
  twitter_cldr (~> 4.4.4)
120
- metanorma-generic (1.4.8)
121
+ metanorma-generic (1.5.0)
121
122
  htmlentities (~> 4.3.4)
122
- isodoc (~> 1.0.0)
123
- metanorma-standoc (~> 1.3.0)
123
+ isodoc (~> 1.1.0)
124
+ metanorma-standoc (~> 1.4.0)
124
125
  ruby-jing
125
- metanorma-iec (1.0.6)
126
- isodoc (~> 1.0.0)
127
- metanorma-iso (~> 1.3.0)
126
+ metanorma-iec (1.1.0)
127
+ isodoc (~> 1.1.0)
128
+ metanorma-iso (~> 1.4.0)
128
129
  ruby-jing
129
- metanorma-ietf (2.0.10)
130
- isodoc (~> 1.0.0)
130
+ metanorma-ietf (2.1.0)
131
+ isodoc (~> 1.1.0)
131
132
  mathml2asciimath
132
- metanorma-standoc (~> 1.3.0)
133
- metanorma-iho (0.0.1)
133
+ metanorma-standoc (~> 1.4.0)
134
+ metanorma-iho (0.1.0)
134
135
  htmlentities (~> 4.3.4)
135
- isodoc (~> 1.0.0)
136
- metanorma-generic (~> 1.4.0)
137
- metanorma-standoc (~> 1.3.0)
138
- metanorma-iso (1.3.24)
139
- isodoc (~> 1.0.0)
140
- metanorma-standoc (~> 1.3.0)
136
+ isodoc (~> 1.1.0)
137
+ metanorma-generic (~> 1.5.0)
138
+ metanorma-standoc (~> 1.4.0)
139
+ metanorma-iso (1.4.0)
140
+ isodoc (~> 1.1.0)
141
+ metanorma-standoc (~> 1.4.0)
142
+ mn2sts (~> 1.2.0)
141
143
  ruby-jing
142
- metanorma-itu (1.0.15)
144
+ tokenizer (~> 0.3.0)
145
+ twitter_cldr
146
+ metanorma-itu (1.1.0)
143
147
  htmlentities (~> 4.3.4)
144
- isodoc (~> 1.0.0)
145
- metanorma-standoc (~> 1.3.0)
148
+ isodoc (~> 1.1.0)
149
+ metanorma-standoc (~> 1.4.0)
146
150
  ruby-jing
147
- metanorma-m3d (1.3.19)
148
- asciimath
151
+ metanorma-m3aawg (1.4.0)
149
152
  htmlentities (~> 4.3.4)
150
153
  image_size
151
- isodoc (~> 1.0.0)
152
- metanorma-standoc (~> 1.3.0)
154
+ isodoc (~> 1.1.0)
155
+ metanorma-standoc (~> 1.4.0)
153
156
  mime-types
154
157
  ruby-jing
155
158
  thread_safe
156
159
  uuidtools
157
- metanorma-nist (1.0.7)
160
+ metanorma-nist (1.1.0)
158
161
  htmlentities (~> 4.3.4)
159
- isodoc (~> 1.0.0)
160
- metanorma-standoc (~> 1.3.0)
162
+ iso-639
163
+ isodoc (~> 1.1.0)
164
+ metanorma-standoc (~> 1.4.0)
161
165
  ruby-jing
162
166
  twitter_cldr
163
167
  tzinfo-data
164
- metanorma-ogc (1.0.6)
168
+ metanorma-ogc (1.1.0)
165
169
  htmlentities (~> 4.3.4)
166
170
  iso-639
167
- isodoc (~> 1.0.20)
168
- metanorma-standoc (~> 1.3.20)
171
+ isodoc (~> 1.1.0)
172
+ metanorma-standoc (~> 1.4.0)
169
173
  ruby-jing
170
- metanorma-standoc (1.3.28)
174
+ metanorma-standoc (1.4.2)
171
175
  asciidoctor (~> 2.0.0)
172
176
  concurrent-ruby
173
177
  iev (~> 0.2.1)
174
- isodoc (~> 1.0.20)
178
+ isodoc (~> 1.1.0)
175
179
  mathml2asciimath
176
180
  mimemagic
177
- relaton (~> 1.0.0)
181
+ relaton (~> 1.2.0)
178
182
  relaton-iev (~> 1.0.0)
179
183
  ruby-jing
180
184
  sterile (~> 1.0.14)
181
185
  unicode2latex (~> 0.0.1)
182
- metanorma-un (0.3.8)
186
+ metanorma-un (0.4.0)
183
187
  htmlentities (~> 4.3.4)
184
188
  iso-639
185
- isodoc (~> 1.0.0)
186
- metanorma-standoc (~> 1.3.0)
189
+ isodoc (~> 1.1.0)
190
+ metanorma-standoc (~> 1.4.0)
187
191
  roman-numerals
188
192
  ruby-jing
189
193
  twitter_cldr
@@ -194,7 +198,8 @@ GEM
194
198
  mimemagic (0.3.5)
195
199
  mini_portile2 (2.4.0)
196
200
  mixlib-shellout (2.4.4)
197
- mn2pdf (1.14)
201
+ mn2pdf (1.18)
202
+ mn2sts (1.2.0)
198
203
  multipart-post (2.1.1)
199
204
  nokogiri (1.10.9)
200
205
  mini_portile2 (~> 2.4.0)
@@ -205,64 +210,71 @@ GEM
205
210
  public_suffix (4.0.5)
206
211
  rake (12.3.3)
207
212
  rchardet (1.8.0)
208
- relaton (1.0.1)
209
- relaton-calconnect (~> 1.0.0)
210
- relaton-gb (~> 1.0.0)
211
- relaton-iec (~> 1.0.0)
212
- relaton-ietf (~> 1.0.0)
213
- relaton-iso (~> 1.0.0)
214
- relaton-itu (~> 1.0.0)
215
- relaton-nist (~> 1.0.0)
216
- relaton-ogc (~> 1.0.0)
217
- relaton-omg (~> 1.0.0)
218
- relaton-un (~> 1.0.0)
219
- relaton-w3c (~> 1.0.0)
220
- relaton-bib (1.0.2)
213
+ relaton (1.2.0)
214
+ relaton-calconnect (~> 1.2.0)
215
+ relaton-gb (~> 1.2.0)
216
+ relaton-iec (~> 1.2.0)
217
+ relaton-ieee (~> 1.2.0)
218
+ relaton-ietf (~> 1.2.0)
219
+ relaton-iho (~> 1.2.0)
220
+ relaton-iso (~> 1.2.0)
221
+ relaton-itu (~> 1.2.0)
222
+ relaton-nist (~> 1.2.0)
223
+ relaton-ogc (~> 1.2.0)
224
+ relaton-omg (~> 1.2.0)
225
+ relaton-un (~> 1.2.0)
226
+ relaton-w3c (~> 1.2.0)
227
+ relaton-bib (1.2.0)
221
228
  addressable
222
229
  bibtex-ruby
223
230
  iso639
224
231
  nokogiri
225
- relaton-calconnect (1.0.0)
232
+ relaton-calconnect (1.2.0)
226
233
  faraday
227
- relaton-iso-bib (~> 1.0.0)
228
- relaton-cli (1.0.1)
234
+ relaton-bib (~> 1.2.0)
235
+ relaton-cli (1.2.0)
229
236
  liquid
230
- relaton (~> 1.0.0)
237
+ relaton (~> 1.2.0)
231
238
  thor
232
- relaton-gb (1.0.0)
239
+ relaton-gb (1.2.0)
233
240
  cnccs (~> 0.1.1)
234
241
  gb-agencies (~> 0.0.1)
235
- relaton-iso-bib (~> 1.0.0)
236
- relaton-iec (1.0.0)
242
+ relaton-iso-bib (>= 1.2.0)
243
+ relaton-iec (1.2.0)
237
244
  addressable
238
- relaton-iso-bib (~> 1.0.0)
239
- relaton-ietf (1.0.0)
240
- relaton-bib (~> 1.0.0)
245
+ relaton-iso-bib (~> 1.2.0)
246
+ relaton-ieee (1.2.0)
247
+ faraday (~> 1.0.0)
248
+ relaton-bib (~> 1.2.0)
249
+ relaton-ietf (1.2.0)
250
+ relaton-bib (~> 1.2.0)
241
251
  relaton-iev (1.0.0)
242
252
  relaton (~> 1)
243
- relaton-iso (1.0.1)
244
- relaton-iec (~> 1.0.0)
245
- relaton-iso-bib (~> 1.0.0)
246
- relaton-iso-bib (1.0.0)
253
+ relaton-iho (1.2.0)
254
+ relaton-bib (~> 1.2.0)
255
+ relaton-iso (1.2.0)
256
+ relaton-iec (~> 1.2.0)
257
+ relaton-iso-bib (~> 1.2.0)
258
+ relaton-iso-bib (1.2.0)
247
259
  isoics (~> 0.1.6)
248
- relaton-bib (~> 1.0.0)
249
- relaton-itu (1.0.2)
250
- relaton-iso-bib (~> 1.0.0)
251
- relaton-nist (1.0.0)
252
- relaton-bib (~> 1.0.0)
260
+ relaton-bib (~> 1.2.0)
261
+ relaton-itu (1.2.0)
262
+ relaton-bib (~> 1.2.0)
263
+ relaton-nist (1.2.0)
264
+ relaton-bib (~> 1.2.0)
253
265
  rubyzip
254
- relaton-ogc (1.0.0)
266
+ relaton-ogc (1.2.0)
255
267
  faraday (~> 1.0.0)
256
- relaton-iso-bib (~> 1.0.0)
257
- relaton-omg (1.0.0)
258
- relaton-bib (~> 1.0.0)
259
- relaton-un (1.0.0)
268
+ relaton-iso-bib (~> 1.2.0)
269
+ relaton-omg (1.2.0)
270
+ relaton-bib (~> 1.2.0)
271
+ relaton-un (1.2.1)
260
272
  faraday
261
273
  http-cookie
262
- relaton-iso-bib (~> 1.0.0)
274
+ relaton-bib (~> 1.2.0)
263
275
  unf_ext (>= 0.0.7.7)
264
- relaton-w3c (1.0.0)
265
- relaton-bib (>= 1.0.0)
276
+ relaton-w3c (1.2.0)
277
+ relaton-bib (>= 1.2.0)
266
278
  roman-numerals (0.3.0)
267
279
  rspec (3.9.0)
268
280
  rspec-core (~> 3.9.0)
@@ -287,12 +299,13 @@ GEM
287
299
  ruby-jing (0.0.1)
288
300
  optout (>= 0.0.2)
289
301
  rubyzip (2.3.0)
290
- sassc (2.2.1)
302
+ sassc (2.4.0)
291
303
  ffi (~> 1.9)
292
304
  sterile (1.0.16)
293
305
  nokogiri (>= 1.10.8)
294
306
  thor (0.20.3)
295
307
  thread_safe (0.3.6)
308
+ tokenizer (0.3.0)
296
309
  twitter_cldr (4.4.5)
297
310
  camertron-eprun
298
311
  cldr-plurals-runtime-rb (~> 1.0)
@@ -321,4 +334,4 @@ DEPENDENCIES
321
334
  rspec-core (~> 3.4)
322
335
 
323
336
  BUNDLED WITH
324
- 2.0.2
337
+ 2.1.4
data/a CHANGED
@@ -1,2 +1,5 @@
1
- git add lib/metanorma/cli.rb metanorma-cli.gemspec
1
+ git add spec/acceptance/list_extensions_spec.rb spec/acceptance/version_spec.rb
2
+
3
+
4
+
2
5
 
data/a.json ADDED
@@ -0,0 +1,33 @@
1
+ {
2
+ "id": "<GUID>",
3
+ "actor": {
4
+ "name": "<Student Name>",
5
+ "mbox": "<Student Email Address>",
6
+ "objectType": "Person"
7
+ },
8
+ "verb": {
9
+ "id": "http://adlnet.gov/expapi/verbs/completed",
10
+ "display": {
11
+ "en-US": "completed"
12
+ }
13
+ },
14
+ "object": {
15
+ "id": "<Activity URL>",
16
+ "definition": {
17
+ "name": {
18
+ "en-US": "<Activity name>"
19
+ },
20
+ "description": {
21
+ "en-US": "<Activity description>"
22
+ },
23
+ "type": "http://id.tincanapi.com/activitytype/resource"
24
+ },
25
+ "objectType": "Activity"
26
+ },
27
+ "result": {
28
+ "completion": "<Boolean>",
29
+ "duration": "<Cumulative ISO 8601 Duration>"
30
+ },
31
+ "timestamp": "<Start, ISO 8601 DATE>"
32
+ }
33
+
data/lib/metanorma/cli.rb CHANGED
@@ -10,10 +10,10 @@ module Metanorma
10
10
  "metanorma-iec",
11
11
  "metanorma-ietf",
12
12
  "metanorma-gb",
13
- "metanorma-csd",
13
+ "metanorma-cc",
14
14
  "metanorma-csa",
15
15
  "metanorma-iho",
16
- "metanorma-m3d",
16
+ "metanorma-m3aawg",
17
17
  "metanorma-generic",
18
18
  "metanorma-standoc",
19
19
  "metanorma-un",
@@ -22,20 +22,7 @@ module Metanorma
22
22
  "metanorma-itu",
23
23
  ]
24
24
 
25
- # @TODO: Note
26
- #
27
- # This is temporary, we are going to extend this to
28
- # each of the metanorma gem, so they can specifcy their
29
- # own font requirements.
30
- #
31
- # Please add the whole set here.
32
- #
33
- REQUIRED_FONTS = [
34
- "CALIBRI.TTF",
35
- "CAMBRIA.TTC",
36
- ].freeze
37
-
38
- PRIVATE_SUPPORTED_GEMS = ["metanorma-rsd", "metanorma-mpfd"]
25
+ PRIVATE_SUPPORTED_GEMS = ["metanorma-ribose", "metanorma-mpfa"]
39
26
 
40
27
  def self.load_flavors(flavor_names = SUPPORTED_GEMS + PRIVATE_SUPPORTED_GEMS)
41
28
  flavor_names.each do |flavor|
data/lib/metanorma/cli/command.rb CHANGED
@@ -33,7 +33,9 @@ module Metanorma
33
33
  def compile(file_name = nil)
34
34
  if file_name && !options[:version]
35
35
  Metanorma::Cli.load_flavors
36
- Metanorma::Cli::Compiler.compile(file_name, options.dup)
36
+ errs = Metanorma::Cli::Compiler.compile(file_name, options.dup)
37
+ errs.each { |e| Util.log e, :error }
38
+ exit(1) if errs.any?
37
39
 
38
40
  elsif options[:version]
39
41
  invoke(:version, [], type: options[:type], format: options[:format])
@@ -76,11 +78,15 @@ module Metanorma
76
78
  )
77
79
 
78
80
  def setup
79
- Metanorma::Cli::REQUIRED_FONTS.each do |font|
80
- Metanorma::Cli::Setup.run(
81
- font: font,
82
- term_agreement: options[:agree_to_terms],
83
- )
81
+ list_required_fonts.each do |font|
82
+ begin
83
+ Metanorma::Cli::Setup.run(
84
+ font: font,
85
+ term_agreement: options[:agree_to_terms],
86
+ )
87
+ rescue Fontist::Errors::NonSupportedFontError
88
+ UI.say("[info]: Font `#{font}` is not supported yet!")
89
+ end
84
90
  end
85
91
  end
86
92
 
@@ -141,6 +147,19 @@ module Metanorma
141
147
  overwrite: options[:overwrite],
142
148
  )
143
149
  end
150
+
151
+ def list_required_fonts
152
+ Metanorma::Cli.load_flavors
153
+
154
+ Metanorma::Registry.instance.processors.map do |_key, processor|
155
+ flavour = processor.class.to_s.gsub("::Processor", "")
156
+ flavour_module = Object.const_get(flavour)
157
+
158
+ if flavour_module.respond_to?(:fonts_used)
159
+ flavour_module.fonts_used.map { |_, value| value }.flatten
160
+ end
161
+ end.compact.flatten.uniq
162
+ end
144
163
  end
145
164
  end
146
165
  end
data/lib/metanorma/cli/compiler.rb CHANGED
@@ -25,10 +25,12 @@ module Metanorma
25
25
  end
26
26
  end
27
27
 
28
+ # @return [Array<String>]
28
29
  def compile
29
30
  compile_file
30
31
  end
31
32
 
33
+ # @return [Array<String>]
32
34
  def self.compile(file, options)
33
35
  new(file, options).compile
34
36
  end
@@ -37,8 +39,11 @@ module Metanorma
37
39
 
38
40
  attr_reader :file, :options, :extract, :extensions
39
41
 
42
+ # @return [Array<String>]
40
43
  def compile_file
41
- Compile.new.compile(file, serialize_options)
44
+ c = Compile.new
45
+ c.compile(file, serialize_options)
46
+ c.errors
42
47
  end
43
48
 
44
49
  def serialize_options
data/lib/metanorma/cli/setup.rb CHANGED
@@ -40,9 +40,11 @@ module Metanorma
40
40
  end
41
41
 
42
42
  def download_font
43
- Fontist::Finder.find(font_name)
44
- rescue Fontist::Errors::MissingFontError
45
- ask_user_and_download_font(font_name)
43
+ begin
44
+ Fontist::Font.find(font_name)
45
+ rescue Fontist::Errors::MissingFontError
46
+ ask_user_and_download_font(font_name)
47
+ end
46
48
  end
47
49
 
48
50
  def copy_to_fonts(fonts_path)
@@ -54,23 +56,30 @@ module Metanorma
54
56
 
55
57
  def ask_user_and_download_font(font_name)
56
58
  response = term_agreement ? "yes" : "no"
59
+ formula = Fontist::Formula.find(font_name)
57
60
 
58
61
  if !term_agreement
59
- response = UI.ask(message.strip)
62
+ response = UI.ask(message(formula.license).strip)
60
63
  end
61
64
 
62
65
  if response.downcase === "yes"
63
- Fontist::Installer.download(font_name, confirmation: response)
66
+ Fontist::Font.install(font_name, confirmation: response)
64
67
  end
65
68
  end
66
69
 
67
- def message
70
+ def message(license)
68
71
  <<~MSG
69
72
  Metanorma has detected that you do not have the necessary fonts installed
70
73
  for PDF generation. The generated PDF will use generic fonts that may not
71
74
  resemble the desired styling. Metanorma can download these files for you
72
75
  if you accept the font licensing conditions for the font #{font_name}.
73
76
 
77
+ ----------
78
+
79
+ #{license}
80
+
81
+ ----------
82
+
74
83
  If you want Metanorma to download these fonts for you and indicate your
75
84
  acceptance of the font licenses, type "Yes" / "No":
76
85
  MSG
data/lib/metanorma/cli/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Cli
3
- VERSION = "1.2.12"
3
+ VERSION = "1.3.1"
4
4
  end
5
5
  end
data/metanorma-cli.gemspec CHANGED
@@ -32,26 +32,26 @@ Gem::Specification.new do |spec|
32
32
  spec.add_development_dependency "rspec-core", "~> 3.4"
33
33
 
34
34
  spec.add_runtime_dependency "thor", "~> 0.20.3"
35
- spec.add_runtime_dependency "metanorma-iso", "~> 1.3.0"
36
- spec.add_runtime_dependency 'metanorma-ietf', "~> 2.0.0"
37
- spec.add_runtime_dependency 'metanorma-gb', "~> 1.3.0"
38
- spec.add_runtime_dependency 'metanorma-iec', "~> 1.0.0"
39
- spec.add_runtime_dependency 'metanorma-csd', "~> 1.3.0"
40
- spec.add_runtime_dependency 'metanorma-csa', "~> 1.4.0"
41
- #spec.add_runtime_dependency 'metanorma-rsd', "~> 1.4.0"
42
- spec.add_runtime_dependency 'metanorma-m3d', "~> 1.3.0"
43
- spec.add_runtime_dependency 'metanorma-generic', "~> 1.4.0"
44
- spec.add_runtime_dependency 'metanorma-standoc', "~> 1.3.0", ">= 1.3.18"
45
- #spec.add_runtime_dependency 'metanorma-mpfd', "~> 0.1.0"
46
- spec.add_runtime_dependency 'metanorma-un', "~> 0.3.1"
47
- spec.add_runtime_dependency 'metanorma-ogc', "~> 1.0.0"
48
- spec.add_runtime_dependency 'metanorma-nist', "~> 1.0.0"
49
- spec.add_runtime_dependency 'metanorma-itu', "~> 1.0.0"
50
- spec.add_runtime_dependency 'metanorma-iho', "~> 0.0.1"
51
- spec.add_runtime_dependency 'isodoc', "~> 1.0.0"
52
- spec.add_runtime_dependency 'metanorma', "~> 1.0.0"
35
+ spec.add_runtime_dependency "metanorma-iso", "~> 1.4.0"
36
+ spec.add_runtime_dependency 'metanorma-ietf', "~> 2.1.0"
37
+ spec.add_runtime_dependency 'metanorma-gb', "~> 1.4.0"
38
+ spec.add_runtime_dependency 'metanorma-iec', "~> 1.1.0"
39
+ spec.add_runtime_dependency 'metanorma-cc', "~> 1.4.0"
40
+ spec.add_runtime_dependency 'metanorma-csa', "~> 1.5.0"
41
+ #spec.add_runtime_dependency 'metanorma-ribose', "~> 1.5.0"
42
+ spec.add_runtime_dependency 'metanorma-m3aawg', "~> 1.4.0"
43
+ spec.add_runtime_dependency 'metanorma-generic', "~> 1.5.0"
44
+ spec.add_runtime_dependency 'metanorma-standoc', "~> 1.4.0"
45
+ #spec.add_runtime_dependency 'metanorma-mpfa', "~> 0.4.0"
46
+ spec.add_runtime_dependency 'metanorma-un', "~> 0.4.0"
47
+ spec.add_runtime_dependency 'metanorma-ogc', "~> 1.1.0"
48
+ spec.add_runtime_dependency 'metanorma-nist', "~> 1.1.0"
49
+ spec.add_runtime_dependency 'metanorma-itu', "~> 1.1.0"
50
+ spec.add_runtime_dependency 'metanorma-iho', "~> 0.1.0"
51
+ spec.add_runtime_dependency 'isodoc', "~> 1.1.0"
52
+ spec.add_runtime_dependency 'metanorma', "~> 1.1.0"
53
53
  #spec.add_runtime_dependency 'nokogiri', ">= 1"
54
54
  spec.add_runtime_dependency "git", "~> 1.5"
55
55
  spec.add_runtime_dependency "relaton-cli", ">= 0.8.2"
56
- spec.add_runtime_dependency "fontist", "~> 0.2.0"
56
+ spec.add_runtime_dependency "fontist", "~> 1.0.0"
57
57
  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.2.12
4
+ version: 1.3.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
- autorequire:
8
+ autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2020-05-13 00:00:00.000000000 Z
11
+ date: 2020-06-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: pry
@@ -128,230 +128,224 @@ dependencies:
128
128
  requirements:
129
129
  - - "~>"
130
130
  - !ruby/object:Gem::Version
131
- version: 1.3.0
131
+ version: 1.4.0
132
132
  type: :runtime
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
136
  - - "~>"
137
137
  - !ruby/object:Gem::Version
138
- version: 1.3.0
138
+ version: 1.4.0
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: metanorma-ietf
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
143
  - - "~>"
144
144
  - !ruby/object:Gem::Version
145
- version: 2.0.0
145
+ version: 2.1.0
146
146
  type: :runtime
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
150
  - - "~>"
151
151
  - !ruby/object:Gem::Version
152
- version: 2.0.0
152
+ version: 2.1.0
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: metanorma-gb
155
155
  requirement: !ruby/object:Gem::Requirement
156
156
  requirements:
157
157
  - - "~>"
158
158
  - !ruby/object:Gem::Version
159
- version: 1.3.0
159
+ version: 1.4.0
160
160
  type: :runtime
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
164
  - - "~>"
165
165
  - !ruby/object:Gem::Version
166
- version: 1.3.0
166
+ version: 1.4.0
167
167
  - !ruby/object:Gem::Dependency
168
168
  name: metanorma-iec
169
169
  requirement: !ruby/object:Gem::Requirement
170
170
  requirements:
171
171
  - - "~>"
172
172
  - !ruby/object:Gem::Version
173
- version: 1.0.0
173
+ version: 1.1.0
174
174
  type: :runtime
175
175
  prerelease: false
176
176
  version_requirements: !ruby/object:Gem::Requirement
177
177
  requirements:
178
178
  - - "~>"
179
179
  - !ruby/object:Gem::Version
180
- version: 1.0.0
180
+ version: 1.1.0
181
181
  - !ruby/object:Gem::Dependency
182
- name: metanorma-csd
182
+ name: metanorma-cc
183
183
  requirement: !ruby/object:Gem::Requirement
184
184
  requirements:
185
185
  - - "~>"
186
186
  - !ruby/object:Gem::Version
187
- version: 1.3.0
187
+ version: 1.4.0
188
188
  type: :runtime
189
189
  prerelease: false
190
190
  version_requirements: !ruby/object:Gem::Requirement
191
191
  requirements:
192
192
  - - "~>"
193
193
  - !ruby/object:Gem::Version
194
- version: 1.3.0
194
+ version: 1.4.0
195
195
  - !ruby/object:Gem::Dependency
196
196
  name: metanorma-csa
197
197
  requirement: !ruby/object:Gem::Requirement
198
198
  requirements:
199
199
  - - "~>"
200
200
  - !ruby/object:Gem::Version
201
- version: 1.4.0
201
+ version: 1.5.0
202
202
  type: :runtime
203
203
  prerelease: false
204
204
  version_requirements: !ruby/object:Gem::Requirement
205
205
  requirements:
206
206
  - - "~>"
207
207
  - !ruby/object:Gem::Version
208
- version: 1.4.0
208
+ version: 1.5.0
209
209
  - !ruby/object:Gem::Dependency
210
- name: metanorma-m3d
210
+ name: metanorma-m3aawg
211
211
  requirement: !ruby/object:Gem::Requirement
212
212
  requirements:
213
213
  - - "~>"
214
214
  - !ruby/object:Gem::Version
215
- version: 1.3.0
215
+ version: 1.4.0
216
216
  type: :runtime
217
217
  prerelease: false
218
218
  version_requirements: !ruby/object:Gem::Requirement
219
219
  requirements:
220
220
  - - "~>"
221
221
  - !ruby/object:Gem::Version
222
- version: 1.3.0
222
+ version: 1.4.0
223
223
  - !ruby/object:Gem::Dependency
224
224
  name: metanorma-generic
225
225
  requirement: !ruby/object:Gem::Requirement
226
226
  requirements:
227
227
  - - "~>"
228
228
  - !ruby/object:Gem::Version
229
- version: 1.4.0
229
+ version: 1.5.0
230
230
  type: :runtime
231
231
  prerelease: false
232
232
  version_requirements: !ruby/object:Gem::Requirement
233
233
  requirements:
234
234
  - - "~>"
235
235
  - !ruby/object:Gem::Version
236
- version: 1.4.0
236
+ version: 1.5.0
237
237
  - !ruby/object:Gem::Dependency
238
238
  name: metanorma-standoc
239
239
  requirement: !ruby/object:Gem::Requirement
240
240
  requirements:
241
241
  - - "~>"
242
242
  - !ruby/object:Gem::Version
243
- version: 1.3.0
244
- - - ">="
245
- - !ruby/object:Gem::Version
246
- version: 1.3.18
243
+ version: 1.4.0
247
244
  type: :runtime
248
245
  prerelease: false
249
246
  version_requirements: !ruby/object:Gem::Requirement
250
247
  requirements:
251
248
  - - "~>"
252
249
  - !ruby/object:Gem::Version
253
- version: 1.3.0
254
- - - ">="
255
- - !ruby/object:Gem::Version
256
- version: 1.3.18
250
+ version: 1.4.0
257
251
  - !ruby/object:Gem::Dependency
258
252
  name: metanorma-un
259
253
  requirement: !ruby/object:Gem::Requirement
260
254
  requirements:
261
255
  - - "~>"
262
256
  - !ruby/object:Gem::Version
263
- version: 0.3.1
257
+ version: 0.4.0
264
258
  type: :runtime
265
259
  prerelease: false
266
260
  version_requirements: !ruby/object:Gem::Requirement
267
261
  requirements:
268
262
  - - "~>"
269
263
  - !ruby/object:Gem::Version
270
- version: 0.3.1
264
+ version: 0.4.0
271
265
  - !ruby/object:Gem::Dependency
272
266
  name: metanorma-ogc
273
267
  requirement: !ruby/object:Gem::Requirement
274
268
  requirements:
275
269
  - - "~>"
276
270
  - !ruby/object:Gem::Version
277
- version: 1.0.0
271
+ version: 1.1.0
278
272
  type: :runtime
279
273
  prerelease: false
280
274
  version_requirements: !ruby/object:Gem::Requirement
281
275
  requirements:
282
276
  - - "~>"
283
277
  - !ruby/object:Gem::Version
284
- version: 1.0.0
278
+ version: 1.1.0
285
279
  - !ruby/object:Gem::Dependency
286
280
  name: metanorma-nist
287
281
  requirement: !ruby/object:Gem::Requirement
288
282
  requirements:
289
283
  - - "~>"
290
284
  - !ruby/object:Gem::Version
291
- version: 1.0.0
285
+ version: 1.1.0
292
286
  type: :runtime
293
287
  prerelease: false
294
288
  version_requirements: !ruby/object:Gem::Requirement
295
289
  requirements:
296
290
  - - "~>"
297
291
  - !ruby/object:Gem::Version
298
- version: 1.0.0
292
+ version: 1.1.0
299
293
  - !ruby/object:Gem::Dependency
300
294
  name: metanorma-itu
301
295
  requirement: !ruby/object:Gem::Requirement
302
296
  requirements:
303
297
  - - "~>"
304
298
  - !ruby/object:Gem::Version
305
- version: 1.0.0
299
+ version: 1.1.0
306
300
  type: :runtime
307
301
  prerelease: false
308
302
  version_requirements: !ruby/object:Gem::Requirement
309
303
  requirements:
310
304
  - - "~>"
311
305
  - !ruby/object:Gem::Version
312
- version: 1.0.0
306
+ version: 1.1.0
313
307
  - !ruby/object:Gem::Dependency
314
308
  name: metanorma-iho
315
309
  requirement: !ruby/object:Gem::Requirement
316
310
  requirements:
317
311
  - - "~>"
318
312
  - !ruby/object:Gem::Version
319
- version: 0.0.1
313
+ version: 0.1.0
320
314
  type: :runtime
321
315
  prerelease: false
322
316
  version_requirements: !ruby/object:Gem::Requirement
323
317
  requirements:
324
318
  - - "~>"
325
319
  - !ruby/object:Gem::Version
326
- version: 0.0.1
320
+ version: 0.1.0
327
321
  - !ruby/object:Gem::Dependency
328
322
  name: isodoc
329
323
  requirement: !ruby/object:Gem::Requirement
330
324
  requirements:
331
325
  - - "~>"
332
326
  - !ruby/object:Gem::Version
333
- version: 1.0.0
327
+ version: 1.1.0
334
328
  type: :runtime
335
329
  prerelease: false
336
330
  version_requirements: !ruby/object:Gem::Requirement
337
331
  requirements:
338
332
  - - "~>"
339
333
  - !ruby/object:Gem::Version
340
- version: 1.0.0
334
+ version: 1.1.0
341
335
  - !ruby/object:Gem::Dependency
342
336
  name: metanorma
343
337
  requirement: !ruby/object:Gem::Requirement
344
338
  requirements:
345
339
  - - "~>"
346
340
  - !ruby/object:Gem::Version
347
- version: 1.0.0
341
+ version: 1.1.0
348
342
  type: :runtime
349
343
  prerelease: false
350
344
  version_requirements: !ruby/object:Gem::Requirement
351
345
  requirements:
352
346
  - - "~>"
353
347
  - !ruby/object:Gem::Version
354
- version: 1.0.0
348
+ version: 1.1.0
355
349
  - !ruby/object:Gem::Dependency
356
350
  name: git
357
351
  requirement: !ruby/object:Gem::Requirement
@@ -386,14 +380,14 @@ dependencies:
386
380
  requirements:
387
381
  - - "~>"
388
382
  - !ruby/object:Gem::Version
389
- version: 0.2.0
383
+ version: 1.0.0
390
384
  type: :runtime
391
385
  prerelease: false
392
386
  version_requirements: !ruby/object:Gem::Requirement
393
387
  requirements:
394
388
  - - "~>"
395
389
  - !ruby/object:Gem::Version
396
- version: 0.2.0
390
+ version: 1.0.0
397
391
  description: Executable to process any Metanorma standard.
398
392
  email:
399
393
  - open.source@ribose.com
@@ -415,6 +409,7 @@ files:
415
409
  - README.adoc
416
410
  - Rakefile
417
411
  - a
412
+ - a.json
418
413
  - a.rb
419
414
  - a.rxl
420
415
  - b
@@ -473,7 +468,7 @@ homepage: https://www.metanorma.com
473
468
  licenses:
474
469
  - BSD-2-Clause
475
470
  metadata: {}
476
- post_install_message:
471
+ post_install_message:
477
472
  rdoc_options: []
478
473
  require_paths:
479
474
  - lib
@@ -488,9 +483,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
488
483
  - !ruby/object:Gem::Version
489
484
  version: '0'
490
485
  requirements: []
491
- rubyforge_project:
492
- rubygems_version: 2.7.6
493
- signing_key:
486
+ rubygems_version: 3.0.3
487
+ signing_key:
494
488
  specification_version: 4
495
489
  summary: Metanorma is the standard of standards; the metanorma gem allows you to create
496
490
  any standard document type supported by Metanorma.