From c92c69cfa330c44c43f713d9eb034bd9176bf08c Mon Sep 17 00:00:00 2001
From: kei <kei.shiratsuchi@gmail.com>
Date: Tue, 26 Nov 2013 16:13:41 +0900
Subject: [PATCH 1/2] upgrade ruby version


From 2480ff9fea2d3dfb31a934d89b05224a111e75d9 Mon Sep 17 00:00:00 2001
From: kei <kei.shiratsuchi@gmail.com>
Date: Tue, 10 Dec 2013 12:29:57 +0900
Subject: [PATCH 2/2] bundle update

---
 Gemfile      |   4 +-
 Gemfile.lock | 108 +++++++++++++++++++++------------------------------
 2 files changed, 47 insertions(+), 65 deletions(-)

diff --git a/Gemfile b/Gemfile
index 386ff27..3e32bb4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,15 +5,15 @@ gem 'haml'
 gem 'github-markup'
 gem 'redcarpet'
 gem 'RedCloth'
-gem 'rdoc'
+gem 'rdoc', '3.6.1'
 gem 'org-ruby'
 gem 'creole'
 gem 'wikicloth'
 gem 'thin' # better performance on heroku + long urls possible
-gem 'heroku'
 
 group :test do
   gem 'rake'
   gem 'rspec'
   gem 'capybara'
+  gem 'selenium-webdriver'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 82388ee..78d4c21 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,86 +2,68 @@ GEM
   remote: http://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    addressable (2.3.2)
-    builder (3.1.4)
-    capybara (2.0.1)
+    builder (3.2.2)
+    capybara (2.2.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 1.0.0)
-    childprocess (0.3.6)
-      ffi (~> 1.0, >= 1.0.6)
+      xpath (~> 2.0)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
     creole (0.5.0)
     daemons (1.1.9)
-    diff-lcs (1.1.3)
-    eventmachine (1.0.0)
-    excon (0.16.10)
+    diff-lcs (1.2.5)
+    eventmachine (1.0.3)
     expression_parser (0.9.0)
-    ffi (1.2.0)
-    github-markup (0.7.5)
-    haml (3.1.7)
-    heroku (2.33.5)
-      heroku-api (~> 0.3.7)
-      launchy (>= 0.3.2)
-      netrc (~> 0.7.7)
-      rest-client (~> 1.6.1)
-      rubyzip
-    heroku-api (0.3.7)
-      excon (~> 0.16.10)
-    json (1.7.5)
-    launchy (2.1.2)
-      addressable (~> 2.3)
-    libwebsocket (0.1.7.1)
-      addressable
-      websocket
-    mime-types (1.19)
-    multi_json (1.5.0)
-    netrc (0.7.7)
-    nokogiri (1.5.6)
-    org-ruby (0.7.2)
+    ffi (1.9.3)
+    github-markup (1.0.0)
+    haml (4.0.4)
+      tilt
+    mime-types (2.0)
+    mini_portile (0.5.2)
+    multi_json (1.8.2)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
+    org-ruby (0.8.2)
       rubypants (>= 0.2.0)
-    rack (1.4.1)
-    rack-protection (1.3.2)
+    rack (1.5.2)
+    rack-protection (1.5.1)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rake (10.0.3)
-    rdoc (3.12)
-      json (~> 1.4)
-    redcarpet (2.2.2)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.1)
+    rake (10.1.0)
+    rdoc (3.6.1)
+    redcarpet (3.0.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.4)
     rubypants (0.2.0)
-    rubyzip (0.9.9)
-    selenium-webdriver (2.27.2)
+    rubyzip (1.1.0)
+    selenium-webdriver (2.38.0)
       childprocess (>= 0.2.5)
-      libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
-      rubyzip
-    sinatra (1.3.3)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
-    thin (1.5.0)
+      rubyzip (~> 1.0)
+      websocket (~> 1.0.4)
+    sinatra (1.4.4)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
+    thin (1.6.1)
       daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
+      eventmachine (>= 1.0.0)
       rack (>= 1.0.0)
-    tilt (1.3.3)
-    websocket (1.0.6)
+    tilt (1.4.1)
+    websocket (1.0.7)
     wikicloth (0.8.0)
       builder
       expression_parser
-    xpath (1.0.0)
+    xpath (2.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
@@ -93,12 +75,12 @@ DEPENDENCIES
   creole
   github-markup
   haml
-  heroku
   org-ruby
   rake
-  rdoc
+  rdoc (= 3.6.1)
   redcarpet
   rspec
+  selenium-webdriver
   sinatra
   thin
   wikicloth