Skip to content

Commit 85a1e97

Browse files
committed
mailcatcher: fix missing UI assets
Co-authored-by: Samuel Cochran <[email protected]> Signed-off-by: Patrick Linnane <[email protected]> mailcatcher: patch Rakefile Signed-off-by: Patrick Linnane <[email protected]>
1 parent 47782e3 commit 85a1e97

File tree

1 file changed

+40
-21
lines changed

1 file changed

+40
-21
lines changed

Formula/m/mailcatcher.rb

+40-21
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class Mailcatcher < Formula
44
url "https://github.com/sj26/mailcatcher/archive/refs/tags/v0.10.0.tar.gz"
55
sha256 "4cd027e22878342d6a002402306d42ada1f34045cc1d7f35b5a7fa37b944326e"
66
license "MIT"
7-
revision 1
7+
revision 2
88

99
bottle do
1010
sha256 cellar: :any, arm64_sequoia: "42f5b6813789c297bfb3f2cf9867cb89c387124336f78f0b2db31a9490ff8e39"
@@ -32,8 +32,8 @@ class Mailcatcher < Formula
3232
end
3333

3434
resource "rack" do
35-
url "https://rubygems.org/downloads/rack-2.2.9.gem"
36-
sha256 "fd6301a97a1c1e955e68f85c861fcb1cde6145a32c532e1ea321a72ff8cc4042"
35+
url "https://rubygems.org/downloads/rack-2.2.13.gem"
36+
sha256 "ccee101719696a5da12ee9da6fb3b1d20cb329939e089e0e458be6e93667f0fb"
3737
end
3838

3939
resource "eventmachine" do
@@ -53,18 +53,18 @@ class Mailcatcher < Formula
5353

5454
# needed for sqlite
5555
resource "mini_portile2" do
56-
url "https://rubygems.org/downloads/mini_portile2-2.8.5.gem"
57-
sha256 "7a37db8ae758086c3c3ac3a59c036704d331e965d5e106635e4a42d6e66089ce"
56+
url "https://rubygems.org/downloads/mini_portile2-2.8.8.gem"
57+
sha256 "8e47136cdac04ce81750bb6c09733b37895bf06962554e4b4056d78168d70a75"
5858
end
5959

60-
resource "sqlite" do
60+
resource "sqlite3" do
6161
url "https://rubygems.org/downloads/sqlite3-1.7.3.gem"
6262
sha256 "fa77f63c709548f46d4e9b6bb45cda52aa3881aa12cc85991132758e8968701c"
6363
end
6464

6565
resource "tilt" do
66-
url "https://rubygems.org/downloads/tilt-2.3.0.gem"
67-
sha256 "82dd903d61213c63679d28e404ee8e10d1b0fdf5270f1ad0898ec314cc3e745c"
66+
url "https://rubygems.org/downloads/tilt-2.6.0.gem"
67+
sha256 "263d748466e0d83e510aa1a2e2281eff547937f0ef06be33d3632721e255f76b"
6868
end
6969

7070
resource "base64" do
@@ -83,8 +83,8 @@ class Mailcatcher < Formula
8383
end
8484

8585
resource "mustermann" do
86-
url "https://rubygems.org/downloads/mustermann-3.0.0.gem"
87-
sha256 "6d3569aa3c3b2f048c60626f48d9b2d561cc8d2ef269296943b03da181c08b67"
86+
url "https://rubygems.org/downloads/mustermann-3.0.3.gem"
87+
sha256 "d1f8e9ba2ddaed47150ddf81f6a7ea046826b64c672fbc92d83bce6b70657e88"
8888
end
8989

9090
resource "sinatra" do
@@ -93,8 +93,8 @@ class Mailcatcher < Formula
9393
end
9494

9595
resource "timeout" do
96-
url "https://rubygems.org/downloads/timeout-0.4.1.gem"
97-
sha256 "6f1f4edd4bca28cffa59501733a94215407c6960bd2107331f0280d4abdebb9a"
96+
url "https://rubygems.org/downloads/timeout-0.4.3.gem"
97+
sha256 "9509f079b2b55fe4236d79633bd75e34c1c1e7e3fb4b56cb5fda61f80a0fe30e"
9898
end
9999

100100
resource "net-protocol" do
@@ -103,8 +103,8 @@ class Mailcatcher < Formula
103103
end
104104

105105
resource "net-smtp" do
106-
url "https://rubygems.org/downloads/net-smtp-0.4.0.1.gem"
107-
sha256 "098d28fab9d9bc280a2cfada77692cdca89c83c6789bdbb8d8429f97f1bf5a33"
106+
url "https://rubygems.org/downloads/net-smtp-0.5.1.gem"
107+
sha256 "ed96a0af63c524fceb4b29b0d352195c30d82dd916a42f03c62a3a70e5b70736"
108108
end
109109

