From df32bb74c561b07fc91f2913c8db0f809a340d19 Mon Sep 17 00:00:00 2001 From: Dmitry Bochkarev Date: Mon, 17 Jul 2017 14:37:19 +0500 Subject: [PATCH] chore: Appraisals --- .gitignore | 1 + Appraisals | 23 +++++++++++++++++++++++ dip.yml | 10 ++++++++-- lib/resque/integration.rb | 5 +---- resque-integration.gemspec | 1 + 5 files changed, 34 insertions(+), 6 deletions(-) create mode 100644 Appraisals diff --git a/.gitignore b/.gitignore index 94cdc7d..d42c411 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ .config .yardoc Gemfile.lock +gemfiles InstalledFiles _yardoc coverage diff --git a/Appraisals b/Appraisals new file mode 100644 index 0000000..f6b8463 --- /dev/null +++ b/Appraisals @@ -0,0 +1,23 @@ +appraise 'rails3.2' do + gem 'rails', '~> 3.2.0' + gem 'test_after_commit', '~> 0.4.0' + gem 'strong_parameters' +end + +appraise 'rails4.0' do + gem 'rails', '~> 4.0.13' + gem "protected_attributes" + gem 'rails-observers', '0.1.2' +end + +appraise 'rails4.1' do + gem 'rails', '~> 4.1.16' + gem "protected_attributes" + gem 'rails-observers', '0.1.2' +end + +appraise 'rails4.2' do + gem 'rails', '~> 4.2.9' + gem "protected_attributes" + gem 'rails-observers', '0.1.2' +end diff --git a/dip.yml b/dip.yml index d6bfb95..87e1447 100644 --- a/dip.yml +++ b/dip.yml @@ -24,15 +24,21 @@ interaction: service: app command: bundle + appraisal: + service: app + command: bundle exec appraisal + rspec: service: app - command: bundle exec rspec + command: bundle exec appraisal bundle exec rspec clean: service: app - command: rm -f Gemfile.lock + command: rm -f Gemfile.lock gemfiles/*.gemfile.* provision: - docker volume create --name bundler_data + - dip bundle config --local https://gems.railsc.ru/ ${APRESS_GEMS_CREDENTIALS} - dip clean - dip bundle install + - dip appraisal install diff --git a/lib/resque/integration.rb b/lib/resque/integration.rb index dc4085c..9f98c0c 100644 --- a/lib/resque/integration.rb +++ b/lib/resque/integration.rb @@ -3,10 +3,7 @@ require 'resque' -require 'active_support/core_ext/kernel/reporting' -require 'active_support/core_ext/module/aliasing' -require 'active_support/core_ext/module/attribute_accessors' -require 'active_support/core_ext/module/concerning' +require 'active_support/all' require 'multi_json' diff --git a/resque-integration.gemspec b/resque-integration.gemspec index 0e5bc20..57ac33a 100644 --- a/resque-integration.gemspec +++ b/resque-integration.gemspec @@ -38,6 +38,7 @@ Gem::Specification.new do |gem| gem.add_development_dependency 'bundler' gem.add_development_dependency 'rspec', '~> 2.14' gem.add_development_dependency 'simplecov' + gem.add_development_dependency 'appraisal', '>= 1.0.2' gem.add_development_dependency 'combustion', '>= 0.5.5' gem.add_development_dependency 'mock_redis' gem.add_development_dependency 'timecop'