diff -Nru ruby-haml-rails-1.0.0/Appraisals ruby-haml-rails-2.0.1/Appraisals --- ruby-haml-rails-1.0.0/Appraisals 2018-11-23 19:49:51.000000000 +0000 +++ ruby-haml-rails-2.0.1/Appraisals 2019-05-31 08:24:39.000000000 +0000 @@ -13,3 +13,15 @@ appraise "rails_5_0" do gem "rails", "5.0" end + +appraise "rails_5_1" do + gem "rails", "5.1" +end + +appraise "rails_5_2" do + gem "rails", "5.2" +end + +appraise "rails_6.beta2" do + gem "rails", "6.0.0.beta2" +end diff -Nru ruby-haml-rails-1.0.0/debian/changelog ruby-haml-rails-2.0.1/debian/changelog --- ruby-haml-rails-1.0.0/debian/changelog 2019-02-14 14:04:16.000000000 +0000 +++ ruby-haml-rails-2.0.1/debian/changelog 2020-01-04 08:00:26.000000000 +0000 @@ -1,3 +1,15 @@ +ruby-haml-rails (2.0.1-1) unstable; urgency=medium + + * New upstream version 2.0.1 + * Add salsa-ci.yml + * Add d/upstream/metadata + * Fix package wrt cme + * Add myself as an uploader + * Bump Standards-Version to 4.4.1 + * Bump debhelper-compat to 12 + + -- Utkarsh Gupta Sat, 04 Jan 2020 13:30:26 +0530 + ruby-haml-rails (1.0.0-2) unstable; urgency=medium * Team upload @@ -39,13 +51,13 @@ ruby-haml-rails (0.9.0-2) unstable; urgency=medium - * Reupload to unstable as freeze is over + * Reupload to unstable as freeze is over -- Balasankar C Sun, 24 May 2015 09:34:16 +0530 ruby-haml-rails (0.9.0-1) experimental; urgency=medium - * Upstream update + * Upstream update -- Balasankar C Tue, 24 Mar 2015 17:05:18 +0530 diff -Nru ruby-haml-rails-1.0.0/debian/compat ruby-haml-rails-2.0.1/debian/compat --- ruby-haml-rails-1.0.0/debian/compat 2019-02-14 14:04:16.000000000 +0000 +++ ruby-haml-rails-2.0.1/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru ruby-haml-rails-1.0.0/debian/control ruby-haml-rails-2.0.1/debian/control --- ruby-haml-rails-1.0.0/debian/control 2019-02-14 14:04:16.000000000 +0000 +++ ruby-haml-rails-2.0.1/debian/control 2020-01-04 08:00:26.000000000 +0000 @@ -1,39 +1,41 @@ Source: ruby-haml-rails +Maintainer: Debian Ruby Extras Maintainers +Uploaders: Balasankar C , + Utkarsh Gupta Section: ruby +Testsuite: autopkgtest-pkg-ruby Priority: optional -Maintainer: Debian Ruby Extras Maintainers -Uploaders: Balasankar C -Build-Depends: debhelper (>= 11~), +Build-Depends: debhelper-compat (= 12), gem2deb, rails, rake, - ruby-actionpack (>= 4.0.1~), - ruby-activesupport (>= 4.0.1~), + ruby-actionpack, + ruby-activesupport, ruby-haml (<< 6.0), ruby-haml (>= 4.0.6~), ruby-html2haml (>= 2.0~), - ruby-railties (>= 4.0.1~), + ruby-railties, ruby-test-unit -Standards-Version: 4.3.0 -Vcs-Git: https://salsa.debian.org/ruby-team/ruby-haml-rails.git +Standards-Version: 4.4.1 Vcs-Browser: https://salsa.debian.org/ruby-team/ruby-haml-rails -Homepage: http://github.com/indirect/haml-rails -Testsuite: autopkgtest-pkg-ruby +Vcs-Git: https://salsa.debian.org/ruby-team/ruby-haml-rails.git +Homepage: https://github.com/indirect/haml-rails XS-Ruby-Versions: all +Rules-Requires-Root: no Package: ruby-haml-rails Architecture: all XB-Ruby-Versions: ${ruby:Versions} Depends: ruby | ruby-interpreter, - ruby-actionpack (>= 4.0.1~), - ruby-activesupport (>= 4.0.1~), + ruby-actionpack, + ruby-activesupport, ruby-haml (<< 6.0), ruby-haml (>= 4.0.6~), ruby-html2haml (>= 2.0~), - ruby-railties (>= 4.0.1~), + ruby-railties, ${misc:Depends}, ${shlibs:Depends} -Description: Haml Generator for Rails +Description: Haml Generator for Rails Haml-rails provides Haml generators for Rails. It also enables Haml as the templating engine for you, so you don't have to screw around in your own application.rb when your Gemfile already clearly indicated what templating diff -Nru ruby-haml-rails-1.0.0/debian/copyright ruby-haml-rails-2.0.1/debian/copyright --- ruby-haml-rails-1.0.0/debian/copyright 2019-02-14 14:04:16.000000000 +0000 +++ ruby-haml-rails-2.0.1/debian/copyright 2020-01-04 08:00:26.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: haml-rails Source: https://github.com/indirect/haml-rails diff -Nru ruby-haml-rails-1.0.0/debian/patches/no-git-in-gemspecs.patch ruby-haml-rails-2.0.1/debian/patches/no-git-in-gemspecs.patch --- ruby-haml-rails-1.0.0/debian/patches/no-git-in-gemspecs.patch 2019-02-14 14:04:16.000000000 +0000 +++ ruby-haml-rails-2.0.1/debian/patches/no-git-in-gemspecs.patch 2020-01-04 08:00:26.000000000 +0000 @@ -2,10 +2,9 @@ gem2deb/metadata.rb should take care of that but there seems to be an encoding problem See bug report -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=920953 +Bug-Debian: https://bugs.debian.org/920953 Author: Cédric Boutillier Last-Update: 2019-02-14 - --- a/haml-rails.gemspec +++ b/haml-rails.gemspec @@ -26,7 +26,7 @@ diff -Nru ruby-haml-rails-1.0.0/debian/salsa-ci.yml ruby-haml-rails-2.0.1/debian/salsa-ci.yml --- ruby-haml-rails-1.0.0/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ ruby-haml-rails-2.0.1/debian/salsa-ci.yml 2020-01-04 07:59:11.000000000 +0000 @@ -0,0 +1,4 @@ +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml diff -Nru ruby-haml-rails-1.0.0/debian/upstream/metadata ruby-haml-rails-2.0.1/debian/upstream/metadata --- ruby-haml-rails-1.0.0/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ ruby-haml-rails-2.0.1/debian/upstream/metadata 2020-01-04 08:00:26.000000000 +0000 @@ -0,0 +1,9 @@ +--- +Archive: GitHub +Bug-Database: https://github.com/indirect/haml-rails/issues +Bug-Submit: https://github.com/indirect/haml-rails/issues +Changelog: https://github.com/indirect/haml-rails/tags +Contact: https://github.com/indirect/haml-rails/issues +Name: haml-rails +Repository: https://github.com/indirect/haml-rails.git +Repository-Browse: https://github.com/indirect/haml-rails diff -Nru ruby-haml-rails-1.0.0/gemfiles/rails_4_0.gemfile ruby-haml-rails-2.0.1/gemfiles/rails_4_0.gemfile --- ruby-haml-rails-1.0.0/gemfiles/rails_4_0.gemfile 2018-11-23 19:49:51.000000000 +0000 +++ ruby-haml-rails-2.0.1/gemfiles/rails_4_0.gemfile 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "rubysl", "~> 2.0", :platforms => :rbx -gem "minitest", :platforms => :rbx -gem "html2haml" -gem "rails", "~> 4.0.1" - -gemspec :path => "../" diff -Nru ruby-haml-rails-1.0.0/gemfiles/rails_4_1.gemfile ruby-haml-rails-2.0.1/gemfiles/rails_4_1.gemfile --- ruby-haml-rails-1.0.0/gemfiles/rails_4_1.gemfile 2018-11-23 19:49:51.000000000 +0000 +++ ruby-haml-rails-2.0.1/gemfiles/rails_4_1.gemfile 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "rubysl", "~> 2.0", :platforms => :rbx -gem "minitest", :platforms => :rbx -gem "html2haml" -gem "rails", "4.1" - -gemspec :path => "../" diff -Nru ruby-haml-rails-1.0.0/gemfiles/rails_4_2.gemfile ruby-haml-rails-2.0.1/gemfiles/rails_4_2.gemfile --- ruby-haml-rails-1.0.0/gemfiles/rails_4_2.gemfile 2018-11-23 19:49:51.000000000 +0000 +++ ruby-haml-rails-2.0.1/gemfiles/rails_4_2.gemfile 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "rubysl", "~> 2.0", :platforms => :rbx -gem "minitest", :platforms => :rbx -gem "html2haml" -gem "rails", "4.2" - -gemspec :path => "../" diff -Nru ruby-haml-rails-1.0.0/gemfiles/rails_5_0.gemfile ruby-haml-rails-2.0.1/gemfiles/rails_5_0.gemfile --- ruby-haml-rails-1.0.0/gemfiles/rails_5_0.gemfile 2018-11-23 19:49:51.000000000 +0000 +++ ruby-haml-rails-2.0.1/gemfiles/rails_5_0.gemfile 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "rubysl", "~> 2.0", :platforms => :rbx -gem "minitest", :platforms => :rbx -gem "html2haml" -gem "rails", "5.0" - -gemspec :path => "../" diff -Nru ruby-haml-rails-1.0.0/gemfiles/rails_5_1.gemfile ruby-haml-rails-2.0.1/gemfiles/rails_5_1.gemfile --- ruby-haml-rails-1.0.0/gemfiles/rails_5_1.gemfile 1970-01-01 00:00:00.000000000 +0000 +++ ruby-haml-rails-2.0.1/gemfiles/rails_5_1.gemfile 2019-05-31 08:24:39.000000000 +0000 @@ -0,0 +1,10 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rubysl", "~> 2.0", :platforms => :rbx +gem "minitest", :platforms => :rbx +gem "html2haml" +gem "rails", "~> 5.1.5" + +gemspec :path => "../" diff -Nru ruby-haml-rails-1.0.0/gemfiles/rails_5_2.gemfile ruby-haml-rails-2.0.1/gemfiles/rails_5_2.gemfile --- ruby-haml-rails-1.0.0/gemfiles/rails_5_2.gemfile 1970-01-01 00:00:00.000000000 +0000 +++ ruby-haml-rails-2.0.1/gemfiles/rails_5_2.gemfile 2019-05-31 08:24:39.000000000 +0000 @@ -0,0 +1,10 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rubysl", "~> 2.0", :platforms => :rbx +gem "minitest", :platforms => :rbx +gem "html2haml" +gem "rails", "~> 5.2.0" + +gemspec :path => "../" diff -Nru ruby-haml-rails-1.0.0/gemfiles/rails_6.beta2.gemfile ruby-haml-rails-2.0.1/gemfiles/rails_6.beta2.gemfile --- ruby-haml-rails-1.0.0/gemfiles/rails_6.beta2.gemfile 1970-01-01 00:00:00.000000000 +0000 +++ ruby-haml-rails-2.0.1/gemfiles/rails_6.beta2.gemfile 2019-05-31 08:24:39.000000000 +0000 @@ -0,0 +1,10 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rubysl", "~> 2.0", :platforms => :rbx +gem "minitest", :platforms => :rbx +gem "html2haml" +gem "rails", "6.0.0.beta2" + +gemspec :path => "../" diff -Nru ruby-haml-rails-1.0.0/haml-rails.gemspec ruby-haml-rails-2.0.1/haml-rails.gemspec --- ruby-haml-rails-1.0.0/haml-rails.gemspec 2018-11-23 19:49:51.000000000 +0000 +++ ruby-haml-rails-2.0.1/haml-rails.gemspec 2019-05-31 08:24:39.000000000 +0000 @@ -7,22 +7,23 @@ s.platform = Gem::Platform::RUBY s.authors = ["André Arko"] s.email = ["andre@arko.net"] - s.homepage = "http://github.com/indirect/haml-rails" + s.homepage = "https://github.com/indirect/haml-rails" s.summary = "let your Gemfile do the configuring" s.description = "Haml-rails provides Haml generators for Rails 4. It also enables Haml as the templating engine for you, so you don't have to screw around in your own application.rb when your Gemfile already clearly indicated what templating engine you have installed. Hurrah." s.licenses = ["MIT"] s.rubyforge_project = "haml-rails" - s.required_rubygems_version = ">= 1.3.6" + s.required_rubygems_version = ">= 2.0.0" + s.required_ruby_version = ">= 2.3.0" s.add_dependency "haml", [">= 4.0.6", "< 6.0"] - s.add_dependency "activesupport", [">= 4.0.1"] - s.add_dependency "actionpack", [">= 4.0.1"] - s.add_dependency "railties", [">= 4.0.1"] + s.add_dependency "activesupport", [">= 5.1"] + s.add_dependency "actionpack", [">= 5.1"] + s.add_dependency "railties", [">= 5.1"] s.add_dependency "html2haml", [">= 1.0.1"] - s.add_development_dependency "rails", [">= 4.0.1"] - s.add_development_dependency "bundler", "~> 1.7" + s.add_development_dependency "rails", [">= 5.1"] + s.add_development_dependency "bundler", "~> 2.0" s.add_development_dependency "rake" s.add_development_dependency 'appraisal', '~> 1.0' diff -Nru ruby-haml-rails-1.0.0/lib/generators/haml/mailer/mailer_generator.rb ruby-haml-rails-2.0.1/lib/generators/haml/mailer/mailer_generator.rb --- ruby-haml-rails-1.0.0/lib/generators/haml/mailer/mailer_generator.rb 2018-11-23 19:49:51.000000000 +0000 +++ ruby-haml-rails-2.0.1/lib/generators/haml/mailer/mailer_generator.rb 2019-05-31 08:24:39.000000000 +0000 @@ -7,13 +7,13 @@ def copy_view_files if ::Rails.version.to_s >= "4.2.0" - view_base_path = File.join("app/views", class_path, file_name) + view_base_path = File.join("app/views", class_path, file_name + "_mailer") empty_directory view_base_path - if self.behavior == :invoke + if behavior == :invoke formats.each do |format| - layout_path = File.join("app/views/layouts", filename_with_extensions("mailer", format)) - template filename_with_extensions(:layout, format), layout_path + layout_path = File.join("app/views/layouts", class_path, filename_with_extensions("mailer", format)) + template filename_with_extensions(:layout, format), layout_path unless File.exist?(layout_path) end end diff -Nru ruby-haml-rails-1.0.0/lib/generators/haml/mailer/templates/layout.html.haml ruby-haml-rails-2.0.1/lib/generators/haml/mailer/templates/layout.html.haml --- ruby-haml-rails-1.0.0/lib/generators/haml/mailer/templates/layout.html.haml 2018-11-23 19:49:51.000000000 +0000 +++ ruby-haml-rails-2.0.1/lib/generators/haml/mailer/templates/layout.html.haml 2019-05-31 08:24:39.000000000 +0000 @@ -1,3 +1,8 @@ +!!! %html + %head + %meta{:content => "text/html; charset=utf-8", "http-equiv" => "Content-Type"}/ + :css + /* Email styles need to be inline */ %body = yield diff -Nru ruby-haml-rails-1.0.0/lib/haml-rails/version.rb ruby-haml-rails-2.0.1/lib/haml-rails/version.rb --- ruby-haml-rails-1.0.0/lib/haml-rails/version.rb 2018-11-23 19:49:51.000000000 +0000 +++ ruby-haml-rails-2.0.1/lib/haml-rails/version.rb 2019-05-31 08:24:39.000000000 +0000 @@ -1,5 +1,5 @@ module Haml module Rails - VERSION = "1.0.0" + VERSION = "2.0.1" end end diff -Nru ruby-haml-rails-1.0.0/lib/haml-rails.rb ruby-haml-rails-2.0.1/lib/haml-rails.rb --- ruby-haml-rails-1.0.0/lib/haml-rails.rb 2018-11-23 19:49:51.000000000 +0000 +++ ruby-haml-rails-2.0.1/lib/haml-rails.rb 2019-05-31 08:24:39.000000000 +0000 @@ -46,7 +46,13 @@ # provided directly by railties 3.2..4.1 but was dropped in 4.2. if Gem::Requirement.new(">= 4.2").satisfied_by?(Gem::Version.new(::Rails.version)) initializer 'haml_rails.configure_source_annotation' do - SourceAnnotationExtractor::Annotation.register_extensions('haml') do |tag| + annotation_class = if ::Rails::VERSION::STRING >= '6.0' + require 'rails/source_annotation_extractor' + ::Rails::SourceAnnotationExtractor::Annotation + else + ::SourceAnnotationExtractor::Annotation + end + annotation_class.register_extensions('haml') do |tag| /\s*-#\s*(#{tag}):?\s*(.*)/ end end diff -Nru ruby-haml-rails-1.0.0/lib/tasks/erb2haml.rake ruby-haml-rails-2.0.1/lib/tasks/erb2haml.rake --- ruby-haml-rails-1.0.0/lib/tasks/erb2haml.rake 2018-11-23 19:49:51.000000000 +0000 +++ ruby-haml-rails-2.0.1/lib/tasks/erb2haml.rake 2019-05-31 08:24:39.000000000 +0000 @@ -58,8 +58,12 @@ puts '-'*80 begin - puts 'Would you like to delete the original .erb files? (This is not recommended unless you are under version control.) (y/n)' - should_delete = STDIN.gets.chomp.downcase[0] + if ENV.has_key?("HAML_RAILS_DELETE_ERB") + should_delete = ENV["HAML_RAILS_DELETE_ERB"] == "true" ? "y" : "n" + else + puts 'Would you like to delete the original .erb files? (This is not recommended unless you are under version control.) (y/n)' + should_delete = STDIN.gets.chomp.downcase[0] + end end until ['y', 'n'].include?(should_delete) if should_delete == 'y' diff -Nru ruby-haml-rails-1.0.0/README.md ruby-haml-rails-2.0.1/README.md --- ruby-haml-rails-1.0.0/README.md 2018-11-23 19:49:51.000000000 +0000 +++ ruby-haml-rails-2.0.1/README.md 2019-05-31 08:24:39.000000000 +0000 @@ -1,10 +1,11 @@ # Haml-rails +[![Build Status](https://travis-ci.org/indirect/haml-rails.svg)](https://travis-ci.org/indirect/haml-rails) Haml-rails provides Haml generators for Rails 4. It also enables Haml as the templating engine for you, so you don't have to screw around in your own application.rb when your Gemfile already clearly indicated what templating engine you have installed. Hurrah. To use it, add this line to your Gemfile: - gem "haml-rails", "~> 0.9" + gem "haml-rails", "~> 2.0" This ensures that: @@ -30,13 +31,19 @@ If you want to convert all of your .erb views into .haml, you can do so using the following command: - $ rake haml:erb2haml + $ rails haml:erb2haml If you already have .haml files for one or more of the .erb files, the rake task will give you the option of either replacing these .haml files or leaving them in place. Once the task is complete, you will have the option of deleting the original .erb files. Unless you are under -version control, it is recommended that you decline this option. +version control, it is recommended that you decline this option. If you are running in a script, you can use +an environment variable to answer this question. + + $ HAML_RAILS_DELETE_ERB=true rails haml:erb2haml + +Running the above will not prompt for the question and will delete the original .erb files. Setting this value to +false will also not prompt, however, will leave the .erb files intact. ### Older versions of Rails @@ -50,10 +57,6 @@ Haml generators originally from [rails3-generators](http://github.com/indirect/rails3-generators), and written by José Valim, André Arko, Paul Barry, Anuj Dutta, Louis T, and Chris Rhoden. Tests originally written by Louis T. -### Code Status - -[![Build Status](https://travis-ci.org/indirect/haml-rails.svg)](https://travis-ci.org/indirect/haml-rails) - ### License Ruby license or MIT license, take your pick. diff -Nru ruby-haml-rails-1.0.0/test/lib/generators/haml/mailer_generator_test.rb ruby-haml-rails-2.0.1/test/lib/generators/haml/mailer_generator_test.rb --- ruby-haml-rails-1.0.0/test/lib/generators/haml/mailer_generator_test.rb 2018-11-23 19:49:51.000000000 +0000 +++ ruby-haml-rails-2.0.1/test/lib/generators/haml/mailer_generator_test.rb 2019-05-31 08:24:39.000000000 +0000 @@ -13,34 +13,55 @@ run_generator if ::Rails.version.to_s >= '4.2' - assert_file "app/views/layouts/mailer.text.haml" do |view| - assert_match /\= yield/, view + assert_match(/\= yield/, view) end assert_file "app/views/layouts/mailer.html.haml" do |view| - assert_match /\= yield/, view + assert_match(/\= yield/, view) end - assert_file "app/views/notifier/foo.html.haml" do |view| - assert_match %r(app/views/notifier/foo\.html\.haml), view - assert_match /\= @greeting/, view + assert_file "app/views/notifier_mailer/foo.html.haml" do |view| + assert_match %r(app/views/notifier_mailer/foo\.html\.haml), view + assert_match(/\= @greeting/, view) end - assert_file "app/views/notifier/bar.html.haml" do |view| - assert_match %r(app/views/notifier/bar\.html\.haml), view - assert_match /\= @greeting/, view + assert_file "app/views/notifier_mailer/bar.html.haml" do |view| + assert_match %r(app/views/notifier_mailer/bar\.html\.haml), view + assert_match(/\= @greeting/, view) end - end - assert_file "app/views/notifier/foo.text.haml" do |view| - assert_match %r(app/views/notifier/foo\.text\.haml), view - assert_match /\= @greeting/, view - end + assert_file "app/views/notifier_mailer/foo.text.haml" do |view| + assert_match %r(app/views/notifier_mailer/foo\.text\.haml), view + assert_match(/\= @greeting/, view) + end + + assert_file "app/views/notifier_mailer/bar.text.haml" do |view| + assert_match %r(app/views/notifier_mailer/bar\.text\.haml), view + assert_match(/\= @greeting/, view) + end + else + if ::Rails.version.to_s >= '4.1' + assert_file "app/views/notifier/foo.html.haml" do |view| + assert_match %r(app/views/notifier/foo\.html\.haml), view + assert_match(/\= @greeting/, view) + end + + assert_file "app/views/notifier/bar.html.haml" do |view| + assert_match %r(app/views/notifier/bar\.html\.haml), view + assert_match(/\= @greeting/, view) + end + end - assert_file "app/views/notifier/bar.text.haml" do |view| - assert_match %r(app/views/notifier/bar\.text\.haml), view - assert_match /\= @greeting/, view + assert_file "app/views/notifier/foo.text.haml" do |view| + assert_match %r(app/views/notifier/foo\.text\.haml), view + assert_match(/\= @greeting/, view) + end + + assert_file "app/views/notifier/bar.text.haml" do |view| + assert_match %r(app/views/notifier/bar\.text\.haml), view + assert_match(/\= @greeting/, view) + end end end end diff -Nru ruby-haml-rails-1.0.0/test/test_helper.rb ruby-haml-rails-2.0.1/test/test_helper.rb --- ruby-haml-rails-1.0.0/test/test_helper.rb 2018-11-23 19:49:51.000000000 +0000 +++ ruby-haml-rails-2.0.1/test/test_helper.rb 2019-05-31 08:24:39.000000000 +0000 @@ -73,7 +73,7 @@ require_generators generator_list # Remove tmp directory when test suite is completed -MiniTest::Unit.after_tests do +MiniTest.after_run do tmp_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'tmp')) FileUtils.rm_r(tmp_dir) end diff -Nru ruby-haml-rails-1.0.0/.travis.yml ruby-haml-rails-2.0.1/.travis.yml --- ruby-haml-rails-1.0.0/.travis.yml 2018-11-23 19:49:51.000000000 +0000 +++ ruby-haml-rails-2.0.1/.travis.yml 2019-05-31 08:24:39.000000000 +0000 @@ -1,30 +1,23 @@ sudo: false language: ruby cache: bundler -before_install: "gem install bundler" +before_install: + - "gem update --system" + - "gem install bundler" rvm: - - 2.4.1 - - 2.3.1 - - 2.2.5 - - 2.1 - - 2.0 - - 1.9.3 - - jruby-19mode + - 2.5.3 + - 2.4.5 + - 2.3.8 + - jruby-9.2.5.0 gemfile: - - gemfiles/rails_5_0.gemfile - - gemfiles/rails_4_2.gemfile - - gemfiles/rails_4_1.gemfile - - gemfiles/rails_4_0.gemfile + - gemfiles/rails_5_2.gemfile + - gemfiles/rails_5_1.gemfile + - gemfiles/rails_5_2.gemfile + - gemfiles/rails_6.beta2.gemfile matrix: exclude: - - rvm: 2.1 - gemfile: gemfiles/rails_5_0.gemfile - - rvm: 2.0 - gemfile: gemfiles/rails_5_0.gemfile - - rvm: 1.9.3 - gemfile: gemfiles/rails_5_0.gemfile - - rvm: jruby-19mode - gemfile: gemfiles/rails_5_0.gemfile - - rvm: 1.9.3 - gemfile: gemfiles/rails_4_1.gemfile + - rvm: 2.3.8 + gemfile: gemfiles/rails_6.beta2.gemfile + - rvm: 2.4.5 + gemfile: gemfiles/rails_6.beta2.gemfile script: "bundle exec rake test"