Permalink
Browse files

Fix some appraisals / tests failing on Ruby 2.0.0 / Rubinius / JRuby

Change Transition.pause_supported? to whitelist Ruby engines instead of blacklist them
  • Loading branch information...
1 parent 4f3cf86 commit ead10c2f855d252464d1007e29fcbc21bcb82a7e @obrie obrie committed Mar 6, 2013
Showing with 269 additions and 71 deletions.
  1. +38 −8 Appraisals
  2. +7 −0 gemfiles/active_model-3.2.13.rc1.gemfile
  3. +36 −0 gemfiles/active_model-3.2.13.rc1.gemfile.lock
  4. +9 −0 gemfiles/active_record-3.2.13.rc1.gemfile
  5. +51 −0 gemfiles/active_record-3.2.13.rc1.gemfile.lock
  6. +1 −0 gemfiles/mongo_mapper-0.10.0.gemfile
  7. +8 −7 gemfiles/mongo_mapper-0.10.0.gemfile.lock
  8. +1 −0 gemfiles/mongo_mapper-0.11.2.gemfile
  9. +5 −4 gemfiles/mongo_mapper-0.11.2.gemfile.lock
  10. +1 −0 gemfiles/mongo_mapper-0.12.0.gemfile
  11. +5 −4 gemfiles/mongo_mapper-0.12.0.gemfile.lock
  12. +1 −0 gemfiles/mongoid-2.4.0.gemfile
  13. +5 −4 gemfiles/mongoid-2.4.0.gemfile.lock
  14. +1 −0 gemfiles/mongoid-2.4.10.gemfile
  15. +5 −4 gemfiles/mongoid-2.4.10.gemfile.lock
  16. +1 −0 gemfiles/mongoid-2.5.2.gemfile
  17. +5 −4 gemfiles/mongoid-2.5.2.gemfile.lock
  18. +1 −0 gemfiles/mongoid-2.6.0.gemfile
  19. +5 −4 gemfiles/mongoid-2.6.0.gemfile.lock
  20. +1 −0 gemfiles/mongoid-3.0.0.gemfile
  21. +5 −4 gemfiles/mongoid-3.0.0.gemfile.lock
  22. +1 −0 gemfiles/mongoid-3.0.22.gemfile
  23. +5 −4 gemfiles/mongoid-3.0.22.gemfile.lock
  24. +1 −0 gemfiles/mongoid-3.1.0.gemfile
  25. +5 −4 gemfiles/mongoid-3.1.0.gemfile.lock
  26. +1 −1 lib/state_machine/transition.rb
  27. +1 −2 test/unit/integrations/active_model_test.rb
  28. +10 −2 test/unit/integrations/active_record_test.rb
  29. +16 −5 test/unit/integrations/data_mapper_test.rb
  30. +10 −2 test/unit/integrations/mongo_mapper_test.rb
  31. +10 −2 test/unit/integrations/mongoid_test.rb
  32. +17 −6 test/unit/integrations/sequel_test.rb
