Skip to content

Commit

Permalink
Improved gemspec
Browse files Browse the repository at this point in the history
Removed deprecated .css.scss extension (breaking change)
Tested against sass-rails 5.0.0
  • Loading branch information
tagliala committed Dec 14, 2014
1 parent 26074a9 commit fd0ca8c
Show file tree
Hide file tree
Showing 14 changed files with 20 additions and 20 deletions.
12 changes: 6 additions & 6 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
appraise 'rails-4.0' do
gem 'rails', '4.0.12'
gem 'uglifier'
gem 'sass-rails', '~> 4.0.0'
gem 'minitest', '~> 4'
gem 'sass-rails', '~> 4.0.2'
gem 'minitest', '~> 4.0'
end

appraise 'rails-4.1' do
gem 'rails', '4.1.8'
gem 'uglifier'
gem 'sass-rails', '~> 4.0.0'
gem 'minitest', '~> 5'
gem 'sass-rails', '~> 4.0.3'
gem 'minitest', '~> 5.0'
end

appraise 'rails-4.2' do
gem 'rails', '4.2.0.rc3'
gem 'uglifier'
gem 'sass-rails', '5.0.0.beta1'
gem 'minitest', '~> 5'
gem 'sass-rails', '~> 5.0'
gem 'minitest', '~> 5.0'
end
4 changes: 2 additions & 2 deletions gemfiles/rails_4.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source "https://rubygems.org"

gem "rails", "4.0.12"
gem "uglifier"
gem "sass-rails", "~> 4.0.0"
gem "minitest", "~> 4"
gem "sass-rails", "~> 4.0.2"
gem "minitest", "~> 4.0"

gemspec :path => "../"
4 changes: 2 additions & 2 deletions gemfiles/rails_4.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source "https://rubygems.org"

gem "rails", "4.1.8"
gem "uglifier"
gem "sass-rails", "~> 4.0.0"
gem "minitest", "~> 5"
gem "sass-rails", "~> 4.0.3"
gem "minitest", "~> 5.0"

gemspec :path => "../"
4 changes: 2 additions & 2 deletions gemfiles/rails_4.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source "https://rubygems.org"

gem "rails", "4.2.0.rc3"
gem "uglifier"
gem "sass-rails", "5.0.0.beta1"
gem "minitest", "~> 5"
gem "sass-rails", "~> 5.0"
gem "minitest", "~> 5.0"

gemspec :path => "../"
4 changes: 2 additions & 2 deletions lib/generators/twbs_sass_rails/install/install_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ def copy_assets

def copy_bootstrap
copy_file 'twbs.js.coffee', 'app/assets/javascripts/twbs.js.coffee'
copy_file 'twbs-variables.css.scss', 'app/assets/stylesheets/twbs-variables.css.scss'
copy_file 'twbs.css.scss', 'app/assets/stylesheets/twbs.css.scss'
copy_file 'twbs-variables.scss', 'app/assets/stylesheets/twbs-variables.scss'
copy_file 'twbs.scss', 'app/assets/stylesheets/twbs.scss'
end
end
end
Expand Down
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions test/generators/install_generator_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ class InstallGeneratorTest < ::Rails::Generators::TestCase
test "Assert all files are properly created" do
run_generator
assert_file 'app/assets/stylesheets/application.css'
assert_file 'app/assets/stylesheets/twbs-variables.css.scss' do |file_content|
template_file = File.expand_path('../../lib/generators/twbs_sass_rails/install/templates/twbs-variables.css.scss', File.dirname(__FILE__))
assert_file 'app/assets/stylesheets/twbs-variables.scss' do |file_content|
template_file = File.expand_path('../../lib/generators/twbs_sass_rails/install/templates/twbs-variables.scss', File.dirname(__FILE__))
assert_match file_content, File.read(template_file)
end
assert_file 'app/assets/stylesheets/twbs.css.scss' do |file_content|
template_file = File.expand_path('../../lib/generators/twbs_sass_rails/install/templates/twbs.css.scss', File.dirname(__FILE__))
assert_file 'app/assets/stylesheets/twbs.scss' do |file_content|
template_file = File.expand_path('../../lib/generators/twbs_sass_rails/install/templates/twbs.scss', File.dirname(__FILE__))
assert_match file_content, File.read(template_file)
end
assert_file 'app/assets/javascripts/application.js'
Expand Down
4 changes: 2 additions & 2 deletions twbs_sass_rails.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ Gem::Specification.new do |s|
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
s.require_paths = ['lib']

s.add_runtime_dependency 'rails', '>= 4.0.0', '< 5.0.0'
s.add_runtime_dependency 'sass-rails', '>= 4.0', '<= 5.0.0.beta1'
s.add_runtime_dependency 'rails', '>= 4.0.12', '< 5.0.0'
s.add_runtime_dependency 'sass-rails', '>= 4.0.2', '< 6.0.0'

s.add_development_dependency 'appraisal', '~> 1.0'
s.add_development_dependency 'capybara', '~> 2.4'
Expand Down

0 comments on commit fd0ca8c

Please sign in to comment.