From 5ae5d9b76dc7d00882ee04e5975e38df5227c2fd Mon Sep 17 00:00:00 2001 From: pavel Date: Thu, 25 Jun 2020 19:25:18 +0200 Subject: [PATCH 1/5] update rake --- apartment.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apartment.gemspec b/apartment.gemspec index d07567df..5b4fca15 100644 --- a/apartment.gemspec +++ b/apartment.gemspec @@ -36,7 +36,7 @@ Gem::Specification.new do |s| s.add_development_dependency 'appraisal', '~> 2.2' s.add_development_dependency 'bundler', '>= 1.3', '< 3.0' s.add_development_dependency 'capybara', '~> 2.0' - s.add_development_dependency 'rake', '~> 0.9' + s.add_development_dependency 'rake', '~> 13.0' s.add_development_dependency 'rspec', '~> 3.4' s.add_development_dependency 'rspec-rails', '~> 3.4' From a1de9d64c25387d529cd8f72cbcc67e63a648305 Mon Sep 17 00:00:00 2001 From: Rui Baltazar Date: Sat, 27 Jun 2020 11:34:18 +0800 Subject: [PATCH 2/5] [Chore] renamed gemspec to match gem name --- apartment.gemspec => ros-apartment.gemspec | 1 - 1 file changed, 1 deletion(-) rename apartment.gemspec => ros-apartment.gemspec (97%) diff --git a/apartment.gemspec b/ros-apartment.gemspec similarity index 97% rename from apartment.gemspec rename to ros-apartment.gemspec index 5b4fca15..5c01be69 100644 --- a/apartment.gemspec +++ b/ros-apartment.gemspec @@ -27,7 +27,6 @@ Gem::Specification.new do |s| s.homepage = 'https://github.com/rails-on-services/apartment' s.licenses = ['MIT'] - # must be >= 3.1.2 due to bug in prepared_statements s.add_dependency 'activerecord', '>= 5.0.0', '< 6.1' s.add_dependency 'parallel', '< 2.0' s.add_dependency 'public_suffix', '>= 2.0.5', '< 5.0' From b6af077ceb4b16b3a5e27c0126f8d645107b5a24 Mon Sep 17 00:00:00 2001 From: Rui Baltazar Date: Fri, 26 Jun 2020 23:41:21 +0800 Subject: [PATCH 3/5] [#82] remove create from enhanced tasks and seed requires create to have run --- lib/apartment/tasks/enhancements.rb | 2 +- lib/tasks/apartment.rake | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/apartment/tasks/enhancements.rb b/lib/apartment/tasks/enhancements.rb index ede5c1f3..f9a13206 100644 --- a/lib/apartment/tasks/enhancements.rb +++ b/lib/apartment/tasks/enhancements.rb @@ -7,7 +7,7 @@ module Apartment class RakeTaskEnhancer module TASKS ENHANCE_BEFORE = %w[db:drop].freeze - ENHANCE_AFTER = %w[db:create db:migrate db:rollback db:migrate:up db:migrate:down db:migrate:redo db:seed].freeze + ENHANCE_AFTER = %w[db:migrate db:rollback db:migrate:up db:migrate:down db:migrate:redo db:seed].freeze freeze end diff --git a/lib/tasks/apartment.rake b/lib/tasks/apartment.rake index 3623f927..f4583074 100644 --- a/lib/tasks/apartment.rake +++ b/lib/tasks/apartment.rake @@ -7,6 +7,8 @@ require 'parallel' apartment_namespace = namespace :apartment do desc 'Create all tenants' task :create do + Apartment::TaskHelper.warn_if_tenants_empty + Apartment::TaskHelper.tenants.each do |tenant| begin puts("Creating #{tenant} tenant") @@ -43,7 +45,7 @@ apartment_namespace = namespace :apartment do end desc 'Seed all tenants' - task :seed do + task seed: :create do Apartment::TaskHelper.warn_if_tenants_empty Apartment::TaskHelper.each_tenant do |tenant| From f508098cf8508ca51357032d3e758f97a78c73ab Mon Sep 17 00:00:00 2001 From: Rui Baltazar Date: Sat, 27 Jun 2020 12:23:09 +0800 Subject: [PATCH 4/5] Version Bump to 2.7.1 --- lib/apartment/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/apartment/version.rb b/lib/apartment/version.rb index 0986bd0e..215a1191 100644 --- a/lib/apartment/version.rb +++ b/lib/apartment/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module Apartment - VERSION = '2.7.0' + VERSION = '2.7.1' end From 6f7ecf2fc9e21bc5e9965165905570fd803d463a Mon Sep 17 00:00:00 2001 From: Rui Baltazar Date: Sat, 27 Jun 2020 12:27:49 +0800 Subject: [PATCH 5/5] Update history with the recent releases --- HISTORY.md | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/HISTORY.md b/HISTORY.md index f76c9d24..43165b28 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,36 @@ +# 2.7.1 + +# Enhancements + +- N/a + +# Bugfixes + +- [Resolves #82] Enhanced db:create breaks plugin compatibility - + +# Chores + +- Update rake version in development +- Renamed gemspec to match gem name + +# 2.7.0 + +# Enhancements + +- [Resolves #70] Rake tasks define methods on main - +- Add database and schema to active record log. Configurable, defaults to false to keep current behavior - + +# Bugfixes + +- [Fixes #61] Fix database create in mysql - + +# Chores + +- Remove deprecated tld_length config option: tld_length was removed in influitive#309, this configuration option doesn't have any effect now. - +- Using [diffend.io proxy](https://diffend.io) to safely check required gems +- Added [story branch](https://github.com/story-branch/story_branch) to the configuration +- Using travis-ci to run rubocop as well, replacing github actions: github actions do not work in fork's PRs + # 2.6.1 ## Enhancements