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

Merge pull request #353 from bhollis/minify

Browse source 
Minify all JS and CSS via middleware
This commit is contained in:
Thomas Reynolds 2012-04-09 11:10:36 -07:00
commit cd89e5ffa4
16 changed files with 347 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

6
middleman-core/lib/middleman-core/step_definitions/server_steps.rb
View file

@ -68,10 +68,14 @@ Then /^I should see '([^\']*)'$/ do |expected|
@browser.last_response.body.should include(expected)
end
Then /^I should see:$/ do |expected|
@browser.last_response.body.should include(expected)
end
Then /^I should not see "([^\"]*)"$/ do |expected|
@browser.last_response.body.should_not include(expected)
end
Then /^I should see "([^\"]*)" lines$/ do |lines|
@browser.last_response.body.chomp.split($/).length.should == lines.to_i
end
end

5
middleman-core/lib/middleman-core/templates.rb
View file

@ -59,8 +59,9 @@ module Middleman::Templates
return unless options[:bundler]
template "shared/Gemfile.tt", File.join(location, "Gemfile")
say_status :run, "bundle install"
print `cd #{location} && "#{Gem.ruby}" -rubygems "#{Gem.bin_path('bundler', 'bundle')}" install`
inside(location) do
run('bundle install', :capture => true)
end
end
end
end