Update Padrino to 0.11.0. (reworded commit)

* Update Gemfile.* * Upgrade Rakefile to comply with new Rakefile format
findoutwho · May 20, 2013 · b761b46 · b761b46
1 parent 126bbb3
commit b761b46
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 42 deletions.
diff --git a/Gemfile b/Gemfile
@@ -24,4 +24,4 @@ group :test do
 end
 
 # Padrino Stable Gem
-gem 'padrino', '0.10.6.e'
+gem 'padrino', '0.11.0'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.7)
+    activesupport (3.2.12)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.3.2)
@@ -11,52 +11,54 @@ GEM
     diff-lcs (1.1.3)
     eventmachine (1.0.0)
     fakeweb (1.3.0)
-    http_router (0.10.2)
+    http_router (0.11.0)
       rack (>= 1.0.0)
       url_mount (~> 0.2.1)
-    i18n (0.6.0)
-    mail (2.3.3)
+    i18n (0.6.4)
+    mail (2.5.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     method_source (0.8)
-    mime-types (1.19)
-    multi_json (1.3.6)
+    mime-types (1.21)
+    multi_json (1.7.2)
     nokogiri (1.5.5)
-    padrino (0.10.6.e)
-      padrino-admin (= 0.10.6.e)
-      padrino-cache (= 0.10.6.e)
-      padrino-core (= 0.10.6.e)
-      padrino-gen (= 0.10.6.e)
-      padrino-helpers (= 0.10.6.e)
-      padrino-mailer (= 0.10.6.e)
-    padrino-admin (0.10.6.e)
-      padrino-core (= 0.10.6.e)
-      padrino-helpers (= 0.10.6.e)
-    padrino-cache (0.10.6.e)
-      padrino-core (= 0.10.6.e)
-    padrino-core (0.10.6.e)
-      activesupport (~> 3.2.0)
-      http_router (~> 0.10.2)
-      sinatra (~> 1.3.1)
-      thor (~> 0.14.3)
+    padrino (0.11.0)
+      padrino-admin (= 0.11.0)
+      padrino-cache (= 0.11.0)
+      padrino-core (= 0.11.0)
+      padrino-gen (= 0.11.0)
+      padrino-helpers (= 0.11.0)
+      padrino-mailer (= 0.11.0)
+    padrino-admin (0.11.0)
+      padrino-core (= 0.11.0)
+      padrino-helpers (= 0.11.0)
+    padrino-cache (0.11.0)
+      padrino-core (= 0.11.0)
+      padrino-helpers (= 0.11.0)
+    padrino-core (0.11.0)
+      activesupport (>= 3.1.0)
+      http_router (~> 0.11.0)
+      rack-protection (>= 1.5.0)
+      sinatra (~> 1.4.2)
+      thor (~> 0.17.0)
       tilt (~> 1.3.0)
-    padrino-gen (0.10.6.e)
+    padrino-gen (0.11.0)
       bundler (~> 1.0)
-      padrino-core (= 0.10.6.e)
-    padrino-helpers (0.10.6.e)
+      padrino-core (= 0.11.0)
+    padrino-helpers (0.11.0)
       i18n (~> 0.6)
-      padrino-core (= 0.10.6.e)
-    padrino-mailer (0.10.6.e)
-      mail (~> 2.3.0)
-      padrino-core (= 0.10.6.e)
+      padrino-core (= 0.11.0)
+    padrino-mailer (0.11.0)
+      mail (~> 2.5.3)
+      padrino-core (= 0.11.0)
     polyglot (0.3.3)
     pry (0.9.10)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.3.1)
-    rack (1.4.1)
-    rack-protection (1.2.0)
+    rack (1.5.2)
+    rack-protection (1.5.0)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
@@ -69,20 +71,20 @@ GEM
     rspec-expectations (2.11.2)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.11.1)
-    sinatra (1.3.2)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
+    sinatra (1.4.2)
+      rack (~> 1.5, >= 1.5.2)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
     sinatra-flash (0.3.0)
       sinatra (>= 1.0.0)
     slop (3.3.3)
     thin (1.4.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
-    thor (0.14.6)
-    tilt (1.3.3)
-    treetop (1.4.10)
+    thor (0.17.0)
+    tilt (1.3.6)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
     url_mount (0.2.1)
@@ -99,7 +101,7 @@ DEPENDENCIES
   capybara
   fakeweb
   nokogiri
-  padrino (= 0.10.6.e)
+  padrino (= 0.11.0)
   pry
   rack-test
   rake

diff --git a/Rakefile b/Rakefile
@@ -1,3 +1,3 @@
-require File.expand_path('../config/boot.rb', __FILE__)
 require 'padrino-core/cli/rake'
+PadrinoTasks.use(:database)
 PadrinoTasks.init