travis update

This commit is contained in:
Thomas Reynolds 2012-03-14 20:02:49 -07:00
parent f76883b53a
commit 7d2821a472
5 changed files with 68 additions and 2 deletions

View file

@ -2,8 +2,13 @@ rvm:
- 1.8.7 - 1.8.7
- 1.9.2 - 1.9.2
- 1.9.3 - 1.9.3
- jruby
script: "bundle exec rake test" script: "bundle exec rake test"
branches: branches:
only: only:
- master - master
matrix:
allow_failures:
- rvm: jruby

View file

@ -23,3 +23,4 @@ end
gem "middleman-core", :path => "middleman-core" gem "middleman-core", :path => "middleman-core"
gem "middleman-more", :path => "middleman-more" gem "middleman-more", :path => "middleman-more"
gem "middleman", :path => "middleman" gem "middleman", :path => "middleman"
gem "compass", "~> 0.11.0"

26
gemfiles/Gemfile Normal file
View file

@ -0,0 +1,26 @@
source :rubygems
group :development do
gem "cucumber", "~> 1.1.0"
gem "aruba", "~> 0.4.11"
gem "rake", "~> 0.9.2"
gem "rspec", "~> 2.7"
gem "rdoc", "~> 3.9"
# gem "yard"
end
group :test do
# For actual tests
gem "sinatra"
gem "slim"
gem "coffee-filter", "~> 0.1.1"
gem "liquid", "~> 2.2"
gem "jquery-rails", "~> 2.0.1"
# gem "bootstrap-rails", "0.0.5"
# gem "zurb-foundation"
end
gem "middleman-core", :path => "middleman-core"
gem "middleman-more", :path => "middleman-more"
gem "middleman", :path => "middleman"
gem "compass", "~> 0.11.0"

View file

@ -0,0 +1,25 @@
source :rubygems
group :development do
gem "cucumber", "~> 1.1.0"
gem "aruba", "~> 0.4.11"
gem "rake", "~> 0.9.2"
gem "rspec", "~> 2.7"
gem "rdoc", "~> 3.9"
# gem "yard"
end
group :test do
# For actual tests
gem "sinatra"
gem "slim"
gem "coffee-filter", "~> 0.1.1"
gem "liquid", "~> 2.2"
gem "jquery-rails", "~> 2.0.1"
# gem "bootstrap-rails", "0.0.5"
# gem "zurb-foundation"
end
gem "middleman-core", :path => "middleman-core"
gem "middleman-more", :path => "middleman-more"
gem "middleman", :path => "middleman"

View file

@ -26,6 +26,15 @@ module Middleman::CoreExtensions::Compass
config.images_dir = images_dir config.images_dir = images_dir
config.http_path = http_prefix config.http_path = http_prefix
# Correctly support HTTP paths with generated sprites
# if config.respond_to? :http_generated_images_path
# config.http_generated_images_path = if app.respond_to? :http_generated_images_path
# app.http_generated_images_path
# else
# File.join(app.http_prefix || "/", app.images_dir)
# end
# end
config.asset_cache_buster :none config.asset_cache_buster :none
config.relative_assets = false config.relative_assets = false
config.output_style = :nested config.output_style = :nested