diff --git a/.travis.yml b/.travis.yml index 7cae9fa..b548468 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,35 +1,6 @@ language: ruby -sudo: false - -env: - global: - - NOKOGIRI_USE_SYSTEM_LIBRARIES=true - - VIPS_VERSION_MAJOR=8 - - VIPS_VERSION_MINOR=5 - - VIPS_VERSION_MICRO=7 - - PATH=$HOME/vips/bin:$PATH - - LD_LIBRARY_PATH=$HOME/vips/lib:$LD_LIBRARY_PATH - - PKG_CONFIG_PATH=$HOME/vips/lib/pkgconfig:$PKG_CONFIG_PATH - -rvm: - - "2.0" - - "2.1.10" - - "2.2.7" - - "2.3.4" - - "2.4.1" - - "jruby-9.0.4.0" - -script: rake test - -cache: - bundler: true - directories: - - $HOME/vips - -before_install: - - uname -a - - bash install-vips.sh --without-python +sudo: required addons: apt: @@ -58,3 +29,38 @@ addons: # - libwebpmux2 - libfftw3-dev - libglib2.0-dev + +before_install: + - wget http://www.imagemagick.org/download/ImageMagick.tar.gz + - tar -xvf ImageMagick.tar.gz + - cd ImageMagick-7.* + - ./configure + - make + - sudo make install + - sudo ldconfig /usr/local/lib + - sudo apt-get install -qq graphicsmagick + - uname -a + - bash install-vips.sh --without-python + +env: + global: + - NOKOGIRI_USE_SYSTEM_LIBRARIES=true + - VIPS_VERSION_MAJOR=8 + - VIPS_VERSION_MINOR=5 + - VIPS_VERSION_MICRO=7 + - PATH=$HOME/vips/bin:$PATH + - LD_LIBRARY_PATH=$HOME/vips/lib:$LD_LIBRARY_PATH + - PKG_CONFIG_PATH=$HOME/vips/lib/pkgconfig:$PKG_CONFIG_PATH + +cache: + bundler: true + directories: + - $HOME/vips + +rvm: + - "2.2" + - "2.3" + - "2.4" + - "jruby-9.1.9.0" + +script: rake test diff --git a/README.md b/README.md index 0080a4b..9bf336e 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ that they can be used in any project. The goal of image_processing is to have a centralized place where helper methods for image processing are maintained, instead of CarrierWave, Dragonfly and Refile each implementing their own. -It's been tested with MRI 2.x and JRuby. +It's been tested with MRI 2.2+ and JRuby. ## Installation diff --git a/image_processing.gemspec b/image_processing.gemspec index 54bf8fc..8c03ef2 100644 --- a/image_processing.gemspec +++ b/image_processing.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |spec| spec.require_paths = ["lib"] spec.add_development_dependency "minitest", "~> 5.8" - spec.add_development_dependency "minitest-hooks" + spec.add_development_dependency "minitest-hooks", ">= 1.4.2" spec.add_development_dependency "minispec-metadata" spec.add_development_dependency "mini_magick", ">= 4.3.5" spec.add_development_dependency "ruby-vips", ">= 2.0.0" diff --git a/lib/image_processing/mini_magick.rb b/lib/image_processing/mini_magick.rb index 726b8dc..e84b14e 100644 --- a/lib/image_processing/mini_magick.rb +++ b/lib/image_processing/mini_magick.rb @@ -227,7 +227,7 @@ module ImageProcessing # IO object that responds to `#read(length = nil, outbuf = nil)`. def _copy_to_tempfile(file) extension = File.extname(file.path) if file.respond_to?(:path) - tempfile = Tempfile.new(["mini_magick", extension.to_s], binmode: true) + tempfile = Tempfile.new(["image_processing-mini_magick", extension.to_s], binmode: true) IO.copy_stream(file, tempfile.path) file.rewind tempfile