Skip to content

Commit 0e1f46e

Browse files
committed
Upgrade to Ruby 3.1, Awestruct 0.6.5 and update dependencies
1 parent 813a7b0 commit 0e1f46e

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

Gemfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ source 'https://rubygems.org'
33
gem 'bundler', '2.3.4'
44

55
# Main site dependencies
6-
gem 'awestruct', '0.6.1'
6+
gem 'awestruct', '0.6.5'
77
gem 'htmlcompressor'
88
gem 'uglifier'
99
gem 'json'
10+
gem 'haml', '< 6.0' # Haml 6 would require udpating our filter registration code
1011

1112
# Enable a Markdown gem (only rdiscount seems to work w/ the site):
1213
gem 'rdiscount', '~> 2.0.7', :platforms => [:ruby]

Gemfile.lock

+11-10
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.8.1)
4+
addressable (2.8.3)
55
public_suffix (>= 2.0.2, < 6.0)
66
ansi (1.5.0)
77
asciidoctor (2.0.18)
88
ast (2.4.2)
9-
awestruct (0.6.1)
10-
asciidoctor (>= 1.5.2, < 3.0)
9+
awestruct (0.6.5)
10+
asciidoctor (>= 1.5.2)
1111
git (~> 1.2, >= 1.2.6)
1212
guard (~> 2.0, >= 2.13.0)
1313
guard-livereload (~> 2.0, >= 2.1.2)
14-
haml (>= 4.0.5, < 6.0)
14+
haml (>= 4.0.5)
1515
listen (~> 3.1)
1616
logging (~> 2.2)
1717
mime-types (~> 3.0)
@@ -30,7 +30,7 @@ GEM
3030
execjs (2.8.1)
3131
ffi (1.15.5)
3232
formatador (1.1.0)
33-
git (1.13.1)
33+
git (1.18.0)
3434
addressable (~> 2.8)
3535
rchardet (~> 1.8)
3636
guard (2.18.0)
@@ -68,7 +68,7 @@ GEM
6868
method_source (1.0.0)
6969
mime-types (3.4.1)
7070
mime-types-data (~> 3.2015)
71-
mime-types-data (3.2022.0105)
71+
mime-types-data (3.2023.0218.1)
7272
multi_json (1.15.0)
7373
nenv (0.3.0)
7474
netrc (0.11.0)
@@ -83,7 +83,7 @@ GEM
8383
coderay (~> 1.1)
8484
method_source (~> 1.0)
8585
public_suffix (5.0.1)
86-
rack (2.2.6.2)
86+
rack (2.2.6.4)
8787
rake (13.0.6)
8888
rb-fsevent (0.11.2)
8989
rb-inotify (0.10.1)
@@ -108,22 +108,23 @@ GEM
108108
shellany (0.0.1)
109109
temple (0.10.0)
110110
thor (1.2.1)
111-
tilt (2.0.11)
111+
tilt (2.1.0)
112112
uglifier (4.2.0)
113113
execjs (>= 0.3.0, < 3)
114114
unf (0.1.4)
115115
unf_ext
116116
unf_ext (0.0.8.2)
117-
webrick (1.7.0)
117+
webrick (1.8.1)
118118

119119
PLATFORMS
120120
ruby
121121

122122
DEPENDENCIES
123-
awestruct (= 0.6.1)
123+
awestruct (= 0.6.5)
124124
bundler (= 2.3.4)
125125
guard
126126
guard-livereload
127+
haml (< 6.0)
127128
htmlcompressor
128129
json
129130
rake

Rakefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ task :default => :preview
3131
task :init do
3232
cmd = "bundle check"
3333
msg cmd
34-
system cmd or raise "Bundle dependencies not satisfied. Run 'rake setup' first", :warn
34+
system cmd or raise StandardError, "Bundle dependencies not satisfied. Run 'rake setup' first"
3535
end
3636

3737
desc 'Setup the environment to run Awestruct using Bundler'
@@ -102,7 +102,7 @@ end
102102
def run_awestruct(args)
103103
cmd = "bundle exec awestruct #{args}"
104104
msg cmd
105-
system cmd or raise "ERROR: Running Awestruct failed."
105+
system cmd or raise StandardError, "ERROR: Running Awestruct failed."
106106
end
107107

108108
def get_profile(args)

0 commit comments

Comments
 (0)