sort out some bundle issues

This commit is contained in:
Chris Eppstein 2010-12-06 13:52:35 -08:00
parent e3ad16e5fe
commit caafd963a3
2 changed files with 12 additions and 7 deletions

View File

@ -5,11 +5,11 @@ gem 'rdiscount'
gem 'thor' gem 'thor'
gem 'rack' gem 'rack'
gem 'mime-types' gem 'mime-types'
gem 'fssm'
gem 'serve', "1.0.0" gem 'serve', "1.0.0"
gem 'nokogiri' gem 'nokogiri'
gem 'coderay' gem 'coderay'
gem 'sass', ">= 3.1.0.alpha.50" gem 'sass', ">= 3.1.0.alpha.50", :git => "git://github.com/chriseppstein/sass.git"
gem 'fssm', '0.1.2'
gem 'haml', ">= 3.1.0.alpha.36" gem 'haml', ">= 3.1.0.alpha.36"
gem 'rake' gem 'rake'
gem 'compass', :path => ".." gem 'compass', :path => ".."

View File

@ -5,10 +5,16 @@ GIT
nanoc3 (3.2.0a3) nanoc3 (3.2.0a3)
cri (>= 1.0.0) cri (>= 1.0.0)
GIT
remote: git://github.com/chriseppstein/sass.git
revision: c9de58c678644ec9b0ae5103ab595815e5aa4ecf
specs:
sass (3.1.0.alpha.50)
PATH PATH
remote: .. remote: ..
specs: specs:
compass (0.11.alpha.3.04fb6df) compass (0.11.alpha.3.d0c39f9)
chunky_png (~> 0.10.3) chunky_png (~> 0.10.3)
sass (>= 3.1.0.alpha.50) sass (>= 3.1.0.alpha.50)
@ -23,7 +29,7 @@ GEM
cri (1.0.1) cri (1.0.1)
css-slideshow (0.2.0) css-slideshow (0.2.0)
compass (>= 0.10.0.rc3) compass (>= 0.10.0.rc3)
fssm (0.2.0) fssm (0.1.2)
haml (3.1.0.alpha.36) haml (3.1.0.alpha.36)
i18n (0.4.2) i18n (0.4.2)
json (1.4.6) json (1.4.6)
@ -32,7 +38,6 @@ GEM
rack (1.2.1) rack (1.2.1)
rake (0.8.7) rake (0.8.7)
rdiscount (1.6.5) rdiscount (1.6.5)
sass (3.1.0.alpha.50)
serve (1.0.0) serve (1.0.0)
activesupport (~> 3.0.1) activesupport (~> 3.0.1)
i18n (~> 0.4.1) i18n (~> 0.4.1)
@ -49,7 +54,7 @@ DEPENDENCIES
compass! compass!
compass-susy-plugin (>= 0.7.0.pre8) compass-susy-plugin (>= 0.7.0.pre8)
css-slideshow (= 0.2.0) css-slideshow (= 0.2.0)
fssm fssm (= 0.1.2)
haml (>= 3.1.0.alpha.36) haml (>= 3.1.0.alpha.36)
json json
mime-types mime-types
@ -58,6 +63,6 @@ DEPENDENCIES
rack rack
rake rake
rdiscount rdiscount
sass (>= 3.1.0.alpha.50) sass (>= 3.1.0.alpha.50)!
serve (= 1.0.0) serve (= 1.0.0)
thor thor