[DRE-commits] [ruby-mini-magick] 01/10: Merge tag 'upstream/4.0.1'

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository ruby-mini-magick.

commit 6285aea93fcc787b4b27fbbbf8764d83f91da5a2
Merge: b4c8902 ece8ef8
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Nov 30 03:08:40 2014 +0530

    Merge tag 'upstream/4.0.1'
    
    Upstream version 4.0.1
    
    # gpg: Signature made Sunday 30 November 2014 03:08:33 AM IST using RSA key ID 4512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>"
    # gpg:                 aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>"
    # gpg:                 aka "Pirate Praveen (PP) <praveen at privacyrequired.com>"
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>"

 .gitignore                                   |   1 +
 .travis.yml                                  |  13 +-
 .yardopts                                    |   2 +
 CHANGELOG.md                                 |   5 +-
 Gemfile                                      |   2 +
 README.md                                    | 299 ++++++----
 lib/mini_gmagick.rb                          |   3 +-
 lib/mini_magick.rb                           | 108 ++--
 lib/mini_magick/command_builder.rb           |  94 ----
 lib/mini_magick/configuration.rb             | 136 +++++
 lib/mini_magick/errors.rb                    |   4 -
 lib/mini_magick/image.rb                     | 718 ++++++++++++------------
 lib/mini_magick/image/info.rb                | 122 +++++
 lib/mini_magick/logger.rb                    |  40 ++
 lib/mini_magick/shell.rb                     |  48 ++
 lib/mini_magick/tool.rb                      | 250 +++++++++
 lib/mini_magick/tool/animate.rb              |  14 +
 lib/mini_magick/tool/compare.rb              |  14 +
 lib/mini_magick/tool/composite.rb            |  14 +
 lib/mini_magick/tool/conjure.rb              |  14 +
 lib/mini_magick/tool/convert.rb              |  14 +
 lib/mini_magick/tool/display.rb              |  14 +
 lib/mini_magick/tool/identify.rb             |  14 +
 lib/mini_magick/tool/import.rb               |  14 +
 lib/mini_magick/tool/mogrify.rb              |  14 +
 lib/mini_magick/tool/montage.rb              |  14 +
 lib/mini_magick/tool/stream.rb               |  14 +
 lib/mini_magick/utilities.rb                 |  73 +--
 lib/mini_magick/version.rb                   |   8 +-
 mini_magick.gemspec                          |   8 +-
 spec/files/actually_a_gif.jpg                | Bin 2717 -> 0 bytes
 spec/files/animation.gif                     | Bin 10018 -> 0 bytes
 spec/files/composited.jpg                    | Bin 4303 -> 0 bytes
 spec/files/erroneous.jpg                     | Bin 2667 -> 0 bytes
 spec/files/layers.psd                        | Bin 414063 -> 0 bytes
 spec/files/leaves (spaced).tiff              | Bin 8796 -> 0 bytes
 spec/files/not_an_image.php                  |   1 -
 spec/files/png.png                           | Bin 145 -> 0 bytes
 spec/files/simple-minus.gif                  | Bin 1341 -> 0 bytes
 spec/files/simple.gif                        | Bin 4707 -> 0 bytes
 spec/files/trogdor.jpg                       | Bin 4621 -> 0 bytes
 spec/files/trogdor_capitalized.JPG           | Bin 4621 -> 0 bytes
 spec/fixtures/animation.gif                  | Bin 0 -> 912502 bytes
 spec/fixtures/default.jpg                    | Bin 0 -> 26295 bytes
 spec/fixtures/exif.jpg                       | Bin 0 -> 96106 bytes
 spec/fixtures/image.psd                      | Bin 0 -> 363212 bytes
 spec/fixtures/not_an_image.rb                |   1 +
 spec/lib/mini_magick/command_builder_spec.rb | 153 ------
 spec/lib/mini_magick/configuration_spec.rb   |  66 +++
 spec/lib/mini_magick/image_spec.rb           | 781 +++++++++++++--------------
 spec/lib/mini_magick/shell_spec.rb           |  66 +++
 spec/lib/mini_magick/tool_spec.rb            | 107 ++++
 spec/lib/mini_magick/utilities_spec.rb       |  17 +
 spec/lib/mini_magick_spec.rb                 |  70 +--
 spec/spec_helper.rb                          |  42 +-
 spec/support/helpers.rb                      |  37 ++
 56 files changed, 2132 insertions(+), 1297 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-mini-magick.git