From 38ca9cbf4b3e07c7faa09c467592ff745df4f563 Mon Sep 17 00:00:00 2001 From: Andy Cox Date: Thu, 24 Oct 2013 17:15:21 -0400 Subject: [PATCH 1/3] Bump Tilt to 1.4.1 to get its better encoding support --- lib/stasis.rb | 6 +++++- stasis.gemspec | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/stasis.rb b/lib/stasis.rb index 151d21a..213b4b8 100644 --- a/lib/stasis.rb +++ b/lib/stasis.rb @@ -18,7 +18,11 @@ # Activate the [Tilt][ti] gem. -gem "tilt", "1.3.3" +gem "tilt", "1.4.1" + +# Tilt 1.3.4 introduced a plain HTML no-op "template" that breaks Stasis behavior +# for copying files ending with .html. Remove that template handler. +::Tilt.mappings.delete('html') # Add the project directory to the load paths. diff --git a/stasis.gemspec b/stasis.gemspec index 4932a40..0ecaf27 100644 --- a/stasis.gemspec +++ b/stasis.gemspec @@ -30,5 +30,5 @@ Gem::Specification.new do |s| s.add_dependency "directory_watcher", "1.4.1" s.add_dependency "slop", "3.3.2" - s.add_dependency "tilt", "1.3.3" + s.add_dependency "tilt", "1.4.1" end From a1b77f262ebe8cc445822c2835a5ec8a0465c4f0 Mon Sep 17 00:00:00 2001 From: Andy Cox Date: Mon, 14 Sep 2015 13:58:55 -0400 Subject: [PATCH 2/3] Drop Ruby 1.9.2, add 2.1.x --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6cac1b1..a0f3d9b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ language: ruby rvm: - - 1.9.2 - - 1.9.3 \ No newline at end of file + - 1.9.3 + - 2.1.5 From 272a7f9c795518445f724c833f46fe2232413205 Mon Sep 17 00:00:00 2001 From: Andy Cox Date: Mon, 14 Sep 2015 14:03:10 -0400 Subject: [PATCH 3/3] Ruby 1.9.x reached EOL --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a0f3d9b..bebdd10 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ language: ruby rvm: - - 1.9.3 - 2.1.5 + - 2.2.2