ros-apartment 2.8.1 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c36b8c69f5db4dff0a6befb5fdbd81d193cc4c1185b870f146d53ed81e6a0a0b
-  data.tar.gz: a6e57ff1723b954ad083b7d22f184afeec2dbdbbeaff2bd605a995f2b5138143
+  metadata.gz: f31fef7b2332c76bce3bff4823754c145b7a049bbf845ce29bb22b65b29585e4
+  data.tar.gz: 657b9a8bf128f912894e03bd2331b2e2201bf9f43f38515117e434ef65694341
 SHA512:
-  metadata.gz: 5ad2cb2b3b52d20c7be5b1bd780cf27aa35d4cc954b5d03e56376a1dd306e5fa317da1ac783e674bf50c0db343c40dbf386593be2b02497372ae4f34f3f42801
-  data.tar.gz: aaf0d4b3e1bc71fa71dc98731b05d2921546fbcd5c60718c63c1e5dacfdee47924356e9372e1dbef2d34625e9696d001a8b289c4fec42345664ec3afb0de208d
+  metadata.gz: d35580a7ed02ea8423251e0e7ed555d002fe34f4d2705cb16b982e5211a5f79fd8f078b97c7ac633f8b1bb605c9ada8176a6c082c0d1ad00591ba4b079acb7b4
+  data.tar.gz: fa77558d5731e0a99c8ff1f8611c5353e633a5bbcd37fe94c64fe310414f8f724177d6fa7121ca88031315638990087546892a7411fd7477e37362de52682e31

data/.circleci/config.yml

@@ -70,7 +70,7 @@ workflows:
           matrix:
             parameters:
               ruby_version: ["ruby:2.6-buster", "ruby:2.7-buster"]
-              gemfile: ["gemfiles/rails_5_2.gemfile", "gemfiles/rails_6_0.gemfile"]
+              gemfile: ["gemfiles/rails_5_2.gemfile", "gemfiles/rails_6_0.gemfile", "gemfiles/rails_6_1.gemfile"]
 
   rubocop:
     jobs:

data/Appraisals

@@ -45,14 +45,26 @@ appraise 'rails-6-0' do
   end
 end
 
+appraise 'rails-6-1' do
+  gem 'rails', '~> 6.1.0'
+  platforms :ruby do
+    gem 'sqlite3', '~> 1.4'
+  end
+  platforms :jruby do
+    gem 'activerecord-jdbc-adapter', '~> 61.0'
+    gem 'activerecord-jdbcpostgresql-adapter', '~> 61.0'
+    gem 'activerecord-jdbcmysql-adapter', '~> 61.0'
+  end
+end
+
 appraise 'rails-master' do
   gem 'rails', git: 'https://github.com/rails/rails.git'
   platforms :ruby do
     gem 'sqlite3', '~> 1.4'
   end
   platforms :jruby do
-    gem 'activerecord-jdbc-adapter', '~> 52.0'
-    gem 'activerecord-jdbcpostgresql-adapter', '~> 52.0'
-    gem 'activerecord-jdbcmysql-adapter', '~> 52.0'
+    gem 'activerecord-jdbc-adapter', '~> 61.0'
+    gem 'activerecord-jdbcpostgresql-adapter', '~> 61.0'
+    gem 'activerecord-jdbcmysql-adapter', '~> 61.0'
   end
 end

data/gemfiles/rails_6_1.gemfile

@@ -0,0 +1,23 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 6.1.0"
+gem "rubocop"
+
+group :local do
+  gem "guard-rspec", "~> 4.2"
+  gem "pry"
+end
+
+platforms :ruby do
+  gem "sqlite3", "~> 1.4"
+end
+
+platforms :jruby do
+  gem "activerecord-jdbc-adapter", "~> 61.0"
+  gem "activerecord-jdbcpostgresql-adapter", "~> 61.0"
+  gem "activerecord-jdbcmysql-adapter", "~> 61.0"
+end
+
+gemspec path: "../"

data/lib/apartment.rb

@@ -27,7 +27,7 @@ module Apartment
 
     WRITER_METHODS = %i[tenant_names database_schema_file excluded_models
                         persistent_schemas connection_class
-                        db_migrate_tenants seed_data_file
+                        db_migrate_tenants db_migrate_tenant_missing_strategy seed_data_file
                         parallel_migration_threads pg_excluded_names].freeze
 
     attr_accessor(*ACCESSOR_METHODS)
@@ -72,6 +72,21 @@ module Apartment
       @db_migrate_tenants = true
     end
 
+    # How to handle tenant missing on db:migrate
+    # defaults to :rescue_exception
+    # available options: rescue_exception, raise_exception, create_tenant
+    def db_migrate_tenant_missing_strategy
+      valid = %i[rescue_exception raise_exception create_tenant]
+      value = @db_migrate_tenant_missing_strategy || :rescue_exception
+
+      return value if valid.include?(value)
+
+      key_name  = 'config.db_migrate_tenant_missing_strategy'
+      opt_names = valid.join(', ')
+
+      raise ApartmentError, "Option #{value} not valid for `#{key_name}`. Use one of #{opt_names}"
+    end
+
     # Default to empty array
     def excluded_models
       @excluded_models || []

data/lib/apartment/tasks/task_helper.rb

@@ -36,5 +36,17 @@ module Apartment
     rescue Apartment::TenantExists => e
       puts "Tried to create already existing tenant: #{e}"
     end
+
+    def self.migrate_tenant(tenant_name)
+      strategy = Apartment.db_migrate_tenant_missing_strategy
+      create_tenant(tenant_name) if strategy == :create_tenant
+
+      puts("Migrating #{tenant_name} tenant")
+      Apartment::Migrator.migrate tenant_name
+    rescue Apartment::TenantNotFound => e
+      raise e if strategy == :raise_exception
+
+      puts e.message
+    end
   end
 end

data/lib/apartment/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Apartment
-  VERSION = '2.8.1'
+  VERSION = '2.9.0'
 end

data/lib/tasks/apartment.rake

@@ -30,13 +30,7 @@ apartment_namespace = namespace :apartment do
   task :migrate do
     Apartment::TaskHelper.warn_if_tenants_empty
     Apartment::TaskHelper.each_tenant do |tenant|
-      begin
-        Apartment::TaskHelper.create_tenant(tenant)
-        puts("Migrating #{tenant} tenant")
-        Apartment::Migrator.migrate tenant
-      rescue Apartment::TenantNotFound => e
-        puts e.message
-      end
+      Apartment::TaskHelper.migrate_tenant(tenant)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ros-apartment
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.9.0
 platform: ruby
 authors:
 - Ryan Brunner
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-18 00:00:00.000000000 Z
+date: 2021-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -251,6 +251,7 @@ files:
 - gemfiles/rails_5_1.gemfile
 - gemfiles/rails_5_2.gemfile
 - gemfiles/rails_6_0.gemfile
+- gemfiles/rails_6_1.gemfile
 - gemfiles/rails_master.gemfile
 - lib/apartment.rb
 - lib/apartment/active_record/connection_handling.rb