metanorma-ietf 1.0.6 → 1.0.8
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/macos.yml +36 -0
- data/.github/workflows/ubuntu.yml +36 -0
- data/.github/workflows/windows.yml +38 -0
- data/Gemfile +9 -1
- data/Gemfile.lock +72 -66
- data/README.adoc +4 -2
- data/lib/asciidoctor/rfc/common/base.rb +10 -4
- data/lib/asciidoctor/rfc/v2/blocks.rb +2 -2
- data/lib/asciidoctor/rfc/v3/base.rb +2 -2
- data/lib/metanorma/ietf/version.rb +1 -1
- metadata +5 -4
- data/.travis.yml +0 -22
- data/appveyor.yml +0 -38
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: bfb120e2c02b5fbf5b21a50f42efa587ba33113abcce44d7ab34d6f031def5e6
|
|
4
|
+
data.tar.gz: f21a68ce4273babcc44cf49dae1d359875e5567b05f1524ec99c3eb069b802e9
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 9b4889e2ef81bf96aa235fe518b6e4ba9503ef2bb6a225b001374ead336203985fa9f621725f893bf1df3c90d3b38f3a48aa6a26e7f03875994665e11ef8c2ca
|
|
7
|
+
data.tar.gz: 37ef0a433905bb642d2cee82798abce98b6e5c7a4bee6cc5e92685c0a92a81ad75410447afad73860c4edad3b0b277ba0319a3af117419ece2759a0f05dc7442
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
# Auto-generated !!! Do not edit it manually
|
|
2
|
+
# use ci-master https://github.com/metanorma/metanorma-build-scripts
|
|
3
|
+
name: macos
|
|
4
|
+
|
|
5
|
+
on: [push]
|
|
6
|
+
|
|
7
|
+
jobs:
|
|
8
|
+
test-macos:
|
|
9
|
+
name: Test on Ruby ${{ matrix.ruby }} macOS
|
|
10
|
+
runs-on: macos-latest
|
|
11
|
+
strategy:
|
|
12
|
+
matrix:
|
|
13
|
+
ruby: [ '2.6', '2.5', '2.4' ]
|
|
14
|
+
steps:
|
|
15
|
+
- uses: actions/checkout@master
|
|
16
|
+
- name: Use Ruby
|
|
17
|
+
uses: actions/setup-ruby@v1
|
|
18
|
+
with:
|
|
19
|
+
ruby-version: ${{ matrix.ruby }}
|
|
20
|
+
architecture: 'x64'
|
|
21
|
+
- name: Update gems
|
|
22
|
+
run: |
|
|
23
|
+
sudo gem install bundler -v "~> 2" --force
|
|
24
|
+
bundle install --jobs 4 --retry 3
|
|
25
|
+
- name: Use Python
|
|
26
|
+
uses: actions/setup-python@v1
|
|
27
|
+
with:
|
|
28
|
+
python-version: '2.7'
|
|
29
|
+
architecture: 'x64'
|
|
30
|
+
- name: Install xml2rfc
|
|
31
|
+
run: |
|
|
32
|
+
pip install --user xml2rfc
|
|
33
|
+
- name: Run specs
|
|
34
|
+
run: |
|
|
35
|
+
export PATH=$(python -c "import os,site; print os.path.join(site.USER_BASE, 'bin')"):$PATH
|
|
36
|
+
bundle exec rake
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
# Auto-generated !!! Do not edit it manually
|
|
2
|
+
# use ci-master https://github.com/metanorma/metanorma-build-scripts
|
|
3
|
+
name: ubuntu
|
|
4
|
+
|
|
5
|
+
on: [push]
|
|
6
|
+
|
|
7
|
+
jobs:
|
|
8
|
+
test-linux:
|
|
9
|
+
name: Test on Ruby ${{ matrix.ruby }} Ubuntu
|
|
10
|
+
runs-on: ubuntu-latest
|
|
11
|
+
strategy:
|
|
12
|
+
matrix:
|
|
13
|
+
ruby: [ '2.6', '2.5', '2.4' ]
|
|
14
|
+
steps:
|
|
15
|
+
- uses: actions/checkout@master
|
|
16
|
+
- name: Use Ruby
|
|
17
|
+
uses: actions/setup-ruby@v1
|
|
18
|
+
with:
|
|
19
|
+
ruby-version: ${{ matrix.ruby }}
|
|
20
|
+
architecture: 'x64'
|
|
21
|
+
- name: Update gems
|
|
22
|
+
run: |
|
|
23
|
+
gem install bundler -v "~> 2"
|
|
24
|
+
bundle install --jobs 4 --retry 3
|
|
25
|
+
- name: Use Python
|
|
26
|
+
uses: actions/setup-python@v1
|
|
27
|
+
with:
|
|
28
|
+
python-version: '2.7'
|
|
29
|
+
architecture: 'x64'
|
|
30
|
+
- name: Install xml2rfc
|
|
31
|
+
run: |
|
|
32
|
+
pip install --user xml2rfc
|
|
33
|
+
- name: Run specs
|
|
34
|
+
run: |
|
|
35
|
+
export PATH=$(python -c "import os,site; print os.path.join(site.USER_BASE, 'bin')"):$PATH
|
|
36
|
+
bundle exec rake
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
# Auto-generated !!! Do not edit it manually
|
|
2
|
+
# use ci-master https://github.com/metanorma/metanorma-build-scripts
|
|
3
|
+
name: windows
|
|
4
|
+
|
|
5
|
+
on: [push]
|
|
6
|
+
|
|
7
|
+
jobs:
|
|
8
|
+
test-windows:
|
|
9
|
+
name: Test on Ruby ${{ matrix.ruby }} Windows
|
|
10
|
+
runs-on: windows-latest
|
|
11
|
+
strategy:
|
|
12
|
+
matrix:
|
|
13
|
+
ruby: [ '2.6', '2.5', '2.4' ]
|
|
14
|
+
steps:
|
|
15
|
+
- uses: actions/checkout@master
|
|
16
|
+
- name: Use Ruby
|
|
17
|
+
uses: actions/setup-ruby@v1
|
|
18
|
+
with:
|
|
19
|
+
ruby-version: ${{ matrix.ruby }}
|
|
20
|
+
architecture: 'x64'
|
|
21
|
+
- name: Update gems
|
|
22
|
+
shell: pwsh
|
|
23
|
+
run: |
|
|
24
|
+
gem install bundler -v "~> 2"
|
|
25
|
+
bundle config --local path vendor/bundle
|
|
26
|
+
bundle update
|
|
27
|
+
bundle install --jobs 4 --retry 3
|
|
28
|
+
- name: Use Python
|
|
29
|
+
uses: actions/setup-python@v1
|
|
30
|
+
with:
|
|
31
|
+
python-version: '2.7'
|
|
32
|
+
architecture: 'x64'
|
|
33
|
+
- name: Install xml2rfc
|
|
34
|
+
run: |
|
|
35
|
+
pip install xml2rfc
|
|
36
|
+
- name: Run specs
|
|
37
|
+
run: |
|
|
38
|
+
bundle exec rake
|
data/Gemfile
CHANGED
|
@@ -1,3 +1,11 @@
|
|
|
1
|
+
Encoding.default_external = Encoding::UTF_8
|
|
2
|
+
Encoding.default_internal = Encoding::UTF_8
|
|
3
|
+
|
|
1
4
|
source "https://rubygems.org"
|
|
2
|
-
|
|
5
|
+
git_source(:github) { |repo| "https://github.com/#{repo}" }
|
|
6
|
+
|
|
3
7
|
gemspec
|
|
8
|
+
|
|
9
|
+
if File.exist? 'Gemfile.devel'
|
|
10
|
+
eval File.read('Gemfile.devel'), nil, 'Gemfile.devel' # rubocop:disable Security/Eval
|
|
11
|
+
end
|
data/Gemfile.lock
CHANGED
|
@@ -1,23 +1,20 @@
|
|
|
1
1
|
PATH
|
|
2
2
|
remote: .
|
|
3
3
|
specs:
|
|
4
|
-
metanorma-ietf (1.0.
|
|
4
|
+
metanorma-ietf (1.0.8)
|
|
5
5
|
isodoc (~> 1.0.0)
|
|
6
6
|
metanorma-standoc (~> 1.3.0)
|
|
7
7
|
|
|
8
8
|
GEM
|
|
9
9
|
remote: https://rubygems.org/
|
|
10
10
|
specs:
|
|
11
|
-
addressable (2.
|
|
12
|
-
public_suffix (>= 2.0.2, <
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
json (>= 1.5.1)
|
|
16
|
-
asciidoctor (1.5.8)
|
|
17
|
-
asciimath (1.0.8)
|
|
11
|
+
addressable (2.7.0)
|
|
12
|
+
public_suffix (>= 2.0.2, < 5.0)
|
|
13
|
+
asciidoctor (2.0.10)
|
|
14
|
+
asciimath (1.0.9)
|
|
18
15
|
ast (2.4.0)
|
|
19
16
|
byebug (9.1.0)
|
|
20
|
-
cnccs (0.1.
|
|
17
|
+
cnccs (0.1.5)
|
|
21
18
|
coderay (1.1.2)
|
|
22
19
|
concurrent-ruby (1.1.5)
|
|
23
20
|
crack (0.4.3)
|
|
@@ -26,10 +23,12 @@ GEM
|
|
|
26
23
|
docile (1.3.2)
|
|
27
24
|
equivalent-xml (0.6.0)
|
|
28
25
|
nokogiri (>= 1.4.3)
|
|
26
|
+
faraday (0.17.0)
|
|
27
|
+
multipart-post (>= 1.2, < 3)
|
|
29
28
|
ffi (1.11.1)
|
|
30
29
|
formatador (0.2.5)
|
|
31
|
-
gb-agencies (0.0.
|
|
32
|
-
guard (2.
|
|
30
|
+
gb-agencies (0.0.6)
|
|
31
|
+
guard (2.16.1)
|
|
33
32
|
formatador (>= 0.2.4)
|
|
34
33
|
listen (>= 2.7, < 4.0)
|
|
35
34
|
lumberjack (>= 1.0.12, < 2.0)
|
|
@@ -44,127 +43,135 @@ GEM
|
|
|
44
43
|
guard-compat (~> 1.1)
|
|
45
44
|
rspec (>= 2.99.0, < 4.0)
|
|
46
45
|
hashdiff (1.0.0)
|
|
47
|
-
html2doc (0.
|
|
48
|
-
asciimath (~> 1.0.
|
|
46
|
+
html2doc (0.9.1)
|
|
47
|
+
asciimath (~> 1.0.9)
|
|
49
48
|
htmlentities (~> 4.3.4)
|
|
50
49
|
image_size
|
|
51
50
|
mime-types
|
|
52
|
-
nokogiri
|
|
51
|
+
nokogiri (>= 1.10.4)
|
|
53
52
|
thread_safe
|
|
54
53
|
uuidtools
|
|
55
54
|
htmlentities (4.3.4)
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
nokogiri
|
|
55
|
+
iev (0.2.3)
|
|
56
|
+
nokogiri (>= 1.10.4)
|
|
59
57
|
image_size (2.0.2)
|
|
60
|
-
isodoc (1.0.
|
|
58
|
+
isodoc (1.0.7)
|
|
61
59
|
asciimath
|
|
62
|
-
html2doc (~> 0.
|
|
60
|
+
html2doc (~> 0.9.0)
|
|
63
61
|
htmlentities (~> 4.3.4)
|
|
64
62
|
liquid
|
|
65
63
|
metanorma (~> 0.3.0)
|
|
66
|
-
nokogiri (>= 1)
|
|
64
|
+
nokogiri (>= 1.10.4)
|
|
67
65
|
rake (~> 12.0)
|
|
68
66
|
roman-numerals
|
|
69
|
-
sassc (~> 2)
|
|
67
|
+
sassc (~> 2.2.1)
|
|
70
68
|
thread_safe
|
|
71
69
|
uuidtools
|
|
72
|
-
isoics (0.1.
|
|
73
|
-
jaro_winkler (1.5.
|
|
70
|
+
isoics (0.1.8)
|
|
71
|
+
jaro_winkler (1.5.4)
|
|
74
72
|
json (2.2.0)
|
|
75
73
|
liquid (4.0.3)
|
|
76
|
-
listen (3.
|
|
77
|
-
rb-fsevent (~> 0.
|
|
78
|
-
rb-inotify (~> 0.9, >= 0.9.
|
|
79
|
-
ruby_dep (~> 1.2)
|
|
74
|
+
listen (3.2.0)
|
|
75
|
+
rb-fsevent (~> 0.10, >= 0.10.3)
|
|
76
|
+
rb-inotify (~> 0.9, >= 0.9.10)
|
|
80
77
|
lumberjack (1.0.13)
|
|
81
|
-
metanorma (0.3.
|
|
78
|
+
metanorma (0.3.16)
|
|
82
79
|
asciidoctor
|
|
83
80
|
htmlentities
|
|
84
|
-
metanorma-standoc (1.3.
|
|
85
|
-
asciidoctor (~>
|
|
81
|
+
metanorma-standoc (1.3.7)
|
|
82
|
+
asciidoctor (~> 2.0.0)
|
|
86
83
|
concurrent-ruby
|
|
87
|
-
html2doc (~> 0.
|
|
84
|
+
html2doc (~> 0.9.0)
|
|
88
85
|
iev (~> 0.2.1)
|
|
89
86
|
isodoc (~> 1.0.0)
|
|
87
|
+
mimemagic
|
|
90
88
|
relaton (~> 0.5.0)
|
|
91
89
|
relaton-iev (~> 0.1.0)
|
|
92
90
|
ruby-jing
|
|
93
91
|
sterile (~> 1.0.14)
|
|
94
92
|
unicode2latex (~> 0.0.1)
|
|
95
93
|
method_source (0.9.2)
|
|
96
|
-
mime-types (3.
|
|
94
|
+
mime-types (3.3)
|
|
97
95
|
mime-types-data (~> 3.2015)
|
|
98
|
-
mime-types-data (3.2019.
|
|
96
|
+
mime-types-data (3.2019.1009)
|
|
97
|
+
mimemagic (0.3.3)
|
|
99
98
|
mini_portile2 (2.4.0)
|
|
99
|
+
multipart-post (2.1.1)
|
|
100
100
|
nenv (0.3.0)
|
|
101
|
-
nokogiri (1.10.
|
|
101
|
+
nokogiri (1.10.5)
|
|
102
102
|
mini_portile2 (~> 2.4.0)
|
|
103
103
|
notiffany (0.1.3)
|
|
104
104
|
nenv (~> 0.1)
|
|
105
105
|
shellany (~> 0.0)
|
|
106
106
|
optout (0.0.2)
|
|
107
|
-
parallel (1.
|
|
108
|
-
parser (2.6.
|
|
107
|
+
parallel (1.18.0)
|
|
108
|
+
parser (2.6.5.0)
|
|
109
109
|
ast (~> 2.4.0)
|
|
110
110
|
pry (0.12.2)
|
|
111
111
|
coderay (~> 1.1.0)
|
|
112
112
|
method_source (~> 0.9.0)
|
|
113
|
-
public_suffix (
|
|
113
|
+
public_suffix (4.0.1)
|
|
114
114
|
rainbow (3.0.0)
|
|
115
115
|
rake (12.3.3)
|
|
116
116
|
rb-fsevent (0.10.3)
|
|
117
117
|
rb-inotify (0.10.0)
|
|
118
118
|
ffi (~> 1.0)
|
|
119
|
-
relaton (0.5.
|
|
120
|
-
|
|
119
|
+
relaton (0.5.11)
|
|
120
|
+
relaton-calconnect (~> 0.1.0)
|
|
121
121
|
relaton-gb (~> 0.6.0)
|
|
122
122
|
relaton-iec (~> 0.4.0)
|
|
123
123
|
relaton-ietf (~> 0.6.0)
|
|
124
124
|
relaton-iso (~> 0.6.0)
|
|
125
125
|
relaton-itu (~> 0.3.0)
|
|
126
126
|
relaton-nist (~> 0.3.0)
|
|
127
|
-
|
|
127
|
+
relaton-ogc (~> 0.1.0)
|
|
128
|
+
relaton-bib (0.3.12)
|
|
128
129
|
addressable
|
|
129
|
-
nokogiri
|
|
130
|
-
relaton-
|
|
130
|
+
nokogiri
|
|
131
|
+
relaton-calconnect (0.1.0)
|
|
132
|
+
faraday
|
|
133
|
+
relaton-iso-bib (~> 0.3.0)
|
|
134
|
+
relaton-gb (0.6.7)
|
|
131
135
|
cnccs (~> 0.1.1)
|
|
132
136
|
gb-agencies (~> 0.0.1)
|
|
133
137
|
relaton-iso-bib (~> 0.3.0)
|
|
134
|
-
relaton-iec (0.4.
|
|
138
|
+
relaton-iec (0.4.10)
|
|
135
139
|
addressable
|
|
136
140
|
relaton-iso-bib (~> 0.3.0)
|
|
137
|
-
relaton-ietf (0.6.
|
|
141
|
+
relaton-ietf (0.6.9)
|
|
138
142
|
relaton-bib (~> 0.3.0)
|
|
139
143
|
relaton-iev (0.1.1)
|
|
140
144
|
relaton (~> 0.5.0)
|
|
141
|
-
relaton-iso (0.6.
|
|
145
|
+
relaton-iso (0.6.9)
|
|
142
146
|
relaton-iec (~> 0.4.0)
|
|
143
147
|
relaton-iso-bib (~> 0.3.0)
|
|
144
|
-
relaton-iso-bib (0.3.
|
|
148
|
+
relaton-iso-bib (0.3.12)
|
|
145
149
|
isoics (~> 0.1.6)
|
|
146
150
|
relaton-bib (~> 0.3.0)
|
|
147
151
|
ruby_deep_clone (~> 0.8.0)
|
|
148
|
-
relaton-itu (0.3.
|
|
152
|
+
relaton-itu (0.3.7)
|
|
149
153
|
relaton-iso-bib (~> 0.3.0)
|
|
150
|
-
relaton-nist (0.3.
|
|
154
|
+
relaton-nist (0.3.8)
|
|
151
155
|
relaton-bib (~> 0.3.0)
|
|
152
156
|
rubyzip
|
|
157
|
+
relaton-ogc (0.1.4)
|
|
158
|
+
faraday
|
|
159
|
+
relaton-iso-bib (~> 0.3.0)
|
|
153
160
|
roman-numerals (0.3.0)
|
|
154
|
-
rspec (3.
|
|
155
|
-
rspec-core (~> 3.
|
|
156
|
-
rspec-expectations (~> 3.
|
|
157
|
-
rspec-mocks (~> 3.
|
|
158
|
-
rspec-core (3.
|
|
159
|
-
rspec-support (~> 3.
|
|
160
|
-
rspec-expectations (3.
|
|
161
|
+
rspec (3.9.0)
|
|
162
|
+
rspec-core (~> 3.9.0)
|
|
163
|
+
rspec-expectations (~> 3.9.0)
|
|
164
|
+
rspec-mocks (~> 3.9.0)
|
|
165
|
+
rspec-core (3.9.0)
|
|
166
|
+
rspec-support (~> 3.9.0)
|
|
167
|
+
rspec-expectations (3.9.0)
|
|
161
168
|
diff-lcs (>= 1.2.0, < 2.0)
|
|
162
|
-
rspec-support (~> 3.
|
|
163
|
-
rspec-mocks (3.
|
|
169
|
+
rspec-support (~> 3.9.0)
|
|
170
|
+
rspec-mocks (3.9.0)
|
|
164
171
|
diff-lcs (>= 1.2.0, < 2.0)
|
|
165
|
-
rspec-support (~> 3.
|
|
166
|
-
rspec-support (3.
|
|
167
|
-
rubocop (0.
|
|
172
|
+
rspec-support (~> 3.9.0)
|
|
173
|
+
rspec-support (3.9.0)
|
|
174
|
+
rubocop (0.76.0)
|
|
168
175
|
jaro_winkler (~> 1.5.1)
|
|
169
176
|
parallel (~> 1.10)
|
|
170
177
|
parser (>= 2.6)
|
|
@@ -175,13 +182,12 @@ GEM
|
|
|
175
182
|
optout (>= 0.0.2)
|
|
176
183
|
ruby-progressbar (1.10.1)
|
|
177
184
|
ruby_deep_clone (0.8.0)
|
|
178
|
-
|
|
179
|
-
rubyzip (1.2.3)
|
|
185
|
+
rubyzip (2.0.0)
|
|
180
186
|
safe_yaml (1.0.5)
|
|
181
|
-
sassc (2.1
|
|
187
|
+
sassc (2.2.1)
|
|
182
188
|
ffi (~> 1.9)
|
|
183
189
|
shellany (0.0.1)
|
|
184
|
-
simplecov (0.17.
|
|
190
|
+
simplecov (0.17.1)
|
|
185
191
|
docile (~> 1.1)
|
|
186
192
|
json (>= 1.8, < 3)
|
|
187
193
|
simplecov-html (~> 0.10.0)
|
|
@@ -192,10 +198,10 @@ GEM
|
|
|
192
198
|
thread_safe (0.3.6)
|
|
193
199
|
timecop (0.9.1)
|
|
194
200
|
unicode-display_width (1.6.0)
|
|
195
|
-
unicode2latex (0.0.
|
|
201
|
+
unicode2latex (0.0.3)
|
|
196
202
|
uuidtools (2.1.5)
|
|
197
203
|
vcr (5.0.0)
|
|
198
|
-
webmock (3.6
|
|
204
|
+
webmock (3.7.6)
|
|
199
205
|
addressable (>= 2.3.6)
|
|
200
206
|
crack (>= 0.3.2)
|
|
201
207
|
hashdiff (>= 0.4.0, < 2.0.0)
|
data/README.adoc
CHANGED
|
@@ -6,9 +6,11 @@
|
|
|
6
6
|
"`http://asciidoctor.org/[asciidoctor]-way`".
|
|
7
7
|
|
|
8
8
|
image:https://img.shields.io/gem/v/metanorma-ietf.svg["Gem Version", link="https://rubygems.org/gems/metanorma-ietf"]
|
|
9
|
-
image:https://
|
|
9
|
+
image:https://travis-ci.com/metanorma/metanorma-ietf.svg["Build Status", link="https://travis-ci.com/metanorma/metanorma-ietf"]
|
|
10
|
+
image:https://ci.appveyor.com/api/projects/status/or6b0wx4b0q3qm0m?svg=true["Appveyor Build Status", link="https://ci.appveyor.com/project/metanorma/metanorma-ietf"]
|
|
10
11
|
image:https://codeclimate.com/github/metanorma/metanorma-ietf/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-ietf"]
|
|
11
|
-
image:https://
|
|
12
|
+
image:https://img.shields.io/github/issues-pr-raw/metanorma/metanorma-ietf.svg["Pull Requests", link="https://github.com/metanorma/metanorma-ietf/pulls"]
|
|
13
|
+
image:https://img.shields.io/github/commits-since/metanorma/metanorma-ietf/latest.svg["Commits since latest",link="https://github.com/metanorma/metanorma-ietf/releases"]
|
|
12
14
|
|
|
13
15
|
_Formerly known as_ `asciidoctor-rfc`.
|
|
14
16
|
|
|
@@ -4,8 +4,8 @@ require "htmlentities"
|
|
|
4
4
|
require "json"
|
|
5
5
|
require "pathname"
|
|
6
6
|
require "open-uri"
|
|
7
|
-
require "pp"
|
|
8
7
|
require "set"
|
|
8
|
+
require "fileutils"
|
|
9
9
|
|
|
10
10
|
module Asciidoctor
|
|
11
11
|
module Rfc::Common
|
|
@@ -374,7 +374,7 @@ HERE
|
|
|
374
374
|
end
|
|
375
375
|
|
|
376
376
|
def cache_workgroup(node)
|
|
377
|
-
wgcache_name = "#{Dir.home}/.
|
|
377
|
+
wgcache_name = "#{Dir.home}/.metanorma-ietf-workgroup-cache.json"
|
|
378
378
|
# If we are required to, clear the wg cache
|
|
379
379
|
if node.attr("flush-caches") == "true"
|
|
380
380
|
FileUtils.rm wgcache_name, :force => true
|
|
@@ -418,7 +418,7 @@ HERE
|
|
|
418
418
|
end
|
|
419
419
|
|
|
420
420
|
def cache_biblio(node)
|
|
421
|
-
bibliocache_name = "#{Dir.home}/.
|
|
421
|
+
bibliocache_name = "#{Dir.home}/.metanorma-ietf-biblio-cache.json"
|
|
422
422
|
# If we are required to, clear the biblio cache
|
|
423
423
|
if node.attr("flush-caches") == "true"
|
|
424
424
|
system("rm -f #{bibliocache_name}")
|
|
@@ -426,10 +426,16 @@ HERE
|
|
|
426
426
|
# Is there already a biblio cache? If not, create it.
|
|
427
427
|
biblio = {}
|
|
428
428
|
if Pathname.new(bibliocache_name).file?
|
|
429
|
+
begin
|
|
429
430
|
File.open(bibliocache_name, "r") do |f|
|
|
430
431
|
biblio = JSON.parse(f.read)
|
|
431
432
|
end
|
|
432
|
-
|
|
433
|
+
rescue Exception => e
|
|
434
|
+
warn "JSON in #{bibliocache_name} is corrupt: deleting"
|
|
435
|
+
end
|
|
436
|
+
end
|
|
437
|
+
|
|
438
|
+
if biblio.empty?
|
|
433
439
|
File.open(bibliocache_name, "w") do |b|
|
|
434
440
|
STDERR.puts "Reading references from https://xml2rfc.tools.ietf.org/public/rfc/bibxml/..."
|
|
435
441
|
Kernel.open("https://xml2rfc.tools.ietf.org/public/rfc/bibxml/") do |f|
|
|
@@ -220,11 +220,11 @@ module Asciidoctor
|
|
|
220
220
|
# we want to see the para text, not its <t> container
|
|
221
221
|
if seen_artwork
|
|
222
222
|
xml_figure.postamble do |postamble|
|
|
223
|
-
postamble << b.content
|
|
223
|
+
postamble << Array(b.content).join("\n")
|
|
224
224
|
end
|
|
225
225
|
else
|
|
226
226
|
xml_figure.preamble do |preamble|
|
|
227
|
-
preamble << b.content
|
|
227
|
+
preamble << Array(b.content).join("\n")
|
|
228
228
|
end
|
|
229
229
|
end
|
|
230
230
|
end
|
|
@@ -125,7 +125,7 @@ module Asciidoctor
|
|
|
125
125
|
# <br> is only defined within tables
|
|
126
126
|
noko do |xml|
|
|
127
127
|
xml << node.text
|
|
128
|
-
xml.br if node.parent.context == :
|
|
128
|
+
xml.br if node.parent.context == :table_cell
|
|
129
129
|
end.join
|
|
130
130
|
end
|
|
131
131
|
|
|
@@ -261,7 +261,7 @@ module Asciidoctor
|
|
|
261
261
|
anchor: node.id,
|
|
262
262
|
removeInRFC: node.attr("remove-in-rfc"),
|
|
263
263
|
toc: node.attr("toc"),
|
|
264
|
-
numbered: node.
|
|
264
|
+
numbered: node.numbered
|
|
265
265
|
}
|
|
266
266
|
|
|
267
267
|
result << noko do |xml|
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metanorma-ietf
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.0.
|
|
4
|
+
version: 1.0.8
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ribose Inc.
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2019-08
|
|
11
|
+
date: 2019-11-08 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: metanorma-standoc
|
|
@@ -237,6 +237,9 @@ executables: []
|
|
|
237
237
|
extensions: []
|
|
238
238
|
extra_rdoc_files: []
|
|
239
239
|
files:
|
|
240
|
+
- ".github/workflows/macos.yml"
|
|
241
|
+
- ".github/workflows/ubuntu.yml"
|
|
242
|
+
- ".github/workflows/windows.yml"
|
|
240
243
|
- ".gitignore"
|
|
241
244
|
- ".hound.yml"
|
|
242
245
|
- ".oss-guides.rubocop.yml"
|
|
@@ -244,7 +247,6 @@ files:
|
|
|
244
247
|
- ".rubocop.ribose.yml"
|
|
245
248
|
- ".rubocop.tb.yml"
|
|
246
249
|
- ".rubocop.yml"
|
|
247
|
-
- ".travis.yml"
|
|
248
250
|
- CODE_OF_CONDUCT.md
|
|
249
251
|
- Gemfile
|
|
250
252
|
- Gemfile.lock
|
|
@@ -252,7 +254,6 @@ files:
|
|
|
252
254
|
- LICENSE
|
|
253
255
|
- README.adoc
|
|
254
256
|
- Rakefile
|
|
255
|
-
- appveyor.yml
|
|
256
257
|
- bin/asciidoctor-rfc2
|
|
257
258
|
- bin/asciidoctor-rfc2.bat
|
|
258
259
|
- bin/asciidoctor-rfc3
|
data/.travis.yml
DELETED
|
@@ -1,22 +0,0 @@
|
|
|
1
|
-
# Auto-generated !!! Do not edit it manually
|
|
2
|
-
# use ci-master https://github.com/metanorma/metanorma-build-scripts
|
|
3
|
-
language: ruby
|
|
4
|
-
cache: bundler
|
|
5
|
-
os:
|
|
6
|
-
- linux
|
|
7
|
-
- osx
|
|
8
|
-
python:
|
|
9
|
-
- 2.7
|
|
10
|
-
rvm:
|
|
11
|
-
- 2.6
|
|
12
|
-
- 2.5
|
|
13
|
-
- 2.4
|
|
14
|
-
- ruby-head
|
|
15
|
-
before_install:
|
|
16
|
-
- gem install bundler -v "~> 2"
|
|
17
|
-
- bundle update
|
|
18
|
-
- pip install --user xml2rfc
|
|
19
|
-
- export PATH=$(python -c "import os,site; print os.path.join(site.USER_BASE, 'bin')"):$PATH
|
|
20
|
-
matrix:
|
|
21
|
-
allow_failures:
|
|
22
|
-
- rvm: ruby-head
|
data/appveyor.yml
DELETED
|
@@ -1,38 +0,0 @@
|
|
|
1
|
-
# Auto-generated !!! Do not edit it manually
|
|
2
|
-
# use ci-master https://github.com/metanorma/metanorma-build-scripts
|
|
3
|
-
version: '{build}'
|
|
4
|
-
|
|
5
|
-
cache:
|
|
6
|
-
- vendor/bundle
|
|
7
|
-
|
|
8
|
-
environment:
|
|
9
|
-
matrix:
|
|
10
|
-
- RUBY_VERSION: 26
|
|
11
|
-
- RUBY_VERSION: 25
|
|
12
|
-
- RUBY_VERSION: 24
|
|
13
|
-
- RUBY_VERSION: _trunk
|
|
14
|
-
|
|
15
|
-
matrix:
|
|
16
|
-
allow_failures:
|
|
17
|
-
- RUBY_VERSION: _trunk
|
|
18
|
-
|
|
19
|
-
install:
|
|
20
|
-
- ps: . { iwr -useb https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/appveyor.ps1 } | iex
|
|
21
|
-
- refreshenv
|
|
22
|
-
|
|
23
|
-
build_script:
|
|
24
|
-
- set PYTHON_VERSION=37
|
|
25
|
-
- set PATH=C:\Ruby%RUBY_VERSION%\bin;%USERPROFILE%\AppData\Roaming\Python\Python%PYTHON_VERSION%\Scripts;C:\Python%PYTHON_VERSION%\Scripts;C:\Python%PYTHON_VERSION%;%PATH%
|
|
26
|
-
- pip3 install --user --upgrade pip
|
|
27
|
-
- pip3 install --user xml2rfc
|
|
28
|
-
- bundle config --local path vendor/bundle
|
|
29
|
-
- bundle update
|
|
30
|
-
- bundle install
|
|
31
|
-
|
|
32
|
-
before_test:
|
|
33
|
-
- ruby -v
|
|
34
|
-
- gem -v
|
|
35
|
-
- bundle -v
|
|
36
|
-
|
|
37
|
-
test_script:
|
|
38
|
-
- bundle exec rake
|