Hack added to make Rails 4 work with JRuby

inossidabile · Mar 5, 2013 · 0d89809 · 0d89809
1 parent d89614f
commit 0d89809
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 0 deletions.
diff --git a/gemfiles/rails_3.1.3.gemfile b/gemfiles/rails_3.1.3.gemfile
@@ -5,6 +5,7 @@ source "http://rubygems.org"
 gem "wasabi"
 gem "savon"
 gem "httpi", :git=>"git://github.com/savonrb/httpi.git"
+gem "bundler", "~> 1.3.0"
 gem "rspec-rails"
 gem "guard"
 gem "guard-rspec"

diff --git a/gemfiles/rails_3.1.3.gemfile.lock b/gemfiles/rails_3.1.3.gemfile.lock
@@ -67,6 +67,7 @@ GEM
     hike (1.2.1)
     i18n (0.6.1)
     json (1.7.6)
+    json (1.7.6-java)
     listen (0.7.0)
     lumberjack (1.0.2)
     mail (2.3.3)
@@ -77,12 +78,18 @@ GEM
     mime-types (1.19)
     multi_json (1.5.0)
     nokogiri (1.5.6)
+    nokogiri (1.5.6-java)
     nori (2.0.0)
     polyglot (0.3.3)
     pry (0.9.10)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.3.1)
+    pry (0.9.10-java)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.3.1)
+      spoon (~> 0.0)
     rack (1.3.6)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -142,6 +149,7 @@ GEM
       colored
       simplecov
     slop (3.3.3)
+    spoon (0.0.1)
     sprockets (2.0.4)
       hike (~> 1.2)
       rack (~> 1.0)
@@ -157,10 +165,12 @@ GEM
       nokogiri (>= 1.4.0)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   appraisal
+  bundler (~> 1.3.0)
   guard
   guard-rspec
   httpi!

diff --git a/gemfiles/rails_3.2.12.gemfile b/gemfiles/rails_3.2.12.gemfile
@@ -5,6 +5,7 @@ source "http://rubygems.org"
 gem "wasabi"
 gem "savon"
 gem "httpi", :git=>"git://github.com/savonrb/httpi.git"
+gem "bundler", "~> 1.3.0"
 gem "rspec-rails"
 gem "guard"
 gem "guard-rspec"

diff --git a/gemfiles/rails_3.2.12.gemfile.lock b/gemfiles/rails_3.2.12.gemfile.lock
@@ -69,6 +69,7 @@ GEM
     i18n (0.6.4)
     journey (1.0.4)
     json (1.7.7)
+    json (1.7.7-java)
     listen (0.7.3)
     lumberjack (1.0.2)
     mail (2.4.4)
@@ -79,12 +80,18 @@ GEM
     mime-types (1.21)
     multi_json (1.6.1)
     nokogiri (1.5.6)
+    nokogiri (1.5.6-java)
     nori (2.0.4)
     polyglot (0.3.3)
     pry (0.9.12)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
+    pry (0.9.12-java)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+      spoon (~> 0.0)
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -143,6 +150,7 @@ GEM
       colored
       simplecov
     slop (3.4.3)
+    spoon (0.0.1)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -160,10 +168,12 @@ GEM
       nokogiri (>= 1.4.0)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   appraisal
+  bundler (~> 1.3.0)
   guard
   guard-rspec
   httpi!

diff --git a/gemfiles/rails_3.2.8.gemfile b/gemfiles/rails_3.2.8.gemfile
@@ -5,6 +5,7 @@ source "http://rubygems.org"
 gem "wasabi"
 gem "savon"
 gem "httpi", :git=>"git://github.com/savonrb/httpi.git"
+gem "bundler", "~> 1.3.0"
 gem "rspec-rails"
 gem "guard"
 gem "guard-rspec"

diff --git a/gemfiles/rails_3.2.8.gemfile.lock b/gemfiles/rails_3.2.8.gemfile.lock
@@ -67,6 +67,7 @@ GEM
     i18n (0.6.1)
     journey (1.0.4)
     json (1.7.6)
+    json (1.7.6-java)
     listen (0.7.0)
     lumberjack (1.0.2)
     mail (2.4.4)
@@ -77,12 +78,18 @@ GEM
     mime-types (1.19)
     multi_json (1.5.0)
     nokogiri (1.5.6)
+    nokogiri (1.5.6-java)
     nori (2.0.0)
     polyglot (0.3.3)
     pry (0.9.10)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.3.1)
+    pry (0.9.10-java)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.3.1)
+      spoon (~> 0.0)
     rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -140,6 +147,7 @@ GEM
       colored
       simplecov
     slop (3.3.3)
+    spoon (0.0.1)
     sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
@@ -155,10 +163,12 @@ GEM
       nokogiri (>= 1.4.0)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   appraisal
+  bundler (~> 1.3.0)
   guard
   guard-rspec
   httpi!

diff --git a/gemfiles/rails_4.0.0.beta1.gemfile b/gemfiles/rails_4.0.0.beta1.gemfile
@@ -5,6 +5,7 @@ source "http://rubygems.org"
 gem "wasabi"
 gem "savon"
 gem "httpi", :git=>"git://github.com/savonrb/httpi.git"
+gem "bundler", "~> 1.3.0"
 gem "rspec-rails"
 gem "guard"
 gem "guard-rspec"

diff --git a/gemfiles/rails_4.0.0.beta1.gemfile.lock b/gemfiles/rails_4.0.0.beta1.gemfile.lock
@@ -47,6 +47,7 @@ GEM
       rake
     arel (4.0.0.beta1)
     atomic (1.0.1)
+    atomic (1.0.1-java)
     builder (3.1.4)
     coderay (1.0.9)
     colored (1.2)
@@ -66,6 +67,7 @@ GEM
     hike (1.2.1)
     i18n (0.6.4)
     json (1.7.7)
+    json (1.7.7-java)
     listen (0.7.3)
     lumberjack (1.0.2)
     mail (2.5.3)
@@ -77,12 +79,18 @@ GEM
     minitest (4.6.2)
     multi_json (1.6.1)
     nokogiri (1.5.6)
+    nokogiri (1.5.6-java)
     nori (2.0.4)
     polyglot (0.3.3)
     pry (0.9.12)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
+    pry (0.9.12-java)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+      spoon (~> 0.0)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -136,6 +144,7 @@ GEM
       colored
       simplecov
     slop (3.4.3)
+    spoon (0.0.1)
     sprockets (2.9.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -159,10 +168,12 @@ GEM
       nokogiri (>= 1.4.0)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   appraisal
+  bundler (~> 1.3.0)
   guard
   guard-rspec
   httpi!

diff --git a/spec/dummy/config/application.rb b/spec/dummy/config/application.rb
@@ -3,6 +3,15 @@
 require "action_controller/railtie"
 require "rails/test_unit/railtie"
 
+if Rails::VERSION::MAJOR > 4
+  # Ugly hack to make Rails 4 JRuby-compatible to escape Travis errors
+  Rails::Engine.class_eval do
+    def railties
+      @railties ||= self.class.const_get(:Railties).new
+    end
+  end
+end
+
 Bundler.require
 require "wash_out"