mini_magick 4.9.1 → 4.9.2
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.
Potentially problematic release.
This version of mini_magick might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/lib/mini_magick/shell.rb +3 -2
- data/lib/mini_magick/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 72e3bfe484416705487e711ad30028e9c3d63f69cc739a2e2183365f5564260c
|
|
4
|
+
data.tar.gz: 9a1734abf7ea02c7a0397afb67691048b92e1a36286fbc954ff2b10a31f3d64d
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: eaab301f2254bcedc6e2108190424fc5f74f1dc8ea7f02cbb95bbbb7c7bf7fe26ec0a6c6af8224397792529d40307e034dcbd728f3d0962f4a103fa70275b712
|
|
7
|
+
data.tar.gz: 5e9b9f80ada493b9372a16e599b2542cda3a8490d666256a41abd67d3e8aa1c1f3fe9842e389d3c2150d10021ba9eec579b175373eb038d5a2555bf10579cde3
|
data/lib/mini_magick/shell.rb
CHANGED
|
@@ -51,10 +51,11 @@ module MiniMagick
|
|
|
51
51
|
in_w.close
|
|
52
52
|
|
|
53
53
|
begin
|
|
54
|
-
Timeout.timeout(MiniMagick.timeout
|
|
55
|
-
|
|
54
|
+
Timeout.timeout(MiniMagick.timeout) { thread.join }
|
|
55
|
+
rescue Timeout::Error
|
|
56
56
|
Process.kill("TERM", thread.pid) rescue nil
|
|
57
57
|
Process.waitpid(thread.pid) rescue nil
|
|
58
|
+
raise Timeout::Error, "MiniMagick command timed out: #{command}"
|
|
58
59
|
end
|
|
59
60
|
|
|
60
61
|
[stdout_reader.value, stderr_reader.value, thread.value]
|
data/lib/mini_magick/version.rb
CHANGED