Permalink
Browse files

Run on Rails 4

  • Loading branch information...
1 parent 34607d0 commit ca694009b39fe0c6fc6d057f435c13bb5633596a @carlosantoniodasilva carlosantoniodasilva committed May 7, 2013
Showing with 52 additions and 43 deletions.
  1. +7 −0 .travis.yml
  2. +3 −1 Gemfile
  3. +32 −40 Gemfile.lock
  4. +8 −0 gemfiles/Gemfile-rails.3.2.x
  5. +2 −2 show_for.gemspec
View
@@ -8,7 +8,14 @@ rvm:
gemfile:
- gemfiles/Gemfile-rails.3.0.x
- gemfiles/Gemfile-rails.3.1.x
+ - gemfiles/Gemfile-rails.3.2.x
- Gemfile
+matrix:
+ exclude:
+ - rvm: 1.8.7
+ gemfile: Gemfile
+ - rvm: jruby
+ gemfile: Gemfile
notifications:
email: false
campfire:
View
@@ -4,4 +4,6 @@ gemspec
gem "rake"
gem "rdoc"
-gem "railties"
+gem "railties", "~> 4.0.0.rc1"
+gem "activemodel", "~> 4.0.0.rc1"
+gem "actionpack", "~> 4.0.0.rc1"
View
@@ -2,65 +2,57 @@ PATH
remote: .
specs:
show_for (0.2.6)
- actionpack (~> 3.0)
- activemodel (~> 3.0)
+ actionpack (>= 3.0, < 5)
+ activemodel (>= 3.0, < 5)
GEM
remote: https://rubygems.org/
specs:
- actionpack (3.2.13)
- activemodel (= 3.2.13)
- activesupport (= 3.2.13)
- builder (~> 3.0.0)
+ actionpack (4.0.0.rc1)
+ activesupport (= 4.0.0.rc1)
+ builder (~> 3.1.0)
erubis (~> 2.7.0)
- journey (~> 1.0.4)
- rack (~> 1.4.5)
- rack-cache (~> 1.2)
- rack-test (~> 0.6.1)
- sprockets (~> 2.2.1)
- activemodel (3.2.13)
- activesupport (= 3.2.13)
- builder (~> 3.0.0)
- activesupport (3.2.13)
- i18n (= 0.6.1)
- multi_json (~> 1.0)
- builder (3.0.4)
+ rack (~> 1.5.2)
+ rack-test (~> 0.6.2)
+ activemodel (4.0.0.rc1)
+ activesupport (= 4.0.0.rc1)
+ builder (~> 3.1.0)
+ activesupport (4.0.0.rc1)
+ i18n (~> 0.6, >= 0.6.4)
+ minitest (~> 4.2)
+ multi_json (~> 1.3)
+ thread_safe (~> 0.1)
+ tzinfo (~> 0.3.37)
+ atomic (1.1.9)
+ builder (3.1.4)
erubis (2.7.0)
- hike (1.2.2)
- i18n (0.6.1)
- journey (1.0.4)
+ i18n (0.6.4)
json (1.7.7)
+ minitest (4.7.4)
multi_json (1.7.3)
- rack (1.4.5)
- rack-cache (1.2)
- rack (>= 0.4)
- rack-ssl (1.3.3)
- rack
+ rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
- railties (3.2.13)
- actionpack (= 3.2.13)
- activesupport (= 3.2.13)
- rack-ssl (~> 1.3.2)
+ railties (4.0.0.rc1)
+ actionpack (= 4.0.0.rc1)
+ activesupport (= 4.0.0.rc1)
rake (>= 0.8.7)
- rdoc (~> 3.4)
- thor (>= 0.14.6, < 2.0)
+ thor (>= 0.18.1, < 2.0)
rake (10.0.4)
- rdoc (3.12.2)
+ rdoc (4.0.1)
json (~> 1.4)
- sprockets (2.2.2)
- hike (~> 1.2)
- multi_json (~> 1.0)
- rack (~> 1.0)
- tilt (~> 1.1, != 1.3.0)
thor (0.18.1)
- tilt (1.4.0)
+ thread_safe (0.1.0)
+ atomic
+ tzinfo (0.3.37)
PLATFORMS
ruby
DEPENDENCIES
- railties
+ actionpack (~> 4.0.0.rc1)
+ activemodel (~> 4.0.0.rc1)
+ railties (~> 4.0.0.rc1)
rake
rdoc
show_for!
@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+gem "rake"
+gem "rdoc"
+gem 'show_for', :path => '..'
+gem 'activemodel', '~> 3.2.0'
+gem 'actionpack', '~> 3.2.0'
+gem 'railties', '~> 3.2.0'
View
@@ -18,6 +18,6 @@ Gem::Specification.new do |s|
s.rubyforge_project = "show_for"
- s.add_dependency('activemodel', '~> 3.0')
- s.add_dependency('actionpack', '~> 3.0')
+ s.add_dependency('activemodel', '>= 3.0', '< 5')
+ s.add_dependency('actionpack', '>= 3.0', '< 5')
end

0 comments on commit ca69400

Please sign in to comment.