Remove ruby-debug and clean up gemfiles so 3.1 is green

jwang · Nov 14, 2011 · 2a0d993 · 2a0d993
1 parent d4bdd12
commit 2a0d993
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 44 deletions.
diff --git a/Appraisals b/Appraisals
@@ -8,5 +8,9 @@ end
 
 appraise "3.1" do
   gem "rails", "~> 3.1.0"
+  gem "jquery-rails"
+  gem "uglifier"
+  gem "sass-rails"
+  gem "coffee-rails"
 end
 
diff --git a/Gemfile b/Gemfile
@@ -11,7 +11,6 @@ gem "cucumber", "~> 0.10.0"
 gem "sinatra", :require => false
 gem "yard", :require => false
 gem "aruba", "~> 0.3.2"
-gem "ruby-debug"
 gem "thin"
 gem "i18n"
 gem "appraisal", :require => false

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -45,7 +45,6 @@ GEM
     builder (3.0.0)
     childprocess (0.2.2)
       ffi (~> 1.0.6)
-    columnize (0.3.4)
     crack (0.1.8)
     cucumber (0.10.7)
       builder (>= 2.1.2)
@@ -63,8 +62,6 @@ GEM
     hike (1.2.1)
     i18n (0.6.0)
     json (1.5.4)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
     mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -99,7 +96,6 @@ GEM
       rdoc (~> 3.4)
       thor (~> 0.14.6)
     rake (0.9.2)
-    rbx-require-relative (0.0.5)
     rdoc (3.9.4)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
@@ -109,11 +105,6 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
     sham_rack (1.3.3)
       rack
     sinatra (1.2.6)
@@ -154,7 +145,6 @@ DEPENDENCIES
   rails (~> 3.1.0)
   rake (= 0.9.2)
   rspec (~> 2.3)
-  ruby-debug
   sham_rack
   sinatra
   sqlite3-ruby

diff --git a/gemfiles/2.3.gemfile b/gemfiles/2.3.gemfile
@@ -2,7 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "ruby-debug"
 gem "rails", "~> 2.3"
 gem "sqlite3-ruby", :require=>false
 gem "rake", "0.9.2"

diff --git a/gemfiles/2.3.gemfile.lock b/gemfiles/2.3.gemfile.lock
@@ -23,7 +23,6 @@ GEM
     builder (3.0.0)
     childprocess (0.2.2)
       ffi (~> 1.0.6)
-    columnize (0.3.4)
     cucumber (0.10.7)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
@@ -38,8 +37,6 @@ GEM
       json (>= 1.4.6)
     i18n (0.6.0)
     json (1.5.4)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
     mocha (0.9.8)
       rake
     rack (1.1.2)
@@ -51,7 +48,6 @@ GEM
       activesupport (= 2.3.14)
       rake (>= 0.8.3)
     rake (0.9.2)
-    rbx-require-relative (0.0.5)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -60,11 +56,6 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
     sham_rack (1.3.3)
       rack
     sinatra (1.2.6)
@@ -94,7 +85,6 @@ DEPENDENCIES
   rails (~> 2.3)
   rake (= 0.9.2)
   rspec (~> 2.3)
-  ruby-debug
   sham_rack
   sinatra
   sqlite3-ruby

diff --git a/gemfiles/3.0.gemfile b/gemfiles/3.0.gemfile
@@ -2,7 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "ruby-debug"
 gem "rails", "~> 3.0.3"
 gem "sqlite3-ruby", :require=>false
 gem "rake", "0.9.2"

diff --git a/gemfiles/3.0.gemfile.lock b/gemfiles/3.0.gemfile.lock
@@ -42,7 +42,6 @@ GEM
     builder (2.1.2)
     childprocess (0.2.2)
       ffi (~> 1.0.6)
-    columnize (0.3.4)
     crack (0.1.8)
     cucumber (0.10.7)
       builder (>= 2.1.2)
@@ -60,8 +59,6 @@ GEM
       json (>= 1.4.6)
     i18n (0.5.0)
     json (1.5.4)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -91,7 +88,6 @@ GEM
       rdoc (~> 3.4)
       thor (~> 0.14.4)
     rake (0.9.2)
-    rbx-require-relative (0.0.5)
     rdoc (3.9.4)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
@@ -101,11 +97,6 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
     sham_rack (1.3.3)
       rack
     sinatra (1.2.6)
@@ -142,7 +133,6 @@ DEPENDENCIES
   rails (~> 3.0.3)
   rake (= 0.9.2)
   rspec (~> 2.3)
-  ruby-debug
   sham_rack
   sinatra
   sqlite3-ruby

diff --git a/gemfiles/3.1.gemfile b/gemfiles/3.1.gemfile
@@ -2,8 +2,11 @@
 
 source "http://rubygems.org"
 
-gem "ruby-debug"
+gem "coffee-rails"
+gem "uglifier"
+gem "jquery-rails"
 gem "rails", "~> 3.1.0"
+gem "sass-rails"
 gem "sqlite3-ruby", :require=>false
 gem "rake", "0.9.2"
 gem "bourne"

diff --git a/gemfiles/3.1.gemfile.lock b/gemfiles/3.1.gemfile.lock
@@ -45,7 +45,13 @@ GEM
     builder (3.0.0)
     childprocess (0.2.2)
       ffi (~> 1.0.6)
-    columnize (0.3.4)
+    coffee-rails (3.1.1)
+      coffee-script (>= 2.2.0)
+      railties (~> 3.1.0)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.1.3)
     crack (0.1.8)
     cucumber (0.10.7)
       builder (>= 2.1.2)
@@ -57,14 +63,17 @@ GEM
     diff-lcs (1.1.3)
     erubis (2.7.0)
     eventmachine (0.12.10)
+    execjs (1.2.9)
+      multi_json (~> 1.0)
     ffi (1.0.9)
     gherkin (2.4.18)
       json (>= 1.4.6)
     hike (1.2.1)
     i18n (0.6.0)
+    jquery-rails (1.0.17)
+      railties (~> 3.0)
+      thor (~> 0.14)
     json (1.5.4)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
     mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -99,7 +108,6 @@ GEM
       rdoc (~> 3.4)
       thor (~> 0.14.6)
     rake (0.9.2)
-    rbx-require-relative (0.0.5)
     rdoc (3.9.4)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
@@ -109,11 +117,13 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
+    sass (3.1.10)
+    sass-rails (3.1.4)
+      actionpack (~> 3.1.0)
+      railties (~> 3.1.0)
+      sass (>= 3.1.4)
+      sprockets (~> 2.0.0)
+      tilt (~> 1.3.2)
     sham_rack (1.3.3)
       rack
     sinatra (1.2.6)
@@ -137,6 +147,9 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.29)
+    uglifier (1.0.4)
+      execjs (>= 0.3.0)
+      multi_json (>= 1.0.2)
     webmock (1.7.6)
       addressable (> 2.2.5, ~> 2.2)
       crack (>= 0.1.7)
@@ -149,15 +162,18 @@ DEPENDENCIES
   appraisal
   aruba (~> 0.3.2)
   bourne
+  coffee-rails
   cucumber (~> 0.10.0)
   i18n
+  jquery-rails
   rails (~> 3.1.0)
   rake (= 0.9.2)
   rspec (~> 2.3)
-  ruby-debug
+  sass-rails
   sham_rack
   sinatra
   sqlite3-ruby
   thin
+  uglifier
   webmock
   yard