Skip to content

Commit

Permalink
deprecate ruby 1.x and rails 3.x supports
Browse files Browse the repository at this point in the history
  • Loading branch information
eitoball committed Aug 20, 2016
1 parent e41aa7f commit de7c02c
Show file tree
Hide file tree
Showing 39 changed files with 520 additions and 1,513 deletions.
78 changes: 15 additions & 63 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,73 +3,25 @@ services: mongodb
language: ruby
cache: bundler
rvm:
- 'ree'
- '1.8.7'
- '1.9.2'
- '1.9.3'
- '2.0.0'
- '2.1.0'
- 'rbx-2.1.1'
- 2.0
- 2.1
- 2.2.5
- 2.3.1
- rbx-2
- jruby
gemfile:
- gemfiles/active3.0.20.gemfile
- gemfiles/active3.1.12.gemfile
- gemfiles/active3.2.20.gemfile
- gemfiles/active4.0.13.gemfile
- gemfiles/active4.1.10.gemfile
- gemfiles/active4.2.1.gemfile
- gemfiles/data_mapper1.2.0.gemfile
- gemfiles/mongoid3.1.6.gemfile
- gemfiles/rails3.0.20.gemfile
- gemfiles/rails3.1.12.gemfile
- gemfiles/rails3.2.20.gemfile
- gemfiles/active4.1.15.gemfile
- gemfiles/active4.2.6.gemfile
- gemfiles/rails4.0.13.gemfile
- gemfiles/rails4.1.10.gemfile
- gemfiles/rails4.2.1.gemfile
- gemfiles/rails4.1.15.gemfile
- gemfiles/rails4.2.6.gemfile
matrix:
exclude:
- rvm: ree
gemfile: gemfiles/active4.0.13.gemfile
- rvm: ree
gemfile: gemfiles/active4.1.10.gemfile
- rvm: ree
gemfile: gemfiles/active4.2.1.gemfile
- rvm: ree
gemfile: gemfiles/mongoid3.1.6.gemfile
- rvm: ree
gemfile: gemfiles/rails4.0.13.gemfile
- rvm: ree
gemfile: gemfiles/rails4.1.10.gemfile
- rvm: ree
gemfile: gemfiles/rails4.2.1.gemfile
- rvm: 1.8.7
gemfile: gemfiles/active4.0.13.gemfile
- rvm: 1.8.7
gemfile: gemfiles/active4.1.10.gemfile
- rvm: 1.8.7
gemfile: gemfiles/active4.2.1.gemfile
- rvm: 1.8.7
gemfile: gemfiles/mongoid3.1.6.gemfile
- rvm: 1.8.7
gemfile: gemfiles/rails4.0.13.gemfile
- rvm: 1.8.7
gemfile: gemfiles/rails4.1.10.gemfile
- rvm: 1.8.7
gemfile: gemfiles/rails4.2.1.gemfile
- rvm: 1.9.2
gemfile: gemfiles/active4.0.13.gemfile
- rvm: 1.9.2
gemfile: gemfiles/active4.1.10.gemfile
- rvm: 1.9.2
gemfile: gemfiles/active4.2.1.gemfile
- rvm: 1.9.2
gemfile: gemfiles/mongoid3.1.6.gemfile
- rvm: 1.9.2
gemfile: gemfiles/rails4.0.13.gemfile
- rvm: 1.9.2
gemfile: gemfiles/rails4.1.10.gemfile
- rvm: 1.9.2
gemfile: gemfiles/rails4.2.1.gemfile
allow_failures:
- rvm: rbx-2.1.1
- rvm: rbx-2
- rvm: jruby
fast_finish: true
# Need to update because there is a bug in bundler that Travis CI uses.
before_install:
- gem update bundler
script: 'bundle exec rake spec'
15 changes: 2 additions & 13 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,25 +1,14 @@
['3.0.20', '3.1.12', '3.2.20', '4.0.13', '4.1.10', '4.2.1'].each do |version_number|
['4.0.13', '4.1.15', '4.2.6'].each do |version_number|
clean_number = version_number.gsub(/[<>~=]*/, '')
next if RUBY_VERSION < '1.9.3' && version_number >= '4.0.0'

appraise "rails#{ clean_number }" do
gem "rails", version_number
gem "rspec-rails"
gem 'test-unit'
end

appraise "active#{ clean_number }" do
gem "activesupport", version_number
gem "activerecord", version_number
end
end

if RUBY_VERSION >= '1.9.3'
appraise 'mongoid3.1.6' do
gem 'mongoid', '3.1.6'
end
end

