[DRE-commits] [nanoc] 05/09: Merge tag 'upstream/3.6.7'

[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 7607677d3039bb69ad50a4aba03d6ed210eae556
Merge: f96e623 79e0a36
Author: Cédric Boutillier <boutil at debian.org>
Date:   Thu Jan 23 21:47:05 2014 +0100

    Merge tag 'upstream/3.6.7'
    
    Upstream version 3.6.7
    
    # gpg: Signature faite le jeu. 23 janv. 2014 21:46:58 CET 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> »

 Architecture.md                                    |  70 ------------
 Gemfile                                            |   7 +-
 Gemfile.lock                                       | 127 +++++++++++----------
 NEWS.md                                            |  40 ++++++-
 TODO.md                                            | 114 ------------------
 checksums.yaml.gz                                  | Bin 422 -> 421 bytes
 lib/nanoc.rb                                       |   9 +-
 lib/nanoc/base/compilation/compiler.rb             |   3 +-
 lib/nanoc/base/compilation/dependency_tracker.rb   |   5 +
 lib/nanoc/base/source_data/item.rb                 |   3 +-
 lib/nanoc/cli.rb                                   |  17 ++-
 lib/nanoc/cli/cleaning_stream.rb                   |  27 ++++-
 lib/nanoc/cli/commands/autocompile.rb              |   1 +
 lib/nanoc/cli/commands/compile.rb                  |  82 +++++++++----
 lib/nanoc/cli/commands/create-site.rb              |  22 +---
 lib/nanoc/cli/commands/view.rb                     |  12 +-
 lib/nanoc/cli/commands/watch.rb                    |   5 +-
 lib/nanoc/data_sources/filesystem_unified.rb       |   6 +-
 lib/nanoc/extra/deployers/fog.rb                   |  10 +-
 lib/nanoc/filters/handlebars.rb                    |   4 +-
 lib/nanoc/filters/sass.rb                          |  35 ++----
 lib/nanoc/filters/sass/sass_filesystem_importer.rb |  33 +++---
 lib/nanoc/helpers/capturing.rb                     |   6 +-
 lib/nanoc/version.rb                               |   8 ++
 metadata.yml                                       |  17 ++-
 nanoc.gemspec                                      |   2 +-
 tasks/test.rake                                    |  41 +++----
 test/base/test_compiler.rb                         |  34 ++++++
 test/base/test_context.rb                          |   2 +-
 test/base/test_directed_graph.rb                   |   2 +-
 test/cli/commands/test_compile.rb                  |  61 ++++++++++
 test/cli/commands/test_deploy.rb                   |   3 +
 test/cli/commands/test_prune.rb                    |   1 +
 test/cli/commands/test_watch.rb                    |   2 +
 test/cli/test_cleaning_stream.rb                   |  10 +-
 test/cli/test_cli.rb                               |  43 +++++++
 test/data_sources/test_filesystem.rb               |   2 +-
 test/data_sources/test_filesystem_unified.rb       |  40 +++++++
 test/data_sources/test_static.rb                   |   2 +
 test/extra/test_filesystem_tools.rb                |   4 +
 test/filters/test_asciidoc.rb                      |   4 +-
 test/filters/test_colorize_syntax.rb               |  14 +--
 test/filters/test_handlebars.rb                    |  21 ++++
 test/filters/test_less.rb                          |   2 +-
 test/filters/test_maruku.rb                        |   2 +-
 test/filters/test_pandoc.rb                        |   4 +-
 test/filters/test_sass.rb                          |  65 +++++++++++
 test/helper.rb                                     |  51 ++++++++-
 test/helpers/test_capturing.rb                     |   5 +-
 test/helpers/test_link_to.rb                       |   6 +-
 test/helpers/test_rendering.rb                     |   4 +-
 test/test_gem.rb                                   |   2 +-
 52 files changed, 644 insertions(+), 448 deletions(-)

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