diff -Nru ruby-sinatra-contrib-1.4.6/debian/changelog ruby-sinatra-contrib-1.4.7/debian/changelog --- ruby-sinatra-contrib-1.4.6/debian/changelog 2016-02-18 15:27:40.000000000 +0000 +++ ruby-sinatra-contrib-1.4.7/debian/changelog 2016-12-01 10:41:34.000000000 +0000 @@ -1,3 +1,21 @@ +ruby-sinatra-contrib (1.4.7-1) unstable; urgency=medium + + [ Jérémy Bobbio ] + * New upstream version. + * Refresh patches. + + [ Cédric Boutillier ] + * Remove version in the gem2deb build-dependency. + * Use https:// in Vcs-* fields. + * Use https:// in Vcs-* fields. + * Bump Standards-Version to 3.9.7 (no changes needed). + + [ Jérémy Bobbio ] + * Bump Standards-Version to 3.9.8, no changes required. + * Fix spelling mistake in extended description. + + -- Jérémy Bobbio Thu, 01 Dec 2016 11:41:34 +0100 + ruby-sinatra-contrib (1.4.6-2) unstable; urgency=medium * Remove unavailable dependencies from the list of engines. (Closes: #812189) diff -Nru ruby-sinatra-contrib-1.4.6/debian/control ruby-sinatra-contrib-1.4.7/debian/control --- ruby-sinatra-contrib-1.4.6/debian/control 2016-02-18 15:03:54.000000000 +0000 +++ ruby-sinatra-contrib-1.4.7/debian/control 2016-12-01 10:41:25.000000000 +0000 @@ -6,7 +6,7 @@ Jérémy Bobbio Build-Depends: asciidoctor, debhelper (>= 9~), - gem2deb (>= 0.3.0~), + gem2deb, rake, ruby-backports (>= 2.0~), ruby-builder, @@ -29,7 +29,7 @@ ruby-tilt (>= 1.3~), ruby-wikicloth, ruby-yajl -Standards-Version: 3.9.6 +Standards-Version: 3.9.8 Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/ruby-sinatra-contrib.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-sinatra-contrib.git Homepage: https://github.com/sinatra/sinatra-contrib @@ -50,7 +50,7 @@ Description: collection of useful extensions to the Sinatra web framework sinatra-contrib is a collection of common extensions to the Sinatra web framework, semi-officially supported: - - capture: Let's you capture the content of blocks in templates. + - capture: Lets you capture the content of blocks in templates. - config_file: Allows loading configuration from yaml files. - content_for: Adds Rails-style content_for helpers to Haml, Erb, Erubis and Slim. diff -Nru ruby-sinatra-contrib-1.4.6/debian/patches/remove-unpackaged-dependencies.patch ruby-sinatra-contrib-1.4.7/debian/patches/remove-unpackaged-dependencies.patch --- ruby-sinatra-contrib-1.4.6/debian/patches/remove-unpackaged-dependencies.patch 2016-02-18 15:27:21.000000000 +0000 +++ ruby-sinatra-contrib-1.4.7/debian/patches/remove-unpackaged-dependencies.patch 2016-12-01 10:40:43.000000000 +0000 @@ -1,104 +1,16 @@ -Description: remove unpackaged dependencies - less, markaby, and radius are not in Debian. As they are just used - how Sinatra behave with these engines loaded, we simply remove them. -Author: Jérémy Bobbio -Forwarded: not-needed -Last-Update: 2015-09-09 +From: =?utf-8?q?J=C3=A9r=C3=A9my_Bobbio?= +Date: Thu, 1 Dec 2016 11:19:11 +0100 +Subject: Remove unpackaged optional dependencies -Index: git/metadata.yml -=================================================================== ---- git.orig/metadata.yml -+++ git/metadata.yml -@@ -204,20 +204,6 @@ dependencies: - - !ruby/object:Gem::Version - version: '0' - - !ruby/object:Gem::Dependency -- name: less -- requirement: !ruby/object:Gem::Requirement -- requirements: -- - - ">=" -- - !ruby/object:Gem::Version -- version: '0' -- type: :development -- prerelease: false -- version_requirements: !ruby/object:Gem::Requirement -- requirements: -- - - ">=" -- - !ruby/object:Gem::Version -- version: '0' --- !ruby/object:Gem::Dependency - name: sass - requirement: !ruby/object:Gem::Requirement - requirements: -@@ -302,20 +288,6 @@ dependencies: - - !ruby/object:Gem::Version - version: '0' - - !ruby/object:Gem::Dependency -- name: radius -- requirement: !ruby/object:Gem::Requirement -- requirements: -- - - ">=" -- - !ruby/object:Gem::Version -- version: '0' -- type: :development -- prerelease: false -- version_requirements: !ruby/object:Gem::Requirement -- requirements: -- - - ">=" -- - !ruby/object:Gem::Version -- version: '0' --- !ruby/object:Gem::Dependency - name: coffee-script - requirement: !ruby/object:Gem::Requirement - requirements: -@@ -362,20 +334,6 @@ dependencies: - requirement: !ruby/object:Gem::Requirement - requirements: - - - ">=" -- - !ruby/object:Gem::Version -- version: '0' -- type: :development -- prerelease: false -- version_requirements: !ruby/object:Gem::Requirement -- requirements: -- - - ">=" -- - !ruby/object:Gem::Version -- version: '0' --- !ruby/object:Gem::Dependency -- name: markaby -- requirement: !ruby/object:Gem::Requirement -- requirements: -- - - ">=" - - !ruby/object:Gem::Version - version: '0' - type: :development -Index: git/sinatra-contrib.gemspec -=================================================================== ---- git.orig/sinatra-contrib.gemspec -+++ git/sinatra-contrib.gemspec -@@ -219,18 +219,15 @@ Gem::Specification.new do |s| - s.add_development_dependency "haml" - s.add_development_dependency "erubis" - s.add_development_dependency "slim" -- s.add_development_dependency "less" - s.add_development_dependency "sass" - s.add_development_dependency "builder" - s.add_development_dependency "liquid" - s.add_development_dependency "redcarpet" - s.add_development_dependency "RedCloth" - s.add_development_dependency "asciidoctor" -- s.add_development_dependency "radius" - s.add_development_dependency "coffee-script" - s.add_development_dependency "nokogiri" - s.add_development_dependency "creole" - s.add_development_dependency "wikicloth" -- s.add_development_dependency "markaby" - s.add_development_dependency "rake" - end -Index: git/lib/sinatra/respond_with.rb -=================================================================== ---- git.orig/lib/sinatra/respond_with.rb -+++ git/lib/sinatra/respond_with.rb +--- + lib/sinatra/respond_with.rb | 9 ++++----- + sinatra-contrib.gemspec | 3 --- + 2 files changed, 4 insertions(+), 8 deletions(-) + +diff --git a/lib/sinatra/respond_with.rb b/lib/sinatra/respond_with.rb +index 1ff8989..4f45cea 100644 +--- a/lib/sinatra/respond_with.rb ++++ b/lib/sinatra/respond_with.rb @@ -216,7 +216,6 @@ module Sinatra def rendering_method(engine) @@ -107,7 +19,7 @@ [:render, :engine] end -@@ -238,13 +237,12 @@ module Sinatra +@@ -238,13 +237,13 @@ module Sinatra def self.engines engines = { @@ -120,7 +32,31 @@ :markdown, :textile, :rdoc], - :all => (Sinatra::Templates.instance_methods.map(&:to_sym) + - [:mab] - [:find_template, :markaby]), -+ :all => (Sinatra::Templates.instance_methods.map(&:to_sym) - [:find_template, :less, :radius, :markaby]), ++ :all => (Sinatra::Templates.instance_methods.map(&:to_sym) - ++ [:find_template, :less, :radius, :markaby]), :json => [:yajl], } engines.default = [] +diff --git a/sinatra-contrib.gemspec b/sinatra-contrib.gemspec +index 6ee6d0c..b63654b 100644 +--- a/sinatra-contrib.gemspec ++++ b/sinatra-contrib.gemspec +@@ -224,18 +224,15 @@ Gem::Specification.new do |s| + s.add_development_dependency "haml" + s.add_development_dependency "erubis" + s.add_development_dependency "slim" +- s.add_development_dependency "less" + s.add_development_dependency "sass" + s.add_development_dependency "builder" + s.add_development_dependency "liquid" + s.add_development_dependency "redcarpet" + s.add_development_dependency "RedCloth" + s.add_development_dependency "asciidoctor" +- s.add_development_dependency "radius" + s.add_development_dependency "coffee-script" + s.add_development_dependency "nokogiri" + s.add_development_dependency "creole" + s.add_development_dependency "wikicloth" +- s.add_development_dependency "markaby" + s.add_development_dependency "rake", "< 11" + end diff -Nru ruby-sinatra-contrib-1.4.6/lib/sinatra/content_for.rb ruby-sinatra-contrib-1.4.7/lib/sinatra/content_for.rb --- ruby-sinatra-contrib-1.4.6/lib/sinatra/content_for.rb 2015-08-02 14:16:12.000000000 +0000 +++ ruby-sinatra-contrib-1.4.7/lib/sinatra/content_for.rb 2016-04-21 17:12:47.000000000 +0000 @@ -55,7 +55,7 @@ # # For example, some of your views might need a few javascript tags and # stylesheets, but you don't want to force this files in all your pages. - # Then you can put <% yield_content :scripts_and_styles %> on your + # Then you can put <%= yield_content :scripts_and_styles %> on your # layout, inside the tag, and each view can call content_for # setting the appropriate set of tags that should be added to the layout. # diff -Nru ruby-sinatra-contrib-1.4.6/lib/sinatra/contrib/version.rb ruby-sinatra-contrib-1.4.7/lib/sinatra/contrib/version.rb --- ruby-sinatra-contrib-1.4.6/lib/sinatra/contrib/version.rb 2015-08-02 14:16:12.000000000 +0000 +++ ruby-sinatra-contrib-1.4.7/lib/sinatra/contrib/version.rb 2016-04-21 17:12:47.000000000 +0000 @@ -4,7 +4,7 @@ VERSION end - SIGNATURE = [1, 4, 6] + SIGNATURE = [1, 4, 7] VERSION = SIGNATURE.join('.') VERSION.extend Comparable diff -Nru ruby-sinatra-contrib-1.4.6/lib/sinatra/reloader.rb ruby-sinatra-contrib-1.4.7/lib/sinatra/reloader.rb --- ruby-sinatra-contrib-1.4.6/lib/sinatra/reloader.rb 2015-08-02 14:16:12.000000000 +0000 +++ ruby-sinatra-contrib-1.4.7/lib/sinatra/reloader.rb 2016-04-21 17:12:47.000000000 +0000 @@ -203,6 +203,8 @@ end end + MUTEX_FOR_PERFORM = Mutex.new + # When the extension is registered it extends the Sinatra application # +klass+ with the modules +BaseMethods+ and +ExtensionMethods+ and # defines a before filter to +perform+ the reload of the modified files. @@ -218,11 +220,7 @@ klass.set(:reload_templates) { klass.reloader? } klass.before do if klass.reloader? - if Reloader.thread_safe? - Thread.exclusive { Reloader.perform(klass) } - else - Reloader.perform(klass) - end + MUTEX_FOR_PERFORM.synchronize { Reloader.perform(klass) } end end klass.set(:inline_templates, klass.app_file) if klass == Sinatra::Application @@ -240,11 +238,6 @@ end end - # Indicates whether or not we can and need to run thread-safely. - def self.thread_safe? - Thread and Thread.list.size > 1 and Thread.respond_to?(:exclusive) - end - # Contains the methods defined in Sinatra::Base that are overridden. module BaseMethods # Protects Sinatra::Base.run! from being called more than once. diff -Nru ruby-sinatra-contrib-1.4.6/metadata.yml ruby-sinatra-contrib-1.4.7/metadata.yml --- ruby-sinatra-contrib-1.4.6/metadata.yml 2015-08-02 14:16:12.000000000 +0000 +++ ruby-sinatra-contrib-1.4.7/metadata.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,570 +0,0 @@ ---- !ruby/object:Gem::Specification -name: sinatra-contrib -version: !ruby/object:Gem::Version - version: 1.4.6 -platform: ruby -authors: -- Konstantin Haase -- Gabriel Andretta -- Zachary Scott -- Trevor Bramble -- Katrina Owen -- Ashley Williams -- Nicolas Sanguinetti -- Hrvoje Šimić -- Masahiro Fujiwara -- Rafael Magana -- Vipul A M -- Jack Chu -- ashley williams -- Ilya Shindyapin -- Jake Worth -- Kashyap -- Sumeet Singh -- lest -- Adrian Pacała -- Aish -- Alexey Chernenkov -- Andrew Crump -- Anton Davydov -- Bo Jeanes -- David Asabina -- Eliot Shepard -- Eric Marden -- Gray Manley -- Guillaume Bouteille -- Jamie Hodge -- Koichi Sasada -- Kyle Lacy -- Lars Vonk -- Martin Frost -- Mathieu Allaire -- Matt Lyon -- Matthew Conway -- Meck -- Michi Huber -- Nic Benders -- Patricio Mac Adden -- Reed Lipman -- Samy Dindane -- Sergey Nartimov -- Thibaut Sacreste -- Uchio KONDO -- Will Bailey -- undr -autorequire: -bindir: bin -cert_chain: [] -date: 2015-07-02 00:00:00.000000000 Z -dependencies: -- !ruby/object:Gem::Dependency - name: sinatra - requirement: !ruby/object:Gem::Requirement - requirements: - - - "~>" - - !ruby/object:Gem::Version - version: 1.4.0 - type: :runtime - prerelease: false - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - "~>" - - !ruby/object:Gem::Version - version: 1.4.0 -- !ruby/object:Gem::Dependency - name: backports - requirement: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '2.0' - type: :runtime - prerelease: false - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '2.0' -- !ruby/object:Gem::Dependency - name: tilt - requirement: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '1.3' - - - "<" - - !ruby/object:Gem::Version - version: '3' - type: :runtime - prerelease: false - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '1.3' - - - "<" - - !ruby/object:Gem::Version - version: '3' -- !ruby/object:Gem::Dependency - name: rack-test - requirement: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' - type: :runtime - prerelease: false - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' -- !ruby/object:Gem::Dependency - name: rack-protection - requirement: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' - type: :runtime - prerelease: false - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' -- !ruby/object:Gem::Dependency - name: multi_json - requirement: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' - type: :runtime - prerelease: false - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' -- !ruby/object:Gem::Dependency - name: rspec - requirement: !ruby/object:Gem::Requirement - requirements: - - - "~>" - - !ruby/object:Gem::Version - version: '2.3' - type: :development - prerelease: false - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - "~>" - - !ruby/object:Gem::Version - version: '2.3' -- !ruby/object:Gem::Dependency - name: haml - requirement: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' - type: :development - prerelease: false - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' -- !ruby/object:Gem::Dependency - name: erubis - requirement: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' - type: :development - prerelease: false - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' -- !ruby/object:Gem::Dependency - name: slim - requirement: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' - type: :development - prerelease: false - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' -- !ruby/object:Gem::Dependency - name: less - requirement: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' - type: :development - prerelease: false - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' -- !ruby/object:Gem::Dependency - name: sass - requirement: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' - type: :development - prerelease: false - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' -- !ruby/object:Gem::Dependency - name: builder - requirement: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' - type: :development - prerelease: false - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' -- !ruby/object:Gem::Dependency - name: liquid - requirement: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' - type: :development - prerelease: false - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' -- !ruby/object:Gem::Dependency - name: redcarpet - requirement: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' - type: :development - prerelease: false - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' -- !ruby/object:Gem::Dependency - name: RedCloth - requirement: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' - type: :development - prerelease: false - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' -- !ruby/object:Gem::Dependency - name: asciidoctor - requirement: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' - type: :development - prerelease: false - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' -- !ruby/object:Gem::Dependency - name: radius - requirement: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' - type: :development - prerelease: false - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' -- !ruby/object:Gem::Dependency - name: coffee-script - requirement: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' - type: :development - prerelease: false - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' -- !ruby/object:Gem::Dependency - name: nokogiri - requirement: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' - type: :development - prerelease: false - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' -- !ruby/object:Gem::Dependency - name: creole - requirement: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' - type: :development - prerelease: false - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' -- !ruby/object:Gem::Dependency - name: wikicloth - requirement: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' - type: :development - prerelease: false - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' -- !ruby/object:Gem::Dependency - name: markaby - requirement: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' - type: :development - prerelease: false - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' -- !ruby/object:Gem::Dependency - name: rake - requirement: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' - type: :development - prerelease: false - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' -description: Collection of useful Sinatra extensions -email: -- konstantin.mailinglists@googlemail.com -- ohhgabriel@gmail.com -- inbox@trevorbramble.com -- e@zzak.io -- zachary@zacharyscott.net -- katrina.owen@gmail.com -- ashley@bocoup.com -- contacto@nicolassanguinetti.info -- shime.ferovac@gmail.com -- m-fujiwara@axsh.net -- raf.magana@gmail.com -- vipulnsward@gmail.com -- jack@jackchu.com -- konstantin.haase@gmail.com -- ashley666ashley@gmail.com -- ilya@shindyapin.com -- jworth@prevailhs.com -- kashyap.kmbc@gmail.com -- ortuna@gmail.com -- tbramble@chef.io -- just.lest@gmail.com -- altpacala@gmail.com -- aisha.fenton@visfleet.com -- laise@pisem.net -- andrew.crump@ieee.org -- antondavydov.o@gmail.com -- me@bjeanes.com -- david@supr.nu -- eshepard@slower.net -- eric.marden@gmail.com -- g.manley@tukaiz.com -- duffman@via.ecp.fr -- jamiehodge@me.com -- ko1@atdot.net -- kylewlacy@me.com -- lars.vonk@gmail.com -- blame@kth.se -- mathieuallaire@gmail.com -- matt@flowerpowered.com -- himself@mattonrails.com -- yesmeck@gmail.com -- michi.huber@gmail.com -- nic@newrelic.com -- patriciomacadden@gmail.com -- rmlipman@gmail.com -- samy@dindane.com -- just.lest@gmail.com -- thibaut.sacreste@gmail.com -- udzura@udzura.jp -- will.bailey@gmail.com -- undr@yandex.ru -executables: [] -extensions: [] -extra_rdoc_files: [] -files: -- LICENSE -- README.md -- Rakefile -- ideas.md -- lib/sinatra/capture.rb -- lib/sinatra/config_file.rb -- lib/sinatra/content_for.rb -- lib/sinatra/contrib.rb -- lib/sinatra/contrib/all.rb -- lib/sinatra/contrib/setup.rb -- lib/sinatra/contrib/version.rb -- lib/sinatra/cookies.rb -- lib/sinatra/custom_logger.rb -- lib/sinatra/decompile.rb -- lib/sinatra/engine_tracking.rb -- lib/sinatra/extension.rb -- lib/sinatra/json.rb -- lib/sinatra/link_header.rb -- lib/sinatra/multi_route.rb -- lib/sinatra/namespace.rb -- lib/sinatra/reloader.rb -- lib/sinatra/respond_with.rb -- lib/sinatra/streaming.rb -- lib/sinatra/test_helpers.rb -- sinatra-contrib.gemspec -- spec/capture_spec.rb -- spec/config_file/key_value.yml -- spec/config_file/key_value.yml.erb -- spec/config_file/key_value_override.yml -- spec/config_file/missing_env.yml -- spec/config_file/with_envs.yml -- spec/config_file/with_nested_envs.yml -- spec/config_file_spec.rb -- spec/content_for/different_key.erb -- spec/content_for/different_key.erubis -- spec/content_for/different_key.haml -- spec/content_for/different_key.slim -- spec/content_for/footer.erb -- spec/content_for/footer.erubis -- spec/content_for/footer.haml -- spec/content_for/footer.slim -- spec/content_for/layout.erb -- spec/content_for/layout.erubis -- spec/content_for/layout.haml -- spec/content_for/layout.slim -- spec/content_for/multiple_blocks.erb -- spec/content_for/multiple_blocks.erubis -- spec/content_for/multiple_blocks.haml -- spec/content_for/multiple_blocks.slim -- spec/content_for/multiple_yields.erb -- spec/content_for/multiple_yields.erubis -- spec/content_for/multiple_yields.haml -- spec/content_for/multiple_yields.slim -- spec/content_for/passes_values.erb -- spec/content_for/passes_values.erubis -- spec/content_for/passes_values.haml -- spec/content_for/passes_values.slim -- spec/content_for/same_key.erb -- spec/content_for/same_key.erubis -- spec/content_for/same_key.haml -- spec/content_for/same_key.slim -- spec/content_for/takes_values.erb -- spec/content_for/takes_values.erubis -- spec/content_for/takes_values.haml -- spec/content_for/takes_values.slim -- spec/content_for_spec.rb -- spec/cookies_spec.rb -- spec/custom_logger_spec.rb -- spec/decompile_spec.rb -- spec/extension_spec.rb -- spec/json_spec.rb -- spec/link_header_spec.rb -- spec/multi_route_spec.rb -- spec/namespace/foo.erb -- spec/namespace/nested/foo.erb -- spec/namespace_spec.rb -- spec/okjson.rb -- spec/reloader/app.rb.erb -- spec/reloader_spec.rb -- spec/respond_with/bar.erb -- spec/respond_with/bar.json.erb -- spec/respond_with/baz.yajl -- spec/respond_with/foo.html.erb -- spec/respond_with/not_html.sass -- spec/respond_with_spec.rb -- spec/spec_helper.rb -- spec/streaming_spec.rb -homepage: http://github.com/sinatra/sinatra-contrib -licenses: -- MIT -metadata: {} -post_install_message: -rdoc_options: [] -require_paths: -- lib -required_ruby_version: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' -required_rubygems_version: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' -requirements: [] -rubyforge_project: -rubygems_version: 2.4.6 -signing_key: -specification_version: 4 -summary: Collection of useful Sinatra extensions -test_files: [] diff -Nru ruby-sinatra-contrib-1.4.6/Rakefile ruby-sinatra-contrib-1.4.7/Rakefile --- ruby-sinatra-contrib-1.4.6/Rakefile 2015-08-02 14:16:12.000000000 +0000 +++ ruby-sinatra-contrib-1.4.7/Rakefile 2016-04-21 17:12:47.000000000 +0000 @@ -49,15 +49,6 @@ task :gemspec => 'sinatra-contrib.gemspec' -desc 'update travis config to correspond to sinatra' -task :travis, [:branch] do |t, a| - a.with_defaults :branch => :master - data = YAML.load open("https://raw.github.com/sinatra/sinatra/#{a.branch}/.travis.yml") - data["notifications"]["recipients"] << "ohhgabriel@gmail.com" - File.open('.travis.yml', 'w') { |f| f << data.to_yaml } - system 'git add .travis.yml && git diff --cached .travis.yml' -end - task :release => :gemspec do sh <<-SH rm -Rf sinatra-contrib*.gem && diff -Nru ruby-sinatra-contrib-1.4.6/sinatra-contrib.gemspec ruby-sinatra-contrib-1.4.7/sinatra-contrib.gemspec --- ruby-sinatra-contrib-1.4.6/sinatra-contrib.gemspec 2015-08-02 14:16:12.000000000 +0000 +++ ruby-sinatra-contrib-1.4.7/sinatra-contrib.gemspec 2016-04-21 17:12:47.000000000 +0000 @@ -13,8 +13,8 @@ # generated from git shortlog -sn s.authors = [ "Konstantin Haase", - "Gabriel Andretta", "Zachary Scott", + "Gabriel Andretta", "Trevor Bramble", "Katrina Owen", "Ashley Williams", @@ -23,14 +23,28 @@ "Masahiro Fujiwara", "Rafael Magana", "Vipul A M", - "Jack Chu", "ashley williams", + "Jack Chu", + "Sumeet Singh", "Ilya Shindyapin", + "lest", "Jake Worth", "Kashyap", - "Sumeet Singh", - "lest", + "Matt Lyon", + "Matthew Conway", + "Meck", + "Michi Huber", + "Nic Benders", + "Patricio Mac Adden", + "Reed Lipman", + "Samy Dindane", + "Sergey Nartimov", + "Thibaut Sacreste", + "Uchio KONDO", + "Will Bailey", + "mono", "Adrian Pacała", + "undr", "Aish", "Alexey Chernenkov", "Andrew Crump", @@ -42,24 +56,12 @@ "Gray Manley", "Guillaume Bouteille", "Jamie Hodge", + "Julie Ng", "Koichi Sasada", "Kyle Lacy", "Lars Vonk", "Martin Frost", - "Mathieu Allaire", - "Matt Lyon", - "Matthew Conway", - "Meck", - "Michi Huber", - "Nic Benders", - "Patricio Mac Adden", - "Reed Lipman", - "Samy Dindane", - "Sergey Nartimov", - "Thibaut Sacreste", - "Uchio KONDO", - "Will Bailey", - "undr" + "Mathieu Allaire" ] # generated from git shortlog -sne @@ -73,19 +75,30 @@ "ashley@bocoup.com", "contacto@nicolassanguinetti.info", "shime.ferovac@gmail.com", - "m-fujiwara@axsh.net", "raf.magana@gmail.com", + "m-fujiwara@axsh.net", "vipulnsward@gmail.com", - "jack@jackchu.com", "konstantin.haase@gmail.com", + "jack@jackchu.com", "ashley666ashley@gmail.com", "ilya@shindyapin.com", - "jworth@prevailhs.com", + "just.lest@gmail.com", "kashyap.kmbc@gmail.com", "ortuna@gmail.com", "tbramble@chef.io", + "jworth@prevailhs.com", + "mail@zzak.io", + "nic@newrelic.com", + "patriciomacadden@gmail.com", + "rmlipman@gmail.com", + "samy@dindane.com", "just.lest@gmail.com", + "thibaut.sacreste@gmail.com", + "udzura@udzura.jp", + "will.bailey@gmail.com", + "mono@mono0x.net", "altpacala@gmail.com", + "undr@yandex.ru", "aisha.fenton@visfleet.com", "laise@pisem.net", "andrew.crump@ieee.org", @@ -97,6 +110,7 @@ "g.manley@tukaiz.com", "duffman@via.ecp.fr", "jamiehodge@me.com", + "uxjulie@gmail.com", "ko1@atdot.net", "kylewlacy@me.com", "lars.vonk@gmail.com", @@ -105,16 +119,7 @@ "matt@flowerpowered.com", "himself@mattonrails.com", "yesmeck@gmail.com", - "michi.huber@gmail.com", - "nic@newrelic.com", - "patriciomacadden@gmail.com", - "rmlipman@gmail.com", - "samy@dindane.com", - "just.lest@gmail.com", - "thibaut.sacreste@gmail.com", - "udzura@udzura.jp", - "will.bailey@gmail.com", - "undr@yandex.ru" + "michi.huber@gmail.com" ] # generated from git ls-files @@ -232,5 +237,5 @@ s.add_development_dependency "creole" s.add_development_dependency "wikicloth" s.add_development_dependency "markaby" - s.add_development_dependency "rake" + s.add_development_dependency "rake", "< 11" end