appraise 'data_mapper1.2.0' do
gem 'data_mapper', '1.2.0'
gem 'dm-sqlite-adapter', '1.2.0'
end
5 changes: 0 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
source 'https://rubygems.org'

gem 'coveralls', :require => false
gem 'fastercsv', :platforms => :ruby_18
# coveralls gem depends on rest-client, newer rest-client gem
# requires ruby 1.9.2 or above. While supporting ruby 1.8.7,
# we specify rest-client gem version.
gem 'rest-client', '> 1.6.2', '< 1.7', :require => false

gemspec
31 changes: 19 additions & 12 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,17 @@ PATH
remote: .
specs:
comma (3.2.4)
activesupport (>= 3.0.0)
activesupport (>= 4.0.0, < 5.0)

GEM
remote: https://rubygems.org/
specs:
activesupport (3.2.14)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
activesupport (4.2.6)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
appraisal (0.4.1)
bundler
rake
Expand All @@ -22,12 +25,12 @@ GEM
thor
diff-lcs (1.1.3)
docile (1.1.5)
fastercsv (1.5.4)
i18n (0.6.5)
i18n (0.7.0)
json (1.8.2)
mime-types (1.25.1)
minitest (5.9.0)
multi_json (1.1.0)
rake (0.9.2.2)
rake (10.5.0)
rdoc (4.2.0)
json (~> 1.4)
rest-client (1.6.8)
Expand All @@ -46,8 +49,11 @@ GEM
multi_json (~> 1.0)
simplecov-html (~> 0.9.0)
simplecov-html (0.9.0)
sqlite3 (1.3.5)
sqlite3 (1.3.11)
thor (0.19.1)
thread_safe (0.3.5)
tzinfo (1.2.2)
thread_safe (~> 0.1)

PLATFORMS
ruby
Expand All @@ -56,8 +62,9 @@ DEPENDENCIES
appraisal (~> 0.4.1)
comma!
coveralls
fastercsv
rake (~> 0.9.2)
rest-client (> 1.6.2, < 1.7)
rake (~> 10.5.0)
rspec (~> 2.8.0)
sqlite3 (~> 1.3.4)
sqlite3 (~> 1.3.11)

BUNDLED WITH
1.12.5
12 changes: 3 additions & 9 deletions README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,12 @@ http://github.com/comma-csv/comma
##COMPATIBILITY
The mainline of this project builds gems to the 3.x version series, and is compatible and tested with :

* Ruby 1.8.7, 1.9.2, 1.9.3, 2.0.0, 2.1
* REE 1.8.7
* RBX 1.8 mode, 1.9 mode
* Rails 3.x, 4.x (all versions, with ActiveRecord, DataMapper and Mongoid support)
* Ruby 2.x
* RBX2
* Rails (all versions, with ActiveRecord, DataMapper and Mongoid support)

[![Build Status](https://travis-ci.org/comma-csv/comma.png?branch=master)](https://travis-ci.org/comma-csv/comma) [![Code Climate](https://codeclimate.com/github/comma-csv/comma.png)](https://codeclimate.com/github/comma-csv/comma)

###LOOKING FOR RAILS 2?
* Rails 2 is supported in the 'rails2' branch of this project, and versioned in the 2.x version of this gem. (https://github.com/comma-csv/comma/tree/rails2).

##INSTALLATION

Comma is distributed as a gem, best installed via Bundler.

Include the gem in your Gemfile:
Expand Down
6 changes: 3 additions & 3 deletions comma.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ Gem::Specification.new do |s|

s.licenses = ['MIT']

s.add_dependency 'activesupport', ['>= 3.0.0']
s.add_dependency 'activesupport', ['>= 4.0.0', '< 5.0']

s.add_development_dependency 'appraisal', ['~> 0.4.1']
s.add_development_dependency 'rake', ['~> 0.9.2']
s.add_development_dependency 'rake', ['~> 10.5.0']
s.add_development_dependency 'rspec', ['~> 2.8.0']
s.add_development_dependency 'sqlite3', ['~> 1.3.4']
s.add_development_dependency 'sqlite3', ['~> 1.3.11']
end
11 changes: 0 additions & 11 deletions gemfiles/active3.0.20.gemfile

This file was deleted.

75 changes: 0 additions & 75 deletions gemfiles/active3.0.20.gemfile.lock

This file was deleted.

11 changes: 0 additions & 11 deletions gemfiles/active3.1.12.gemfile

This file was deleted.

Loading

0 comments on commit de7c02c

Please sign in to comment.