removing CI support for Ruby 1.8 (about time)

removing CI support for older versions of Mongoid (Mongoid 3 looks stable now)
sravan44 · Aug 27, 2012 · 8bf35bb · 8bf35bb
1 parent 69463df
commit 8bf35bb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 58 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,5 @@
 bundler_args: "--without debug"
 rvm:
-  - 1.8.7
   - 1.9.3
   - jruby-19mode
   - rbx-19mode
@@ -9,33 +8,18 @@ env:
   - "CI_ORM=active_record CI_DB_ADAPTER=postgresql CI_DB_USERNAME=postgres"
   - "CI_ORM=active_record CI_DB_ADAPTER=mysql"
   - "CI_ORM=mongoid"
-  - "CI_ORM=mongoid CI_ORM_VERSION=2.4"
-  - "CI_ORM=mongoid CI_ORM_VERSION=head"
 language: ruby
 matrix:
   exclude:
-    - rvm: 1.8.7
-      env: "CI_ORM=mongoid"
-    - rvm: 1.8.7
-      env: "CI_ORM=mongoid CI_ORM_VERSION=head"
     - rvm: jruby-19mode
       env: "CI_ORM=active_record CI_DB_ADAPTER=postgresql CI_DB_USERNAME=postgres"
     - rvm: jruby-19mode
       env: "CI_ORM=active_record CI_DB_ADAPTER=mysql"
-    - rvm: jruby-19mode
-      env: "CI_ORM=mongoid CI_ORM_VERSION=2.4"
-    - rvm: jruby-19mode
-      env: "CI_ORM=mongoid CI_ORM_VERSION=head"
     - rvm: rbx-19mode
       env: "CI_ORM=active_record CI_DB_ADAPTER=postgresql CI_DB_USERNAME=postgres"
     - rvm: rbx-19mode
       env: "CI_ORM=active_record CI_DB_ADAPTER=mysql"
-    - rvm: rbx-19mode
-      env: "CI_ORM=mongoid CI_ORM_VERSION=2.4"
-    - rvm: rbx-19mode
-      env: "CI_ORM=mongoid CI_ORM_VERSION=head"
   allow_failures:
-    - env: "CI_ORM=mongoid CI_ORM_VERSION=head"
     - rvm: jruby-19mode
     - rvm: rbx-19mode
 notifications:

diff --git a/Gemfile b/Gemfile
@@ -32,23 +32,9 @@ group :active_record do
 end
 
 group :mongoid do
-  case ENV['CI_ORM_VERSION']
-  when '2.4'
-    platforms :ruby, :mswin, :mingw do
-      gem 'bson_ext'
-    end
-    gem 'mongoid', '~> 2.4'
-    gem 'mongoid-paperclip', :require => 'mongoid_paperclip'
-    gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid'
-  when 'head'
-    gem 'mongoid', :git => 'git://github.com/mongoid/mongoid.git'
-    gem 'mongoid-paperclip', :require => 'mongoid_paperclip', :git => 'git://github.com/meskyanichi/mongoid-paperclip.git', :branch => 'develop'
-    gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid', :git => 'git://github.com/jnicklas/carrierwave-mongoid.git', :branch => 'mongoid-3.0'
-  else
-    gem 'mongoid', '~> 3.0.0'
-    gem 'mongoid-paperclip', :require => 'mongoid_paperclip', :git => 'git://github.com/meskyanichi/mongoid-paperclip.git', :branch => 'develop'
-    gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid', :git => 'git://github.com/jnicklas/carrierwave-mongoid.git', :branch => 'mongoid-3.0'
-  end
+  gem 'mongoid', '~> 3.0'
+  gem 'mongoid-paperclip', :require => 'mongoid_paperclip', :git => 'git://github.com/meskyanichi/mongoid-paperclip.git', :branch => 'develop'
+  gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid', :git => 'git://github.com/jnicklas/carrierwave-mongoid.git', :branch => 'mongoid-3.0'
 end
 
 group :debug do

diff --git a/README.md b/README.md
@@ -180,7 +180,6 @@ Ideally, a bug report should include a pull request with failing specs.
 ## Supported Ruby Versions
 This library aims to support and is [tested against][travis] the following Ruby implementations:
 
-* Ruby 1.8.7
 * Ruby 1.9.2
 * Ruby 1.9.3
 * [Rubinius][]

diff --git a/spec/dummy_app/Gemfile b/spec/dummy_app/Gemfile
@@ -2,8 +2,6 @@ source 'https://rubygems.org'
 
 gem 'rails', '~> 3.2'
 
-gem 'cancan'
-
 group :active_record do
   platforms :jruby do
     gem 'jruby-openssl', '~> 0.7'
@@ -30,33 +28,18 @@ group :active_record do
       gem 'sqlite3', '~> 1.3'
     end
   end
-  gem 'paperclip'
-  gem 'carrierwave'
-  gem 'dragonfly'
 end
 
 group :mongoid do
-  case ENV['CI_ORM_VERSION']
-  when '2.4'
-    platforms :ruby, :mswin, :mingw do
-      gem 'bson_ext'
-    end
-    gem 'mongoid', '~> 2.4'
-    gem 'mongoid-paperclip', :require => 'mongoid_paperclip'
-    gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid'
-  when 'head'
-    gem 'mongoid', :git => 'git://github.com/mongoid/mongoid.git'
-    gem 'mongoid-paperclip', :require => 'mongoid_paperclip', :git => 'git://github.com/meskyanichi/mongoid-paperclip.git', :branch => 'develop'
-    gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid', :git => 'git://github.com/jnicklas/carrierwave-mongoid.git', :branch => 'mongoid-3.0'
-  else
-    gem 'mongoid', '~> 3.0.0'
-    gem 'mongoid-paperclip', :require => 'mongoid_paperclip', :git => 'git://github.com/meskyanichi/mongoid-paperclip.git', :branch => 'develop'
-    gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid', :git => 'git://github.com/jnicklas/carrierwave-mongoid.git', :branch => 'mongoid-3.0'
-  end
-  gem 'paperclip'
-  gem 'dragonfly'
+  gem 'mongoid', '~> 3.0'
+  gem 'mongoid-paperclip', :require => 'mongoid_paperclip', :git => 'git://github.com/meskyanichi/mongoid-paperclip.git', :branch => 'develop'
+  gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid', :git => 'git://github.com/jnicklas/carrierwave-mongoid.git', :branch => 'mongoid-3.0'
 end
 
+gem 'paperclip'
+gem 'carrierwave'
+gem 'dragonfly'
+
 gem 'devise', '~> 2.0'
 gem 'rails_admin', :path => '../../'
 gem 'mlb', '~> 0.5'