[DRE-commits] [nanoc] 05/10: Merge tag 'upstream/4.2.2'

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository nanoc.

commit eeedff1a2ce6e8a4d331ab45c4d807d57f26db61
Merge: 79d5934 7708a15
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sat Jul 2 21:46:45 2016 +0200

    Merge tag 'upstream/4.2.2'
    
    Upstream version 4.2.2
    
    # gpg: Signature faite le sam. 02 juil. 2016 21:46:44 CEST
    # gpg:                avec la clef RSA 0x89AF82B739CD217A
    # gpg: Bonne signature de « Cédric Boutillier <boutil at debian.org> » [ultime]
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at upmc.fr> » [ultime]
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at polytechnique.org> » [ultime]
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at gmail.com> » [ultime]
    # Empreinte de clef principale : 3041 4D81 DC28 290C 2568  6DE3 DA49 58F6 11E1 49E9
    #    Empreinte de la sous-clef : 9CCD 6B31 9DBF 8E40 AB1A  BD1A 89AF 82B7 39CD 217A

 Gemfile.lock                                       | 52 ++++++++++++----------
 NEWS.md                                            | 13 ++++++
 lib/nanoc/base/checksummer.rb                      | 12 ++++-
 lib/nanoc/base/compilation/compiler.rb             |  4 ++
 lib/nanoc/base/entities/configuration.rb           |  6 +--
 lib/nanoc/base/entities/document.rb                |  6 ++-
 lib/nanoc/base/entities/identifier.rb              |  8 +++-
 lib/nanoc/base/repos/config_loader.rb              |  2 +-
 lib/nanoc/base/repos/dependency_store.rb           |  2 +-
 lib/nanoc/base/services/executor.rb                |  2 +
 lib/nanoc/base/views/item_rep_view.rb              |  8 +++-
 lib/nanoc/base/views/mixins/document_view_mixin.rb |  6 ++-
 lib/nanoc/cli.rb                                   |  2 +-
 lib/nanoc/cli/error_handler.rb                     | 10 ++---
 lib/nanoc/filters/asciidoc.rb                      |  2 +-
 lib/nanoc/version.rb                               |  2 +-
 nanoc.gemspec                                      |  1 +
 test/base/test_compiler.rb                         | 16 +++----
 test/base/test_site.rb                             |  2 +-
 test/cli/commands/test_check.rb                    |  4 +-
 test/cli/commands/test_compile.rb                  | 12 ++---
 test/cli/commands/test_create_site.rb              | 24 +++++-----
 test/cli/commands/test_help.rb                     |  4 +-
 test/cli/commands/test_info.rb                     |  2 +-
 test/cli/commands/test_prune.rb                    | 12 ++---
 test/cli/test_cli.rb                               | 18 ++++----
 test/data_sources/test_filesystem.rb               | 14 +++---
 test/extra/checking/test_runner.rb                 |  4 +-
 test/extra/core_ext/test_pathname.rb               |  2 +-
 test/extra/test_link_collector.rb                  |  6 +--
 test/extra/test_piper.rb                           |  6 +--
 test/helpers/test_capturing.rb                     |  2 +-
 test/rule_dsl/test_action_provider.rb              |  4 +-
 test/test_gem.rb                                   |  2 +-
 34 files changed, 160 insertions(+), 112 deletions(-)

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