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

[Sruthi Chandran]

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

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

commit 131fcee2b31394b8b940343e4c4a23fc41d081db
Merge: 12b8648 222753e
Author: Sruthi Chandran <srud at disroot.org>
Date:   Tue Jun 27 23:16:46 2017 +0530

    Merge tag 'upstream/1.2.1'
    
    Upstream version 1.2.1
    
    # gpg: Signature made Tue 27 Jun 2017 11:16:45 PM IST
    # gpg:                using RSA key B1C94F67189FFAC02648FBF3D4DEB22FC0B96E15
    # gpg: Good signature from "Sruthi Chandran <srud at openmailbox.org>" [unknown]
    # gpg:                 aka "Srud <angelsrud at gmail.com>" [unknown]
    # gpg:                 aka "Srud <srud at openmailbox.org>" [unknown]
    # gpg:                 aka "Sruthi Chandran <srud at disroot.org>" [unknown]
    # gpg: WARNING: This key is not certified with a trusted signature!
    # gpg:          There is no indication that the signature belongs to the owner.
    # Primary key fingerprint: F889 1B55 2BAD DE5D 0936  8B47 C9B0 AC74 C72B 5836
    #      Subkey fingerprint: B1C9 4F67 189F FAC0 2648  FBF3 D4DE B22F C0B9 6E15

 .simplecov                                  |  4 +-
 .travis.yml                                 | 15 +++++--
 Changelog.md                                | 25 +++++++++++
 README.md                                   | 16 +++----
 lib/zip/entry.rb                            |  8 +++-
 lib/zip/entry_set.rb                        |  2 +-
 lib/zip/file.rb                             | 43 ++++++++-----------
 lib/zip/ioextras/abstract_output_stream.rb  |  4 +-
 lib/zip/version.rb                          |  2 +-
 samples/example_recursive.rb                |  6 +--
 test/central_directory_entry_test.rb        |  2 +-
 test/crypto/null_encryption_test.rb         |  8 +++-
 test/entry_set_test.rb                      | 15 ++++++-
 test/entry_test.rb                          | 15 ++-----
 test/file_permissions_test.rb               | 66 ++++++++++++++---------------
 test/file_test.rb                           | 26 ++++++++++--
 test/filesystem/file_nonmutating_test.rb    |  6 +--
 test/filesystem/file_stat_test.rb           |  2 +-
 test/gentestfiles.rb                        |  4 ++
 test/input_stream_test.rb                   |  8 ++--
 test/ioextras/abstract_input_stream_test.rb |  2 +-
 test/ioextras/fake_io_test.rb               |  2 +-
 test/local_entry_test.rb                    |  2 +-
 test/test_helper.rb                         | 15 ++++++-
 24 files changed, 183 insertions(+), 115 deletions(-)

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