Permalink
Browse files

Bundle update, fix deprecation and make `bundle console` work

  • Loading branch information...
1 parent 4f200bb commit 427cdcbb931f3eea96940726b1b6b7b3a0a6f564 @carlosantoniodasilva carlosantoniodasilva committed May 12, 2012
Showing with 22 additions and 21 deletions.
  1. +18 −16 Gemfile.lock
  2. +1 −1 Rakefile
  3. +2 −1 lib/show_for.rb
  4. +1 −3 test/test_helper.rb
View
@@ -8,42 +8,44 @@ PATH
GEM
remote: http://rubygems.org/
specs:
- actionpack (3.2.0)
- activemodel (= 3.2.0)
- activesupport (= 3.2.0)
+ actionpack (3.2.3)
+ activemodel (= 3.2.3)
+ activesupport (= 3.2.3)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- journey (~> 1.0.0)
+ journey (~> 1.0.1)
rack (~> 1.4.0)
- rack-cache (~> 1.1)
+ rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.1.2)
- activemodel (3.2.0)
- activesupport (= 3.2.0)
+ activemodel (3.2.3)
+ activesupport (= 3.2.3)
builder (~> 3.0.0)
- activesupport (3.2.0)
+ activesupport (3.2.3)
i18n (~> 0.6)
multi_json (~> 1.0)
builder (3.0.0)
- columnize (0.3.2)
+ columnize (0.3.6)
erubis (2.7.0)
hike (1.2.1)
i18n (0.6.0)
- journey (1.0.0)
- linecache (0.43)
- multi_json (1.0.4)
- rack (1.4.0)
- rack-cache (1.1)
+ journey (1.0.3)
+ linecache (0.46)
+ rbx-require-relative (> 0.0.4)
+ multi_json (1.3.5)
+ rack (1.4.1)
+ rack-cache (1.2)
rack (>= 0.4)
rack-test (0.6.1)
rack (>= 1.0)
- rake (0.8.7)
+ rake (0.9.2.2)
+ rbx-require-relative (0.0.9)
ruby-debug (0.10.4)
columnize (>= 0.1)
ruby-debug-base (~> 0.10.4.0)
ruby-debug-base (0.10.4)
linecache (>= 0.3)
- sprockets (2.1.2)
+ sprockets (2.1.3)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
View
@@ -4,7 +4,7 @@ require 'bundler'
Bundler::GemHelper.install_tasks
require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
desc 'Default: run unit tests.'
task :default => :test
View
@@ -1,3 +1,4 @@
+require 'action_view'
require 'show_for/helper'
module ShowFor
@@ -44,7 +45,7 @@ module ShowFor
mattr_accessor :association_methods
@@association_methods = [ :name, :title, :to_s ]
-
+
mattr_accessor :label_proc
@@label_proc = nil
View
@@ -1,7 +1,5 @@
require 'rubygems'
-require 'bundler'
-
-Bundler.setup
+require 'bundler/setup'
require 'test/unit'

0 comments on commit 427cdcb

Please sign in to comment.