[DRE-commits] [nanoc] 01/05: Merge tag 'upstream/3.6.11'

[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 b1ef9532f099b8de9ae41640cdc7f5ba4a6933c0
Merge: df68d41 8e8d04e
Author: Cédric Boutillier <boutil at debian.org>
Date:   Fri May 9 14:26:23 2014 +0200

    Merge tag 'upstream/3.6.11'
    
    Upstream version 3.6.11
    
    # gpg: Signature faite le ven. 09 mai 2014 14:26:10 CEST avec la clef RSA d'identifiant 39CD217A
    # gpg: Bonne signature de « Cédric Boutillier <boutil at debian.org> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at upmc.fr> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at polytechnique.org> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at gmail.com> »

 Gemfile                                        |  23 ++-
 Gemfile.lock                                   |  67 ++++--
 NEWS.md                                        |  20 ++
 checksums.yaml.gz                              | Bin 269 -> 268 bytes
 lib/nanoc.rb                                   |   2 +-
 lib/nanoc/base.rb                              |   2 +
 lib/nanoc/base/checksummer.rb                  |  82 ++++++++
 lib/nanoc/base/compilation/compiler.rb         |   7 +-
 lib/nanoc/base/compilation/filter.rb           |  13 +-
 lib/nanoc/base/compilation/rules_collection.rb |   7 +-
 lib/nanoc/base/core_ext/array.rb               |   2 +-
 lib/nanoc/base/core_ext/hash.rb                |   3 +-
 lib/nanoc/base/core_ext/pathname.rb            |   3 +-
 lib/nanoc/base/core_ext/string.rb              |   4 +-
 lib/nanoc/base/errors.rb                       |   9 +
 lib/nanoc/base/result_data/item_rep.rb         |   9 +-
 lib/nanoc/base/source_data/code_snippet.rb     |   2 +-
 lib/nanoc/base/source_data/item.rb             |  17 +-
 lib/nanoc/base/source_data/layout.rb           |   4 +-
 lib/nanoc/base/source_data/site.rb             |  14 ++
 lib/nanoc/base/temp_filename_factory.rb        |  53 +++++
 lib/nanoc/cli/commands/compile.rb              |   8 +-
 lib/nanoc/cli/commands/create-site.rb          |   3 +
 lib/nanoc/cli/error_handler.rb                 |  14 +-
 lib/nanoc/extra.rb                             |  17 +-
 lib/nanoc/extra/jruby_nokogiri_warner.rb       |  48 +++++
 lib/nanoc/extra/link_collector.rb              |   2 +
 lib/nanoc/extra/piper.rb                       |   2 +-
 lib/nanoc/filters/colorize_syntax.rb           |   2 +
 lib/nanoc/filters/pandoc.rb                    |   4 +-
 lib/nanoc/filters/relativize_paths.rb          |   2 +
 lib/nanoc/filters/xsl.rb                       |   2 +
 lib/nanoc/version.rb                           |   2 +-
 metadata.yml                                   |  13 +-
 tasks/rubocop.rake                             |  10 +-
 test/base/checksummer_spec.rb                  | 274 +++++++++++++++++++++++++
 test/base/core_ext/array_spec.rb               |   4 +-
 test/base/core_ext/hash_spec.rb                |  11 +-
 test/base/core_ext/pathname_spec.rb            |  12 +-
 test/base/core_ext/string_spec.rb              |   4 +-
 test/base/temp_filename_factory_spec.rb        |  72 +++++++
 test/base/test_site.rb                         |  26 +++
 test/cli/commands/test_prune.rb                |   4 +
 test/extra/checking/checks/test_css.rb         |  52 ++---
 test/extra/checking/checks/test_html.rb        |  52 ++---
 test/extra/test_piper.rb                       |  12 ++
 test/filters/test_colorize_syntax.rb           |  12 +-
 test/filters/test_erb.rb                       |   4 +
 test/filters/test_pandoc.rb                    |  15 ++
 test/filters/test_relativize_paths.rb          |  92 +++------
 test/filters/test_xsl.rb                       |  42 +---
 test/fixtures/vcr_cassettes/css_run_error.yml  |  65 ++++++
 test/fixtures/vcr_cassettes/css_run_ok.yml     |  55 +++++
 test/fixtures/vcr_cassettes/html_run_error.yml |  94 +++++++++
 test/fixtures/vcr_cassettes/html_run_ok.yml    |  56 +++++
 test/helper.rb                                 |  28 ++-
 56 files changed, 1177 insertions(+), 281 deletions(-)

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