From ebbe21cd4fd8b1da57b2b618d5b0242efc833c09 Mon Sep 17 00:00:00 2001 From: Erik Michaels-Ober Date: Wed, 4 May 2011 10:00:41 -0700 Subject: [PATCH] Remove dynamic code from gemspec because it can only be built one way --- Gemfile | 14 +++++++++----- rails_admin.gemspec | 1 - spec/dummy_app/Gemfile | 12 +++++++----- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index fa46e70c32..9dd225430e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,14 +1,13 @@ source 'http://rubygems.org' -gemspec - # Bundle gems for the local environment. Make sure to # put test-only gems in this group so their generators # and rake tasks are available in development mode: group :development, :test do gem 'rails', '~> 3.0.7' - if 'java' == RUBY_PLATFORM + platforms :jruby do + gem 'jruby-openssl', '~> 0.7' case ENV['CI_DB_ADAPTER'] when 'mysql' gem 'activerecord-jdbcmysql-adapter', '~> 1.1', :platform => :jruby @@ -20,7 +19,9 @@ group :development, :test do gem 'activerecord-jdbcsqlite3-adapter', '~> 1.1', :platform => :jruby gem 'jdbc-sqlite3', '~> 3.6', :platform => :jruby end - else + end + + platforms :ruby, :mswin, :mingw do case ENV['CI_DB_ADAPTER'] when 'mysql' gem 'mysql', '~> 2.8' @@ -30,7 +31,10 @@ group :development, :test do gem 'sqlite3', '~> 1.3' end end - gem "cancan" if ENV["AUTHORIZATION_ADAPTER"] == "cancan" + + gem 'cancan' if ENV['AUTHORIZATION_ADAPTER'] == 'cancan' gem 'factory_girl', '2.0.0.beta2' gem 'generator_spec' end + +gemspec diff --git a/rails_admin.gemspec b/rails_admin.gemspec index be5dff9a0b..e69fee43fe 100644 --- a/rails_admin.gemspec +++ b/rails_admin.gemspec @@ -14,7 +14,6 @@ Gem::Specification.new do |s| s.add_development_dependency('ZenTest', '~> 4.5') # If you add a runtime dependency, please maintain alphabetical order s.add_runtime_dependency('builder', '~> 2.1.0') - s.add_runtime_dependency('jruby-openssl', '~> 0.7.2') if RUBY_PLATFORM == 'java' s.add_runtime_dependency('rails', '~> 3.0.6') s.authors = ["Erik Michaels-Ober", "Bogdan Gaza"] s.description = %q{RailsAdmin is a Rails engine that provides an easy-to-use interface for managing your data} diff --git a/spec/dummy_app/Gemfile b/spec/dummy_app/Gemfile index 0f9d3a53e6..c786c09e9c 100644 --- a/spec/dummy_app/Gemfile +++ b/spec/dummy_app/Gemfile @@ -6,11 +6,10 @@ gem 'paperclip', '~> 2.3' gem 'rails_admin', :path => '../../' gem 'mlb' -# Bundle gems for the local environment. Make sure to -# put test-only gems in this group so their generators -# and rake tasks are available in development mode: group :development, :test do - if 'java' == RUBY_PLATFORM + + platforms :jruby do + gem 'jruby-openssl', '~> 0.7' case ENV['CI_DB_ADAPTER'] when 'mysql' gem 'activerecord-jdbcmysql-adapter', '~> 1.1', :platform => :jruby @@ -22,7 +21,9 @@ group :development, :test do gem 'activerecord-jdbcsqlite3-adapter', '~> 1.1', :platform => :jruby gem 'jdbc-sqlite3', '~> 3.6', :platform => :jruby end - else + end + + platforms :ruby, :mswin, :mingw do case ENV['CI_DB_ADAPTER'] when 'mysql' gem 'mysql', '~> 2.8' @@ -32,4 +33,5 @@ group :development, :test do gem 'sqlite3', '~> 1.3' end end + end