deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update haml and sass deps

Browse source
This commit is contained in:
Thomas Reynolds 2014-04-03 09:53:33 -07:00
parent 142d1b1871
commit f800a51fb2
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -19,4 +19,5 @@ Makefile
.mm-pid-* .mm-pid-*
.idea .idea
*.sublime-workspace *.sublime-workspace
/bin /bin
middleman-core/fixtures/compass-sprites-app/source/images/icon-s0de2218f58.png

3
Gemfile
View file

@ -6,13 +6,12 @@ gem 'yard', '~> 0.8.0', :require => false
# Test tools # Test tools
gem 'cucumber', '~> 1.3.1' gem 'cucumber', '~> 1.3.1'
gem 'fivemat' gem 'fivemat', '~> 1.2.1'
gem 'aruba', '~> 0.5.1' gem 'aruba', '~> 0.5.1'
gem 'rspec', '~> 2.12' gem 'rspec', '~> 2.12'
gem 'simplecov' gem 'simplecov'
# Optional middleman dependencies, included for tests # Optional middleman dependencies, included for tests
gem 'haml', '~> 4.0.0', :require => false # Make sure to use Haml 4 for tests
gem 'sinatra', :require => false gem 'sinatra', :require => false
gem 'slim', :require => false gem 'slim', :require => false
gem 'liquid', :require => false gem 'liquid', :require => false

2
middleman-core/features/compass-sprites.feature
View file

@ -3,4 +3,4 @@ Feature: Compass sprites should be generated on build and copied
Given a successfully built app at "compass-sprites-app" Given a successfully built app at "compass-sprites-app"
When I cd to "build" When I cd to "build"
Then the following files should exist: Then the following files should exist:
| images/icon-s1a8aa64128.png | | images/icon-s0de2218f58.png |

6
middleman/middleman.gemspec
View file

@ -20,9 +20,9 @@ Gem::Specification.new do |s|
s.add_dependency("middleman-core", Middleman::VERSION) s.add_dependency("middleman-core", Middleman::VERSION)
s.add_dependency("middleman-sprockets", ">= 3.1.2") s.add_dependency("middleman-sprockets", ">= 3.1.2")
s.add_dependency("haml", [">= 3.1.6"]) s.add_dependency("haml", [">= 4.0.5"])
s.add_dependency("sass", [">= 3.1.20"]) s.add_dependency("sass", [">= 3.3.4"])
s.add_dependency("compass", [">= 0.12.2"]) s.add_dependency("compass", [">= 1.0.0.alpha.19"])
s.add_dependency("uglifier", ["~> 2.4.0"]) s.add_dependency("uglifier", ["~> 2.4.0"])
s.add_dependency("coffee-script", ["~> 2.2.0"]) s.add_dependency("coffee-script", ["~> 2.2.0"])
s.add_dependency("execjs", ["~> 1.4.0"]) s.add_dependency("execjs", ["~> 1.4.0"])