Skip to content

Commit 0b0323a

Browse files
committed
WIP rewrites and additions for 10.3
1 parent 7bc2253 commit 0b0323a

20 files changed

+934
-1524
lines changed

GEMFILE

+13-7
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ source "https://rubygems.org"
88
#
99
# This will help ensure the proper Jekyll version is running.
1010
# Happy Jekylling!
11-
gem "jekyll", "~> 3.8.3"
11+
gem "jekyll", "~> 4.3.4"
1212

1313

1414
# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
@@ -17,13 +17,19 @@ gem "jekyll", "~> 3.8.3"
1717

1818
# If you have any plugins, put them here!
1919
group :jekyll_plugins do
20-
# gem "jekyll-feed", "~> 0.6"
21-
# gem "jekyll-menus"
22-
# gem "jekyll-toc"
20+
gem "jekyll-feed", "~> 0.17.0"
21+
gem "jekyll-sass-converter", "~> 3.0"
2322
end
2423

25-
gem 'html-proofer'
26-
gem 'rake'
24+
gem "logger", "~> 1.5" # Required for Ruby 3.5+
25+
gem "csv", "~> 3.2" # Required for Ruby 3.4+
26+
gem "html-proofer", "~> 5.0"
27+
gem "rake", "~> 13.0"
28+
gem "webrick", "~> 1.8" # Required for Ruby 3+ compatibility
2729

2830
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
29-
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
31+
# Windows and JRuby dependencies
32+
platforms :mingw, :x64_mingw, :mswin, :jruby do
33+
gem "tzinfo", "~> 2.0"
34+
gem "tzinfo-data"
35+
end

Gemfile.lock