View
@@ -63,21 +63,23 @@ if RUBY_VERSION < "2.0.0"
end
end
-if RUBY_VERSION > "1.8.6"
+if RUBY_VERSION > "1.8.6" && RUBY_PLATFORM != "java"
appraise "active_record-3.0.0" do
gem "sqlite3-ruby", "1.3.1", :platform => [:ruby, :mswin, :mingw]
gem "activerecord", "3.0.0"
gem "activerecord-jdbcsqlite3-adapter", "1.2.7", :platform => :jruby
end
+end
+if RUBY_VERSION > "1.8.6"
appraise "active_record-3.0.5" do
gem "sqlite3-ruby", "1.3.1", :platform => [:ruby, :mswin, :mingw]
gem "activerecord", "3.0.5"
gem "activerecord-jdbcsqlite3-adapter", "1.2.7", :platform => :jruby
end
end
-if RUBY_VERSION > "1.8.6" && RUBY_VERSION != "1.9.1"
+if RUBY_VERSION > "1.8.6" && RUBY_VERSION != "1.9.1" && RUBY_VERSION < "2.0.0"
appraise "active_record-3.1.1" do
gem "sqlite3", "1.3.6", :platform => [:ruby, :mswin, :mingw]
gem "activerecord", "3.1.1"
@@ -91,6 +93,14 @@ if RUBY_VERSION > "1.8.6" && RUBY_VERSION != "1.9.1"
end
end
+if RUBY_VERSION > "1.8.6" && RUBY_VERSION != "1.9.1"
+ appraise "active_record-3.2.13.rc1" do
+ gem "sqlite3", "1.3.6", :platform => [:ruby, :mswin, :mingw]
+ gem "activerecord", "3.2.13.rc1"
+ gem "activerecord-jdbcsqlite3-adapter", "1.2.7", :platform => :jruby
+ end
+end
+
if RUBY_VERSION > "1.9.2"
appraise "active_record-4.0.0" do
gem "sqlite3", "1.3.6"
@@ -102,7 +112,7 @@ if RUBY_VERSION > "1.9.2"
end
# ActiveModel integrations
-if RUBY_VERSION > "1.8.6"
+if RUBY_VERSION > "1.8.6" && RUBY_VERSION < "2.0.0"
appraise "active_model-3.0.0" do
gem "activemodel", "3.0.0"
end
@@ -120,6 +130,12 @@ if RUBY_VERSION > "1.8.6"
end
end
+if RUBY_VERSION > "1.8.6"
+ appraise "active_model-3.2.13.rc1" do
+ gem "activemodel", "3.2.13.rc1"
+ end
+end
+
if RUBY_VERSION > "1.9.2"
appraise "active_model-4.0.0" do
gem "activemodel", "4.0.0.beta", :git => "git://github.com/rails/rails.git", :ref => "4e286bf"
@@ -156,7 +172,9 @@ if RUBY_VERSION > "1.8.6" && RUBY_VERSION < "2.0.0"
gem "activesupport", "2.3.11"
gem "mongo_mapper", "0.7.0"
end
+end
+if RUBY_VERSION > "1.8.6" && RUBY_VERSION < "2.0.0" && (!defined?(RUBY_ENGINE) || RUBY_ENGINE != 'rbx')
appraise "mongo_mapper-0.7.5" do
gem "activesupport", "2.3.11"
gem "mongo_mapper", "0.7.5"
@@ -175,7 +193,9 @@ if RUBY_VERSION > "1.8.6" && RUBY_VERSION < "2.0.0"
gem "plucky", "0.3.3"
gem "mongo_mapper", "0.8.3"
end
+end
+if RUBY_VERSION > "1.8.6" && RUBY_VERSION < "2.0.0"
appraise "mongo_mapper-0.8.4" do
gem "activesupport", "2.3.11"
gem "mongo_mapper", "0.8.4"
@@ -187,31 +207,34 @@ if RUBY_VERSION > "1.8.6" && RUBY_VERSION < "2.0.0"
end
end
+# MongoMapper 0.9.0+ breaks on Ruby 1.9.1
if RUBY_VERSION > "1.8.6" && RUBY_VERSION != "1.9.1" && RUBY_VERSION < "2.0.0"
appraise "mongo_mapper-0.9.0" do
gem "mongo_mapper", "0.9.0"
end
end
-# MongoMapper 0.9.0+ breaks on Ruby 1.9.1
if RUBY_VERSION > "1.8.6" && RUBY_VERSION != "1.9.1"
appraise "mongo_mapper-0.10.0" do
+ gem "activemodel", "3.2.13.rc1"
gem "mongo_mapper", "0.10.0"
end
appraise "mongo_mapper-0.11.2" do
+ gem "activemodel", "3.2.13.rc1"
gem "mongo", "~> 1.7.0"
gem "mongo_mapper", "0.11.2"
end
appraise "mongo_mapper-0.12.0" do
+ gem "activemodel", "3.2.13.rc1"
gem "mongo", "~> 1.7.0"
gem "mongo_mapper", "0.12.0"
end
end
# Mongoid integrations
-if RUBY_VERSION > "1.8.6"
+if RUBY_VERSION > "1.8.6" && RUBY_VERSION < "2.0.0"
appraise "mongoid-2.0.0" do
gem "activemodel", "~> 3.1.0"
gem "mongo", "~> 1.7.0"
@@ -235,38 +258,47 @@ if RUBY_VERSION > "1.8.6"
gem "mongo", "~> 1.7.0"
gem "mongoid", "2.3.3"
end
-
+end
+
+if RUBY_VERSION > "1.8.6"
appraise "mongoid-2.4.0" do
+ gem "activemodel", "3.2.13.rc1"
gem "mongo", "~> 1.7.0"
gem "mongoid", "2.4.0"
end
appraise "mongoid-2.4.10" do
+ gem "activemodel", "3.2.13.rc1"
gem "mongo", "~> 1.7.0"
gem "mongoid", "2.4.10"
end
appraise "mongoid-2.5.2" do
+ gem "activemodel", "3.2.13.rc1"
gem "mongo", "~> 1.7.0"
gem "mongoid", "2.5.2"
end
appraise "mongoid-2.6.0" do
+ gem "activemodel", "3.2.13.rc1"
gem "mongo", "~> 1.7.0"
gem "mongoid", "2.6.0"
end
end
if RUBY_VERSION > "1.9.2"
appraise "mongoid-3.0.0" do
+ gem "activemodel", "3.2.13.rc1"
gem "mongoid", "3.0.0"
end
appraise "mongoid-3.0.22" do
+ gem "activemodel", "3.2.13.rc1"
gem "mongoid", "3.0.22"
end
appraise "mongoid-3.1.0" do
+ gem "activemodel", "3.2.13.rc1"
gem "mongoid", "3.1.0"
end
end
@@ -374,9 +406,7 @@ if RUBY_VERSION < "1.9.1" && RUBY_PLATFORM != 'java' && (!defined?(RUBY_ENGINE)
gem "data_objects", "0.9.11"
gem "do_sqlite3", "0.9.11"
end
-end
-if RUBY_VERSION < "1.9.1" && RUBY_PLATFORM != 'java'
appraise "data_mapper-0.10.2" do
gem "dm-core", "0.10.2"
gem "dm-migrations", "0.10.2"
@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://www.rubygems.org"
+
+gem "activemodel", "3.2.13.rc1"
+
+gemspec :path=>"../"
@@ -0,0 +1,36 @@
+PATH
+ remote: /home/aaron/Projects/Personal/pluginaweek/state_machine
+ specs:
+ state_machine (1.1.2)
+
+GEM
+ remote: http://www.rubygems.org/
+ specs:
+ activemodel (3.2.13.rc1)
+ activesupport (= 3.2.13.rc1)
+ builder (~> 3.0.0)
+ activesupport (3.2.13.rc1)
+ i18n (= 0.6.1)
+ multi_json (~> 1.0)
+ appraisal (0.4.1)
+ bundler
+ rake
+ builder (3.0.4)
+ i18n (0.6.1)
+ multi_json (1.6.1)
+ rake (10.0.3)
+ simplecov (0.7.1)
+ multi_json (~> 1.0)
+ simplecov-html (~> 0.7.1)
+ simplecov-html (0.7.1)
+
+PLATFORMS
+ java
+ ruby
+
+DEPENDENCIES
+ activemodel (= 3.2.13.rc1)
+ appraisal (~> 0.4.0)
+ rake
+ simplecov
+ state_machine!
@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "http://www.rubygems.org"
+
+gem "sqlite3", "1.3.6", :platform=>[:ruby, :mswin, :mingw]
+gem "activerecord", "3.2.13.rc1"
+gem "activerecord-jdbcsqlite3-adapter", "1.2.7", :platform=>:jruby
+
+gemspec :path=>"../"
@@ -0,0 +1,51 @@
+PATH
+ remote: /home/aaron/Projects/Personal/pluginaweek/state_machine
+ specs:
+ state_machine (1.1.2)
+
+GEM
+ remote: http://www.rubygems.org/
+ specs:
+ activemodel (3.2.13.rc1)
+ activesupport (= 3.2.13.rc1)
+ builder (~> 3.0.0)
+ activerecord (3.2.13.rc1)
+ activemodel (= 3.2.13.rc1)
+ activesupport (= 3.2.13.rc1)
+ arel (~> 3.0.2)
+ tzinfo (~> 0.3.29)
+ activerecord-jdbc-adapter (1.2.7)
+ activerecord-jdbcsqlite3-adapter (1.2.7)
+ activerecord-jdbc-adapter (~> 1.2.7)
+ jdbc-sqlite3 (~> 3.7.2)
+ activesupport (3.2.13.rc1)
+ i18n (= 0.6.1)
+ multi_json (~> 1.0)
+ appraisal (0.4.1)
+ bundler
+ rake
+ arel (3.0.2)
+ builder (3.0.4)
+ i18n (0.6.1)
+ jdbc-sqlite3 (3.7.2.1)
+ multi_json (1.6.1)
+ rake (10.0.3)
+ simplecov (0.7.1)
+ multi_json (~> 1.0)
+ simplecov-html (~> 0.7.1)
+ simplecov-html (0.7.1)
+ sqlite3 (1.3.6)
+ tzinfo (0.3.35)
+
+PLATFORMS
+ java
+ ruby
+
+DEPENDENCIES
+ activerecord (= 3.2.13.rc1)
+ activerecord-jdbcsqlite3-adapter (= 1.2.7)
+ appraisal (~> 0.4.0)
+ rake
+ simplecov
+ sqlite3 (= 1.3.6)
+ state_machine!
@@ -2,6 +2,7 @@
source "http://www.rubygems.org"
+gem "activemodel", "3.2.13.rc1"
gem "mongo_mapper", "0.10.0"
gemspec :path=>"../"
@@ -6,26 +6,26 @@ PATH
GEM
remote: http://www.rubygems.org/
specs:
- activemodel (3.1.1)
- activesupport (= 3.1.1)
+ activemodel (3.2.13.rc1)
+ activesupport (= 3.2.13.rc1)
builder (~> 3.0.0)
- i18n (~> 0.6)
- activesupport (3.1.1)
+ activesupport (3.2.13.rc1)
+ i18n (= 0.6.1)
multi_json (~> 1.0)
appraisal (0.4.0)
bundler
rake
bson (1.4.0)
bson (1.4.0-java)
- builder (3.0.0)
- i18n (0.6.0)
+ builder (3.0.4)
+ i18n (0.6.1)
mongo (1.4.0)
bson (= 1.4.0)
mongo_mapper (0.10.0)
activemodel (~> 3.0)
activesupport (~> 3.0)
plucky (~> 0.3.8)
- multi_json (1.0.3)
+ multi_json (1.0.4)
plucky (0.3.8)
mongo (~> 1.3)
rake (0.9.2.2)
@@ -39,6 +39,7 @@ PLATFORMS
ruby
DEPENDENCIES
+ activemodel (= 3.2.13.rc1)
appraisal (~> 0.4.0)
mongo_mapper (= 0.10.0)
rake
@@ -2,6 +2,7 @@
source "http://www.rubygems.org"
+gem "activemodel", "3.2.13.rc1"
gem "mongo", "~> 1.7.0"
gem "mongo_mapper", "0.11.2"
@@ -6,11 +6,11 @@ PATH
GEM
remote: http://www.rubygems.org/
specs:
- activemodel (3.2.12)
- activesupport (= 3.2.12)
+ activemodel (3.2.13.rc1)
+ activesupport (= 3.2.13.rc1)
builder (~> 3.0.0)
- activesupport (3.2.12)
- i18n (~> 0.6)
+ activesupport (3.2.13.rc1)
+ i18n (= 0.6.1)
multi_json (~> 1.0)
appraisal (0.4.1)
bundler
@@ -39,6 +39,7 @@ PLATFORMS
ruby
DEPENDENCIES
+ activemodel (= 3.2.13.rc1)
appraisal (~> 0.4.0)
mongo (~> 1.7.0)
mongo_mapper (= 0.11.2)
@@ -2,6 +2,7 @@
source "http://www.rubygems.org"
+gem "activemodel", "3.2.13.rc1"
gem "mongo", "~> 1.7.0"
gem "mongo_mapper", "0.12.0"
Oops, something went wrong.

0 comments on commit ead10c2

Please sign in to comment.