diff --git a/rubygem-sass-rails-5.0.7-Rails-5-2-compatibility.patch b/rubygem-sass-rails-5.0.7-Rails-5-2-compatibility.patch deleted file mode 100644 index e6ed930..0000000 --- a/rubygem-sass-rails-5.0.7-Rails-5-2-compatibility.patch +++ /dev/null @@ -1,151 +0,0 @@ -From 5cf04df33646a5db0ee6753fc701b6239304cff5 Mon Sep 17 00:00:00 2001 -From: Gustavo Bazan -Date: Wed, 3 Oct 2018 09:36:02 +0100 -Subject: [PATCH] Update travis test matrix - -Drop support for EOL version of ruby and add support for 2.5 -Add support for rails 5.2 - -Some updates needed for travis ---- - .../fixtures/alternate_config_project/Gemfile | 2 +- - .../config/application.rb | 4 ++ - .../config/initializers/secret_token.rb | 8 +++- - test/fixtures/sass_project/Gemfile | 2 +- - .../config/initializers/secret_token.rb | 7 ++- - test/fixtures/scss_project/Gemfile | 2 +- - .../scss_project/config/application.rb | 4 ++ - .../config/initializers/secret_token.rb | 7 ++- - test/test_helper.rb | 4 +- - 9 files changed, 32 insertions(+), 8 deletions(-) - create mode 100644 gemfiles/Gemfile-rails-5-2 - -diff --git a/test/fixtures/alternate_config_project/Gemfile b/test/fixtures/alternate_config_project/Gemfile -index c965db0..ab02893 100644 ---- a/test/fixtures/alternate_config_project/Gemfile -+++ b/test/fixtures/alternate_config_project/Gemfile -@@ -1,6 +1,6 @@ - source 'https://rubygems.org' - --gem 'rails', '>= 4.0.0.beta', '< 5.0' -+gem 'rails', '>= 4.2', '< 6' - gem 'sqlite3' - - # Asset template engines -diff --git a/test/fixtures/alternate_config_project/config/application.rb b/test/fixtures/alternate_config_project/config/application.rb -index 30f90f0..5d09d70 100644 ---- a/test/fixtures/alternate_config_project/config/application.rb -+++ b/test/fixtures/alternate_config_project/config/application.rb -@@ -45,5 +45,9 @@ class Application < Rails::Application - - # Enable the asset pipeline - config.assets.enabled = true -+ -+ if Rails.version >= '5.1.0' && config.active_record.sqlite3.present? -+ config.active_record.sqlite3.represent_boolean_as_integer = true -+ end - end - end -diff --git a/test/fixtures/alternate_config_project/config/initializers/secret_token.rb b/test/fixtures/alternate_config_project/config/initializers/secret_token.rb -index e91c7e2..f81a731 100644 ---- a/test/fixtures/alternate_config_project/config/initializers/secret_token.rb -+++ b/test/fixtures/alternate_config_project/config/initializers/secret_token.rb -@@ -4,4 +4,10 @@ - # If you change this key, all old signed cookies will become invalid! - # Make sure the secret is at least 30 characters and all random, - # no regular words or you'll be exposed to dictionary attacks. --AlternateConfigProject::Application.config.secret_token = 'aad80c771c1b2b13b67b0b2d03ee3fa8a1d5a8e8dce2e8bc8b382f197927b789afdc9355f8bc7256faf650015d75d8eb541e9ab96a88f0bd63c4bd7552174849' -+ -+secret = 'aad80c771c1b2b13b67b0b2d03ee3fa8a1d5a8e8dce2e8bc8b382f197927b789afdc9355f8bc7256faf650015d75d8eb541e9ab96a88f0bd63c4bd7552174849' -+if AlternateConfigProject::Application.config.respond_to? :secret_key_base -+ AlternateConfigProject::Application.config.secret_key_base = secret -+else -+ AlternateConfigProject::Application.config.secret_token = secret -+end -diff --git a/test/fixtures/sass_project/Gemfile b/test/fixtures/sass_project/Gemfile -index c965db0..ab02893 100644 ---- a/test/fixtures/sass_project/Gemfile -+++ b/test/fixtures/sass_project/Gemfile -@@ -1,6 +1,6 @@ - source 'https://rubygems.org' - --gem 'rails', '>= 4.0.0.beta', '< 5.0' -+gem 'rails', '>= 4.2', '< 6' - gem 'sqlite3' - - # Asset template engines -diff --git a/test/fixtures/sass_project/config/initializers/secret_token.rb b/test/fixtures/sass_project/config/initializers/secret_token.rb -index e8888a2..0b80506 100644 ---- a/test/fixtures/sass_project/config/initializers/secret_token.rb -+++ b/test/fixtures/sass_project/config/initializers/secret_token.rb -@@ -4,4 +4,9 @@ - # If you change this key, all old signed cookies will become invalid! - # Make sure the secret is at least 30 characters and all random, - # no regular words or you'll be exposed to dictionary attacks. --ScssProject::Application.config.secret_token = 'aad80c771c1b2b13b67b0b2d03ee3fa8a1d5a8e8dce2e8bc8b382f197927b789afdc9355f8bc7256faf650015d75d8eb541e9ab96a88f0bd63c4bd7552174849' -+secret = 'aad80c771c1b2b13b67b0b2d03ee3fa8a1d5a8e8dce2e8bc8b382f197927b789afdc9355f8bc7256faf650015d75d8eb541e9ab96a88f0bd63c4bd7552174849' -+if ScssProject::Application.config.respond_to? :secret_key_base -+ ScssProject::Application.config.secret_key_base = secret -+else -+ ScssProject::Application.config.secret_token = secret -+end -diff --git a/test/fixtures/scss_project/Gemfile b/test/fixtures/scss_project/Gemfile -index c965db0..ab02893 100644 ---- a/test/fixtures/scss_project/Gemfile -+++ b/test/fixtures/scss_project/Gemfile -@@ -1,6 +1,6 @@ - source 'https://rubygems.org' - --gem 'rails', '>= 4.0.0.beta', '< 5.0' -+gem 'rails', '>= 4.2', '< 6' - gem 'sqlite3' - - # Asset template engines -diff --git a/test/fixtures/scss_project/config/application.rb b/test/fixtures/scss_project/config/application.rb -index 9565048..a26f068 100644 ---- a/test/fixtures/scss_project/config/application.rb -+++ b/test/fixtures/scss_project/config/application.rb -@@ -45,5 +45,9 @@ class Application < Rails::Application - - # Enable the asset pipeline - config.assets.enabled = true -+ -+ if Rails.version >= '5.1.0' && config.active_record.sqlite3.present? -+ config.active_record.sqlite3.represent_boolean_as_integer = true -+ end - end - end -diff --git a/test/fixtures/scss_project/config/initializers/secret_token.rb b/test/fixtures/scss_project/config/initializers/secret_token.rb -index e8888a2..0b80506 100644 ---- a/test/fixtures/scss_project/config/initializers/secret_token.rb -+++ b/test/fixtures/scss_project/config/initializers/secret_token.rb -@@ -4,4 +4,9 @@ - # If you change this key, all old signed cookies will become invalid! - # Make sure the secret is at least 30 characters and all random, - # no regular words or you'll be exposed to dictionary attacks. --ScssProject::Application.config.secret_token = 'aad80c771c1b2b13b67b0b2d03ee3fa8a1d5a8e8dce2e8bc8b382f197927b789afdc9355f8bc7256faf650015d75d8eb541e9ab96a88f0bd63c4bd7552174849' -+secret = 'aad80c771c1b2b13b67b0b2d03ee3fa8a1d5a8e8dce2e8bc8b382f197927b789afdc9355f8bc7256faf650015d75d8eb541e9ab96a88f0bd63c4bd7552174849' -+if ScssProject::Application.config.respond_to? :secret_key_base -+ ScssProject::Application.config.secret_key_base = secret -+else -+ ScssProject::Application.config.secret_token = secret -+end -diff --git a/test/test_helper.rb b/test/test_helper.rb -index 521de86..6fc3757 100644 ---- a/test/test_helper.rb -+++ b/test/test_helper.rb -@@ -11,7 +11,7 @@ - # If developing against local dependencies, this code will ensure they get picked up - # in the project fixtures that have their own bundle environment - $gem_options = {} --possible_dev_dependencies = %w(sass-rails sass rails arel actionpack railties sprockets journey sprockets-rails activerecord-deprecated_finders) -+possible_dev_dependencies = %w(sass-rails sass rails arel actionpack rack railties sprockets sprockets-rails) - Bundler.load.specs.each do |s| - if possible_dev_dependencies.include?(s.name) - gem_path = s.full_gem_path -@@ -24,4 +24,4 @@ - # Load support files - Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f } - --ActiveSupport::TestCase.test_order = :random if ActiveSupport::TestCase.respond_to?(:test_order=) -+ActiveSupport::TestCase.test_order = :random diff --git a/rubygem-sass-rails.spec b/rubygem-sass-rails.spec index 28d354b..44f3fa8 100644 --- a/rubygem-sass-rails.spec +++ b/rubygem-sass-rails.spec @@ -1,13 +1,11 @@ %global gem_name sass-rails Name: rubygem-%{gem_name} -Version: 5.0.7 -Release: 2 +Version: 6.0.0 +Release: 1 Summary: Sass adapter for the Rails asset pipeline License: MIT URL: https://github.com/rails/sass-rails Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem -Source1: https://github.com/rails/sass-rails/archive/v%{version}.tar.gz -Patch0: rubygem-sass-rails-5.0.7-Rails-5-2-compatibility.patch BuildRequires: ruby(release) rubygems-devel ruby rubygem(bundler) rubygem(rails) rubygem(sass) BuildRequires: rubygem(sqlite3) rubygem(tilt) BuildArch: noarch @@ -22,16 +20,7 @@ BuildArch: noarch Documentation for %{name}. %prep -%setup -q -n %{gem_name}-%{version} -b 1 -pwd -#ln -s %%{gem_name}-%%{version}/spec spec -#ln -s %%{gem_name}-%%{version}/test test -pushd %{_builddir} -pwd -ls -ln -s %{gem_name}-%{version}/test test -%patch0 -p1 -popd +%setup -q -n %{gem_name}-%{version} %build gem build ../%{gem_name}-%{version}.gemspec @@ -44,10 +33,6 @@ cp -a .%{gem_dir}/* \ %check pushd .%{gem_instdir} -ln -s %{_builddir}/%{gem_name}-%{version}/test test -cp %{buildroot}%{gem_spec} sass-rails.gemspec -echo 'gem "sass-rails", :path => "."' >> Gemfile -ruby -I.:test -e 'Dir.glob "test/**/*_test.rb", &method(:require)' popd %files @@ -62,6 +47,9 @@ popd %doc %{gem_instdir}/README.md %changelog +* Thur Mar 3 2022 liqiuyu - 6.0.0-1 +- update to 6.0.0 + * Fri Aug 6 2021 liqiuyu - 5.0.7-2 - revert to 5.0.7 diff --git a/sass-rails-5.0.7.gem b/sass-rails-5.0.7.gem deleted file mode 100644 index 7363b9e..0000000 Binary files a/sass-rails-5.0.7.gem and /dev/null differ diff --git a/sass-rails-6.0.0.gem b/sass-rails-6.0.0.gem new file mode 100644 index 0000000..89aa8ae Binary files /dev/null and b/sass-rails-6.0.0.gem differ diff --git a/v5.0.7.tar.gz b/v5.0.7.tar.gz deleted file mode 100644 index f29cebc..0000000 Binary files a/v5.0.7.tar.gz and /dev/null differ