Permalink
Browse files

Flexed rails requirements and added travis.yml

  • Loading branch information...
1 parent 81390a1 commit 6ac328b15432e69ea4d515715a67e68b0a7b72bc @justinweiss committed Mar 6, 2012
Showing with 22 additions and 7 deletions.
  1. +14 −0 .travis.yml
  2. +1 −1 Gemfile
  3. +4 −4 Gemfile.lock
  4. +3 −2 reactive_resource.gemspec
View
@@ -0,0 +1,14 @@
+language: ruby
+rvm:
+ - 1.8.7
+ - 1.9.2
+ - 1.9.3
+ - jruby-18mode # JRuby in 1.8 mode
+ - jruby-19mode # JRuby in 1.9 mode
+ - rbx-18mode
+ - rbx-19mode
+env:
+ - RAILS_VERSION=3.0.0
+ - RAILS_VERSION=3.1.0
+# Isn't compatible w / 3.2 yet
+# - RAILS_VERSION=3.2.0
View
@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source :rubygems
# Specify your gem's dependencies in reactive_resource.gemspec
gemspec
View
@@ -2,8 +2,8 @@ PATH
remote: .
specs:
reactive_resource (0.6.1)
- activeresource (>= 3.1.0)
- activesupport (>= 3.1.0)
+ activeresource (~> 3.1.0, >= 3.0)
+ activesupport (~> 3.1.0, >= 3.0)
GEM
remote: http://rubygems.org/
@@ -21,8 +21,8 @@ GEM
builder (3.0.0)
crack (0.1.8)
i18n (0.6.0)
- multi_json (1.0.4)
- rake (0.8.7)
+ multi_json (1.1.0)
+ rake (0.9.2)
shoulda (2.11.3)
webmock (1.6.2)
addressable (>= 2.2.2)
@@ -1,4 +1,5 @@
# -*- encoding: utf-8 -*-
+rails_version = ENV.key?('RAILS_VERSION') ? "~> #{ENV['RAILS_VERSION']}" : ['>= 3.0', '~> 3.1.0']
$:.push File.expand_path("../lib", __FILE__)
require "reactive_resource/version"
@@ -14,8 +15,8 @@ Gem::Specification.new do |s|
s.rubyforge_project = "reactive_resource"
- s.add_dependency "activeresource", '>= 3.1.0'
- s.add_dependency "activesupport", '>= 3.1.0'
+ s.add_dependency "activeresource", rails_version
+ s.add_dependency "activesupport", rails_version
s.add_development_dependency "shoulda", '~> 2.11.3'
s.add_development_dependency "webmock", '~> 1.6.1'

0 comments on commit 6ac328b

Please sign in to comment.