Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
paperclip
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ikcrm_common
paperclip
Commits
d61ddd5c
Commit
d61ddd5c
authored
Mar 30, 2012
by
Prem Sichanugrist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Silence ALL the STDERR warnings!
parent
51bb0f9f
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
15 deletions
+21
-15
lib/paperclip/geometry.rb
+3
-1
lib/paperclip/thumbnail.rb
+0
-1
test/helper.rb
+0
-7
test/integration_test.rb
+6
-2
test/thumbnail_test.rb
+12
-4
No files found.
lib/paperclip/geometry.rb
View file @
d61ddd5c
...
...
@@ -24,7 +24,9 @@ module Paperclip
file_path
=
file
.
respond_to?
(
:path
)
?
file
.
path
:
file
raise
(
Errors
::
NotIdentifiedByImageMagickError
.
new
(
"Cannot find the geometry of a file with a blank name"
))
if
file_path
.
blank?
geometry
=
begin
Paperclip
.
run
(
"identify"
,
"-format %wx%h :file"
,
:file
=>
"
#{
file_path
}
[0]"
)
silence_stream
(
STDERR
)
do
Paperclip
.
run
(
"identify"
,
"-format %wx%h :file"
,
:file
=>
"
#{
file_path
}
[0]"
)
end
rescue
Cocaine
::
ExitStatusError
""
rescue
Cocaine
::
CommandNotFoundError
=>
e
...
...
lib/paperclip/thumbnail.rb
View file @
d61ddd5c
...
...
@@ -44,7 +44,6 @@ module Paperclip
@current_format
=
File
.
extname
(
@file
.
path
)
@basename
=
File
.
basename
(
@file
.
path
,
@current_format
)
end
# Returns true if the +target_geometry+ is meant to crop.
...
...
test/helper.rb
View file @
d61ddd5c
...
...
@@ -28,13 +28,6 @@ end
ROOT
=
Pathname
(
File
.
expand_path
(
File
.
join
(
File
.
dirname
(
__FILE__
),
'..'
)))
def
silence_warnings
old_verbose
,
$VERBOSE
=
$VERBOSE
,
nil
yield
ensure
$VERBOSE
=
old_verbose
end
class
Test
::
Unit
::
TestCase
def
setup
silence_warnings
do
...
...
test/integration_test.rb
View file @
d61ddd5c
...
...
@@ -40,12 +40,16 @@ class IntegrationTest < Test::Unit::TestCase
should
"not raise an error"
do
assert_nothing_raised
do
@dummy
.
avatar
.
reprocess!
silence_stream
(
STDERR
)
do
@dummy
.
avatar
.
reprocess!
end
end
end
should
"return false"
do
assert
!
@dummy
.
avatar
.
reprocess!
silence_stream
(
STDERR
)
do
assert
!
@dummy
.
avatar
.
reprocess!
end
end
teardown
{
File
.
chmod
(
0644
,
@dummy
.
avatar
.
path
)
}
...
...
test/thumbnail_test.rb
View file @
d61ddd5c
...
...
@@ -78,7 +78,9 @@ class ThumbnailTest < Test::Unit::TestCase
begin
ENV
[
'PATH'
]
=
''
assert_raises
(
Paperclip
::
Errors
::
CommandNotFoundError
)
do
@thumb
.
make
silence_stream
(
STDERR
)
do
@thumb
.
make
end
end
ensure
ENV
[
'PATH'
]
=
old_path
...
...
@@ -155,7 +157,9 @@ class ThumbnailTest < Test::Unit::TestCase
should
"error when trying to create the thumbnail"
do
assert_raises
(
Paperclip
::
Error
)
do
@thumb
.
make
silence_stream
(
STDERR
)
do
@thumb
.
make
end
end
end
end
...
...
@@ -195,7 +199,9 @@ class ThumbnailTest < Test::Unit::TestCase
should
"error when trying to create the thumbnail"
do
assert_raises
(
Paperclip
::
Error
)
do
@thumb
.
make
silence_stream
(
STDERR
)
do
@thumb
.
make
end
end
end
...
...
@@ -204,7 +210,9 @@ class ThumbnailTest < Test::Unit::TestCase
begin
ENV
[
'PATH'
]
=
''
assert_raises
(
Paperclip
::
Errors
::
CommandNotFoundError
)
do
@thumb
.
make
silence_stream
(
STDERR
)
do
@thumb
.
make
end
end
ensure
ENV
[
'PATH'
]
=
old_path
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment