[DRE-commits] [ruby-tilt] 01/07: Merge tag 'upstream/2.0.1'

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository ruby-tilt.

commit 252a3f7226067386d5bb23644b05329cf4b5be01
Merge: e6c46f4 942048c
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Dec 23 19:01:03 2015 +0530

    Merge tag 'upstream/2.0.1'
    
    Upstream version 2.0.1
    
    # gpg: Signature made Wednesday 23 December 2015 07:00:58 PM IST using RSA key ID 4512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>"
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>"
    # gpg:                 aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>"
    # gpg:                 aka "Pirate Praveen (PP) <praveen at privacyrequired.com>"
    # gpg:                 aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>"

 CHANGELOG.md                           |  28 +++
 Gemfile                                |  64 +++--
 README.md                              |  72 ++----
 Rakefile                               |  51 ++--
 bin/tilt                               |   4 +-
 checksums.yaml.gz                      | Bin 0 -> 268 bytes
 TEMPLATES.md => docs/TEMPLATES.md      |  15 +-
 docs/common.css                        |  14 ++
 lib/tilt.rb                            | 241 +++++++------------
 lib/tilt/asciidoc.rb                   |   9 +-
 lib/tilt/bluecloth.rb                  |  24 ++
 lib/tilt/builder.rb                    |   9 +-
 lib/tilt/coffee.rb                     |   9 +-
 lib/tilt/creole.rb                     |  25 ++
 lib/tilt/css.rb                        |  80 -------
 lib/tilt/csv.rb                        |  20 +-
 lib/tilt/erb.rb                        |  57 +----
 lib/tilt/erubis.rb                     |  43 ++++
 lib/tilt/haml.rb                       |   9 +-
 lib/tilt/kramdown.rb                   |  33 +++
 lib/tilt/less.rb                       |  38 +++
 lib/tilt/liquid.rb                     |   9 +-
 lib/tilt/mapping.rb                    | 265 +++++++++++++++++++++
 lib/tilt/markaby.rb                    |   9 +-
 lib/tilt/markdown.rb                   | 214 -----------------
 lib/tilt/maruku.rb                     |  22 ++
 lib/tilt/nokogiri.rb                   |   9 +-
 lib/tilt/radius.rb                     |   9 +-
 lib/tilt/rdiscount.rb                  |  39 +++
 lib/tilt/rdoc.rb                       |  13 +-
 lib/tilt/redcarpet.rb                  | 104 ++++++++
 lib/tilt/{textile.rb => redcloth.rb}   |   9 +-
 lib/tilt/sass.rb                       |  41 ++++
 lib/tilt/template.rb                   | 180 +++++++-------
 lib/tilt/wiki.rb                       |  58 -----
 lib/tilt/wikicloth.rb                  |  22 ++
 lib/tilt/yajl.rb                       |   9 +-
 metadata.yml                           | 419 +++------------------------------
 test/{contest.rb => test_helper.rb}    |  18 +-
 test/tilt_asciidoctor_test.rb          |  12 +-
 test/tilt_blueclothtemplate_test.rb    |  18 +-
 test/tilt_buildertemplate_test.rb      |   6 +-
 test/tilt_cache_test.rb                |   4 +-
 test/tilt_coffeescripttemplate_test.rb |  26 +-
 test/tilt_compilesite_test.rb          |   4 +-
 test/tilt_creoletemplate_test.rb       |  10 +-
 test/tilt_csv_test.rb                  |  14 +-
 test/tilt_erbtemplate_test.rb          |  14 +-
 test/tilt_erubistemplate_test.rb       |  14 +-
 test/tilt_etannitemplate_test.rb       |   7 +-
 test/tilt_fallback_test.rb             | 122 ----------
 test/tilt_hamltemplate_test.rb         |   8 +-
 test/tilt_kramdown_test.rb             |  32 +--
 test/tilt_lesstemplate_test.rb         |   6 +-
 test/tilt_liquidtemplate_test.rb       |   6 +-
 test/tilt_mapping_test.rb              | 229 ++++++++++++++++++
 test/tilt_markaby_test.rb              |   8 +-
 test/tilt_markdown_test.rb             |  44 ++--
 test/tilt_marukutemplate_test.rb       |  30 +--
 test/tilt_metadata_test.rb             |  42 ++++
 test/tilt_nokogiritemplate_test.rb     |   6 +-
 test/tilt_radiustemplate_test.rb       |   6 +-
 test/tilt_rdiscounttemplate_test.rb    |  26 +-
 test/tilt_rdoctemplate_test.rb         |   8 +-
 test/tilt_redcarpettemplate_test.rb    |  34 +--
 test/tilt_redclothtemplate_test.rb     |   6 +-
 test/tilt_sasstemplate_test.rb         |   8 +-
 test/tilt_stringtemplate_test.rb       |   7 +-
 test/tilt_template_test.rb             |  91 ++++---
 test/tilt_test.rb                      |  25 +-
 test/tilt_wikiclothtemplate_test.rb    |   6 +-
 test/tilt_yajltemplate_test.rb         |   6 +-
 tilt.gemspec                           |  51 ++--
 73 files changed, 1513 insertions(+), 1717 deletions(-)

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