updated Gems, added more liberal definitions to gemfile

Conflicts:

	Gemfile.lock
This commit is contained in:
Brandon Mathis 2012-05-21 16:16:29 -05:00
parent 9fbc46abd9
commit 99767a4e0c
2 changed files with 43 additions and 40 deletions

12
Gemfile
View File

@ -3,16 +3,16 @@ source "http://rubygems.org"
group :development do
gem 'rake'
gem 'rack'
gem 'jekyll'
gem 'jekyll', '~> 0.11'
gem 'rdiscount'
gem 'pygments.rb'
gem 'RedCloth'
gem 'haml', '>= 3.1'
gem 'compass', '>= 0.11'
gem 'haml', '~> 3.1'
gem 'compass', '~> 0.12'
gem 'rubypants'
gem 'rb-fsevent'
gem 'rb-fsevent', '~> 0.9'
gem 'stringex'
gem 'liquid', '2.2.2'
gem 'liquid', '~> 2.3'
end
gem 'sinatra', '1.2.6'
gem 'sinatra', '~> 1.3'

View File

@ -1,66 +1,69 @@
GEM
remote: http://rubygems.org/
specs:
RedCloth (4.2.8)
RedCloth (4.2.9)
albino (1.3.3)
posix-spawn (>= 0.3.6)
blankslate (2.1.2.4)
chunky_png (1.2.1)
chunky_png (1.2.5)
classifier (1.3.3)
fast-stemmer (>= 1.0.0)
compass (0.11.5)
compass (0.12.1)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.1)
directory_watcher (1.4.0)
fast-stemmer (1.0.0)
ffi (1.0.9)
fssm (0.2.7)
haml (3.1.2)
jekyll (0.11.0)
albino (>= 1.3.2)
classifier (>= 1.3.1)
directory_watcher (>= 1.1.1)
kramdown (>= 0.13.2)
liquid (>= 1.9.0)
maruku (>= 0.5.9)
kramdown (0.13.3)
liquid (2.2.2)
directory_watcher (1.4.1)
fast-stemmer (1.0.1)
ffi (1.0.11)
fssm (0.2.9)
haml (3.1.6)
jekyll (0.11.2)
albino (~> 1.3)
classifier (~> 1.3)
directory_watcher (~> 1.1)
kramdown (~> 0.13)
liquid (~> 2.3)
maruku (~> 0.5)
kramdown (0.13.6)
liquid (2.3.0)
maruku (0.6.0)
syntax (>= 1.0.0)
posix-spawn (0.3.6)
pygments.rb (0.1.3)
rubypython (>= 0.5.1)
rack (1.3.2)
rake (0.9.2)
rb-fsevent (0.4.3.1)
pygments.rb (0.2.12)
rubypython (~> 0.5.3)
rack (1.4.1)
rack-protection (1.2.0)
rack
rake (0.9.2.2)
rb-fsevent (0.9.1)
rdiscount (1.6.8)
rubypants (0.2.0)
rubypython (0.5.1)
rubypython (0.5.3)
blankslate (>= 2.1.2.3)
ffi (~> 1.0.7)
sass (3.1.18)
sinatra (1.2.6)
rack (~> 1.1)
tilt (>= 1.2.2, < 2.0)
stringex (1.3.0)
sinatra (1.3.2)
rack (~> 1.3, >= 1.3.6)
rack-protection (~> 1.2)
tilt (~> 1.3, >= 1.3.3)
stringex (1.4.0)
syntax (1.0.0)
tilt (1.3.2)
tilt (1.3.3)
PLATFORMS
ruby
DEPENDENCIES
RedCloth
compass (>= 0.11)
haml (>= 3.1)
jekyll
liquid (= 2.2.2)
compass (~> 0.12)
haml (~> 3.1)
jekyll (~> 0.11)
liquid (~> 2.3)
pygments.rb
rack
rake
rb-fsevent
rb-fsevent (~> 0.9)
rdiscount
rubypants
sinatra (= 1.2.6)
sinatra (~> 1.3)
stringex