+162-67
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,190 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (5.2.1)
5-
concurrent-ruby (~> 1.0, >= 1.0.2)
6-
i18n (>= 0.7, < 2)
7-
minitest (~> 5.1)
8-
tzinfo (~> 1.1)
9-
addressable (2.5.2)
10-
public_suffix (>= 2.0.2, < 4.0)
4+
Ascii85 (2.0.1)
5+
addressable (2.8.7)
6+
public_suffix (>= 2.0.2, < 7.0)
7+
afm (0.2.2)
8+
async (2.21.1)
9+
console (~> 1.29)
10+
fiber-annotation
11+
io-event (~> 1.6, >= 1.6.5)
12+
bigdecimal (3.1.9)
1113
colorator (1.1.0)
12-
colorize (0.8.1)
13-
concurrent-ruby (1.0.5)
14-
em-websocket (0.5.1)
14+
concurrent-ruby (1.3.4)
15+
console (1.29.2)
16+
fiber-annotation
17+
fiber-local (~> 1.1)
18+
json
19+
csv (3.2.8)
20+
em-websocket (0.5.3)
1521
eventmachine (>= 0.12.9)
16-
http_parser.rb (~> 0.6.0)
17-
ethon (0.11.0)
18-
ffi (>= 1.3.0)
22+
http_parser.rb (~> 0)
23+
ethon (0.16.0)
24+
ffi (>= 1.15.0)
1925
eventmachine (1.2.7)
20-
ffi (1.9.25)
26+
ffi (1.17.1-aarch64-linux-gnu)
27+
ffi (1.17.1-aarch64-linux-musl)
28+
ffi (1.17.1-arm-linux-gnu)
29+
ffi (1.17.1-arm-linux-musl)
30+
ffi (1.17.1-arm64-darwin)
31+
ffi (1.17.1-x86_64-darwin)
32+
ffi (1.17.1-x86_64-linux-gnu)
33+
ffi (1.17.1-x86_64-linux-musl)
34+
fiber-annotation (0.2.0)
35+
fiber-local (1.1.0)
36+
fiber-storage
37+
fiber-storage (1.0.0)
2138
forwardable-extended (2.6.0)
22-
html-proofer (3.9.2)
23-
activesupport (>= 4.2, < 6.0)
39+
google-protobuf (4.29.2)
40+
bigdecimal
41+
rake (>= 13)
42+
google-protobuf (4.29.2-aarch64-linux)
43+
bigdecimal
44+
rake (>= 13)
45+
google-protobuf (4.29.2-arm64-darwin)
46+
bigdecimal
47+
rake (>= 13)
48+
google-protobuf (4.29.2-x86_64-darwin)
49+
bigdecimal
50+
rake (>= 13)
51+
google-protobuf (4.29.2-x86_64-linux)
52+
bigdecimal
53+
rake (>= 13)
54+
hashery (2.1.2)
55+
html-proofer (5.0.9)
2456
addressable (~> 2.3)
25-
colorize (~> 0.8)
26-
mercenary (~> 0.3.2)
27-
nokogiri (~> 1.8.1)
28-
parallel (~> 1.3)
57+
async (~> 2.1)
58+
nokogiri (~> 1.13)
59+
pdf-reader (~> 2.11)
60+
rainbow (~> 3.0)
2961
typhoeus (~> 1.3)
3062
yell (~> 2.0)
31-
http_parser.rb (0.6.0)
32-
i18n (0.9.5)
63+
zeitwerk (~> 2.5)
64+
http_parser.rb (0.8.0)
65+
i18n (1.14.6)
3366
concurrent-ruby (~> 1.0)
34-
jekyll (3.8.3)
67+
io-event (1.7.5)
68+
jekyll (4.3.4)
3569
addressable (~> 2.4)
3670
colorator (~> 1.0)
3771
em-websocket (~> 0.5)
38-
i18n (~> 0.7)
39-
jekyll-sass-converter (~> 1.0)
72+
i18n (~> 1.0)
73+
jekyll-sass-converter (>= 2.0, < 4.0)
4074
jekyll-watch (~> 2.0)
41-
kramdown (~> 1.14)
75+
kramdown (~> 2.3, >= 2.3.1)
76+
kramdown-parser-gfm (~> 1.0)
4277
liquid (~> 4.0)
43-
mercenary (~> 0.3.3)
78+
mercenary (>= 0.3.6, < 0.5)
4479
pathutil (~> 0.9)
45-
rouge (>= 1.7, < 4)
80+
rouge (>= 3.0, < 5.0)
4681
safe_yaml (~> 1.0)
47-
jekyll-sass-converter (1.5.2)
48-
sass (~> 3.4)
49-
jekyll-watch (2.0.0)
82+
terminal-table (>= 1.8, < 4.0)
83+
webrick (~> 1.7)
84+
jekyll-feed (0.17.0)
85+
jekyll (>= 3.7, < 5.0)
86+
jekyll-sass-converter (3.0.0)
87+
sass-embedded (~> 1.54)
88+
jekyll-watch (2.2.1)
5089
listen (~> 3.0)
51-
kramdown (1.17.0)
52-
liquid (4.0.0)
53-
listen (3.1.5)
54-
rb-fsevent (~> 0.9, >= 0.9.4)
55-
rb-inotify (~> 0.9, >= 0.9.7)
56-
ruby_dep (~> 1.2)
57-
mercenary (0.3.6)
58-
mini_portile2 (2.3.0)
59-
minitest (5.11.3)
60-
nokogiri (1.8.4)
61-
mini_portile2 (~> 2.3.0)
62-
parallel (1.12.1)
63-
pathutil (0.16.1)
90+
json (2.9.1)
91+
kramdown (2.5.1)
92+
rexml (>= 3.3.9)
93+
kramdown-parser-gfm (1.1.0)
94+
kramdown (~> 2.0)
95+
liquid (4.0.4)
96+
listen (3.9.0)
97+
rb-fsevent (~> 0.10, >= 0.10.3)
98+
rb-inotify (~> 0.9, >= 0.9.10)
99+
logger (1.6.0)
100+
mercenary (0.4.0)
101+
nokogiri (1.18.1-aarch64-linux-gnu)
102+
racc (~> 1.4)
103+
nokogiri (1.18.1-aarch64-linux-musl)
104+
racc (~> 1.4)
105+
nokogiri (1.18.1-arm-linux-gnu)
106+
racc (~> 1.4)
107+
nokogiri (1.18.1-arm-linux-musl)
108+
racc (~> 1.4)
109+
nokogiri (1.18.1-arm64-darwin)
110+
racc (~> 1.4)
111+
nokogiri (1.18.1-x86_64-darwin)
112+
racc (~> 1.4)
113+
nokogiri (1.18.1-x86_64-linux-gnu)
114+
racc (~> 1.4)
115+
nokogiri (1.18.1-x86_64-linux-musl)
116+
racc (~> 1.4)
117+
pathutil (0.16.2)
64118
forwardable-extended (~> 2.6)
65-
public_suffix (3.0.2)
66-
rake (12.3.0)
67-
rb-fsevent (0.10.3)
68-
rb-inotify (0.9.10)
69-
ffi (>= 0.5.0, < 2)
70-
rouge (3.1.1)
71-
ruby_dep (1.5.0)
72-
safe_yaml (1.0.4)
73-
sass (3.5.7)
74-
sass-listen (~> 4.0.0)
75-
sass-listen (4.0.0)
76-
rb-fsevent (~> 0.9, >= 0.9.4)
77-
rb-inotify (~> 0.9, >= 0.9.7)
78-
thread_safe (0.3.6)
79-
typhoeus (1.3.0)
119+
pdf-reader (2.13.0)
120+
Ascii85 (>= 1.0, < 3.0, != 2.0.0)
121+
afm (~> 0.2.1)
122+
hashery (~> 2.0)
123+
ruby-rc4
124+
ttfunk
125+
public_suffix (6.0.1)
126+
racc (1.8.1)
127+
rainbow (3.1.1)
128+
rake (13.2.1)
129+
rb-fsevent (0.11.2)
130+
rb-inotify (0.11.1)
131+
ffi (~> 1.0)
132+
rexml (3.4.0)
133+
rouge (4.5.1)
134+
ruby-rc4 (0.1.5)
135+
safe_yaml (1.0.5)
136+
sass-embedded (1.83.1-aarch64-linux-gnu)
137+
google-protobuf (~> 4.29)
138+
sass-embedded (1.83.1-aarch64-linux-musl)
139+
google-protobuf (~> 4.29)
140+
sass-embedded (1.83.1-arm-linux-gnueabihf)
141+
google-protobuf (~> 4.29)
142+
sass-embedded (1.83.1-arm-linux-musleabihf)
143+
google-protobuf (~> 4.29)
144+
sass-embedded (1.83.1-arm64-darwin)
145+
google-protobuf (~> 4.29)
146+
sass-embedded (1.83.1-x86_64-darwin)
147+
google-protobuf (~> 4.29)
148+
sass-embedded (1.83.1-x86_64-linux-gnu)
149+
google-protobuf (~> 4.29)
150+
sass-embedded (1.83.1-x86_64-linux-musl)
151+
google-protobuf (~> 4.29)
152+
terminal-table (3.0.2)
153+
unicode-display_width (>= 1.1.1, < 3)
154+
ttfunk (1.8.0)
155+
bigdecimal (~> 3.1)
156+
typhoeus (1.4.1)
80157
ethon (>= 0.9.0)
81-
tzinfo (1.2.5)
82-
thread_safe (~> 0.1)
83-
yell (2.0.7)
158+
unicode-display_width (2.6.0)
159+
webrick (1.9.1)
160+
yell (2.2.2)
161+
zeitwerk (2.7.1)
84162

