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

[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 9de3cc843def37115be8dc979c24686b244a8845
Merge: 3cc86a7 971d324
Author: Cédric Boutillier <boutil at debian.org>
Date:   Mon Jun 9 22:37:29 2014 +0200

    Merge tag 'upstream/3.7.0'
    
    Upstream version 3.7.0
    
    # gpg: Signature faite le lun. 09 juin 2014 22:37:22 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                                           |   2 +
 Gemfile.lock                                      | 102 ++++++++++------------
 NEWS.md                                           |  21 +++++
 bin/nanoc                                         |   1 +
 checksums.yaml.gz                                 | Bin 268 -> 270 bytes
 lib/nanoc/base/compilation/compiler.rb            |   7 +-
 lib/nanoc/base/compilation/compiler_dsl.rb        |  12 ++-
 lib/nanoc/base/compilation/rules_collection.rb    |  35 +++++---
 lib/nanoc/base/source_data/data_source.rb         |   2 +-
 lib/nanoc/base/source_data/site.rb                |  52 ++++++++---
 lib/nanoc/base/temp_filename_factory.rb           |   4 +
 lib/nanoc/cli.rb                                  |  18 ++++
 lib/nanoc/cli/commands/create-site.rb             |  14 ++-
 lib/nanoc/data_sources/filesystem.rb              |  18 ++--
 lib/nanoc/data_sources/filesystem_unified.rb      |  11 ++-
 lib/nanoc/data_sources/static.rb                  |   6 +-
 lib/nanoc/extra/checking/checks/internal_links.rb |  11 +++
 lib/nanoc/extra/deployers/rsync.rb                |  10 ++-
 lib/nanoc/filters/colorize_syntax.rb              |  44 +++++++++-
 lib/nanoc/filters/redcarpet.rb                    |  35 ++++++--
 lib/nanoc/helpers/blogging.rb                     |  19 +++-
 lib/nanoc/version.rb                              |   2 +-
 metadata.yml                                      |   4 +-
 nanoc.gemspec                                     |   2 +-
 tasks/rubocop.rake                                |   4 +-
 test/base/temp_filename_factory_spec.rb           |   8 ++
 test/base/test_compiler_dsl.rb                    |  34 ++++++++
 test/base/test_site.rb                            |  77 +++++++++++++++-
 test/cli/commands/test_create_site.rb             |  31 +++++++
 test/cli/test_cli.rb                              |   9 ++
 test/extra/checking/checks/test_internal_links.rb |  14 +++
 test/filters/test_colorize_syntax.rb              |  54 ++++++++++++
 test/filters/test_redcarpet.rb                    |  26 +++++-
 test/helper.rb                                    |   4 +
 34 files changed, 577 insertions(+), 116 deletions(-)

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