[DRE-commits] [ruby-zip] 01/05: Merge tag 'upstream/1.1.7'

[Praveen Arimbrathodiyil]

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

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

commit d53e46f067d2a2a0cf0e426a680886276ca4dd75
Merge: 0f8c3a2 a593a5d
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Aug 29 09:52:04 2015 +0530

    Merge tag 'upstream/1.1.7'
    
    Upstream version 1.1.7
    
    # gpg: Signature made Saturday 29 August 2015 09:52:01 AM IST using RSA key ID 4512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>"
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>"
    # gpg:                 aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>"
    # gpg:                 aka "Pirate Praveen (PP) <praveen at privacyrequired.com>"
    # gpg:                 aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>"

 .gitignore                                   |  15 ----
 .travis.yml                                  |  17 ++---
 Changelog.md                                 |  12 ++++
 Gemfile                                      |   4 --
 Guardfile                                    |   6 ++
 README.md                                    |  79 +++++++++++++++++----
 lib/zip.rb                                   |   6 +-
 lib/zip/central_directory.rb                 |   2 +-
 lib/zip/crypto/encryption.rb                 |  11 +++
 lib/zip/crypto/null_encryption.rb            |  45 ++++++++++++
 lib/zip/crypto/traditional_encryption.rb     |  99 +++++++++++++++++++++++++++
 lib/zip/deflater.rb                          |   9 ++-
 lib/zip/entry.rb                             |  16 +++--
 lib/zip/entry_set.rb                         |  11 ++-
 lib/zip/extra_field.rb                       |   1 +
 lib/zip/extra_field/ntfs.rb                  |  92 +++++++++++++++++++++++++
 lib/zip/file.rb                              |  12 +++-
 lib/zip/filesystem.rb                        |   4 ++
 lib/zip/inflater.rb                          |   7 +-
 lib/zip/input_stream.rb                      |  14 ++--
 lib/zip/output_stream.rb                     |  19 +++--
 lib/zip/version.rb                           |   2 +-
 rubyzip.gemspec                              |   6 ++
 test/basic_zip_file_test.rb                  |   2 +-
 test/central_directory_entry_test.rb         |   2 +-
 test/central_directory_test.rb               |   6 +-
 test/crypto/null_encryption_test.rb          |  53 ++++++++++++++
 test/crypto/traditional_encryption_test.rb   |  80 ++++++++++++++++++++++
 test/data/WarnInvalidDate.zip                | Bin 0 -> 29204 bytes
 test/data/ntfs.zip                           | Bin 0 -> 165 bytes
 test/data/zipWithEncryption.zip              | Bin 0 -> 612 bytes
 test/deflater_test.rb                        |  23 ++++---
 test/encryption_test.rb                      |  42 ++++++++++++
 test/entry_set_test.rb                       |  15 +++-
 test/entry_test.rb                           |   4 +-
 test/errors_test.rb                          |   2 +-
 test/extra_field_test.rb                     |  11 ++-
 test/file_extract_directory_test.rb          |   5 +-
 test/file_extract_test.rb                    |   4 +-
 test/file_split_test.rb                      |   4 +-
 test/file_test.rb                            |  29 ++++----
 test/filesystem/dir_iterator_test.rb         |   2 +-
 test/filesystem/directory_test.rb            |   2 +-
 test/filesystem/file_mutating_test.rb        |   2 +-
 test/filesystem/file_nonmutating_test.rb     |  11 ++-
 test/filesystem/file_stat_test.rb            |   2 +-
 test/inflater_test.rb                        |   2 +-
 test/input_stream_test.rb                    |   2 +-
 test/ioextras/abstract_input_stream_test.rb  |   2 +-
 test/ioextras/abstract_output_stream_test.rb |   2 +-
 test/ioextras/fake_io_test.rb                |   2 +-
 test/local_entry_test.rb                     |  25 ++++---
 test/output_stream_test.rb                   |  21 +++++-
 test/pass_thru_compressor_test.rb            |   4 +-
 test/pass_thru_decompressor_test.rb          |   2 +-
 test/settings_test.rb                        |  25 ++++++-
 test/test_helper.rb                          |   2 +-
 test/unicode_file_names_and_comments_test.rb |  20 ++++--
 test/zip64_full_test.rb                      |   6 +-
 test/zip64_support_test.rb                   |   2 +-
 60 files changed, 763 insertions(+), 144 deletions(-)

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