From 8394c9ffb18f602e807c2101529bccf92ddcd910 Mon Sep 17 00:00:00 2001 From: Brandon Mathis Date: Mon, 21 May 2012 16:16:29 -0500 Subject: [PATCH] updated Gems, added more liberal definitions to gemfile --- Gemfile | 12 ++++++------ Gemfile.lock | 37 ++++++++++++++++++++----------------- 2 files changed, 26 insertions(+), 23 deletions(-) diff --git a/Gemfile b/Gemfile index 6160f94..488fc27 100644 --- a/Gemfile +++ b/Gemfile @@ -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' diff --git a/Gemfile.lock b/Gemfile.lock index 9e88ce0..08665b7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,21 +17,23 @@ GEM ffi (1.0.11) fssm (0.2.9) haml (3.1.6) - 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) + 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.2.2) + liquid (2.3.0) maruku (0.6.0) syntax (>= 1.0.0) posix-spawn (0.3.6) 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) @@ -40,9 +42,10 @@ GEM 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) + 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.3) @@ -52,15 +55,15 @@ PLATFORMS 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