110110
resource "net-pop" do
@@ -113,13 +113,13 @@ class Mailcatcher < Formula
113113
end
114114

115115
resource "date" do
116-
url "https://rubygems.org/downloads/date-3.3.4.gem"
117-
sha256 "971f2cb66b945bcbea4ddd9c7908c9400b31a71bc316833cb42fa584b59d3291"
116+
url "https://rubygems.org/downloads/date-3.4.1.gem"
117+
sha256 "bf268e14ef7158009bfeaec40b5fa3c7271906e88b196d958a89d4b408abe64f"
118118
end
119119

120120
resource "net-imap" do
121-
url "https://rubygems.org/downloads/net-imap-0.4.9.1.gem"
122-
sha256 "2f869dc18e3f4a61e5f4c68d6e33e2db5b6d661dfa9151b2b20aa7dfdd342e7d"
121+
url "https://rubygems.org/downloads/net-imap-0.5.7.gem"
122+
sha256 "d5c0247832439b62298c0935ba67d8bc02fdb476d7a3e099d6f75b3daf498b91"
123123
end
124124

125125
resource "mini_mime" do
@@ -138,15 +138,18 @@ class Mailcatcher < Formula
138138
end
139139

140140
resource "websocket-driver" do
141-
url "https://rubygems.org/downloads/websocket-driver-0.7.6.gem"
142-
sha256 "f69400be7bc197879726ad8e6f5869a61823147372fd8928836a53c2c741d0db"
141+
url "https://rubygems.org/downloads/websocket-driver-0.7.7.gem"
142+
sha256 "056d99f2cd545712cfb1291650fde7478e4f2661dc1db6a0fa3b966231a146b4"
143143
end
144144

145145
resource "faye-websocket" do
146146
url "https://rubygems.org/downloads/faye-websocket-0.11.3.gem"
147147
sha256 "109187161939c57032d2bba9e5c45621251d73f806bb608d2d4c3ab2cabeb307"
148148
end
149149

150+
# Fixes `LoadError: cannot load such file -- mail_catcher/version (LoadError)`
151+
patch :DATA
152+
150153
def install
151154
if OS.mac? && MacOS.version >= :mojave && MacOS::CLT.installed?
152155
ENV["SDKROOT"] = ENV["HOMEBREW_SDKROOT"] = MacOS::CLT.sdk_path(MacOS.version)
@@ -159,6 +162,7 @@ def install
159162
"--no-document", "--install-dir", libexec
160163
end
161164

165+
system "rake", "assets"
162166
system "gem", "build", "#{name}.gemspec"
163167
system "gem", "install", "--ignore-dependencies", "#{name}-#{version}.gem"
164168
bin.install libexec/"bin"/name, libexec/"bin/catchmail"
@@ -167,7 +171,7 @@ def install
167171
# Remove temporary logs that reference Homebrew shims.
168172
# TODO: See if we can handle this better:
169173
# https://github.com/sparklemotion/sqlite3-ruby/discussions/394
170-
rm_r(libexec/"gems/sqlite3-#{resource("sqlite").version}/ext/sqlite3/tmp")
174+
rm_r(libexec/"gems/sqlite3-#{resource("sqlite3").version}/ext/sqlite3/tmp")
171175
end
172176

173177
service do
@@ -210,6 +214,21 @@ def install
210214

211215
assert_match "[email protected]", shell_output("curl --silent http://localhost:#{http_port}/messages")
212216
assert_equal "Hello Alice.", shell_output("curl --silent http://localhost:#{http_port}/messages/1.plain").strip
217+
assert_match "Content-Type: application/javascript", shell_output("curl --silent -i http://localhost:#{http_port}/assets/mailcatcher.js").strip
213218
system "curl", "--silent", "-X", "DELETE", "http://localhost:#{http_port}/"
214219
end
215220
end
221+
222+
__END__
223+
diff --git a/Rakefile b/Rakefile
224+
index 6f1f2b4..1381ec2 100644
225+
--- a/Rakefile
226+
+++ b/Rakefile
227+
@@ -3,6 +3,7 @@
228+
require "fileutils"
229+
require "rubygems"
230+
231+
+$LOAD_PATH.unshift File.expand_path("lib", __dir__)
232+
require "mail_catcher/version"
233+
234+
# XXX: Would prefer to use Rake::SprocketsTask but can't populate

0 commit comments

Comments
 (0)