[DRE-commits] [nanoc] 01/10: Merge tag 'upstream/4.2.1'

[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 7a2b839077496dfbca8b9cbb922b86db8f97c931
Merge: 384797c 21b0646
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sun Jun 26 22:01:01 2016 +0200

    Merge tag 'upstream/4.2.1'
    
    Upstream version 4.2.1
    
    # gpg: Signature faite le dim. 26 juin 2016 22:00:48 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                                            |  2 +
 Gemfile.lock                                       | 28 ++++++----
 NEWS.md                                            |  7 +++
 lib/nanoc/base.rb                                  |  1 +
 lib/nanoc/base/contracts_support.rb                | 60 ++++++++++++++++++++++
 lib/nanoc/base/entities.rb                         |  9 ++--
 lib/nanoc/base/entities/code_snippet.rb            |  5 ++
 lib/nanoc/base/entities/configuration.rb           | 16 ++++++
 lib/nanoc/base/entities/content.rb                 | 20 ++++++--
 lib/nanoc/base/entities/document.rb                | 14 +++++
 lib/nanoc/base/entities/identifiable_collection.rb |  9 ++++
 lib/nanoc/base/entities/identifier.rb              | 22 +++++++-
 lib/nanoc/base/entities/item_rep.rb                | 10 ++++
 lib/nanoc/base/entities/lazy_value.rb              |  5 ++
 lib/nanoc/base/entities/pattern.rb                 | 15 +++++-
 lib/nanoc/base/entities/rule_memory.rb             | 14 +++++
 lib/nanoc/base/entities/site.rb                    | 10 ++++
 lib/nanoc/base/entities/snapshot_def.rb            |  4 ++
 lib/nanoc/base/memoization.rb                      | 18 +++++--
 lib/nanoc/cli/command_runner.rb                    |  6 ++-
 lib/nanoc/cli/commands/check.rb                    |  3 +-
 lib/nanoc/cli/commands/deploy.rb                   |  8 +--
 lib/nanoc/cli/commands/prune.rb                    |  4 +-
 lib/nanoc/cli/commands/show-data.rb                |  2 +-
 lib/nanoc/version.rb                               |  2 +-
 tasks/test.rake                                    |  2 +-
 test/base/test_item_rep.rb                         | 16 +++---
 test/filters/test_colorize_syntax.rb               | 29 +----------
 test/helper.rb                                     |  5 +-
 29 files changed, 268 insertions(+), 78 deletions(-)

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