Skip to content

Commit 4984d24

Browse files
committed
support and test against Sprockets 4
1 parent 17a7c9e commit 4984d24

File tree

7 files changed

+47
-7
lines changed

7 files changed

+47
-7
lines changed

.travis.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,24 @@ rvm:
88
- 2.3.0
99
gemfile:
1010
- gemfiles/rails_4_2_sprockets_rails_2.gemfile
11-
- gemfiles/rails_4_2.gemfile
11+
- gemfiles/rails_4_2_sprockets_3.gemfile
12+
- gemfiles/rails_4_2_sprockets_4.gemfile
1213
- gemfiles/rails_5_0_sprockets_rails_2.gemfile
13-
- gemfiles/rails_5_0.gemfile
14+
- gemfiles/rails_5_0_sprockets_3.gemfile
15+
- gemfiles/rails_5_0_sprockets_4.gemfile
1416
script: bundle exec rspec spec
1517
matrix:
1618
fast_finish: true
1719
exclude:
1820
- rvm: 2.0.0
1921
gemfile: gemfiles/rails_5_0_sprockets_rails_2.gemfile
2022
- rvm: 2.0.0
21-
gemfile: gemfiles/rails_5_0.gemfile
23+
gemfile: gemfiles/rails_5_0_sprockets_3.gemfile
24+
- rvm: 2.0.0
25+
gemfile: gemfiles/rails_5_0_sprockets_4.gemfile
2226
- rvm: 2.1.8
2327
gemfile: gemfiles/rails_5_0_sprockets_rails_2.gemfile
2428
- rvm: 2.1.8
25-
gemfile: gemfiles/rails_5_0.gemfile
29+
gemfile: gemfiles/rails_5_0_sprockets_3.gemfile
30+
- rvm: 2.1.8
31+
gemfile: gemfiles/rails_5_0_sprockets_4.gemfile

Appraisals

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,29 @@ appraise "rails-4-2-sprockets-rails-2" do
33
gem "sprockets-rails", "~> 2.0"
44
end
55

6-
appraise "rails-4-2" do
6+
appraise "rails-4-2-sprockets-3" do
77
gem "rails", "~> 4.2.0"
8+
gem "sprockets", "~> 3.0"
9+
end
10+
11+
appraise "rails-4-2-sprockets-4" do
12+
gem "rails", "~> 4.2.0"
13+
gem "sprockets", "~> 4.0.0.beta2"
14+
gem "sass-rails", "~> 6.0.0.beta1"
815
end
916

1017
appraise "rails-5-0-sprockets-rails-2" do
1118
gem "rails", "~> 5.0.0.beta1"
1219
gem "sprockets-rails", "~> 2.0"
1320
end
1421

15-
appraise "rails-5-0" do
22+
appraise "rails-5-0-sprockets-3" do
23+
gem "rails", "~> 5.0.0.beta1"
24+
gem "sprockets", "~> 3.0"
25+
end
26+
27+
appraise "rails-5-0-sprockets-4" do
1628
gem "rails", "~> 5.0.0.beta1"
29+
gem "sprockets", "~> 4.0.0.beta2"
30+
gem "sass-rails", "~> 6.0.0.beta1"
1731
end

gemfiles/rails_4_2.gemfile renamed to gemfiles/rails_4_2_sprockets_3.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
source "https://rubygems.org"
44

55
gem "rails", "~> 4.2.0"
6+
gem "sprockets", "~> 3.0"
67

78
gemspec :path => "../"
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "rails", "~> 4.2.0"
6+
gem "sprockets", "~> 4.0.0.beta2"
7+
gem "sass-rails", "~> 6.0.0.beta1"
8+
9+
gemspec :path => "../"

gemfiles/rails_5_0.gemfile renamed to gemfiles/rails_5_0_sprockets_3.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
source "https://rubygems.org"
44

55
gem "rails", "~> 5.0.0.beta1"
6+
gem "sprockets", "~> 3.0"
67

78
gemspec :path => "../"
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "rails", "~> 5.0.0.beta1"
6+
gem "sprockets", "~> 4.0.0.beta2"
7+
gem "sass-rails", "~> 6.0.0.beta1"
8+
9+
gemspec :path => "../"

spritely.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
2020

2121
s.add_dependency 'chunky_png', '~> 1.3'
2222
s.add_dependency 'sass', '~> 3.1'
23-
s.add_dependency 'sprockets', '~> 3.0'
23+
s.add_dependency 'sprockets', '>= 3.0', '< 5'
2424

2525
s.add_development_dependency 'activesupport'
2626
s.add_development_dependency 'pry-byebug'

0 commit comments

Comments
 (0)