From 2e06576f59d84da87a2f9ce1389dfef75e9d3d05 Mon Sep 17 00:00:00 2001 From: Derick Bailey Date: Thu, 16 Aug 2012 15:00:09 -0500 Subject: [PATCH] updated gem references for sinatra-contrib instead of sinatra-content-for --- .rvmrc | 1 + 1-jquery-to-backbone/Gemfile | 2 +- 1-jquery-to-backbone/Gemfile.lock | 91 ++++++++++++++------------- 1-jquery-to-backbone/app.rb | 2 +- 2-routing-and-navigation/Gemfile | 2 +- 2-routing-and-navigation/Gemfile.lock | 91 ++++++++++++++------------- 2-routing-and-navigation/app.rb | 2 +- 3-app-structure/Gemfile | 2 +- 3-app-structure/Gemfile.lock | 91 ++++++++++++++------------- 3-app-structure/app.rb | 2 +- 4-persistence/Gemfile | 2 +- 4-persistence/Gemfile.lock | 91 ++++++++++++++------------- 5-complete/Gemfile | 2 +- 5-complete/Gemfile.lock | 91 ++++++++++++++------------- 14 files changed, 244 insertions(+), 228 deletions(-) create mode 100644 .rvmrc diff --git a/.rvmrc b/.rvmrc new file mode 100644 index 0000000..3421a40 --- /dev/null +++ b/.rvmrc @@ -0,0 +1 @@ +rvm use 1.9.3@hands-on-bb --create diff --git a/1-jquery-to-backbone/Gemfile b/1-jquery-to-backbone/Gemfile index e13dd28..09a0e53 100644 --- a/1-jquery-to-backbone/Gemfile +++ b/1-jquery-to-backbone/Gemfile @@ -1,7 +1,7 @@ source :rubygems gem 'sinatra' -gem 'sinatra-content-for' +gem 'sinatra-contrib' gem 'json' group :development do diff --git a/1-jquery-to-backbone/Gemfile.lock b/1-jquery-to-backbone/Gemfile.lock index 1fc0dff..fbac7fa 100644 --- a/1-jquery-to-backbone/Gemfile.lock +++ b/1-jquery-to-backbone/Gemfile.lock @@ -1,53 +1,56 @@ GEM remote: http://rubygems.org/ specs: - backports (2.3.0) - childprocess (0.2.2) - ffi (~> 1.0.6) + addressable (2.3.2) + backports (2.6.3) + childprocess (0.3.5) + ffi (~> 1.0, >= 1.0.6) diff-lcs (1.1.3) - ffi (1.0.9) - jasmine (1.0.2.1) - json_pure (>= 1.4.3) - rack (>= 1.1) + eventmachine (0.12.10) + ffi (1.1.5) + jasmine (1.2.1) + jasmine-core (>= 1.2.0) + rack (~> 1.0) rspec (>= 1.3.1) selenium-webdriver (>= 0.1.3) - json (1.6.0) - json_pure (1.5.4) - spruz (~> 0.2.8) - monkey-lib (0.5.4) - backports - rack (1.3.2) - rspec (2.6.0) - rspec-core (~> 2.6.0) - rspec-expectations (~> 2.6.0) - rspec-mocks (~> 2.6.0) - rspec-core (2.6.4) - rspec-expectations (2.6.0) - diff-lcs (~> 1.1.2) - rspec-mocks (2.6.0) - rubyzip (0.9.4) - selenium-webdriver (2.5.0) - childprocess (>= 0.2.1) - ffi (>= 1.0.7) - json_pure + jasmine-core (1.2.0) + json (1.7.4) + libwebsocket (0.1.5) + addressable + multi_json (1.3.6) + rack (1.4.1) + rack-protection (1.2.0) + rack + rack-test (0.6.1) + rack (>= 1.0) + rspec (2.11.0) + rspec-core (~> 2.11.0) + rspec-expectations (~> 2.11.0) + rspec-mocks (~> 2.11.0) + rspec-core (2.11.1) + rspec-expectations (2.11.2) + diff-lcs (~> 1.1.3) + rspec-mocks (2.11.2) + rubyzip (0.9.9) + selenium-webdriver (2.25.0) + childprocess (>= 0.2.5) + libwebsocket (~> 0.1.3) + multi_json (~> 1.0) rubyzip - sinatra (1.2.6) - rack (~> 1.1) - tilt (>= 1.2.2, < 2.0) - sinatra-advanced-routes (0.5.1) - monkey-lib (~> 0.5.0) - sinatra (~> 1.0) - sinatra-sugar (~> 0.5.0) - sinatra-content-for (0.2) - sinatra - sinatra-reloader (0.5.0) - sinatra (~> 1.0) - sinatra-advanced-routes (~> 0.5.0) - sinatra-sugar (0.5.1) - monkey-lib (~> 0.5.0) - sinatra (~> 1.0) - spruz (0.2.13) - tilt (1.3.2) + sinatra (1.3.2) + rack (~> 1.3, >= 1.3.6) + rack-protection (~> 1.2) + tilt (~> 1.3, >= 1.3.3) + sinatra-contrib (1.3.1) + backports (>= 2.0) + eventmachine + rack-protection + rack-test + sinatra (~> 1.3.0) + tilt (~> 1.3) + sinatra-reloader (1.0) + sinatra-contrib + tilt (1.3.3) PLATFORMS ruby @@ -56,5 +59,5 @@ DEPENDENCIES jasmine json sinatra - sinatra-content-for + sinatra-contrib sinatra-reloader diff --git a/1-jquery-to-backbone/app.rb b/1-jquery-to-backbone/app.rb index db4e713..bb8ef68 100644 --- a/1-jquery-to-backbone/app.rb +++ b/1-jquery-to-backbone/app.rb @@ -4,7 +4,7 @@ require 'json' require 'sinatra/reloader' if development? -set :public, File.dirname(__FILE__) + '/public' +set :public_folder, File.dirname(__FILE__) + '/public' get '/' do erb :layout diff --git a/2-routing-and-navigation/Gemfile b/2-routing-and-navigation/Gemfile index e13dd28..09a0e53 100644 --- a/2-routing-and-navigation/Gemfile +++ b/2-routing-and-navigation/Gemfile @@ -1,7 +1,7 @@ source :rubygems gem 'sinatra' -gem 'sinatra-content-for' +gem 'sinatra-contrib' gem 'json' group :development do diff --git a/2-routing-and-navigation/Gemfile.lock b/2-routing-and-navigation/Gemfile.lock index 1fc0dff..fbac7fa 100644 --- a/2-routing-and-navigation/Gemfile.lock +++ b/2-routing-and-navigation/Gemfile.lock @@ -1,53 +1,56 @@ GEM remote: http://rubygems.org/ specs: - backports (2.3.0) - childprocess (0.2.2) - ffi (~> 1.0.6) + addressable (2.3.2) + backports (2.6.3) + childprocess (0.3.5) + ffi (~> 1.0, >= 1.0.6) diff-lcs (1.1.3) - ffi (1.0.9) - jasmine (1.0.2.1) - json_pure (>= 1.4.3) - rack (>= 1.1) + eventmachine (0.12.10) + ffi (1.1.5) + jasmine (1.2.1) + jasmine-core (>= 1.2.0) + rack (~> 1.0) rspec (>= 1.3.1) selenium-webdriver (>= 0.1.3) - json (1.6.0) - json_pure (1.5.4) - spruz (~> 0.2.8) - monkey-lib (0.5.4) - backports - rack (1.3.2) - rspec (2.6.0) - rspec-core (~> 2.6.0) - rspec-expectations (~> 2.6.0) - rspec-mocks (~> 2.6.0) - rspec-core (2.6.4) - rspec-expectations (2.6.0) - diff-lcs (~> 1.1.2) - rspec-mocks (2.6.0) - rubyzip (0.9.4) - selenium-webdriver (2.5.0) - childprocess (>= 0.2.1) - ffi (>= 1.0.7) - json_pure + jasmine-core (1.2.0) + json (1.7.4) + libwebsocket (0.1.5) + addressable + multi_json (1.3.6) + rack (1.4.1) + rack-protection (1.2.0) + rack + rack-test (0.6.1) + rack (>= 1.0) + rspec (2.11.0) + rspec-core (~> 2.11.0) + rspec-expectations (~> 2.11.0) + rspec-mocks (~> 2.11.0) + rspec-core (2.11.1) + rspec-expectations (2.11.2) + diff-lcs (~> 1.1.3) + rspec-mocks (2.11.2) + rubyzip (0.9.9) + selenium-webdriver (2.25.0) + childprocess (>= 0.2.5) + libwebsocket (~> 0.1.3) + multi_json (~> 1.0) rubyzip - sinatra (1.2.6) - rack (~> 1.1) - tilt (>= 1.2.2, < 2.0) - sinatra-advanced-routes (0.5.1) - monkey-lib (~> 0.5.0) - sinatra (~> 1.0) - sinatra-sugar (~> 0.5.0) - sinatra-content-for (0.2) - sinatra - sinatra-reloader (0.5.0) - sinatra (~> 1.0) - sinatra-advanced-routes (~> 0.5.0) - sinatra-sugar (0.5.1) - monkey-lib (~> 0.5.0) - sinatra (~> 1.0) - spruz (0.2.13) - tilt (1.3.2) + sinatra (1.3.2) + rack (~> 1.3, >= 1.3.6) + rack-protection (~> 1.2) + tilt (~> 1.3, >= 1.3.3) + sinatra-contrib (1.3.1) + backports (>= 2.0) + eventmachine + rack-protection + rack-test + sinatra (~> 1.3.0) + tilt (~> 1.3) + sinatra-reloader (1.0) + sinatra-contrib + tilt (1.3.3) PLATFORMS ruby @@ -56,5 +59,5 @@ DEPENDENCIES jasmine json sinatra - sinatra-content-for + sinatra-contrib sinatra-reloader diff --git a/2-routing-and-navigation/app.rb b/2-routing-and-navigation/app.rb index db4e713..bb8ef68 100644 --- a/2-routing-and-navigation/app.rb +++ b/2-routing-and-navigation/app.rb @@ -4,7 +4,7 @@ require 'json' require 'sinatra/reloader' if development? -set :public, File.dirname(__FILE__) + '/public' +set :public_folder, File.dirname(__FILE__) + '/public' get '/' do erb :layout diff --git a/3-app-structure/Gemfile b/3-app-structure/Gemfile index e13dd28..09a0e53 100644 --- a/3-app-structure/Gemfile +++ b/3-app-structure/Gemfile @@ -1,7 +1,7 @@ source :rubygems gem 'sinatra' -gem 'sinatra-content-for' +gem 'sinatra-contrib' gem 'json' group :development do diff --git a/3-app-structure/Gemfile.lock b/3-app-structure/Gemfile.lock index 1fc0dff..fbac7fa 100644 --- a/3-app-structure/Gemfile.lock +++ b/3-app-structure/Gemfile.lock @@ -1,53 +1,56 @@ GEM remote: http://rubygems.org/ specs: - backports (2.3.0) - childprocess (0.2.2) - ffi (~> 1.0.6) + addressable (2.3.2) + backports (2.6.3) + childprocess (0.3.5) + ffi (~> 1.0, >= 1.0.6) diff-lcs (1.1.3) - ffi (1.0.9) - jasmine (1.0.2.1) - json_pure (>= 1.4.3) - rack (>= 1.1) + eventmachine (0.12.10) + ffi (1.1.5) + jasmine (1.2.1) + jasmine-core (>= 1.2.0) + rack (~> 1.0) rspec (>= 1.3.1) selenium-webdriver (>= 0.1.3) - json (1.6.0) - json_pure (1.5.4) - spruz (~> 0.2.8) - monkey-lib (0.5.4) - backports - rack (1.3.2) - rspec (2.6.0) - rspec-core (~> 2.6.0) - rspec-expectations (~> 2.6.0) - rspec-mocks (~> 2.6.0) - rspec-core (2.6.4) - rspec-expectations (2.6.0) - diff-lcs (~> 1.1.2) - rspec-mocks (2.6.0) - rubyzip (0.9.4) - selenium-webdriver (2.5.0) - childprocess (>= 0.2.1) - ffi (>= 1.0.7) - json_pure + jasmine-core (1.2.0) + json (1.7.4) + libwebsocket (0.1.5) + addressable + multi_json (1.3.6) + rack (1.4.1) + rack-protection (1.2.0) + rack + rack-test (0.6.1) + rack (>= 1.0) + rspec (2.11.0) + rspec-core (~> 2.11.0) + rspec-expectations (~> 2.11.0) + rspec-mocks (~> 2.11.0) + rspec-core (2.11.1) + rspec-expectations (2.11.2) + diff-lcs (~> 1.1.3) + rspec-mocks (2.11.2) + rubyzip (0.9.9) + selenium-webdriver (2.25.0) + childprocess (>= 0.2.5) + libwebsocket (~> 0.1.3) + multi_json (~> 1.0) rubyzip - sinatra (1.2.6) - rack (~> 1.1) - tilt (>= 1.2.2, < 2.0) - sinatra-advanced-routes (0.5.1) - monkey-lib (~> 0.5.0) - sinatra (~> 1.0) - sinatra-sugar (~> 0.5.0) - sinatra-content-for (0.2) - sinatra - sinatra-reloader (0.5.0) - sinatra (~> 1.0) - sinatra-advanced-routes (~> 0.5.0) - sinatra-sugar (0.5.1) - monkey-lib (~> 0.5.0) - sinatra (~> 1.0) - spruz (0.2.13) - tilt (1.3.2) + sinatra (1.3.2) + rack (~> 1.3, >= 1.3.6) + rack-protection (~> 1.2) + tilt (~> 1.3, >= 1.3.3) + sinatra-contrib (1.3.1) + backports (>= 2.0) + eventmachine + rack-protection + rack-test + sinatra (~> 1.3.0) + tilt (~> 1.3) + sinatra-reloader (1.0) + sinatra-contrib + tilt (1.3.3) PLATFORMS ruby @@ -56,5 +59,5 @@ DEPENDENCIES jasmine json sinatra - sinatra-content-for + sinatra-contrib sinatra-reloader diff --git a/3-app-structure/app.rb b/3-app-structure/app.rb index db4e713..bb8ef68 100644 --- a/3-app-structure/app.rb +++ b/3-app-structure/app.rb @@ -4,7 +4,7 @@ require 'json' require 'sinatra/reloader' if development? -set :public, File.dirname(__FILE__) + '/public' +set :public_folder, File.dirname(__FILE__) + '/public' get '/' do erb :layout diff --git a/4-persistence/Gemfile b/4-persistence/Gemfile index e13dd28..09a0e53 100644 --- a/4-persistence/Gemfile +++ b/4-persistence/Gemfile @@ -1,7 +1,7 @@ source :rubygems gem 'sinatra' -gem 'sinatra-content-for' +gem 'sinatra-contrib' gem 'json' group :development do diff --git a/4-persistence/Gemfile.lock b/4-persistence/Gemfile.lock index 1fc0dff..fbac7fa 100644 --- a/4-persistence/Gemfile.lock +++ b/4-persistence/Gemfile.lock @@ -1,53 +1,56 @@ GEM remote: http://rubygems.org/ specs: - backports (2.3.0) - childprocess (0.2.2) - ffi (~> 1.0.6) + addressable (2.3.2) + backports (2.6.3) + childprocess (0.3.5) + ffi (~> 1.0, >= 1.0.6) diff-lcs (1.1.3) - ffi (1.0.9) - jasmine (1.0.2.1) - json_pure (>= 1.4.3) - rack (>= 1.1) + eventmachine (0.12.10) + ffi (1.1.5) + jasmine (1.2.1) + jasmine-core (>= 1.2.0) + rack (~> 1.0) rspec (>= 1.3.1) selenium-webdriver (>= 0.1.3) - json (1.6.0) - json_pure (1.5.4) - spruz (~> 0.2.8) - monkey-lib (0.5.4) - backports - rack (1.3.2) - rspec (2.6.0) - rspec-core (~> 2.6.0) - rspec-expectations (~> 2.6.0) - rspec-mocks (~> 2.6.0) - rspec-core (2.6.4) - rspec-expectations (2.6.0) - diff-lcs (~> 1.1.2) - rspec-mocks (2.6.0) - rubyzip (0.9.4) - selenium-webdriver (2.5.0) - childprocess (>= 0.2.1) - ffi (>= 1.0.7) - json_pure + jasmine-core (1.2.0) + json (1.7.4) + libwebsocket (0.1.5) + addressable + multi_json (1.3.6) + rack (1.4.1) + rack-protection (1.2.0) + rack + rack-test (0.6.1) + rack (>= 1.0) + rspec (2.11.0) + rspec-core (~> 2.11.0) + rspec-expectations (~> 2.11.0) + rspec-mocks (~> 2.11.0) + rspec-core (2.11.1) + rspec-expectations (2.11.2) + diff-lcs (~> 1.1.3) + rspec-mocks (2.11.2) + rubyzip (0.9.9) + selenium-webdriver (2.25.0) + childprocess (>= 0.2.5) + libwebsocket (~> 0.1.3) + multi_json (~> 1.0) rubyzip - sinatra (1.2.6) - rack (~> 1.1) - tilt (>= 1.2.2, < 2.0) - sinatra-advanced-routes (0.5.1) - monkey-lib (~> 0.5.0) - sinatra (~> 1.0) - sinatra-sugar (~> 0.5.0) - sinatra-content-for (0.2) - sinatra - sinatra-reloader (0.5.0) - sinatra (~> 1.0) - sinatra-advanced-routes (~> 0.5.0) - sinatra-sugar (0.5.1) - monkey-lib (~> 0.5.0) - sinatra (~> 1.0) - spruz (0.2.13) - tilt (1.3.2) + sinatra (1.3.2) + rack (~> 1.3, >= 1.3.6) + rack-protection (~> 1.2) + tilt (~> 1.3, >= 1.3.3) + sinatra-contrib (1.3.1) + backports (>= 2.0) + eventmachine + rack-protection + rack-test + sinatra (~> 1.3.0) + tilt (~> 1.3) + sinatra-reloader (1.0) + sinatra-contrib + tilt (1.3.3) PLATFORMS ruby @@ -56,5 +59,5 @@ DEPENDENCIES jasmine json sinatra - sinatra-content-for + sinatra-contrib sinatra-reloader diff --git a/5-complete/Gemfile b/5-complete/Gemfile index e13dd28..09a0e53 100644 --- a/5-complete/Gemfile +++ b/5-complete/Gemfile @@ -1,7 +1,7 @@ source :rubygems gem 'sinatra' -gem 'sinatra-content-for' +gem 'sinatra-contrib' gem 'json' group :development do diff --git a/5-complete/Gemfile.lock b/5-complete/Gemfile.lock index 1fc0dff..fbac7fa 100644 --- a/5-complete/Gemfile.lock +++ b/5-complete/Gemfile.lock @@ -1,53 +1,56 @@ GEM remote: http://rubygems.org/ specs: - backports (2.3.0) - childprocess (0.2.2) - ffi (~> 1.0.6) + addressable (2.3.2) + backports (2.6.3) + childprocess (0.3.5) + ffi (~> 1.0, >= 1.0.6) diff-lcs (1.1.3) - ffi (1.0.9) - jasmine (1.0.2.1) - json_pure (>= 1.4.3) - rack (>= 1.1) + eventmachine (0.12.10) + ffi (1.1.5) + jasmine (1.2.1) + jasmine-core (>= 1.2.0) + rack (~> 1.0) rspec (>= 1.3.1) selenium-webdriver (>= 0.1.3) - json (1.6.0) - json_pure (1.5.4) - spruz (~> 0.2.8) - monkey-lib (0.5.4) - backports - rack (1.3.2) - rspec (2.6.0) - rspec-core (~> 2.6.0) - rspec-expectations (~> 2.6.0) - rspec-mocks (~> 2.6.0) - rspec-core (2.6.4) - rspec-expectations (2.6.0) - diff-lcs (~> 1.1.2) - rspec-mocks (2.6.0) - rubyzip (0.9.4) - selenium-webdriver (2.5.0) - childprocess (>= 0.2.1) - ffi (>= 1.0.7) - json_pure + jasmine-core (1.2.0) + json (1.7.4) + libwebsocket (0.1.5) + addressable + multi_json (1.3.6) + rack (1.4.1) + rack-protection (1.2.0) + rack + rack-test (0.6.1) + rack (>= 1.0) + rspec (2.11.0) + rspec-core (~> 2.11.0) + rspec-expectations (~> 2.11.0) + rspec-mocks (~> 2.11.0) + rspec-core (2.11.1) + rspec-expectations (2.11.2) + diff-lcs (~> 1.1.3) + rspec-mocks (2.11.2) + rubyzip (0.9.9) + selenium-webdriver (2.25.0) + childprocess (>= 0.2.5) + libwebsocket (~> 0.1.3) + multi_json (~> 1.0) rubyzip - sinatra (1.2.6) - rack (~> 1.1) - tilt (>= 1.2.2, < 2.0) - sinatra-advanced-routes (0.5.1) - monkey-lib (~> 0.5.0) - sinatra (~> 1.0) - sinatra-sugar (~> 0.5.0) - sinatra-content-for (0.2) - sinatra - sinatra-reloader (0.5.0) - sinatra (~> 1.0) - sinatra-advanced-routes (~> 0.5.0) - sinatra-sugar (0.5.1) - monkey-lib (~> 0.5.0) - sinatra (~> 1.0) - spruz (0.2.13) - tilt (1.3.2) + sinatra (1.3.2) + rack (~> 1.3, >= 1.3.6) + rack-protection (~> 1.2) + tilt (~> 1.3, >= 1.3.3) + sinatra-contrib (1.3.1) + backports (>= 2.0) + eventmachine + rack-protection + rack-test + sinatra (~> 1.3.0) + tilt (~> 1.3) + sinatra-reloader (1.0) + sinatra-contrib + tilt (1.3.3) PLATFORMS ruby @@ -56,5 +59,5 @@ DEPENDENCIES jasmine json sinatra - sinatra-content-for + sinatra-contrib sinatra-reloader