update to 6.0.0

This commit is contained in:
liqiuyu 2021-06-25 15:19:08 +08:00
parent 0b5c2c6b71
commit f85344792a
6 changed files with 55 additions and 179 deletions

View File

@ -1,151 +0,0 @@
From 5cf04df33646a5db0ee6753fc701b6239304cff5 Mon Sep 17 00:00:00 2001
From: Gustavo Bazan <gustavo@swiftcomply.com>
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

View File

@ -1,42 +1,67 @@
%global pkg_name %{name}
%global gem_name sass-rails %global gem_name sass-rails
Name: rubygem-%{gem_name} Name: rubygem-%{gem_name}
Version: 5.0.7 Version: 6.0.0
Release: 1 Release: 1
Summary: Sass adapter for the Rails asset pipeline Summary: Sass adapter for the Rails asset pipeline
Group: Development/Languages
License: MIT License: MIT
URL: https://github.com/rails/sass-rails URL: https://github.com/rails/sass-rails
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
Source1: https://github.com/rails/sass-rails/archive/v%{version}.tar.gz Source1: https://github.com/rails/%{gem_name}/archive/refs/tags/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) # start specfile generated dependencies
BuildRequires: rubygem(sqlite3) rubygem(tilt) Requires: ruby(release)
Requires: ruby
Requires: ruby(rubygems)
Requires: rubygem(sassc-rails) >= 2.1
Requires: rubygem(sassc-rails) < 3
Requires: rubygem(sassc-rails) >= 2.1.1
BuildRequires: ruby(release)
BuildRequires: ruby
BuildRequires: rubygems-devel
BuildArch: noarch BuildArch: noarch
Provides: rubygem(%{gem_name}) = %{version}
# end specfile generated dependencies
%description %description
Sass adapter for the Rails asset pipeline. Sass adapter for the Rails asset pipeline.
%package doc %package doc
Summary: Documentation for %{name} Summary: Documentation for %{pkg_name}
Requires: %{name} = %{version}-%{release} Group: Documentation
Requires: %{pkg_name} = %{version}-%{release}
BuildArch: noarch BuildArch: noarch
%description doc %description doc
Documentation for %{name}. Documentation for %{pkg_name}.
%prep %prep
%setup -q -n %{gem_name}-%{version} -b 1
pwd gem unpack %{SOURCE0}
#ln -s %%{gem_name}-%%{version}/spec spec
#ln -s %%{gem_name}-%%{version}/test test
pushd %{_builddir} %setup -q -D -T -n %{gem_name}-%{version}
pwd
ls
ln -s %{gem_name}-%{version}/test test gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
%patch0 -p1
popd
%build %build
gem build ../%{gem_name}-%{version}.gemspec # Create the gem as gem install only works on a gem file
gem build %{gem_name}.gemspec
# %%gem_install compiles any C extensions and installs the gem into ./%%gem_dir
# by default, so that we can move it into the buildroot in %%install
%gem_install %gem_install
%install %install
mkdir -p %{buildroot}%{gem_dir} mkdir -p %{buildroot}%{gem_dir}
cp -a .%{gem_dir}/* \ cp -a .%{gem_dir}/* \
@ -62,5 +87,7 @@ popd
%doc %{gem_instdir}/README.md %doc %{gem_instdir}/README.md
%changelog %changelog
* Fri Jun 25 2021 liqiuyu <liqiuyu@kylinos.cn> - 6.0.0-1
- update to 6.0.0
* Wed Aug 19 2020 xiezheng <xiezheng4@huawei.com> - 5.0.7-1 * Wed Aug 19 2020 xiezheng <xiezheng4@huawei.com> - 5.0.7-1
- package init - package init

Binary file not shown.

BIN
sass-rails-6.0.0.gem Normal file

Binary file not shown.

Binary file not shown.

BIN
v6.0.0.tar.gz Normal file

Binary file not shown.