aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-11-07 14:11:21 -0800
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-11-07 14:11:21 -0800
commitb683ec623a261bae075c49aa35ff348e0920c795 (patch)
treebf759c74658a6a814f9b80dca9feda6e5d9aee51
parent3a45cf6a05311d822953ed2320b743cc5c3dd6f8 (diff)
parente259afe847f83ae26645d95bb73ec38279414c92 (diff)
downloadrails-b683ec623a261bae075c49aa35ff348e0920c795.tar.gz
rails-b683ec623a261bae075c49aa35ff348e0920c795.tar.bz2
rails-b683ec623a261bae075c49aa35ff348e0920c795.zip
Merge pull request #12795 from arunagw/plateform-dependent-gems
Added platform dependent gems
-rw-r--r--railties/lib/rails/generators/app_base.rb9
-rw-r--r--railties/test/generators/app_generator_test.rb7
2 files changed, 16 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 40145a7a50..962cb5eb1b 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -110,6 +110,7 @@ module Rails
javascript_gemfile_entry,
jbuilder_gemfile_entry,
sdoc_gemfile_entry,
+ platform_dependent_gemfile_entry,
@extra_entries].flatten.find_all(&@gem_filter)
end
@@ -316,6 +317,14 @@ module Rails
gems
end
+ def platform_dependent_gemfile_entry
+ gems = []
+ if RUBY_ENGINE == 'rbx'
+ gems << GemfileEntry.version('rubysl', nil)
+ end
+ gems
+ end
+
def jbuilder_gemfile_entry
comment = 'Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder'
GemfileEntry.version('jbuilder', '~> 1.2', comment)
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 43a985615f..e6cda07ae5 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -305,6 +305,13 @@ class AppGeneratorTest < Rails::Generators::TestCase
end
end
+ def test_inclusion_of_plateform_dependent_gems
+ run_generator([destination_root])
+ if RUBY_ENGINE == 'rbx'
+ assert_gem 'rubysl'
+ end
+ end
+
def test_creation_of_a_test_directory
run_generator
assert_file 'test'