85163
PLATFORMS
86-
ruby
164+
aarch64-linux
165+
aarch64-linux-gnu
166+
aarch64-linux-musl
167+
arm-linux-gnu
168+
arm-linux-gnueabihf
169+
arm-linux-musl
170+
arm-linux-musleabihf
171+
arm64-darwin
172+
x86_64-darwin
173+
x86_64-linux
174+
x86_64-linux-gnu
175+
x86_64-linux-musl
87176

88177
DEPENDENCIES
89-
html-proofer
90-
jekyll (~> 3.8.3)
91-
rake
178+
csv (~> 3.2)
179+
html-proofer (~> 5.0)
180+
jekyll (~> 4.3.4)
181+
jekyll-feed (~> 0.17.0)
182+
jekyll-sass-converter (~> 3.0)
183+
logger (~> 1.5)
184+
rake (~> 13.0)
185+
tzinfo (~> 2.0)
92186
tzinfo-data
187+
webrick (~> 1.8)
93188

94189
BUNDLED WITH
95-
1.11.2
190+
2.5.16

_administrators/administrative-commands.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Administrative Commands
33
tagline: Making use of Fuel tasks to automate Materia administration
44
class: admin
5-
category: administrative
5+
category: maintenance
66
---
77

88
# Materia's CLI Management Commands

_administrators/apache-virtual-host-configuration.md

-96
This file was deleted.

0 commit comments

Comments
 (0)