1 files changed, 20 insertions, 19 deletions
diff --git a/Gemfile b/Gemfile
index d2377c2d08..28b3b450ca 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,36 +8,35 @@ gem "mocha", ">= 0.9.8"
 gem "rdoc",  ">= 2.5.9"
 gem "horo"
 
-mri = !defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby"
-if mri && RUBY_VERSION < '1.9'
+# AS
+gem "memcache-client", ">= 1.8.5"
+
+# AM
+gem "text-format", "~> 1.0.0"
+
+platforms :mri_18 do
   gem "system_timer"
   gem "ruby-debug", ">= 0.10.3"
 end
 
-if mri || RUBY_ENGINE == "rbx"
+platforms :ruby do
   gem 'json'
   gem 'yajl-ruby'
   gem "nokogiri", ">= 1.4.2"
-elsif RUBY_ENGINE == "jruby"
-  gem "ruby-debug"
-  gem "jruby-openssl"
-end
-
-# AS
-gem "memcache-client", ">= 1.8.5"
 
-# AM
-gem "text-format", "~> 1.0.0"
-
-# AR
-if mri || RUBY_ENGINE == "rbx"
+  # AR
   gem "sqlite3-ruby", "~> 1.3.1", :require => 'sqlite3'
 
   group :db do
     gem "pg", ">= 0.9.0"
     gem "mysql", ">= 2.8.1"
   end
-elsif RUBY_ENGINE == "jruby"
+end
+
+platforms :jruby do
+  gem "system_timer"
+  gem "ruby-debug", ">= 0.10.3"
+
   gem "activerecord-jdbcsqlite3-adapter"
 
   group :db do
@@ -46,9 +45,11 @@ elsif RUBY_ENGINE == "jruby"
   end
 end
 
-if ENV['CI']
+env 'CI' do
   gem "nokogiri", ">= 1.4.2"
 
-  # fcgi gem doesn't compile on 1.9
-  gem "fcgi", ">= 0.8.8" if RUBY_VERSION < '1.9.0'
+  platforms :ruby_18 do
+    # fcgi gem doesn't compile on 1.9
+    gem "fcgi", ">= 0.8.8"
+  end
 end