Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Active Support dependency to version >= 2 #257

Merged
merged 5 commits into from
Jul 11, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,32 @@
language: ruby
sudo: false
cache: bundler

addons:
apt:
sources:
- libicu-dev

script: "bundle exec rake"
script: bundle exec rake

gemfile:
- gemfiles/rails_5.gemfile
- gemfiles/rails_4.gemfile
- gemfiles/rails_3.gemfile

rvm:
- 2.0
- 2.3.1
- 2.2.5
- 2.1
- 2.2
- 2.3.0
- 2.0
- ruby-head

matrix:
fast_finish: true
allow_failures:
- rvm: ruby-head
exclude:
- gemfile: gemfiles/rails_5.gemfile
rvm: 2.1
- gemfile: gemfiles/rails_5.gemfile
rvm: 2.0
13 changes: 13 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
appraise "rails-3" do
gem "rack", "< 2"
gem "rails", "3.2.22.2"
end

appraise "rails-4" do
gem "rack", "< 2"
gem "rails", "~> 4.2.6"
end

appraise "rails-5" do
gem "rails", "~> 5.0.0"
end
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ gemspec
group :development do
gem "bundler"
gem "rake"
gem "appraisal"
end

group :test do
gem "minitest", "~> 5.3"
gem "minitest"
gem "rinku", "~> 1.7", :require => false
gem "gemoji", "~> 2.0", :require => false
gem "RedCloth", "~> 4.2.9", :require => false
Expand Down
5 changes: 4 additions & 1 deletion Rakefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#!/usr/bin/env rake
require "rubygems"
require "bundler/setup"

require "bundler/gem_tasks"
require 'rake/testtask'

Expand All @@ -8,4 +11,4 @@ Rake::TestTask.new do |t|
t.verbose = true
end

task :default => :test
task :default => :test
26 changes: 26 additions & 0 deletions gemfiles/rails_3.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "rack", "< 2"
gem "rails", "3.2.22.2"

group :development do
gem "bundler"
gem "rake"
gem "appraisal"
end

group :test do
gem "minitest"
gem "rinku", "~> 1.7", :require => false
gem "gemoji", "~> 2.0", :require => false
gem "RedCloth", "~> 4.2.9", :require => false
gem "github-markdown", "~> 0.5", :require => false
gem "email_reply_parser", "~> 0.5", :require => false
gem "sanitize", "~> 2.0", :require => false
gem "escape_utils", "~> 1.0", :require => false
gem "github-linguist", "~> 2.10", :require => false
end

gemspec :path => "../"
138 changes: 138 additions & 0 deletions gemfiles/rails_3.gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
PATH
remote: ../
specs:
html-pipeline (2.4.1)
activesupport (>= 2)
nokogiri (>= 1.4)

GEM
remote: https://rubygems.org/
specs:
RedCloth (4.2.9)
actionmailer (3.2.22.2)
actionpack (= 3.2.22.2)
mail (~> 2.5.4)
actionpack (3.2.22.2)
activemodel (= 3.2.22.2)
activesupport (= 3.2.22.2)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
activemodel (3.2.22.2)
activesupport (= 3.2.22.2)
builder (~> 3.0.0)
activerecord (3.2.22.2)
activemodel (= 3.2.22.2)
activesupport (= 3.2.22.2)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.22.2)
activemodel (= 3.2.22.2)
activesupport (= 3.2.22.2)
activesupport (3.2.22.2)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
appraisal (2.1.0)
bundler
rake
thor (>= 0.14.0)
arel (3.0.3)
builder (3.0.4)
charlock_holmes (0.7.3)
email_reply_parser (0.5.8)
erubis (2.7.0)
escape_utils (1.0.1)
gemoji (2.1.0)
github-linguist (2.12.0)
charlock_holmes (~> 0.7.3)
escape_utils (~> 1.0.1)
mime-types (~> 1.19)
pygments.rb (~> 0.6.0)
github-markdown (0.6.9)
hike (1.2.3)
i18n (0.7.0)
journey (1.0.4)
json (1.8.3)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.25.1)
mini_portile2 (2.1.0)
minitest (5.9.0)
multi_json (1.12.1)
nokogiri (1.6.8)
mini_portile2 (~> 2.1.0)
pkg-config (~> 1.1.7)
pkg-config (1.1.7)
polyglot (0.3.5)
posix-spawn (0.3.11)
pygments.rb (0.6.3)
posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.2.0)
rack (1.4.7)
rack-cache (1.6.1)
rack (>= 0.4)
rack-ssl (1.3.4)
rack
rack-test (0.6.3)
rack (>= 1.0)
rails (3.2.22.2)
actionmailer (= 3.2.22.2)
actionpack (= 3.2.22.2)
activerecord (= 3.2.22.2)
activeresource (= 3.2.22.2)
activesupport (= 3.2.22.2)
bundler (~> 1.0)
railties (= 3.2.22.2)
railties (3.2.22.2)
actionpack (= 3.2.22.2)
activesupport (= 3.2.22.2)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (11.2.2)
rdoc (3.12.2)
json (~> 1.4)
rinku (1.7.3)
sanitize (2.1.0)
nokogiri (>= 1.4.4)
sprockets (2.2.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
thor (0.19.1)
tilt (1.4.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.50)
yajl-ruby (1.2.1)

PLATFORMS
ruby

DEPENDENCIES
RedCloth (~> 4.2.9)
appraisal
bundler
email_reply_parser (~> 0.5)
escape_utils (~> 1.0)
gemoji (~> 2.0)
github-linguist (~> 2.10)
github-markdown (~> 0.5)
html-pipeline!
minitest
rack (< 2)
rails (= 3.2.22.2)
rake
rinku (~> 1.7)
sanitize (~> 2.0)

BUNDLED WITH
1.12.5
26 changes: 26 additions & 0 deletions gemfiles/rails_4.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "rack", "< 2"
gem "rails", "~> 4.2.6"

group :development do
gem "bundler"
gem "rake"
gem "appraisal"
end

group :test do
gem "minitest"
gem "rinku", "~> 1.7", :require => false
gem "gemoji", "~> 2.0", :require => false
gem "RedCloth", "~> 4.2.9", :require => false
gem "github-markdown", "~> 0.5", :require => false
gem "email_reply_parser", "~> 0.5", :require => false
gem "sanitize", "~> 2.0", :require => false
gem "escape_utils", "~> 1.0", :require => false
gem "github-linguist", "~> 2.10", :require => false
end

gemspec :path => "../"
Loading