remove dragonfly.log (fix issue locomotivecms/engine#1146) + use env variables to detect/find convert and identify, the imagemagick commands + bump version to 1.2.0.beta1
did
committed May 25, 2016
commit 8e777a730365b1552b953052cda48ce0ede3f0ce
Showing 3
changed files with
8 additions
and 10 deletions
Gemfile.lock
+4
-4
| @@ | @@ -1,7 +1,7 @@ |
| PATH | |
| remote: . | |
| specs: | |
| - | locomotivecms_steam (1.1.0) |
| + | locomotivecms_steam (1.2.0.beta1) |
| RedCloth (~> 4.2.9) | |
| autoprefixer-rails (~> 6.3.3.1) | |
| chronic (~> 0.10.2) | |
| @@ | @@ -80,7 +80,7 @@ GEM |
| multi_json (~> 1.0) | |
| rack (>= 1.3.0) | |
| duktape (1.3.0.6) | |
| - | execjs (2.6.0) |
| + | execjs (2.7.0) |
| fast_stack (0.2.0) | |
| ffi (1.9.10) | |
| flamegraph (0.1.0) | |
| @@ | @@ -115,7 +115,7 @@ GEM |
| mime-types (2.6.2) | |
| mimetype-fu (0.1.2) | |
| mini_portile2 (2.0.0) | |
| - | minitest (5.8.4) |
| + | minitest (5.9.0) |
| moneta (0.8.0) | |
| mongo (2.2.5) | |
| bson (~> 4.0) | |
| @@ | @@ -184,7 +184,7 @@ GEM |
| tins (~> 1.0) | |
| thor (0.19.1) | |
| thread_safe (0.3.5) | |
| - | tilt (2.0.2) |
| + | tilt (2.0.4) |
| timecop (0.8.1) | |
| tins (1.6.0) | |
| tzinfo (1.2.2) | |
locomotive/steam/initializers/dragonfly.rb b/lib/locomotive/steam/initializers/dragonfly.rb
+3
-5
| @@ | @@ -26,14 +26,12 @@ module Locomotive |
| fetch_url_whitelist /.+/ | |
| end | |
| - | if ::Dragonfly.logger.nil? |
| - | ::Dragonfly.logger = Locomotive::Common::Logger.instance |
| - | end |
| + | ::Dragonfly.logger = Locomotive::Common::Logger |
| end | |
| def find_imagemagick_commands | |
| - | convert = `which convert`.strip.presence || '/usr/local/bin/convert' |
| - | identify = `which identify`.strip.presence || '/usr/local/bin/identify' |
| + | convert = ENV['IMAGE_MAGICK_CONVERT'] || `which convert`.strip.presence || '/usr/local/bin/convert' |
| + | identify = ENV['IMAGE_MAGICK_IDENTIFY'] || `which identify`.strip.presence || '/usr/local/bin/identify' |
| if File.exists?(convert) | |
| { convert_command: convert, identify_command: identify } | |
locomotive/steam/version.rb b/lib/locomotive/steam/version.rb
+1
-1
| @@ | @@ -3,6 +3,6 @@ |
| # 1.0.0-alpha < 1.0.0-alpha.1 < 1.0.0-alpha.beta < 1.0.0-beta < 1.0.0-beta.2 < 1.0.0-beta.11 < 1.0.0-rc.1 < 1.0.0 | |
| module Locomotive | |
| module Steam | |
| - | VERSION = '1.1.0' |
| + | VERSION = '1.2.0.beta1' |
| end | |
| end | |