[DRE-commits] [nanoc] 04/08: Merge tag 'upstream/3.6.9'

[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 a48d6fb5ea87218ae125b0c5e325fd46b7f7fe9f
Merge: 6473dde 3c069d3
Author: Cédric Boutillier <boutil at debian.org>
Date:   Tue Apr 15 10:59:26 2014 +0200

    Merge tag 'upstream/3.6.9'
    
    Upstream version 3.6.9
    
    # gpg: Signature faite le mar. 15 avril 2014 10:59:18 CEST avec la clef RSA d'identifiant 8F9F8F09
    # 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                               |   7 +-
 Gemfile.lock                          |  39 +++---
 NEWS.md                               |   9 ++
 README.md                             |   9 +-
 checksums.yaml.gz                     | Bin 423 -> 269 bytes
 lib/nanoc/base/store.rb               |  23 ++--
 lib/nanoc/cli/commands/create-site.rb |   2 +-
 lib/nanoc/cli/error_handler.rb        |   1 -
 lib/nanoc/extra.rb                    |   1 +
 lib/nanoc/extra/deployers/rsync.rb    |  10 +-
 lib/nanoc/extra/piper.rb              |  54 +++++++++
 lib/nanoc/filters/asciidoc.rb         |  24 +---
 lib/nanoc/filters/colorize_syntax.rb  |  59 ++++++---
 lib/nanoc/version.rb                  |   2 +-
 metadata.yml                          |  21 ++--
 test/base/test_store.rb               |  41 +++++++
 test/cli/commands/test_create_site.rb |  10 ++
 test/cli/commands/test_deploy.rb      | 220 ++++++++++++++++------------------
 test/extra/deployers/test_rsync.rb    | 146 +++++++++++-----------
 test/extra/test_piper.rb              |  36 ++++++
 test/filters/test_asciidoc.rb         |  14 +--
 test/filters/test_colorize_syntax.rb  |  18 ++-
 test/test_gem.rb                      |  18 +--
 23 files changed, 457 insertions(+), 307 deletions(-)

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